QPID-4996: Restrict queue rebinding on 0.8/0-9.x path to the topic exchanges only

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

4 files changed, 137 insertions, 1 deletions

diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java
index 0eed82b9de..a8e4e38422 100644
--- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java
@@ -23,6 +23,7 @@ package org.apache.qpid.server.protocol.v0_8.handler;
 import org.apache.log4j.Logger;
 
 import org.apache.qpid.AMQException;
+import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.framing.AMQMethodBody;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.FieldTable;
@@ -126,7 +127,7 @@ public class QueueBindHandler implements StateAwareMethodListener<QueueBindBody>
                 String bindingKey = String.valueOf(routingKey);
                 Map<String,Object> arguments = FieldTable.convertToMap(body.getArguments());
 
-                if(!exch.addBinding(bindingKey, queue, arguments))
+                if(!exch.addBinding(bindingKey, queue, arguments) && ExchangeDefaults.TOPIC_EXCHANGE_CLASS.equals(exch.getTypeShortString()))
                 {
                     Binding oldBinding = exch.getBinding(bindingKey, queue, arguments);
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/QueueBindTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/QueueBindTest.java
new file mode 100644
index 0000000000..64ba0156e6
--- /dev/null
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/QueueBindTest.java
@@ -0,0 +1,130 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * 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
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.server.queue;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.jms.Connection;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.Session;
+
+import org.apache.qpid.AMQException;
+import org.apache.qpid.client.AMQDestination;
+import org.apache.qpid.client.AMQQueue;
+import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.common.AMQPFilterTypes;
+import org.apache.qpid.framing.FieldTable;
+import org.apache.qpid.test.utils.QpidBrokerTestCase;
+import org.apache.qpid.url.AMQBindingURL;
+
+public class QueueBindTest extends QpidBrokerTestCase
+{
+    private Connection _connection;
+    private AMQSession<?, ?> _session;
+
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+
+        _connection = getConnection();
+        _session = (AMQSession<?, ?>) _connection.createSession(true, Session.SESSION_TRANSACTED);
+    }
+
+    public void testQueueCannotBeReboundOnNonTopicExchange() throws Exception
+    {
+        runTestForNonTopicExhange(new AMQQueue(new AMQBindingURL("direct://amq.direct//" + getTestQueueName())));
+        runTestForNonTopicExhange(new AMQQueue(new AMQBindingURL("fanout://amq.fanout//" + getTestQueueName()) + "?routingkey='"
+                + getTestQueueName() + "'"));
+    }
+
+    public void testQueueCanBeReboundOnTopicExchange() throws Exception
+    {
+        AMQQueue destination = new AMQQueue(new AMQBindingURL("topic://amq.topic//" + getTestQueueName() + "?routingkey='"
+                + getTestQueueName() + "'"));
+        setTestClientSystemProperty("qpid.default_mandatory", "false");
+        runTestForTopicExchange(destination);
+
+    }
+
+    private void runTestForTopicExchange(AMQDestination destination) throws AMQException, JMSException, Exception
+    {
+        // binding queue with empty arguments
+        _session.declareAndBind(destination, FieldTable.convertToFieldTable(Collections.<String, Object> emptyMap()));
+
+        // try to re-bind queue with a selector
+        Map<String, Object> bindArguments = new HashMap<String, Object>();
+        bindArguments.put(AMQPFilterTypes.JMS_SELECTOR.getValue().toString(), INDEX + "=0");
+        _session.bindQueue(destination.getAMQQueueName(), destination.getRoutingKey(),
+                FieldTable.convertToFieldTable(bindArguments), destination.getExchangeName(), destination);
+
+        _connection.start();
+
+        // repeat send/receive twice to make sure that selector is working
+        for (int i = 0; i < 2; i++)
+        {
+            int numberOfMesssages = 2;
+            sendMessage(_session, destination, numberOfMesssages);
+
+            MessageConsumer consumer = _session.createConsumer(destination);
+            Message m = consumer.receive(1000);
+            assertNotNull("Message not received", m);
+            assertEquals("Unexpected index", 0, m.getIntProperty(INDEX));
+            _session.commit();
+
+            m = consumer.receive(1000);
+            assertNull("Message received", m);
+
+            consumer.close();
+        }
+    }
+
+    private void runTestForNonTopicExhange(AMQQueue destination) throws AMQException, Exception, JMSException
+    {
+        // binding queue with empty arguments
+        _session.declareAndBind(destination, FieldTable.convertToFieldTable(Collections.<String, Object> emptyMap()));
+
+        // try to re-bind queue with a selector
+        Map<String, Object> bindArguments = new HashMap<String, Object>();
+        bindArguments.put(AMQPFilterTypes.JMS_SELECTOR.getValue().toString(), INDEX + "=0");
+        _session.bindQueue(destination.getAMQQueueName(), destination.getRoutingKey(),
+                FieldTable.convertToFieldTable(bindArguments), destination.getExchangeName(), destination);
+
+        // send and receive to prove that selector is not used
+        int numberOfMesssages = 2;
+        sendMessage(_session, destination, numberOfMesssages);
+
+        MessageConsumer consumer = _session.createConsumer(destination);
+        _connection.start();
+
+        for (int i = 0; i < numberOfMesssages; i++)
+        {
+            Message m = consumer.receive(1000l);
+            assertNotNull("Message [" + i + "] not received with exchange " + destination.getExchangeName(), m);
+            assertEquals("Unexpected index", i, m.getIntProperty(INDEX));
+            _session.commit();
+        }
+        consumer.close();
+    }
+}
diff --git a/qpid/java/test-profiles/CPPExcludes b/qpid/java/test-profiles/CPPExcludes
index 72523e2d4b..a75d96fb85 100755
--- a/qpid/java/test-profiles/CPPExcludes
+++ b/qpid/java/test-profiles/CPPExcludes
@@ -187,3 +187,5 @@ org.apache.qpid.client.ssl.SSLTest#testCreateSSLandTCPonSamePort
 // QPID-2796 : Java 0-10 client only sends heartbeats in response to heartbeats from the server, not timeout based
 org.apache.qpid.client.HeartbeatTest#testReadOnlyConnectionHeartbeats
 
+// Exclude java broker specific behavior allowing queue re-bind to topic exchanges on 0.8/0-10 paths
+org.apache.qpid.server.queue.QueueBindTest#testQueueCanBeReboundOnTopicExchange
diff --git a/qpid/java/test-profiles/Java010Excludes b/qpid/java/test-profiles/Java010Excludes
index b0489fca38..055ce25d75 100755
--- a/qpid/java/test-profiles/Java010Excludes
+++ b/qpid/java/test-profiles/Java010Excludes
@@ -68,3 +68,6 @@ org.apache.qpid.client.AsynchMessageListenerTest#testImmediatePrefetchWithMessag
 
 // QPID-2796 : Java 0-10 client only sends heartbeats in response to heartbeats from the server, not timeout based
 org.apache.qpid.client.HeartbeatTest#testReadOnlyConnectionHeartbeats
+
+// Java 0-10 client does not support re-binding the queue to the same exchange
+org.apache.qpid.server.queue.QueueBindTest#testQueueCanBeReboundOnTopicExchange