You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2013/07/17 18:11:10 UTC
svn commit: r1504187 - in /qpid/trunk/qpid/java:
broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/
systests/src/main/java/org/apache/qpid/server/queue/ test-profiles/
Author: orudyy
Date: Wed Jul 17 16:11:09 2013
New Revision: 1504187
URL: http://svn.apache.org/r1504187
Log:
QPID-4996: Restrict queue rebinding on 0.8/0-9.x path to the topic exchanges only
Added:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/QueueBindTest.java
Modified:
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java
qpid/trunk/qpid/java/test-profiles/CPPExcludes
qpid/trunk/qpid/java/test-profiles/Java010Excludes
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java?rev=1504187&r1=1504186&r2=1504187&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueBindHandler.java Wed Jul 17 16:11:09 2013
@@ -23,6 +23,7 @@ package org.apache.qpid.server.protocol.
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
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);
Added: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/QueueBindTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/QueueBindTest.java?rev=1504187&view=auto
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/QueueBindTest.java (added)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/QueueBindTest.java Wed Jul 17 16:11:09 2013
@@ -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();
+ }
+}
Modified: qpid/trunk/qpid/java/test-profiles/CPPExcludes
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/CPPExcludes?rev=1504187&r1=1504186&r2=1504187&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/CPPExcludes (original)
+++ qpid/trunk/qpid/java/test-profiles/CPPExcludes Wed Jul 17 16:11:09 2013
@@ -187,3 +187,5 @@ org.apache.qpid.client.ssl.SSLTest#testC
// 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
Modified: qpid/trunk/qpid/java/test-profiles/Java010Excludes
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/Java010Excludes?rev=1504187&r1=1504186&r2=1504187&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/Java010Excludes (original)
+++ qpid/trunk/qpid/java/test-profiles/Java010Excludes Wed Jul 17 16:11:09 2013
@@ -68,3 +68,6 @@ org.apache.qpid.client.AsynchMessageList
// 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
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org