Refactored exceptions to have single constructors and made room for wrapped causes.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@540165 13f79535-47bb-0310-9956-ffa450edef68

22 files changed, 62 insertions, 126 deletions

diff --git a/java/common/src/main/java/org/apache/qpid/AMQChannelClosedException.java b/java/common/src/main/java/org/apache/qpid/AMQChannelClosedException.java
index 251e91c1b9..1b2eabdc86 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQChannelClosedException.java
+++ b/java/common/src/main/java/org/apache/qpid/AMQChannelClosedException.java
@@ -34,8 +34,8 @@ import org.apache.qpid.protocol.AMQConstant;
  */
 public class AMQChannelClosedException extends AMQException
 {
-    public AMQChannelClosedException(AMQConstant errorCode, String msg)
+    public AMQChannelClosedException(AMQConstant errorCode, String msg, Throwable cause)
     {
-        super(errorCode, msg);
+        super(errorCode, msg, cause);
     }
 }
diff --git a/java/common/src/main/java/org/apache/qpid/AMQChannelException.java b/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
index 9efd271e4d..9d8672f433 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
+++ b/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -39,22 +39,17 @@ public class AMQChannelException extends AMQException
 {
     private final int _classId;
     private final int _methodId;
-    /* AMQP version for which exception ocurred */
+
+    /** AMQP version for which exception ocurred, major code. */
     private final byte major;
-    private final byte minor;
 
-    public AMQChannelException(AMQConstant errorCode, String msg, int classId, int methodId, byte major, byte minor, Throwable t)
-    {
-        super(errorCode, msg, t);
-        _classId = classId;
-        _methodId = methodId;
-        this.major = major;
-        this.minor = minor;
-    }
+    /** AMQP version for which exception ocurred, minor code. */
+    private final byte minor;
 
-    public AMQChannelException(AMQConstant errorCode, String msg, int classId, int methodId, byte major, byte minor)
+    public AMQChannelException(AMQConstant errorCode, String msg, int classId, int methodId, byte major, byte minor,
+        Throwable cause)
     {
-        super(errorCode, msg);
+        super(errorCode, msg, cause);
         _classId = classId;
         _methodId = methodId;
         this.major = major;
@@ -63,6 +58,7 @@ public class AMQChannelException extends AMQException
 
     public AMQFrame getCloseFrame(int channel)
     {
-        return ChannelCloseBody.createAMQFrame(channel, major, minor, _classId, _methodId, getErrorCode().getCode(), new AMQShortString(getMessage()));
+        return ChannelCloseBody.createAMQFrame(channel, major, minor, _classId, _methodId, getErrorCode().getCode(),
+                new AMQShortString(getMessage()));
     }
 }
diff --git a/java/common/src/main/java/org/apache/qpid/AMQConnectionClosedException.java b/java/common/src/main/java/org/apache/qpid/AMQConnectionClosedException.java
index 931c6cd87a..e95e805e9f 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQConnectionClosedException.java
+++ b/java/common/src/main/java/org/apache/qpid/AMQConnectionClosedException.java
@@ -34,8 +34,8 @@ import org.apache.qpid.protocol.AMQConstant;
  */
 public class AMQConnectionClosedException extends AMQException
 {
-    public AMQConnectionClosedException(AMQConstant errorCode, String msg)
+    public AMQConnectionClosedException(AMQConstant errorCode, String msg, Throwable cause)
     {
-        super(errorCode, msg);
+        super(errorCode, msg, cause);
     }
 }
diff --git a/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java b/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java
index 7edfa648ed..ba9f69a05c 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java
+++ b/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java
@@ -40,24 +40,19 @@ public class AMQConnectionException extends AMQException
 {
     private final int _classId;
     private final int _methodId;
-    /* AMQP version for which exception ocurred */
+
+    /** AMQP version for which exception ocurred, major code. */
     private final byte major;
+
+    /** AMQP version for which exception ocurred, minor code. */
     private final byte minor;
+
     boolean _closeConnetion;
 
     public AMQConnectionException(AMQConstant errorCode, String msg, int classId, int methodId, byte major, byte minor,
-        Throwable t)
+        Throwable cause)
     {
-        super(errorCode, msg, t);
-        _classId = classId;
-        _methodId = methodId;
-        this.major = major;
-        this.minor = minor;
-    }
-
-    public AMQConnectionException(AMQConstant errorCode, String msg, int classId, int methodId, byte major, byte minor)
-    {
-        super(errorCode, msg);
+        super(errorCode, msg, cause);
         _classId = classId;
         _methodId = methodId;
         this.major = major;
@@ -69,5 +64,4 @@ public class AMQConnectionException extends AMQException
         return ConnectionCloseBody.createAMQFrame(channel, major, minor, _classId, _methodId, getErrorCode().getCode(),
                 new AMQShortString(getMessage()));
     }
-
 }
