QPID-4390: Stop passing the defaults map into virtual host children

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-config-qpid-4390@1435275 13f79535-47bb-0310-9956-ffa450edef68

12 files changed, 57 insertions, 78 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AbstractAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AbstractAdapter.java
index ee7fd57699..9acacac0f3 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AbstractAdapter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AbstractAdapter.java
@@ -63,6 +63,11 @@ abstract class AbstractAdapter implements ConfiguredObject
         }
     }
 
+    protected AbstractAdapter(UUID id)
+    {
+        this(id, null, null);
+    }
+
     protected AbstractAdapter(UUID id, Map<String, Object> defaults)
     {
         this(id, defaults, null);
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AbstractKeyStoreAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AbstractKeyStoreAdapter.java
index 83426e4b27..a479de9769 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AbstractKeyStoreAdapter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AbstractKeyStoreAdapter.java
@@ -42,7 +42,7 @@ public abstract class AbstractKeyStoreAdapter extends AbstractAdapter
 
     protected AbstractKeyStoreAdapter(UUID id, Broker broker, Map<String, Object> attributes)
     {
-        super(id, null);
+        super(id);
         addParent(Broker.class, broker);
         _name = MapValueConverter.getStringAttribute(TrustStore.NAME, attributes);
         _password = MapValueConverter.getStringAttribute(TrustStore.PASSWORD, attributes);
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java
index 77018412b6..3f02a0bcb1 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java
@@ -385,7 +385,7 @@ public abstract class AuthenticationProviderAdapter<T extends AuthenticationMana
 
             public PrincipalAdapter(Principal user)
             {
-                super(UUIDGenerator.generateUserUUID(PrincipalDatabaseAuthenticationManagerAdapter.this.getName(), user.getName()), null);
+                super(UUIDGenerator.generateUserUUID(PrincipalDatabaseAuthenticationManagerAdapter.this.getName(), user.getName()));
                 _user = user;
 
             }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BindingAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BindingAdapter.java
index 36370621e1..6fa4d31fe5 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BindingAdapter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BindingAdapter.java
@@ -48,7 +48,7 @@ final class BindingAdapter extends AbstractAdapter implements Binding
                           ExchangeAdapter exchangeAdapter,
                           QueueAdapter queueAdapter)
     {
-        super(binding.getId(), null);
+        super(binding.getId());
         _binding = binding;
         _exchange = exchangeAdapter;
         _queue = queueAdapter;
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
index d1af6c8ae0..c160d65b5f 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
@@ -50,9 +50,9 @@ final class ConnectionAdapter extends AbstractAdapter implements Connection
             new HashMap<AMQSessionModel, SessionAdapter>();
     private final Statistics _statistics;
 
-    public ConnectionAdapter(final AMQConnectionModel conn, Map<String, Object> defaults)
+    public ConnectionAdapter(final AMQConnectionModel conn)
     {
-        super(UUIDGenerator.generateRandomUUID(), defaults);
+        super(UUIDGenerator.generateRandomUUID());
         _connection = conn;
         _statistics = new ConnectionStatisticsAdapter(conn);
     }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ConsumerAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ConsumerAdapter.java
index 362993767e..494e226dc4 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ConsumerAdapter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ConsumerAdapter.java
@@ -45,7 +45,7 @@ public class ConsumerAdapter extends AbstractAdapter implements Consumer
                                                queueAdapter.getName(),
                                                subscription.getSessionModel().getConnectionModel().getRemoteAddressString(),
                                                String.valueOf(subscription.getSessionModel().getChannelId()),
-                                               subscription.getConsumerName()), null);
+                                               subscription.getConsumerName()));
         _subscription = subscription;
         _queue = queueAdapter;
         _statistics = new ConsumerStatistics();
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ExchangeAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ExchangeAdapter.java
index c6f15ff065..b945180137 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ExchangeAdapter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ExchangeAdapter.java
@@ -56,7 +56,7 @@ final class ExchangeAdapter extends AbstractAdapter implements Exchange, org.apa
     public ExchangeAdapter(final VirtualHostAdapter virtualHostAdapter,
                            final org.apache.qpid.server.exchange.Exchange exchange)
     {
-        super(exchange.getId(), null);
+        super(exchange.getId());
         _statistics = new ExchangeStatistics();
         _vhost = virtualHostAdapter;
         _exchange = exchange;
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderAdapter.java
index 13f1e27076..c73de436cc 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderAdapter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/GroupProviderAdapter.java
@@ -230,8 +230,7 @@ public class GroupProviderAdapter extends AbstractAdapter implements
 
         public GroupAdapter(String group)
         {
-            super(UUIDGenerator.generateGroupUUID(
-                    GroupProviderAdapter.this.getName(), group), null);
+            super(UUIDGenerator.generateGroupUUID(GroupProviderAdapter.this.getName(), group));
             _group = group;
 
         }
@@ -406,10 +405,7 @@ public class GroupProviderAdapter extends AbstractAdapter implements
 
             public GroupMemberAdapter(String memberName)
             {
-                super(UUIDGenerator
-                        .generateGroupMemberUUID(
-                                GroupProviderAdapter.this.getName(), _group,
-                                memberName), null);
+                super(UUIDGenerator.generateGroupMemberUUID(GroupProviderAdapter.this.getName(), _group, memberName));
                 _memberName = memberName;
             }
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java
index c8450018e0..dbb1f13134 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java
@@ -78,9 +78,9 @@ final class QueueAdapter extends AbstractAdapter implements Queue, AMQQueue.Subs
     private QueueStatisticsAdapter _statistics;
     private QueueNotificationListener _queueNotificationListener;
 
-    public QueueAdapter(final VirtualHostAdapter virtualHostAdapter, final AMQQueue queue, Map<String, Object> defaults)
+    public QueueAdapter(final VirtualHostAdapter virtualHostAdapter, final AMQQueue queue)
     {
-        super(queue.getId(), defaults);
+        super(queue.getId());
         _vhost = virtualHostAdapter;
         addParent(org.apache.qpid.server.model.VirtualHost.class, virtualHostAdapter);
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java
index 9563ab583e..6807968f14 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java
@@ -46,7 +46,7 @@ final class SessionAdapter extends AbstractAdapter implements Session
 
     public SessionAdapter(final AMQSessionModel session)
     {
-        super(UUIDGenerator.generateRandomUUID(), null);
+        super(UUIDGenerator.generateRandomUUID());
         _session = session;
         _statistics = new SessionStatistics();
     }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
index d52296c5dd..7e51f94a86 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
@@ -174,35 +174,13 @@ public final class VirtualHostAdapter extends AbstractAdapter implements Virtual
                 {
                     if(!_queueAdapters.containsKey(queue))
                     {
-                        //TODO: create queue defaults map
-                        Map<String, Object> queueDefaults = null;
-                        _queueAdapters.put(queue, new QueueAdapter(this,queue, queueDefaults));
+                        _queueAdapters.put(queue, new QueueAdapter(this, queue));
                     }
                 }
             }
         }
     }
 
