QPID-5577 : [Java Broker] Change Exchange,Queue,Binding,Consumer to implement ConfiguredObject and remove adapter classes

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

10 files changed, 39 insertions, 44 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java
index eba5a6dd46..e6f9c46523 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java
@@ -34,13 +34,14 @@ import org.apache.qpid.framing.ContentHeaderBody;
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
 import org.apache.qpid.framing.amqp_8_0.BasicConsumeBodyImpl;
-import org.apache.qpid.server.binding.Binding;
+import org.apache.qpid.server.binding.BindingImpl;
 import org.apache.qpid.server.configuration.VirtualHostConfiguration;
 import org.apache.qpid.server.exchange.DirectExchange;
-import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.exchange.ExchangeImpl;
 import org.apache.qpid.server.exchange.TopicExchange;
 import org.apache.qpid.server.message.InstanceProperties;
 import org.apache.qpid.server.message.MessageSource;
+import org.apache.qpid.server.model.Binding;
 import org.apache.qpid.server.model.ExclusivityPolicy;
 import org.apache.qpid.server.model.LifetimePolicy;
 import org.apache.qpid.server.model.Queue;
@@ -212,15 +213,15 @@ public class MessageStoreTest extends QpidTestCase
         createAllTopicQueues();
 
         //Register Non-Durable DirectExchange
-        Exchange nonDurableExchange = createExchange(DirectExchange.TYPE, nonDurableExchangeName, false);
+        ExchangeImpl nonDurableExchange = createExchange(DirectExchange.TYPE, nonDurableExchangeName, false);
         bindAllQueuesToExchange(nonDurableExchange, directRouting);
 
         //Register DirectExchange
-        Exchange directExchange = createExchange(DirectExchange.TYPE, directExchangeName, true);
+        ExchangeImpl directExchange = createExchange(DirectExchange.TYPE, directExchangeName, true);
         bindAllQueuesToExchange(directExchange, directRouting);
 
         //Register TopicExchange
-        Exchange topicExchange = createExchange(TopicExchange.TYPE, topicExchangeName, true);
+        ExchangeImpl topicExchange = createExchange(TopicExchange.TYPE, topicExchangeName, true);
         bindAllTopicQueuesToExchange(topicExchange, topicRouting);
 
         //Send Message To NonDurable direct Exchange = persistent
@@ -365,7 +366,7 @@ public class MessageStoreTest extends QpidTestCase
     {
         int origExchangeCount = getVirtualHost().getExchanges().size();
 
-        Map<String, Exchange> oldExchanges = createExchanges();
+        Map<String, ExchangeImpl> oldExchanges = createExchanges();
 
         assertEquals("Incorrect number of exchanges registered before recovery",
                 origExchangeCount + 3, getVirtualHost().getExchanges().size());
@@ -396,7 +397,7 @@ public class MessageStoreTest extends QpidTestCase
                 origExchangeCount + 1,  getVirtualHost().getExchanges().size());
 
         //test that removing the exchange means it is not recovered next time
-        final Exchange exchange = getVirtualHost().getExchange(directExchangeName);
+        final ExchangeImpl exchange = getVirtualHost().getExchange(directExchangeName);
         DurableConfigurationStoreHelper.removeExchange(getVirtualHost().getDurableConfigurationStore(), exchange);
 
         reloadVirtualHost();
@@ -420,11 +421,11 @@ public class MessageStoreTest extends QpidTestCase
         createAllQueues();
         createAllTopicQueues();
 
-        Map<String, Exchange> exchanges = createExchanges();
+        Map<String, ExchangeImpl> exchanges = createExchanges();
 
-        Exchange nonDurableExchange = exchanges.get(nonDurableExchangeName);
-        Exchange directExchange = exchanges.get(directExchangeName);
-        Exchange topicExchange = exchanges.get(topicExchangeName);
+        ExchangeImpl nonDurableExchange = exchanges.get(nonDurableExchangeName);
+        ExchangeImpl directExchange = exchanges.get(directExchangeName);
+        ExchangeImpl topicExchange = exchanges.get(topicExchangeName);
 
         bindAllQueuesToExchange(nonDurableExchange, directRouting);
         bindAllQueuesToExchange(directExchange, directRouting);
