QPID-2675: Remove obsolete QpidException

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

10 files changed, 49 insertions, 48 deletions

diff --git a/java/client/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java b/java/client/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
index 56d1bdcdc5..a86613f10c 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
@@ -17,7 +17,7 @@
  */
 package org.apache.qpid.filter;
 
-import org.apache.qpid.QpidException;
+import org.apache.qpid.AMQInternalException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 
@@ -241,7 +241,7 @@ public abstract class ArithmeticExpression extends BinaryExpression
         }
     }
 
-    public Object evaluate(AbstractJMSMessage message) throws QpidException
+    public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
     {
         Object lvalue = left.evaluate(message);
         if (lvalue == null)
diff --git a/java/client/src/main/java/org/apache/qpid/filter/BooleanExpression.java b/java/client/src/main/java/org/apache/qpid/filter/BooleanExpression.java
index cc24c81729..14a5c7ea87 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/BooleanExpression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/BooleanExpression.java
@@ -17,7 +17,7 @@
  */
 package org.apache.qpid.filter;
 
-import org.apache.qpid.QpidException;
+import org.apache.qpid.AMQInternalException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 
@@ -28,6 +28,6 @@ import org.apache.qpid.client.message.AbstractJMSMessage;
 public interface BooleanExpression extends Expression
 {
 
-    public boolean matches(AbstractJMSMessage message) throws QpidException;
+    public boolean matches(AbstractJMSMessage message) throws AMQInternalException;
 
 }
diff --git a/java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java b/java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
index adf360698b..55fca853ef 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
@@ -17,13 +17,13 @@
  */
 package org.apache.qpid.filter;
 
-import org.apache.qpid.QpidException;
-import org.apache.qpid.client.message.AbstractJMSMessage;
-
 import java.util.HashSet;
 import java.util.List;
 import java.util.regex.Pattern;
 
+import org.apache.qpid.AMQInternalException;
+import org.apache.qpid.client.message.AbstractJMSMessage;
+
 /**
  * A filter performing a comparison of two objects
  */
@@ -131,7 +131,7 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
         /**
          *  org.apache.activemq.filter.Expression#evaluate(MessageEvaluationContext)
          */
-        public Object evaluate(AbstractJMSMessage message) throws QpidException
+        public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
         {
 
             Object rv = this.getRight().evaluate(message);
@@ -151,7 +151,7 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
             return likePattern.matcher((String) rv).matches() ? Boolean.TRUE : Boolean.FALSE;
         }
 
-        public boolean matches(AbstractJMSMessage message) throws QpidException
+        public boolean matches(AbstractJMSMessage message) throws AMQInternalException
         {
             Object object = evaluate(message);
 
@@ -234,7 +234,7 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
         return new ComparisonExpression(left, right)
             {
 
-                public Object evaluate(AbstractJMSMessage message) throws QpidException
+                public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
                 {
                     Object lv = left.evaluate(message);
                     Object rv = right.evaluate(message);
@@ -417,7 +417,7 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
         super(left, right);
     }
 
-    public Object evaluate(AbstractJMSMessage message) throws QpidException
+    public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
     {
         Comparable lv = (Comparable) left.evaluate(message);
         if (lv == null)
@@ -579,7 +579,7 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
 
     protected abstract boolean asBoolean(int answer);
 
-    public boolean matches(AbstractJMSMessage message) throws QpidException
+    public boolean matches(AbstractJMSMessage message) throws AMQInternalException
     {
         Object object = evaluate(message);
 
diff --git a/java/client/src/main/java/org/apache/qpid/filter/ConstantExpression.java b/java/client/src/main/java/org/apache/qpid/filter/ConstantExpression.java
index 447de914a4..3874d13431 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/ConstantExpression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/ConstantExpression.java
@@ -17,11 +17,11 @@
  */
 package org.apache.qpid.filter;
 
-import org.apache.qpid.QpidException;
-import org.apache.qpid.client.message.AbstractJMSMessage;
-
 import java.math.BigDecimal;
 
+import org.apache.qpid.AMQInternalException;
+import org.apache.qpid.client.message.AbstractJMSMessage;
+
 /**
  * Represents a constant expression
  */
@@ -35,7 +35,7 @@ public class ConstantExpression implements Expression
             super(value);
         }
 
-        public boolean matches(AbstractJMSMessage message) throws QpidException
+        public boolean matches(AbstractJMSMessage message) throws AMQInternalException
         {
             Object object = evaluate(message);
 
@@ -114,7 +114,7 @@ public class ConstantExpression implements Expression
         this.value = value;
     }
 
-    public Object evaluate(AbstractJMSMessage message) throws QpidException
+    public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
     {
         return value;
     }
diff --git a/java/client/src/main/java/org/apache/qpid/filter/Expression.java b/java/client/src/main/java/org/apache/qpid/filter/Expression.java
index e578775a77..8208f49688 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/Expression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/Expression.java
@@ -17,7 +17,7 @@
  */
 package org.apache.qpid.filter;
 
-import org.apache.qpid.QpidException;
+import org.apache.qpid.AMQInternalException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 
@@ -29,6 +29,7 @@ public interface Expression
     /**
      * @param message The message to evaluate
      * @return the value of this expression
+     * @throws AMQInternalException 
      */
-    public Object evaluate(AbstractJMSMessage message) throws QpidException;
+    public Object evaluate(AbstractJMSMessage message) throws AMQInternalException;
 }
diff --git a/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java b/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java
index dcfb9a9940..4159986090 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java
@@ -17,11 +17,11 @@
  */
 package org.apache.qpid.filter;
 
+import org.apache.qpid.AMQInternalException;
+import org.apache.qpid.client.message.AbstractJMSMessage;
+import org.apache.qpid.filter.selector.SelectorParser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.qpid.QpidException;
-import org.apache.qpid.filter.selector.SelectorParser;
-import org.apache.qpid.client.message.AbstractJMSMessage;
 
 
 public class JMSSelectorFilter implements MessageFilter
@@ -34,7 +34,7 @@ public class JMSSelectorFilter implements MessageFilter
     private String _selector;
     private BooleanExpression _matcher;
 
-    public JMSSelectorFilter(String selector) throws QpidException
+    public JMSSelectorFilter(String selector) throws AMQInternalException
     {
         _selector = selector;
         if (JMSSelectorFilter._logger.isDebugEnabled())
@@ -56,7 +56,7 @@ public class JMSSelectorFilter implements MessageFilter
             }
             return match;
         }
-        catch (QpidException e)
+        catch (AMQInternalException e)
         {
             JMSSelectorFilter._logger.warn("Caght exception when evaluating message selector for message  " + message, e);
         }
diff --git a/java/client/src/main/java/org/apache/qpid/filter/LogicExpression.java b/java/client/src/main/java/org/apache/qpid/filter/LogicExpression.java
index d7aabd5a46..7ef85cbacb 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/LogicExpression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/LogicExpression.java
@@ -17,7 +17,7 @@
  */
 package org.apache.qpid.filter;
 
-import org.apache.qpid.QpidException;
+import org.apache.qpid.AMQInternalException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 
@@ -32,7 +32,7 @@ public abstract class LogicExpression extends BinaryExpression implements Boolea
         return new LogicExpression(lvalue, rvalue)
             {
 
-                public Object evaluate(AbstractJMSMessage message) throws QpidException
+                public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
                 {
 
                     Boolean lv = (Boolean) left.evaluate(message);
@@ -59,7 +59,7 @@ public abstract class LogicExpression extends BinaryExpression implements Boolea
         return new LogicExpression(lvalue, rvalue)
             {
 
-                public Object evaluate(AbstractJMSMessage message) throws QpidException
+                public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
                 {
 
                     Boolean lv = (Boolean) left.evaluate(message);
@@ -96,9 +96,9 @@ public abstract class LogicExpression extends BinaryExpression implements Boolea
         super(left, right);
     }
 
-    public abstract Object evaluate(AbstractJMSMessage message) throws QpidException;
+    public abstract Object evaluate(AbstractJMSMessage message) throws AMQInternalException;
 
-    public boolean matches(AbstractJMSMessage message) throws QpidException
+    public boolean matches(AbstractJMSMessage message) throws AMQInternalException
     {
         Object object = evaluate(message);
 
diff --git a/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java b/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java
index a775080d81..62e4a28c1e 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java
@@ -17,11 +17,11 @@
  */
 package org.apache.qpid.filter;
 
-import org.apache.qpid.QpidException;
+import org.apache.qpid.AMQInternalException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 
 public interface MessageFilter
 {
-    boolean matches(AbstractJMSMessage message) throws QpidException;
+    boolean matches(AbstractJMSMessage message) throws AMQInternalException;
 }
diff --git a/java/client/src/main/java/org/apache/qpid/filter/PropertyExpression.java b/java/client/src/main/java/org/apache/qpid/filter/PropertyExpression.java
index 09152f7f1b..b7b6bd57bc 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/PropertyExpression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/PropertyExpression.java
@@ -17,14 +17,14 @@
  */
 package org.apache.qpid.filter;
 
-import org.apache.qpid.client.message.AbstractJMSMessage;
-import org.apache.qpid.QpidException;
-import org.apache.qpid.ErrorCode;
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
+import java.util.HashMap;
 
 import javax.jms.JMSException;
-import java.util.HashMap;
+
+import org.apache.qpid.AMQInternalException;
+import org.apache.qpid.client.message.AbstractJMSMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Represents a property  expression
@@ -234,7 +234,7 @@ public class PropertyExpression implements Expression
         jmsPropertyExpression = JMS_PROPERTY_EXPRESSIONS.get(name);
     }
 
-    public Object evaluate(AbstractJMSMessage message) throws QpidException
+    public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
     {
 
         if (jmsPropertyExpression != null)
@@ -256,7 +256,7 @@ public class PropertyExpression implements Expression
             }
             catch(JMSException e)
             {
-                throw new QpidException("Exception evaluating properties for filter", ErrorCode.INTERNAL_ERROR, e);
+                throw new AMQInternalException("Exception evaluating properties for filter", e);
             }
         }
     }
diff --git a/java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.java b/java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.java
index b620b107c4..0fc3382b7e 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.java
@@ -17,14 +17,14 @@
  */
 package org.apache.qpid.filter;
 
-import org.apache.qpid.QpidException;
-import org.apache.qpid.client.message.AbstractJMSMessage;
-
 import java.math.BigDecimal;
-import java.util.List;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
+
+import org.apache.qpid.AMQInternalException;
+import org.apache.qpid.client.message.AbstractJMSMessage;
 
 /**
  * An expression which performs an operation on two expression values
@@ -39,7 +39,7 @@ public abstract class UnaryExpression implements Expression
     {
         return new UnaryExpression(left)
         {
-            public Object evaluate(AbstractJMSMessage message) throws QpidException
+            public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
             {
                 Object rvalue = right.evaluate(message);
                 if (rvalue == null)
@@ -84,7 +84,7 @@ public abstract class UnaryExpression implements Expression
 
         return new BooleanUnaryExpression(right)
         {
-            public Object evaluate(AbstractJMSMessage message) throws QpidException
+            public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
             {
 
                 Object rvalue = right.evaluate(message);
@@ -156,7 +156,7 @@ public abstract class UnaryExpression implements Expression
             super(left);
         }
 
-        public boolean matches(AbstractJMSMessage message) throws QpidException
+        public boolean matches(AbstractJMSMessage message) throws AMQInternalException
         {
             Object object = evaluate(message);
 
@@ -170,7 +170,7 @@ public abstract class UnaryExpression implements Expression
     {
         return new BooleanUnaryExpression(left)
         {
-            public Object evaluate(AbstractJMSMessage message) throws QpidException
+            public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
             {
                 Boolean lvalue = (Boolean) right.evaluate(message);
                 if (lvalue == null)
@@ -191,7 +191,7 @@ public abstract class UnaryExpression implements Expression
     {
         return new BooleanUnaryExpression(left)
         {
-            public Object evaluate(AbstractJMSMessage message) throws QpidException
+            public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
             {
                 Object rvalue = right.evaluate(message);
                 if (rvalue == null)