From 89a83eed58fcbbf07e5f85c3dee15e70a734131a Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Mon, 5 Jul 2010 11:16:17 +0000 Subject: QPID-2681 : Correcly process global configuration, added test to cover git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@960549 13f79535-47bb-0310-9956-ffa450edef68 --- .../server/configuration/TopicConfiguration.java | 15 ++++-- .../configuration/TopicConfigurationTest.java | 56 ++++++++++++++++++++-- 2 files changed, 65 insertions(+), 6 deletions(-) (limited to 'qpid/java') diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfiguration.java index a16198788f..c7a195f9e4 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfiguration.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfiguration.java @@ -77,8 +77,6 @@ public class TopicConfiguration extends ConfigurationPlugin implements ExchangeC for (int index = 0; index < topics; index++) { - TopicConfig topic = new TopicConfig(); - Configuration topicSubset = _configuration.subset("topic(" + index + ")"); // This will occur when we have a subscriptionName that is bound to a @@ -88,6 +86,8 @@ public class TopicConfiguration extends ConfigurationPlugin implements ExchangeC break; } + TopicConfig topic = new TopicConfig(); + topic.setConfiguration(VIRTUALHOSTS_VIRTUALHOST_TOPICS + ".topic", topicSubset ); String name = _configuration.getString("topic(" + index + ").name"); @@ -169,6 +169,7 @@ public class TopicConfiguration extends ConfigurationPlugin implements ExchangeC */ public ConfigurationPlugin getConfiguration(AMQQueue queue) { + //Create config with global topic configuration TopicConfig config = new TopicConfig(); // Add global topic configuration @@ -225,7 +226,15 @@ public class TopicConfiguration extends ConfigurationPlugin implements ExchangeC } } - // Apply subscription specfic config. + //todo we don't account for wild cards here. only explict matching and all subscriptions + if (subscriptionSpecificConfig == null) + { + // lookup the binding to see if we have a match in the subscription configs + subscriptionSpecificConfig = topics.get("#"); + } + + + // Apply subscription specific config. if (subscriptionSpecificConfig != null) { config.addConfiguration(subscriptionSpecificConfig); diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/TopicConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/TopicConfigurationTest.java index 2cc49f7c93..691d5acfa9 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/TopicConfigurationTest.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/TopicConfigurationTest.java @@ -30,6 +30,9 @@ import org.apache.qpid.server.queue.AMQQueue; import org.apache.qpid.server.queue.AMQQueueFactory; import org.apache.qpid.server.util.InternalBrokerBaseCase; +/** + * Test of the new Topic configuration processing + */ public class TopicConfigurationTest extends InternalBrokerBaseCase { @@ -38,12 +41,19 @@ public class TopicConfigurationTest extends InternalBrokerBaseCase { _configXml.addProperty("virtualhosts.virtualhost.test.topics.topic.name", "stocks.nyse.appl"); - _configXml.addProperty("virtualhosts.virtualhost.test.topics.topic(1).subscriptionName", "testSubscriptionCreation:stockSubscription"); + _configXml.addProperty("virtualhosts.virtualhost.test.topics.topic(1).subscriptionName", getName()+":stockSubscription"); _configXml.addProperty("virtualhosts.virtualhost.test.topics.topic(2).name", "stocks.nyse.orcl"); _configXml.addProperty("virtualhosts.virtualhost.test.topics.topic(2).subscriptionName", getName()+":stockSubscription"); } + /** + * Test that a TopicConfig object is created and attached to the queue when it is bound to the topic exchange. + * + + * @throws ConfigurationException + * @throws AMQSecurityException + */ public void testTopicCreation() throws ConfigurationException, AMQSecurityException { Exchange topicExchange = _virtualHost.getExchangeRegistry().getExchange(ExchangeDefaults.TOPIC_EXCHANGE_NAME); @@ -55,7 +65,14 @@ public class TopicConfigurationTest extends InternalBrokerBaseCase assertEquals("Configuration name not correct", "stocks.nyse.appl", config.getName()); } - public void testSubscriptionCreation() throws ConfigurationException, AMQException + /** + * Test that a queue created for a subscription correctly has topic + * configuration selected based on the subscription and topic name. + * + * @throws ConfigurationException + * @throws AMQException + */ + public void testSubscriptionWithTopicCreation() throws ConfigurationException, AMQException { AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString(getName()+":stockSubscription"), false, new AMQShortString("testowner"), @@ -72,8 +89,41 @@ public class TopicConfigurationTest extends InternalBrokerBaseCase TopicConfig config = queue.getConfiguration().getConfiguration(TopicConfig.class.getName()); assertNotNull("Queue should have topic configuration bound to it.", config); - assertEquals("Configuration name not correct", getName() + ":stockSubscription", config.getSubscriptionName()); + assertEquals("Configuration subscription name not correct", getName() + ":stockSubscription", config.getSubscriptionName()); + assertEquals("Configuration name not correct", "stocks.nyse.orcl", config.getName()); + } + /** + * Test that a queue created for a subscription correctly has topic + * configuration attached here this should be the generic topic section + * with just the subscriptionName + * + * @throws ConfigurationException + * @throws AMQException + */ + public void testSubscriptionCreation() throws ConfigurationException, AMQException + { + + AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString(getName()+":stockSubscription"), false, new AMQShortString("testowner"), + false, false, _virtualHost, null); + + _virtualHost.getQueueRegistry().registerQueue(queue); + Exchange defaultExchange = _virtualHost.getExchangeRegistry().getDefaultExchange(); + _virtualHost.getBindingFactory().addBinding(getName(), queue, defaultExchange, null); + + + Exchange topicExchange = _virtualHost.getExchangeRegistry().getExchange(ExchangeDefaults.TOPIC_EXCHANGE_NAME); + _virtualHost.getBindingFactory().addBinding("stocks.nyse.ibm", queue, topicExchange, null); + + TopicConfig config = queue.getConfiguration().getConfiguration(TopicConfig.class.getName()); + + assertNotNull("Queue should have topic configuration bound to it.", config); + assertEquals("Configuration subscription name not correct", getName() + ":stockSubscription", config.getSubscriptionName()); + assertEquals("Configuration name not correct", "#", config.getName()); + + } + + } -- cgit v1.2.1