QPID-5680 : [Java Broker] remove configuration defualt maps

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

4 files changed, 41 insertions, 32 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
index 74ef6ad0e0..e674cef2d0 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
@@ -27,10 +27,12 @@ import java.net.SocketAddress;
 import java.nio.ByteBuffer;
 import java.security.Principal;
 import java.util.EnumSet;
+import java.util.Iterator;
 import java.util.Set;
 
 import org.apache.qpid.protocol.ServerProtocolEngine;
 import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.model.Protocol;
 import org.apache.qpid.server.util.BrokerTestHelper;
 import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
@@ -130,19 +132,19 @@ public class MultiVersionProtocolEngineFactoryTest extends QpidTestCase
             };
 
 
-    private byte[] getAmqpHeader(final AmqpProtocolVersion version)
+    private byte[] getAmqpHeader(final Protocol version)
     {
         switch(version)
         {
-            case v0_8:
+            case AMQP_0_8:
                 return AMQP_0_8_HEADER;
-            case v0_9:
+            case AMQP_0_9:
                 return AMQP_0_9_HEADER;
-            case v0_9_1:
+            case AMQP_0_9_1:
                 return AMQP_0_9_1_HEADER;
-            case v0_10:
+            case AMQP_0_10:
                 return AMQP_0_10_HEADER;
-            case v1_0_0:
+            case AMQP_1_0:
                 return AMQP_1_0_0_HEADER;
             default:
                 fail("unknown AMQP version, appropriate header must be added for new protocol version");
@@ -156,10 +158,10 @@ public class MultiVersionProtocolEngineFactoryTest extends QpidTestCase
      */
     public void testDifferentProtocolVersionsShareCommonIDNumberingSequence()
     {
-        Set<AmqpProtocolVersion> versions = EnumSet.allOf(AmqpProtocolVersion.class);
+        Set<Protocol> protocols = getAllAMQPProtocols();
 
         MultiVersionProtocolEngineFactory factory =
-            new MultiVersionProtocolEngineFactory(_broker, null, false, false, versions, null, null,
+            new MultiVersionProtocolEngineFactory(_broker, null, false, false, protocols, null, null,
                     org.apache.qpid.server.model.Transport.TCP);
 
         //create a dummy to retrieve the 'current' ID number
@@ -167,10 +169,10 @@ public class MultiVersionProtocolEngineFactoryTest extends QpidTestCase
 
         //create a protocol engine and send the AMQP header for all supported AMQP verisons,
         //ensuring the ID assigned increases as expected
-        for(AmqpProtocolVersion version : versions)
+        for(Protocol protocol : protocols)
         {
             long expectedID = previousId + 1;
-            byte[] header = getAmqpHeader(version);
+            byte[] header = getAmqpHeader(protocol);
             assertNotNull("protocol header should not be null", header);
 
             ServerProtocolEngine engine = factory.newProtocolEngine();
@@ -187,18 +189,33 @@ public class MultiVersionProtocolEngineFactoryTest extends QpidTestCase
         }
     }
 
+    protected Set<Protocol> getAllAMQPProtocols()
+    {
+        Set<Protocol> protocols = EnumSet.allOf(Protocol.class);
+        Iterator<Protocol> protoIter = protocols.iterator();
+        while(protoIter.hasNext())
+        {
+            Protocol protocol = protoIter.next();
+            if(protocol.getProtocolType() != Protocol.ProtocolType.AMQP)
+            {
+                protoIter.remove();
+            }
+        }
+        return protocols;
+    }
+
     /**
      * Test to verify that when requesting a ProtocolEngineFactory to produce engines having a default reply to unsupported
      * version initiations, there is enforcement that the default reply is itself a supported protocol version.
      */
     public void testUnsupportedDefaultReplyCausesIllegalArgumentException()
     {
-        Set<AmqpProtocolVersion> versions = EnumSet.allOf(AmqpProtocolVersion.class);
-        versions.remove(AmqpProtocolVersion.v0_9);
+        Set<Protocol> versions = getAllAMQPProtocols();
+        versions.remove(Protocol.AMQP_0_9);
 
         try
         {
-            new MultiVersionProtocolEngineFactory(_broker, null, false, false, versions, AmqpProtocolVersion.v0_9, null,
+            new MultiVersionProtocolEngineFactory(_broker, null, false, false, versions, Protocol.AMQP_0_9, null,
                     org.apache.qpid.server.model.Transport.TCP);
             fail("should not have been allowed to create the factory");
         }
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 dd7444a0d5..1584dc6e46 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
@@ -40,7 +40,6 @@ import org.apache.qpid.server.model.Exchange;
 import org.apache.qpid.server.model.ExclusivityPolicy;
 import org.apache.qpid.server.model.LifetimePolicy;
 import org.apache.qpid.server.model.Port;
-import org.apache.qpid.server.model.Protocol;
 import org.apache.qpid.server.model.Queue;
 import org.apache.qpid.server.model.State;
 import org.apache.qpid.server.model.VirtualHost;
@@ -266,17 +265,8 @@ public class Asserts
 
         @SuppressWarnings("unchecked")
         Collection<String> protocols = (Collection<String>) port.get(Port.PROTOCOLS);
-        assertNotNull("Unexpected value of attribute " + Port.PROTOCOLS, protocols);
-        boolean isAMQPPort = false;
-        for (String protocolName : protocols)
-        {
-            if (Protocol.valueOf(protocolName).isAMQP())
-            {
-                isAMQPPort = true;
-                break;
-            }
-        }
-        if (isAMQPPort)
+
+        if ("AMQP".equals(port.get(ConfiguredObject.TYPE)))
         {
             assertAttributesPresent(port,
                                     AbstractConfiguredObject.getAttributeNames(Port.class),
@@ -289,7 +279,8 @@ public class Asserts
                                     ConfiguredObject.CONTEXT,
                                     Port.AUTHENTICATION_PROVIDER,
                                     Port.KEY_STORE,
-                                    Port.TRUST_STORES);
+                                    Port.TRUST_STORES,
+                                    Port.PROTOCOLS);
             assertNotNull("Unexpected value of attribute " + Port.BINDING_ADDRESS, port.get(Port.BINDING_ADDRESS));
         }
         else
@@ -311,7 +302,8 @@ public class Asserts
                                     Port.NEED_CLIENT_AUTH,
                                     Port.WANT_CLIENT_AUTH,
                                     Port.KEY_STORE,
-                                    Port.TRUST_STORES);
+                                    Port.TRUST_STORES,
+                                    Port.PROTOCOLS);
         }
 
         @SuppressWarnings("unchecked")
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 1b0d340fcc..20005d4f47 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
@@ -88,7 +88,7 @@ public class BrokerRestTest extends QpidRestTestCase
 
         @SuppressWarnings("unchecked")
         Collection<String> port1Protocols = (Collection<String>) amqpPort.get(Port.PROTOCOLS);
-        assertFalse("AMQP protocol list cannot contain HTTP", port1Protocols.contains("HTTP"));
+        assertFalse("AMQP protocol list cannot contain HTTP", port1Protocols != null && port1Protocols.contains("HTTP"));
 
         @SuppressWarnings("unchecked")
         Collection<String> port2Protocols = (Collection<String>) httpPort.get(Port.PROTOCOLS);
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
index 040774b5ff..8dcf3b9010 100755
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
@@ -63,8 +63,8 @@ import org.apache.qpid.server.Broker;
 import org.apache.qpid.server.BrokerOptions;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.model.Port;
+import org.apache.qpid.server.model.Protocol;
 import org.apache.qpid.server.model.VirtualHost;
-import org.apache.qpid.server.protocol.AmqpProtocolVersion;
 import org.apache.qpid.server.store.MemoryMessageStore;
 import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.virtualhost.StandardVirtualHost;
@@ -155,7 +155,7 @@ public class QpidBrokerTestCase extends QpidTestCase
     protected BrokerCommandHelper _brokerCommandHelper = new BrokerCommandHelper(BROKER_COMMAND_TEMPLATE);
 
     private Boolean _brokerCleanBetweenTests = Boolean.getBoolean(BROKER_CLEAN_BETWEEN_TESTS);
-    private final AmqpProtocolVersion _brokerVersion = AmqpProtocolVersion.valueOf(System.getProperty(BROKER_VERSION, ""));
+    private final Protocol _brokerVersion = Protocol.valueOf("AMQP_" + System.getProperty(BROKER_VERSION, " ").substring(1));
     protected String _output = System.getProperty(TEST_OUTPUT, System.getProperty("java.io.tmpdir"));
     protected Boolean _brokerPersistent = Boolean.getBoolean(BROKER_PERSITENT);
 
@@ -978,12 +978,12 @@ public class QpidBrokerTestCase extends QpidTestCase
      */
     public boolean isBroker08()
     {
-        return _brokerVersion.equals(AmqpProtocolVersion.v0_8);
+        return _brokerVersion.equals(Protocol.AMQP_0_8);
     }
 
     public boolean isBroker010()
     {
-        return _brokerVersion.equals(AmqpProtocolVersion.v0_10);
+        return _brokerVersion.equals(Protocol.AMQP_0_10);
     }
 
     protected boolean isJavaBroker()