diff --git a/java/common/src/main/java/org/apache/qpid/AMQConnectionFailureException.java b/java/common/src/main/java/org/apache/qpid/AMQConnectionFailureException.java
index 72fa2ae984..c043a00836 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQConnectionFailureException.java
+++ b/java/common/src/main/java/org/apache/qpid/AMQConnectionFailureException.java
@@ -12,8 +12,8 @@ package org.apache.qpid;
  */

 public class AMQConnectionFailureException extends AMQException

 {

-    public AMQConnectionFailureException(String message)

+    public AMQConnectionFailureException(String message, Throwable cause)

     {

-        super(message);

+        super(null, message, cause);

     }

 }

diff --git a/java/common/src/main/java/org/apache/qpid/AMQDisconnectedException.java b/java/common/src/main/java/org/apache/qpid/AMQDisconnectedException.java
index e62b2c10a2..5ec5c42ab9 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQDisconnectedException.java
+++ b/java/common/src/main/java/org/apache/qpid/AMQDisconnectedException.java
@@ -32,8 +32,8 @@ package org.apache.qpid;
  */
 public class AMQDisconnectedException extends AMQException
 {
-    public AMQDisconnectedException(String msg)
+    public AMQDisconnectedException(String msg, Throwable cause)
     {
-        super(msg);
+        super(null, msg, cause);
     }
 }
diff --git a/java/common/src/main/java/org/apache/qpid/AMQException.java b/java/common/src/main/java/org/apache/qpid/AMQException.java
index 41599ed880..6cbb98fd86 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQException.java
+++ b/java/common/src/main/java/org/apache/qpid/AMQException.java
@@ -44,48 +44,11 @@ public class AMQException extends Exception
      *
      * @param errorCode The error code. May be null if not to be set.
      * @param msg       The exception message. May be null if not to be set.
-     * @param t         The underlying cause of the exception. May be null if not to be set.
+     * @param cause         The underlying cause of the exception. May be null if not to be set.
      */
-    public AMQException(AMQConstant errorCode, String msg, Throwable t)
+    public AMQException(AMQConstant errorCode, String msg, Throwable cause)
     {
-        super(((msg == null) ? "" : msg) + ((errorCode == null) ? "" : (" [error code " + errorCode + "]")), t);
-        _errorCode = errorCode;
-    }
-
-    /**
-     * @param message
-     *
-     * @deprecated Use {@link #AMQException(org.apache.qpid.protocol.AMQConstant, String, Throwable)} instead.
-     */
-    public AMQException(String message)
-    {
-        super(message);
-        // fixme This method needs removed and all AMQExceptions need a valid error code
-        _errorCode = AMQConstant.getConstant(-1);
-    }
-
-    /**
-     * @param msg
-     * @param t
-     *
-     * @deprecated Use {@link #AMQException(org.apache.qpid.protocol.AMQConstant, String, Throwable)} instead.
-     */
-    public AMQException(String msg, Throwable t)
-    {
-        super(msg, t);
-        // fixme This method needs removed and all AMQExceptions need a valid error code
-        _errorCode = AMQConstant.getConstant(-1);
-    }
-
-    /**
-     * @param errorCode
-     * @param msg
-     *
-     * @deprecated Use {@link #AMQException(org.apache.qpid.protocol.AMQConstant, String, Throwable)} instead.
-     */
-    public AMQException(AMQConstant errorCode, String msg)
-    {
-        super(msg + " [error code " + errorCode + ']');
+        super(((msg == null) ? "" : msg) + ((errorCode == null) ? "" : (" [error code " + errorCode + "]")), cause);
         _errorCode = errorCode;
     }
 