@@ -448,7 +449,7 @@ public class MessageStoreTest extends QpidTestCase
     public void testDurableBindingRemoval() throws Exception
     {
         //create durable queue and exchange, bind them
-        Exchange exch = createExchange(DirectExchange.TYPE, directExchangeName, true);
+        ExchangeImpl exch = createExchange(DirectExchange.TYPE, directExchangeName, true);
         createQueue(durableQueueName, false, true, false, false);
         bindQueueToExchange(exch, directRouting, getVirtualHost().getQueue(durableQueueName), false);
 
@@ -478,11 +479,11 @@ public class MessageStoreTest extends QpidTestCase
      * and that the new exchanges are not the same objects as the provided list (i.e. that the
      * reload actually generated new exchange objects)
      */
-    private void validateExchanges(int originalNumExchanges, Map<String, Exchange> oldExchanges)
+    private void validateExchanges(int originalNumExchanges, Map<String, ExchangeImpl> oldExchanges)
     {
-        Collection<Exchange> exchanges = getVirtualHost().getExchanges();
+        Collection<ExchangeImpl> exchanges = getVirtualHost().getExchanges();
         Collection<String> exchangeNames = new ArrayList(exchanges.size());
-        for(Exchange exchange : exchanges)
+        for(ExchangeImpl exchange : exchanges)
         {
             exchangeNames.add(exchange.getName());
         }
@@ -525,11 +526,11 @@ public class MessageStoreTest extends QpidTestCase
      * @param bindings     the set of bindings to validate
      * @param useSelectors if set, check the binding has a JMS_SELECTOR argument and the correct value for it
      */
-    private void validateBindingProperties(List<Binding> bindings, boolean useSelectors)
+    private void validateBindingProperties(Collection<? extends Binding> bindings, boolean useSelectors)
     {
         assertEquals("Each queue should only be bound once.", 1, bindings.size());
 
-        Binding binding = bindings.get(0);
+        Binding binding = bindings.iterator().next();
 
         if (useSelectors)
         {
@@ -605,7 +606,7 @@ public class MessageStoreTest extends QpidTestCase
         }
     }
 
-    private void sendMessageOnExchange(Exchange exchange, String routingKey, boolean deliveryMode)
+    private void sendMessageOnExchange(ExchangeImpl exchange, String routingKey, boolean deliveryMode)
     {
         //Set MessagePersistence
         BasicContentHeaderProperties properties = new BasicContentHeaderProperties();
@@ -708,9 +709,9 @@ public class MessageStoreTest extends QpidTestCase
 
     }
 
-    private Map<String, Exchange> createExchanges() throws Exception
+    private Map<String, ExchangeImpl> createExchanges() throws Exception
     {
-        Map<String, Exchange> exchanges = new HashMap<String, Exchange>();
+        Map<String, ExchangeImpl> exchanges = new HashMap<String, ExchangeImpl>();
 
         //Register non-durable DirectExchange
         exchanges.put(nonDurableExchangeName, createExchange(DirectExchange.TYPE, nonDurableExchangeName, false));
@@ -722,9 +723,9 @@ public class MessageStoreTest extends QpidTestCase
         return exchanges;
     }
 
-    private Exchange createExchange(ExchangeType<?> type, String name, boolean durable) throws Exception
+    private ExchangeImpl createExchange(ExchangeType<?> type, String name, boolean durable) throws Exception
     {
-        Exchange exchange = null;
+        ExchangeImpl exchange = null;
 
         Map<String,Object> attributes = new HashMap<String, Object>();
 
@@ -739,7 +740,7 @@ public class MessageStoreTest extends QpidTestCase
         return exchange;
     }
 
-    private void bindAllQueuesToExchange(Exchange exchange, String routingKey)
+    private void bindAllQueuesToExchange(ExchangeImpl exchange, String routingKey)
     {
         bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(durablePriorityQueueName), false);
         bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(durableQueueName), false);
@@ -748,7 +749,7 @@ public class MessageStoreTest extends QpidTestCase
         bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(durableExclusiveQueueName), false);
     }
 
-    private void bindAllTopicQueuesToExchange(Exchange exchange, String routingKey)
+    private void bindAllTopicQueuesToExchange(ExchangeImpl exchange, String routingKey)
     {
 
         bindQueueToExchange(exchange, routingKey, getVirtualHost().getQueue(durablePriorityTopicQueueName), true);
@@ -758,7 +759,7 @@ public class MessageStoreTest extends QpidTestCase
     }
 
 
-    protected void bindQueueToExchange(Exchange exchange,
+    protected void bindQueueToExchange(ExchangeImpl exchange,
                                        String routingKey,
                                        AMQQueue queue,
                                        boolean useSelector)
@@ -780,7 +781,7 @@ public class MessageStoreTest extends QpidTestCase
         }
     }
 
