Renamed AMQInvalidSelectorException to be AMQInvalidArgumentException to better fit the generic use of the argument table in the AMQP Queue.Bind spec. Adjusted AMQConstant to match the proposal for additional codes AMQP-39,40,41 (https://wiki.108.redhat.com/jira/browse/AMQP-39).

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

8 files changed, 25 insertions, 31 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java
index 090988d304..da61f2ffd5 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java
@@ -22,12 +22,9 @@ package org.apache.qpid.server.handler;
 
 import org.apache.log4j.Logger;
 import org.apache.qpid.AMQException;
-import org.apache.qpid.AMQInvalidSelectorException;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.BasicConsumeBody;
 import org.apache.qpid.framing.BasicConsumeOkBody;
-import org.apache.qpid.framing.ChannelCloseBody;
-import org.apache.qpid.framing.ConnectionCloseBody;
 import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.protocol.AMQMethodEvent;
 import org.apache.qpid.server.AMQChannel;
@@ -106,10 +103,10 @@ public class BasicConsumeMethodHandler implements StateAwareMethodListener<Basic
                     //now allow queue to start async processing of any backlog of messages
                     queue.deliverAsync();
                 }
-                catch (AMQInvalidSelectorException ise)
+                catch (org.apache.qpid.AMQInvalidArgumentException ise)
                 {
                     _log.info("Closing connection due to invalid selector");
-                    throw body.getChannelException(AMQConstant.INVALID_SELECTOR, ise.getMessage());
+                    throw body.getChannelException(AMQConstant.INVALID_ARGUMENT, ise.getMessage());
                 }
                 catch (ConsumerTagNotUniqueException e)
                 {
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
index 6d4d6cbaad..b08a97bc84 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
@@ -56,9 +56,9 @@ import javax.jms.TopicSubscriber;
 
 import org.apache.log4j.Logger;
 import org.apache.qpid.AMQException;
-import org.apache.qpid.AMQInvalidSelectorException;
 import org.apache.qpid.AMQUndeliveredException;
 import org.apache.qpid.AMQInvalidRoutingKeyException;
+import org.apache.qpid.AMQInvalidArgumentException;
 import org.apache.qpid.client.failover.FailoverSupport;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 import org.apache.qpid.client.message.JMSBytesMessage;
@@ -521,7 +521,7 @@ public class AMQSession extends Closeable implements Session, QueueSession, Topi
                                                                            0,    // methodId
                                                                            AMQConstant.REPLY_SUCCESS.getCode(),    // replyCode
                                                                            new AMQShortString("JMS client closing channel"));    // replyText
-                    
+
                     getProtocolHandler().syncWrite(frame, ChannelCloseOkBody.class, timeout);
                     // When control resumes at this point, a reply will have been received that
                     // indicates the broker has closed the channel successfully
@@ -1049,7 +1049,7 @@ public class AMQSession extends Closeable implements Session, QueueSession, Topi
                 {
                     registerConsumer(consumer, false);
                 }