diff --git a/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java b/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java
index 278128f924..15c8bea0a4 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java
+++ b/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java
@@ -32,8 +32,8 @@ import org.apache.qpid.protocol.AMQConstant;
  */
 public class AMQInvalidArgumentException extends AMQException
 {
-    public AMQInvalidArgumentException(String message)
+    public AMQInvalidArgumentException(String message, Throwable cause)
     {
-        super(AMQConstant.INVALID_ARGUMENT, message);
+        super(AMQConstant.INVALID_ARGUMENT, message, cause);
     }
 }
diff --git a/java/common/src/main/java/org/apache/qpid/AMQInvalidRoutingKeyException.java b/java/common/src/main/java/org/apache/qpid/AMQInvalidRoutingKeyException.java
index b5ec9845d6..c117968a29 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQInvalidRoutingKeyException.java
+++ b/java/common/src/main/java/org/apache/qpid/AMQInvalidRoutingKeyException.java
@@ -32,8 +32,8 @@ import org.apache.qpid.protocol.AMQConstant;
  */
 public class AMQInvalidRoutingKeyException extends AMQException
 {
-    public AMQInvalidRoutingKeyException(String message)
+    public AMQInvalidRoutingKeyException(String message, Throwable cause)
     {
-        super(AMQConstant.INVALID_ROUTING_KEY, message);
+        super(AMQConstant.INVALID_ROUTING_KEY, message, cause);
     }
 }
diff --git a/java/common/src/main/java/org/apache/qpid/AMQTimeoutException.java b/java/common/src/main/java/org/apache/qpid/AMQTimeoutException.java
index 0f8d9c47db..4ae8282af5 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQTimeoutException.java
+++ b/java/common/src/main/java/org/apache/qpid/AMQTimeoutException.java
@@ -32,8 +32,8 @@ import org.apache.qpid.protocol.AMQConstant;
  */
 public class AMQTimeoutException extends AMQException
 {
-    public AMQTimeoutException(String message)
+    public AMQTimeoutException(String message, Throwable cause)
     {
-        super(AMQConstant.REQUEST_TIMEOUT, message);
+        super(AMQConstant.REQUEST_TIMEOUT, message, cause);
     }
 }