-    private void populateConnections()
-    {
-
-        List<AMQConnectionModel> actualConnections = _virtualHost.getConnectionRegistry().getConnections();
-
-        synchronized(_connectionAdapters)
-        {
-            for(AMQConnectionModel conn : actualConnections)
-            {
-                if(!_connectionAdapters.containsKey(conn))
-                {
-                    //TODO: create connection defaults
-                    Map<String, Object> connectionDefaults = null;
-                    _connectionAdapters.put(conn, new ConnectionAdapter(conn, connectionDefaults));
-                }
-            }
-        }
-
-    }
-
     @Override
     public String getReplicationGroupName()
     {
@@ -558,9 +536,7 @@ public final class VirtualHostAdapter extends AbstractAdapter implements Virtual
         {
             if(!_queueAdapters.containsKey(queue))
             {
-                //TODO: create queue defaults
-                Map<String, Object> queueDefaults = null;
-                adapter = new QueueAdapter(this, queue, queueDefaults);
+                adapter = new QueueAdapter(this, queue);
                 _queueAdapters.put(queue, adapter);
 
             }
@@ -596,9 +572,7 @@ public final class VirtualHostAdapter extends AbstractAdapter implements Virtual
         {
             if(!_connectionAdapters.containsKey(connection))
             {
-                //TODO: create defaults
-                Map<String, Object> defaults = null;
-                adapter = new ConnectionAdapter(connection, defaults);
+                adapter = new ConnectionAdapter(connection);
                 _connectionAdapters.put(connection, adapter);
 
             }
@@ -946,38 +920,7 @@ public final class VirtualHostAdapter extends AbstractAdapter implements Virtual
     {
         if (desiredState == State.ACTIVE)
         {
-            VirtualHostRegistry virtualHostRegistry = _broker.getVirtualHostRegistry();
-            String virtualHostName = getName();
-            try
-            {
-                VirtualHostConfiguration configuration = createVirtualHostConfiguration(virtualHostName);
-                _virtualHost = new VirtualHostImpl(_broker.getVirtualHostRegistry(), _brokerStatisticsGatherer, _broker.getSecurityManager(), configuration);
-            }
-            catch (Exception e)
-            {
-               throw new RuntimeException("Failed to create virtual host " + virtualHostName, e);
-            }
-
-            virtualHostRegistry.registerVirtualHost(_virtualHost);
-
-            _statistics = new VirtualHostStatisticsAdapter(_virtualHost);
-            _virtualHost.getQueueRegistry().addRegistryChangeListener(this);
-            populateQueues();
-            _virtualHost.getExchangeRegistry().addRegistryChangeListener(this);
-            populateExchanges();
-            _virtualHost.getConnectionRegistry().addRegistryChangeListener(this);
-            populateConnections();
-
-            synchronized(_aliases)
-            {
-                for(Port port :_broker.getPorts())
-                {
-                   if (Protocol.hasAmqpProtocol(port.getProtocols()))
-                   {
-                       _aliases.add(new VirtualHostAliasAdapter(this, port));
-                   }
-                }
-            }
+            activate();
             return true;
         }
         else if (desiredState == State.STOPPED)
@@ -998,6 +941,41 @@ public final class VirtualHostAdapter extends AbstractAdapter implements Virtual
         return false;
     }
 
+    private void activate()
+    {
+        VirtualHostRegistry virtualHostRegistry = _broker.getVirtualHostRegistry();
+        String virtualHostName = getName();
+        try
+        {
+            VirtualHostConfiguration configuration = createVirtualHostConfiguration(virtualHostName);
+            _virtualHost = new VirtualHostImpl(_broker.getVirtualHostRegistry(), _brokerStatisticsGatherer, _broker.getSecurityManager(), configuration);
+        }
+        catch (Exception e)
+        {
+           throw new RuntimeException("Failed to create virtual host " + virtualHostName, e);
+        }
+
+        virtualHostRegistry.registerVirtualHost(_virtualHost);
+
+        _statistics = new VirtualHostStatisticsAdapter(_virtualHost);
+        _virtualHost.getQueueRegistry().addRegistryChangeListener(this);
+        populateQueues();
+        _virtualHost.getExchangeRegistry().addRegistryChangeListener(this);
+        populateExchanges();
+        _virtualHost.getConnectionRegistry().addRegistryChangeListener(this);
+
+        synchronized(_aliases)
+        {
+            for(Port port :_broker.getPorts())
+            {
+               if (Protocol.hasAmqpProtocol(port.getProtocols()))
+               {
+                   _aliases.add(new VirtualHostAliasAdapter(this, port));
+               }
+            }
+        }
+    }
+
     private VirtualHostConfiguration createVirtualHostConfiguration(String virtualHostName) throws ConfigurationException
     {
         VirtualHostConfiguration configuration;
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java
index b642a80d55..fc07556073 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java
@@ -43,7 +43,7 @@ public class VirtualHostAliasAdapter  extends AbstractAdapter implements Virtual
 
     public VirtualHostAliasAdapter(VirtualHostAdapter virtualHostAdapter, Port port)
     {
-        super(UUIDGenerator.generateVhostAliasUUID(virtualHostAdapter.getName(), port.getName()), null);
+        super(UUIDGenerator.generateVhostAliasUUID(virtualHostAdapter.getName(), port.getName()));
         _vhost = virtualHostAdapter;
         _port = port;
     }