-                catch (AMQInvalidSelectorException ise)
+                catch (AMQInvalidArgumentException ise)
                 {
                     JMSException ex = new InvalidSelectorException(ise.getMessage());
                     ex.setLinkedException(ise);
@@ -1057,7 +1057,9 @@ public class AMQSession extends Closeable implements Session, QueueSession, Topi
                 }
                 catch (AMQInvalidRoutingKeyException e)
                 {
-                    throw new InvalidDestinationException(amqd.getRoutingKey().toString());
+                    JMSException ide = new InvalidDestinationException("Invalid routing key:"+amqd.getRoutingKey().toString());
+                    ide.setLinkedException(e);
+                    throw ide;
                 }
                 catch (AMQException e)
                 {
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java b/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
index 6ef187286b..7cadbd409a 100644
--- a/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
+++ b/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
@@ -23,7 +23,6 @@ package org.apache.qpid.client.handler;
 import org.apache.log4j.Logger;
 import org.apache.qpid.AMQChannelClosedException;
 import org.apache.qpid.AMQException;
-import org.apache.qpid.AMQInvalidSelectorException;
 import org.apache.qpid.AMQInvalidRoutingKeyException;
 import org.apache.qpid.client.AMQNoConsumersException;
 import org.apache.qpid.client.AMQNoRouteException;
@@ -74,11 +73,11 @@ public class ChannelCloseMethodHandler implements StateAwareMethodListener
             {
                 throw new AMQNoRouteException("Error: " + reason, null);
             }
-            else if (errorCode == AMQConstant.INVALID_SELECTOR)
+            else if (errorCode == AMQConstant.INVALID_ARGUMENT)
             {
-                _logger.debug("Broker responded with Invalid Selector.");
+                _logger.debug("Broker responded with Invalid Argument.");
 
-                throw new AMQInvalidSelectorException(String.valueOf(reason));
+                throw new org.apache.qpid.AMQInvalidArgumentException(String.valueOf(reason));
             }
             else if (errorCode == AMQConstant.INVALID_ROUTING_KEY)
             {
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java
index e70196dff2..5e45d1d537 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java
@@ -29,9 +29,9 @@ import org.apache.qpid.client.AMQNoRouteException;
 import org.apache.qpid.protocol.AMQMethodEvent;
 import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.AMQException;
-import org.apache.qpid.AMQInvalidSelectorException;
 import org.apache.qpid.AMQInvalidRoutingKeyException;
 import org.apache.qpid.AMQChannelClosedException;
+import org.apache.qpid.AMQInvalidArgumentException;
 import org.apache.qpid.framing.ChannelCloseBody;
 import org.apache.qpid.framing.AMQShortString;
 
@@ -73,11 +73,11 @@ public class ChannelCloseMethodHandlerNoCloseOk implements StateAwareMethodListe
             {
                 throw new AMQNoRouteException("Error: " + reason, null);
             }
-            else if (errorCode == AMQConstant.INVALID_SELECTOR)
+            else if (errorCode == AMQConstant.INVALID_ARGUMENT)
             {
-                _logger.debug("Broker responded with Invalid Selector.");
+                _logger.debug("Broker responded with Invalid Argument.");
 
-                throw new AMQInvalidSelectorException(String.valueOf(reason));
+                throw new AMQInvalidArgumentException(String.valueOf(reason));
             }
             else if (errorCode == AMQConstant.INVALID_ROUTING_KEY)
             {
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 5c11ec18ca..0222fd9b4e 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQException.java
+++ b/java/common/src/main/java/org/apache/qpid/AMQException.java
@@ -23,9 +23,7 @@ package org.apache.qpid;
 import org.apache.log4j.Logger;
 import org.apache.qpid.protocol.AMQConstant;
 
-/**
- * Generic AMQ exception.
- */
+/** Generic AMQ exception. */
 public class AMQException extends Exception
 {
     private AMQConstant _errorCode;
@@ -78,5 +76,5 @@ public class AMQException extends Exception
     {
         return _errorCode;
     }
- 
+
 }
diff --git a/java/common/src/main/java/org/apache/qpid/AMQInvalidSelectorException.java b/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java
index 9d003514ad..9406921d88 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQInvalidSelectorException.java
+++ b/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java
@@ -22,10 +22,10 @@ package org.apache.qpid;
 
 import org.apache.qpid.protocol.AMQConstant;
 
-public class AMQInvalidSelectorException extends AMQException
+public class AMQInvalidArgumentException extends AMQException
 {
-    public AMQInvalidSelectorException(String message)
+    public AMQInvalidArgumentException(String message)
     {
-        super(AMQConstant.INVALID_SELECTOR,message);
+        super(AMQConstant.INVALID_ARGUMENT, message);
     }
 }
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 3293e2523d..caf8f3a572 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQInvalidRoutingKeyException.java
+++ b/java/common/src/main/java/org/apache/qpid/AMQInvalidRoutingKeyException.java
@@ -26,6 +26,6 @@ public class AMQInvalidRoutingKeyException extends AMQException
 {
     public AMQInvalidRoutingKeyException(String message)
     {
-        super(AMQConstant.INVALID_ROUTING_KEY,message);
+        super(AMQConstant.INVALID_ROUTING_KEY, message);
     }
 }
diff --git a/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java b/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java
index 0c4736a348..ed244396bf 100644
--- a/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java
+++ b/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java
@@ -74,12 +74,6 @@ public final class AMQConstant
 
     public static final AMQConstant CONTEXT_IN_USE = new AMQConstant(320, "context in use", true);
 
-    public static final AMQConstant CONTEXT_UNKNOWN = new AMQConstant(321, "context unknown", true);
-
-    public static final AMQConstant INVALID_SELECTOR = new AMQConstant(322, "selector invalid", true);
-
-    public static final AMQConstant INVALID_ROUTING_KEY = new AMQConstant(323, "routing key invalid", true);
-
     public static final AMQConstant INVALID_PATH = new AMQConstant(402, "invalid path", true);
 
     public static final AMQConstant ACCESS_REFUSED = new AMQConstant(403, "access refused", true);
@@ -90,8 +84,12 @@ public final class AMQConstant
 
     public static final AMQConstant IN_USE = new AMQConstant(406, "In use", true);
 
+    public static final AMQConstant INVALID_ROUTING_KEY = new AMQConstant(407, "routing key invalid", true);
+
     public static final AMQConstant REQUEST_TIMEOUT = new AMQConstant(408, "Request Timeout", true);
 
+    public static final AMQConstant INVALID_ARGUMENT = new AMQConstant(409, "argument invalid", true);        
+
     public static final AMQConstant FRAME_ERROR = new AMQConstant(501, "frame error", true);
 
     public static final AMQConstant SYNTAX_ERROR = new AMQConstant(502, "syntax error", true);