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

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

5 files changed, 13 insertions, 110 deletions

diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageFactory.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageFactory.java
index f3b21e3c64..69960e54e5 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageFactory.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageFactory.java
@@ -6,9 +6,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
@@ -19,12 +19,13 @@
 
 package org.apache.qpid.example.publisher;
 
-import org.apache.qpid.example.shared.FileUtils;
-import org.apache.qpid.example.shared.Statics;
-
 import java.io.*;
+
 import javax.jms.*;
 
+import org.apache.qpid.example.shared.FileUtils;
+import org.apache.qpid.example.shared.Statics;
+
 public class FileMessageFactory
 {
     protected final Session _session;
@@ -47,8 +48,7 @@ public class FileMessageFactory
         }
         catch (IOException e)
         {
-            MessageFactoryException mfe = new MessageFactoryException(e.toString());
-            mfe.initCause(e);
+            MessageFactoryException mfe = new MessageFactoryException(e.toString(), e);
             throw mfe;
         }
     }
@@ -64,7 +64,8 @@ public class FileMessageFactory
     {
         TextMessage msg = _session.createTextMessage();
         msg.setText(_payload);
-        msg.setStringProperty(Statics.FILENAME_PROPERTY,new File(_filename).getName());
+        msg.setStringProperty(Statics.FILENAME_PROPERTY, new File(_filename).getName());
+
         return msg;
     }
 
@@ -79,6 +80,7 @@ public class FileMessageFactory
     {
         TextMessage msg = session.createTextMessage();
         msg.setText(textMsg);
+
         return msg;
     }
 
@@ -116,6 +118,7 @@ public class FileMessageFactory
         catch (JMSException e)
         {
             e.printStackTrace(System.out);
+
             return e.toString();
         }
     }
@@ -124,13 +127,13 @@ public class FileMessageFactory
     {
         try
         {
-            return m instanceof TextMessage && ((TextMessage) m).getText().equals(s);
+            return (m instanceof TextMessage) && ((TextMessage) m).getText().equals(s);
         }
         catch (JMSException e)
         {
             e.printStackTrace(System.out);
+
             return false;
         }
     }
 }
-
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/MessageFactoryException.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/MessageFactoryException.java
index 0a4231c977..d709da6432 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/MessageFactoryException.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/MessageFactoryException.java
@@ -22,33 +22,8 @@ package org.apache.qpid.example.publisher;
 
 public class MessageFactoryException extends Exception
 {
-
-    private int _errorCode;
-
-    public MessageFactoryException(String message)
-    {
-        super(message);
-    }
-
     public MessageFactoryException(String msg, Throwable t)
     {
         super(msg, t);
     }
-
-    public MessageFactoryException(int errorCode, String msg, Throwable t)
-    {
-        super(msg + " [error code " + errorCode + ']', t);
-        _errorCode = errorCode;
-    }
-
-    public MessageFactoryException(int errorCode, String msg)
-    {
-        super(msg + " [error code " + errorCode + ']');
-        _errorCode = errorCode;
-    }
-
-    public int getErrorCode()
-    {
-        return _errorCode;
-    }
 }
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/UndeliveredMessageException.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/UndeliveredMessageException.java
index 399cbc9427..245008b68a 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/UndeliveredMessageException.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/UndeliveredMessageException.java
@@ -25,33 +25,8 @@ package org.apache.qpid.example.publisher;
  */
 public class UndeliveredMessageException extends Exception
 {
-
-    private int _errorCode;
-
-    public UndeliveredMessageException(String message)
-    {
-        super(message);
-    }
-
     public UndeliveredMessageException(String msg, Throwable t)
     {
         super(msg, t);
     }
-
-    public UndeliveredMessageException(int errorCode, String msg, Throwable t)
-    {
-        super(msg + " [error code " + errorCode + ']', t);
-        _errorCode = errorCode;
-    }
-
-    public UndeliveredMessageException(int errorCode, String msg)
-    {
-        super(msg + " [error code " + errorCode + ']');
-        _errorCode = errorCode;
-    }
-
-    public int getErrorCode()
-    {
-        return _errorCode;
-    }
 }
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/ConnectionException.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/ConnectionException.java
index 6eb847ea9d..1a3d596a24 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/ConnectionException.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/ConnectionException.java
@@ -22,33 +22,8 @@ package org.apache.qpid.example.shared;
 
 public class ConnectionException extends Exception
 {
-
-    private int _errorCode;
-
-    public ConnectionException(String message)
-    {
-        super(message);
-    }
-
     public ConnectionException(String msg, Throwable t)
     {
         super(msg, t);
     }
-
-    public ConnectionException(int errorCode, String msg, Throwable t)
-    {
-        super(msg + " [error code " + errorCode + ']', t);
-        _errorCode = errorCode;
-    }
-
-    public ConnectionException(int errorCode, String msg)
-    {
-        super(msg + " [error code " + errorCode + ']');
-        _errorCode = errorCode;
-    }
-
-    public int getErrorCode()
-    {
-        return _errorCode;
-    }
 }
diff --git a/qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/ContextException.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/ContextException.java
index bf805ab817..2987a9559b 100644
--- a/qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/ContextException.java
+++ b/qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/ContextException.java
@@ -22,33 +22,8 @@ package org.apache.qpid.example.shared;
 
 public class ContextException extends Exception
 {
-
-    private int _errorCode;
-
-    public ContextException(String message)
-    {
-        super(message);
-    }
-
     public ContextException(String msg, Throwable t)
     {
         super(msg, t);
     }
-
-    public ContextException(int errorCode, String msg, Throwable t)
-    {
-        super(msg + " [error code " + errorCode + ']', t);
-        _errorCode = errorCode;
-    }
-
-    public ContextException(int errorCode, String msg)
-    {
-        super(msg + " [error code " + errorCode + ']');
-        _errorCode = errorCode;
-    }
-
-    public int getErrorCode()
-    {
-        return _errorCode;
-    }
 }