diff --git a/java/common/src/main/java/org/apache/qpid/AMQUndeliveredException.java b/java/common/src/main/java/org/apache/qpid/AMQUndeliveredException.java
index 03220cc95e..1502c0efc5 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQUndeliveredException.java
+++ b/java/common/src/main/java/org/apache/qpid/AMQUndeliveredException.java
@@ -34,9 +34,9 @@ public class AMQUndeliveredException extends AMQException
 {
     private Object _bounced;
 
-    public AMQUndeliveredException(AMQConstant errorCode, String msg, Object bounced)
+    public AMQUndeliveredException(AMQConstant errorCode, String msg, Object bounced, Throwable cause)
     {
-        super(errorCode, msg);
+        super(errorCode, msg, cause);
 
         _bounced = bounced;
     }
diff --git a/java/common/src/main/java/org/apache/qpid/AMQUnknownExchangeType.java b/java/common/src/main/java/org/apache/qpid/AMQUnknownExchangeType.java
index c4aa992a01..f483b9947b 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQUnknownExchangeType.java
+++ b/java/common/src/main/java/org/apache/qpid/AMQUnknownExchangeType.java
@@ -15,8 +15,8 @@ package org.apache.qpid;
  */

 public class AMQUnknownExchangeType extends AMQException

 {

-    public AMQUnknownExchangeType(String message)

+    public AMQUnknownExchangeType(String message, Throwable cause)

     {

-        super(message);

+        super(null, message, cause);

     }

 }

diff --git a/java/common/src/main/java/org/apache/qpid/AMQUnresolvedAddressException.java b/java/common/src/main/java/org/apache/qpid/AMQUnresolvedAddressException.java
index 6cc9c3fe00..eee3e6afcf 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQUnresolvedAddressException.java
+++ b/java/common/src/main/java/org/apache/qpid/AMQUnresolvedAddressException.java
@@ -37,9 +37,9 @@ public class AMQUnresolvedAddressException extends AMQException
 {
     String _broker;
 
-    public AMQUnresolvedAddressException(String message, String broker)
+    public AMQUnresolvedAddressException(String message, String broker, Throwable cause)
     {
-        super(message);
+        super(null, message, cause);
         _broker = broker;
     }
 
diff --git a/java/common/src/main/java/org/apache/qpid/configuration/PropertyException.java b/java/common/src/main/java/org/apache/qpid/configuration/PropertyException.java
index 1e5cc57fff..73a336321c 100644
--- a/java/common/src/main/java/org/apache/qpid/configuration/PropertyException.java
+++ b/java/common/src/main/java/org/apache/qpid/configuration/PropertyException.java
@@ -36,25 +36,8 @@ import org.apache.qpid.protocol.AMQConstant;
  */
 public class PropertyException extends AMQException
 {
-    public PropertyException(String message)
+    public PropertyException(String message, Throwable cause)
     {
-        super(message);
+        super(null, message, cause);
     }
-
-    /*
-    public PropertyException(String msg, Throwable t)
-    {
-        super(msg, t);
-    }
-
-    public PropertyException(AMQConstant errorCode, String msg, Throwable t)
-    {
-        super(errorCode, msg, t);
-    }
-
-    public PropertyException(AMQConstant errorCode, String msg)
-    {
-        super(errorCode, msg);
-    }
-     */
 }
diff --git a/java/common/src/main/java/org/apache/qpid/configuration/PropertyUtils.java b/java/common/src/main/java/org/apache/qpid/configuration/PropertyUtils.java
index b3c310d23c..6e2b25fb2c 100644
--- a/java/common/src/main/java/org/apache/qpid/configuration/PropertyUtils.java
+++ b/java/common/src/main/java/org/apache/qpid/configuration/PropertyUtils.java
@@ -80,7 +80,7 @@ public class PropertyUtils
 
                 if (replacement == null)
                 {
-                    throw new PropertyException("Property ${" + propertyName + "} has not been set");
+                    throw new PropertyException("Property ${" + propertyName + "} has not been set", null);
                 }
 
                 fragment = replacement;
@@ -145,7 +145,7 @@ public class PropertyUtils
                 int endName = value.indexOf('}', pos);
                 if (endName < 0)
                 {
-                    throw new PropertyException("Syntax error in property: " + value);
+                    throw new PropertyException("Syntax error in property: " + value, null);
                 }
 
                 String propertyName = value.substring(pos + 2, endName);
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQFrameDecodingException.java b/java/common/src/main/java/org/apache/qpid/framing/AMQFrameDecodingException.java
index cd5ccf8e04..843b6a1e8c 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQFrameDecodingException.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/AMQFrameDecodingException.java
@@ -34,8 +34,8 @@ import org.apache.qpid.protocol.AMQConstant;
  */
 public class AMQFrameDecodingException extends AMQException
 {
-    public AMQFrameDecodingException(AMQConstant errorCode, String message, Throwable t)
+    public AMQFrameDecodingException(AMQConstant errorCode, String message, Throwable cause)
     {
-        super(errorCode, message, t);
+        super(errorCode, message, cause);
     }
 }
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java b/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java
index 23a1ce367e..0982847aac 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java
@@ -111,7 +111,7 @@ public abstract class AMQMethodBody extends AMQBody
 

     public AMQChannelException getChannelException(AMQConstant code, String message)

     {

-        return new AMQChannelException(code, message, getClazz(), getMethod(), major, minor);

+        return new AMQChannelException(code, message, getClazz(), getMethod(), major, minor, null);

     }

 

     public AMQChannelException getChannelException(AMQConstant code, String message, Throwable cause)

@@ -121,7 +121,7 @@ public abstract class AMQMethodBody extends AMQBody
 

     public AMQConnectionException getConnectionException(AMQConstant code, String message)

     {

-        return new AMQConnectionException(code, message, getClazz(), getMethod(), major, minor);

+        return new AMQConnectionException(code, message, getClazz(), getMethod(), major, minor, null);

     }

 

     public AMQConnectionException getConnectionException(AMQConstant code, String message, Throwable cause)

diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolClassException.java b/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolClassException.java
index e48fd2e7f9..ab09c1de6d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolClassException.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolClassException.java
@@ -32,8 +32,8 @@ package org.apache.qpid.framing;
  */
 public class AMQProtocolClassException extends AMQProtocolHeaderException
 {
-    public AMQProtocolClassException(String message)
+    public AMQProtocolClassException(String message, Throwable cause)
     {
-        super(message);
+        super(message, cause);
     }
 }
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolHeaderException.java b/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolHeaderException.java
index 1ce49aba83..6b819364da 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolHeaderException.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolHeaderException.java
@@ -34,8 +34,8 @@ import org.apache.qpid.AMQException;
  */
 public class AMQProtocolHeaderException extends AMQException
 {
-    public AMQProtocolHeaderException(String message)
+    public AMQProtocolHeaderException(String message, Throwable cause)
     {
-        super(message);
+        super(null, message, cause);
     }
 }
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolInstanceException.java b/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolInstanceException.java
index 9049eace2a..3165c373a9 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolInstanceException.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolInstanceException.java
@@ -32,8 +32,8 @@ package org.apache.qpid.framing;
  */
 public class AMQProtocolInstanceException extends AMQProtocolHeaderException
 {
-    public AMQProtocolInstanceException(String message)
+    public AMQProtocolInstanceException(String message, Throwable cause)
     {
-        super(message);
+        super(message, cause);
     }
 }
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolVersionException.java b/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolVersionException.java
index 9074931617..c9b0973ea6 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolVersionException.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolVersionException.java
@@ -32,8 +32,8 @@ package org.apache.qpid.framing;
  */
 public class AMQProtocolVersionException extends AMQProtocolHeaderException
 {
-    public AMQProtocolVersionException(String message)
+    public AMQProtocolVersionException(String message, Throwable cause)
     {
-        super(message);
+        super(message, cause);
     }
 }
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java b/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
index 8b40fe72eb..4c253b9973 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
@@ -144,7 +144,7 @@ public class ProtocolInitiation extends AMQDataBlock implements EncodableAMQData
 
         if(_protocolHeader.length != 4)
         {
-            throw new AMQProtocolHeaderException("Protocol header should have exactly four octets");
+            throw new AMQProtocolHeaderException("Protocol header should have exactly four octets", null);
         }
         for(int i = 0; i < 4; i++)
         {
@@ -152,7 +152,7 @@ public class ProtocolInitiation extends AMQDataBlock implements EncodableAMQData
             {
                 try
                 {
-                    throw new AMQProtocolHeaderException("Protocol header is not correct: Got " + new String(_protocolHeader,"ISO-8859-1") + " should be: " + new String(AMQP_HEADER, "ISO-8859-1"));
+                    throw new AMQProtocolHeaderException("Protocol header is not correct: Got " + new String(_protocolHeader,"ISO-8859-1") + " should be: " + new String(AMQP_HEADER, "ISO-8859-1"), null);
                 }
                 catch (UnsupportedEncodingException e)
                 {
@@ -163,12 +163,12 @@ public class ProtocolInitiation extends AMQDataBlock implements EncodableAMQData
         if (_protocolClass != CURRENT_PROTOCOL_CLASS)
         {
             throw new AMQProtocolClassException("Protocol class " + CURRENT_PROTOCOL_CLASS + " was expected; received " +
-                                                _protocolClass);
+                                                _protocolClass, null);
         }
         if (_protocolInstance != TCP_PROTOCOL_INSTANCE)
         {
             throw new AMQProtocolInstanceException("Protocol instance " + TCP_PROTOCOL_INSTANCE + " was expected; received " +
-                                                   _protocolInstance);
+                                                   _protocolInstance, null);
         }
 
         ProtocolVersion pv = new ProtocolVersion(_protocolMajor, _protocolMinor);
@@ -178,7 +178,7 @@ public class ProtocolInitiation extends AMQDataBlock implements EncodableAMQData
         {
             // TODO: add list of available versions in list to msg...
             throw new AMQProtocolVersionException("Protocol version " +
-                                                  _protocolMajor + "." + _protocolMinor + " not suppoerted by this version of the Qpid broker.");
+                                                  _protocolMajor + "." + _protocolMinor + " not suppoerted by this version of the Qpid broker.", null);
         }
     }