-    protected void unbindQueueFromExchange(Exchange exchange,
+    protected void unbindQueueFromExchange(ExchangeImpl exchange,
                                            String routingKey,
                                            AMQQueue queue,
                                            boolean useSelector)
@@ -794,8 +795,7 @@ public class MessageStoreTest extends QpidTestCase
 
         try
         {
-            Binding b = exchange.getBinding(routingKey, queue);
-            b.delete();
+            exchange.deleteBinding(routingKey, queue);
         }
         catch (Exception e)
         {
@@ -833,18 +833,18 @@ public class MessageStoreTest extends QpidTestCase
 
         assertNotNull("Queue(" + queueName + ") not correctly registered:", queue);
 
-        assertEquals("Incorrect Message count on queue:" + queueName, messageCount, queue.getMessageCount());
+        assertEquals("Incorrect Message count on queue:" + queueName, messageCount, queue.getQueueDepthMessages());
     }
 
     private class TestMessagePublishInfo implements MessagePublishInfo
     {
 
-        Exchange _exchange;
+        ExchangeImpl _exchange;
         boolean _immediate;
         boolean _mandatory;
         String _routingKey;
 
-        TestMessagePublishInfo(Exchange exchange, boolean immediate, boolean mandatory, String routingKey)
+        TestMessagePublishInfo(ExchangeImpl exchange, boolean immediate, boolean mandatory, String routingKey)
         {
             _exchange = exchange;
             _immediate = immediate;
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
index 3bd21f8b77..c749318595 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
@@ -49,7 +49,6 @@ public class Asserts
                                 ConfiguredObject.LAST_UPDATED_BY,
                                 ConfiguredObject.LAST_UPDATED_TIME,
                                 ConfiguredObject.DESCRIPTION,
-                                VirtualHost.TIME_TO_LIVE,
                                 VirtualHost.SUPPORTED_QUEUE_TYPES,
                                 VirtualHost.STORE_PATH,
                                 VirtualHost.CONFIG_PATH,
@@ -102,7 +101,6 @@ public class Asserts
                                         Queue.LAST_UPDATED_TIME,
                                         Queue.TYPE,
                                         Queue.DESCRIPTION,
-                                        Queue.TIME_TO_LIVE,
                                         Queue.ALTERNATE_EXCHANGE,
                                         Queue.OWNER,
                                         Queue.NO_LOCAL,
@@ -205,7 +203,6 @@ public class Asserts
                                 Connection.STATE,
                                 Connection.DURABLE,
                                 Connection.LIFETIME_POLICY,
-                                Connection.TIME_TO_LIVE,
                                 Connection.INCOMING,
                                 Connection.REMOTE_PROCESS_NAME,
                                 Connection.REMOTE_PROCESS_PID,
@@ -254,7 +251,6 @@ public class Asserts
         assertEquals("Unexpected value of attribute " + Port.LIFETIME_POLICY, LifetimePolicy.PERMANENT.name(),
                      port.get(Broker.LIFETIME_POLICY));
         assertEquals("Unexpected value of attribute " + Port.STATE, state.name(), port.get(Port.STATE));
-        assertEquals("Unexpected value of attribute " + Port.TIME_TO_LIVE, 0, port.get(Port.TIME_TO_LIVE));
 
         @SuppressWarnings("unchecked")
         Collection<String> protocols = (Collection<String>) port.get(Port.PROTOCOLS);
@@ -322,7 +318,7 @@ public class Asserts
     {
         assertNotNull("Exchange " + exchangeName + " is not found!", exchangeData);
         assertAttributesPresent(exchangeData, AbstractConfiguredObject.getAttributeNames(Exchange.class),
-                                Exchange.ALTERNATE_EXCHANGE, Exchange.TIME_TO_LIVE,
+                                Exchange.ALTERNATE_EXCHANGE,
                                 ConfiguredObject.CREATED_BY,
                                 ConfiguredObject.CREATED_TIME,
                                 ConfiguredObject.LAST_UPDATED_BY,
@@ -357,7 +353,6 @@ public class Asserts
         assertAttributesPresent(binding,
                                 AbstractConfiguredObject.getAttributeNames(Binding.class),
                                 Binding.STATE,
-                                Binding.TIME_TO_LIVE,
                                 ConfiguredObject.TYPE,
                                 ConfiguredObject.CREATED_BY,
                                 ConfiguredObject.CREATED_TIME,
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java
index 5e1489a640..d41e019c13 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java
@@ -306,7 +306,7 @@ public class AuthenticationProviderRestTest extends QpidRestTestCase
     {
         Asserts.assertAttributesPresent(provider, AbstractConfiguredObject.getAttributeNames(
                 AuthenticationProvider.class),
-                AuthenticationProvider.DESCRIPTION, AuthenticationProvider.TIME_TO_LIVE, ConfiguredObject.CREATED_BY,
+                AuthenticationProvider.DESCRIPTION, ConfiguredObject.CREATED_BY,
                 ConfiguredObject.CREATED_TIME, ConfiguredObject.LAST_UPDATED_BY, ConfiguredObject.LAST_UPDATED_TIME);
         assertEquals("Unexpected value of provider attribute " + AuthenticationProvider.STATE, State.ACTIVE.name(),
                 provider.get(AuthenticationProvider.STATE));
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
index a9705f73d5..ad789e6fa1 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
@@ -65,7 +65,7 @@ public class BrokerRestHttpsTest extends QpidRestTestCase
         Map<String, Object> brokerDetails = getRestTestHelper().getJsonAsSingletonList("/rest/broker");
 
         Asserts.assertAttributesPresent(brokerDetails, AbstractConfiguredObject.getAttributeNames(Broker.class),
-                Broker.PROCESS_PID, Broker.SUPPORTED_VIRTUALHOST_STORE_TYPES, Broker.TIME_TO_LIVE,
+                Broker.PROCESS_PID, Broker.SUPPORTED_VIRTUALHOST_STORE_TYPES,
                 ConfiguredObject.TYPE,
                 ConfiguredObject.CREATED_BY,
                 ConfiguredObject.CREATED_TIME,
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
index 178f365fa5..1ccd31a83a 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
@@ -236,7 +236,6 @@ public class BrokerRestTest extends QpidRestTestCase
     {
         Asserts.assertAttributesPresent(brokerDetails, AbstractConfiguredObject.getAttributeNames(Broker.class),
                 Broker.PROCESS_PID,
-                Broker.TIME_TO_LIVE,
                 ConfiguredObject.TYPE,
                 ConfiguredObject.CREATED_BY,
                 ConfiguredObject.CREATED_TIME,
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java
index 07f1627d94..d405a91ad4 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java
@@ -183,7 +183,7 @@ public class ConnectionRestTest extends QpidRestTestCase
                                         ConfiguredObject.DESCRIPTION,
                                         Session.STATE,
                                         Session.DURABLE,
-                Session.LIFETIME_POLICY, Session.TIME_TO_LIVE);
+                                        Session.LIFETIME_POLICY);
         assertEquals("Unexpecte value of attribute " + Session.NAME, session.getChannelId() + "",
                 sessionData.get(Session.NAME));
         assertEquals("Unexpecte value of attribute " + Session.PRODUCER_FLOW_BLOCKED, Boolean.FALSE,
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java
index 11c0b7bc4a..e0a06d15a2 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java
@@ -323,7 +323,6 @@ public class GroupProviderRestTest extends QpidRestTestCase
     private void assertProvider(String name, String type, Map<String, Object> provider)
     {
         Asserts.assertAttributesPresent(provider, AbstractConfiguredObject.getAttributeNames(GroupProvider.class),
-                GroupProvider.TIME_TO_LIVE,
                 ConfiguredObject.TYPE,
                 ConfiguredObject.CREATED_BY,
                 ConfiguredObject.CREATED_TIME,
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java
index d9ff53a351..94b088dbaf 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java
@@ -169,7 +169,7 @@ public class PreferencesProviderRestTest extends QpidRestTestCase
                                         ConfiguredObject.CREATED_TIME,
                                         ConfiguredObject.LAST_UPDATED_BY,
                                         ConfiguredObject.LAST_UPDATED_TIME,
-                                        ConfiguredObject.DESCRIPTION, PreferencesProvider.TIME_TO_LIVE);
+                                        ConfiguredObject.DESCRIPTION);
         assertEquals("Unexpected value of provider attribute " + PreferencesProvider.STATE, State.ACTIVE.name(),
                 provider.get(PreferencesProvider.STATE));
         assertEquals("Unexpected value of provider attribute " + PreferencesProvider.LIFETIME_POLICY,
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java
index fba319e907..faccca9e9d 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java
@@ -212,7 +212,7 @@ public class QueueRestTest extends QpidRestTestCase
     {
         assertNotNull("Consumer map should not be null", consumer);
         Asserts.assertAttributesPresent(consumer,
-                                        AbstractConfiguredObject.getAttributeNames(Consumer.class), Consumer.STATE, Consumer.TIME_TO_LIVE,
+                                        AbstractConfiguredObject.getAttributeNames(Consumer.class), Consumer.STATE,
                 Consumer.SETTLEMENT_MODE, Consumer.EXCLUSIVE, Consumer.SELECTOR,
                 Consumer.NO_LOCAL,
                 ConfiguredObject.TYPE,
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
index bd826259bc..324b101b89 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
@@ -53,6 +53,8 @@ public class AddressBasedDestinationTest extends QpidBrokerTestCase
     @Override
     public void setUp() throws Exception
     {
+        setVirtualHostConfigurationProperty("virtualhosts.virtualhost.test.queues.maximumDeliveryCount",
+                                            "0");
         super.setUp();
         _connection = getConnection() ;
         _connection.start();