QPID-6010 : [Java Broker] Remove unnecessary system properties for controlling which AMQP protocols are made available

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

17 files changed, 42 insertions, 200 deletions

diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java
index ccda1e1fe1..765e1e4fa5 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java
@@ -40,9 +40,6 @@ public class BrokerProperties
     public static final String PROPERTY_DEFAULT_SUPPORTED_PROTOCOL_REPLY = "qpid.broker_default_supported_protocol_version_reply";
     public static final String PROPERTY_DISABLED_FEATURES = "qpid.broker_disabled_features";
 
-    public static final String PROPERTY_BROKER_DEFAULT_AMQP_PROTOCOL_EXCLUDES = "qpid.broker_default_amqp_protocol_excludes";
-    public static final String PROPERTY_BROKER_DEFAULT_AMQP_PROTOCOL_INCLUDES = "qpid.broker_default_amqp_protocol_includes";
-
     public static final String PROPERTY_MANAGEMENT_RIGHTS_INFER_ALL_ACCESS = "qpid.broker_jmx_method_rights_infer_all_access";
     public static final String PROPERTY_USE_CUSTOM_RMI_SOCKET_FACTORY = "qpid.broker_jmx_use_custom_rmi_socket_factory";
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
index e98ff1a79a..eca3b0c7b1 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
@@ -20,7 +20,6 @@
  */
 package org.apache.qpid.server.model;
 
-import java.security.AccessControlException;
 import java.util.Collection;
 import java.util.Set;
 
@@ -64,30 +63,6 @@ public interface Port<X extends Port<X>> extends ConfiguredObject<X>
     @ManagedAttribute
     Collection<TrustStore> getTrustStores();
 
-
-
-
-
-
-    void addTransport(Transport transport) throws IllegalStateException,
-                                                  AccessControlException,
-                                                  IllegalArgumentException;
-
-    Transport removeTransport(Transport transport) throws IllegalStateException,
-                                                          AccessControlException,
-                                                          IllegalArgumentException;
-
-
-    void addProtocol(Protocol protocol) throws IllegalStateException,
-                                               AccessControlException,
-                                               IllegalArgumentException;
-
-    Protocol removeProtocol(Protocol protocol) throws IllegalStateException,
-                                                      AccessControlException,
-                                                      IllegalArgumentException;
-
-    Collection<Protocol> getAvailableProtocols();
-
     //children
     Collection<VirtualHostAlias> getVirtualHostBindings();
     Collection<Connection> getConnections();
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
index 32587c0f4e..61790441f9 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
@@ -190,40 +190,12 @@ abstract public class AbstractPort<X extends AbstractPort<X>> extends AbstractCo
     }
 
     @Override
-    public void addTransport(Transport transport)
-            throws IllegalStateException, AccessControlException, IllegalArgumentException
-    {
-        throw new IllegalStateException();
-    }
-
-    @Override
-    public Transport removeTransport(Transport transport)
-            throws IllegalStateException, AccessControlException, IllegalArgumentException
-    {
-        throw new IllegalStateException();
-    }
-
-    @Override
     public Set<Protocol> getProtocols()
     {
         return _protocols;
     }
 
     @Override
-    public void addProtocol(Protocol protocol)
-            throws IllegalStateException, AccessControlException, IllegalArgumentException
-    {
-        throw new IllegalStateException();
-    }
-
-    @Override
-    public Protocol removeProtocol(Protocol protocol)
-            throws IllegalStateException, AccessControlException, IllegalArgumentException
-    {
-        throw new IllegalStateException();
-    }
-
-    @Override
     public Collection<VirtualHostAlias> getVirtualHostBindings()
     {
         List<VirtualHostAlias> aliases = new ArrayList<VirtualHostAlias>();
@@ -251,19 +223,6 @@ abstract public class AbstractPort<X extends AbstractPort<X>> extends AbstractCo
     }
 
     @Override
-    public Set<Protocol> getAvailableProtocols()
-    {
-        Set<Protocol> protocols = getProtocols();
-        if(protocols == null || protocols.isEmpty())
-        {
-            protocols = getDefaultProtocols();
-        }
-        return protocols;
-    }
-
-    protected abstract Set<Protocol> getDefaultProtocols();
-
-    @Override
     public State getState()
     {
         return _state;
@@ -382,11 +341,11 @@ abstract public class AbstractPort<X extends AbstractPort<X>> extends AbstractCo
 
             for (Port<?> existingPort : existingPorts)
             {
-                Collection<Protocol> portProtocols = existingPort.getAvailableProtocols();
+                Collection<Protocol> portProtocols = existingPort.getProtocols();
                 if (portProtocols != null)
                 {
                     final ArrayList<Protocol> intersection = new ArrayList(portProtocols);
-                    intersection.retainAll(getAvailableProtocols());
+                    intersection.retainAll(getProtocols());
                     if(!intersection.isEmpty())
                     {
                         throw new IllegalConfigurationException("Port for protocols " + intersection + " already exists. Only one management port per protocol can be created.");
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
index fa599b4d5f..b50a289b22 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
@@ -24,6 +24,7 @@ import java.util.Set;
 
 import org.apache.qpid.server.model.AuthenticationProvider;
 import org.apache.qpid.server.model.ManagedAttribute;
+import org.apache.qpid.server.model.ManagedContextDefault;
 import org.apache.qpid.server.model.ManagedObject;
 import org.apache.qpid.server.model.Port;
 import org.apache.qpid.server.model.Protocol;
@@ -42,6 +43,11 @@ public interface AmqpPort<X extends AmqpPort<X>> extends Port<X>
     String SEND_BUFFER_SIZE                     = "sendBufferSize";
     String RECEIVE_BUFFER_SIZE                  = "receiveBufferSize";
 
+    String DEFAULT_AMQP_PROTOCOLS = "qpid.port.default_amqp_protocols";
+
+    @ManagedContextDefault(name = DEFAULT_AMQP_PROTOCOLS)
+    String INSTALLED_PROTOCOLS = AmqpPortImpl.getInstalledProtocolsAsString();
+
     @ManagedAttribute( defaultValue = AmqpPort.DEFAULT_AMQP_TCP_NO_DELAY )
     boolean isTcpNoDelay();
 
@@ -66,8 +72,9 @@ public interface AmqpPort<X extends AmqpPort<X>> extends Port<X>
                        validValues = {"org.apache.qpid.server.model.port.AmqpPortImpl#getAllAvailableTransportCombinations()"})
     Set<Transport> getTransports();
 
-    @ManagedAttribute( validValues = {"org.apache.qpid.server.model.port.AmqpPortImpl#getAllAvailableProtocolCombinations()"} )
+    @ManagedAttribute( defaultValue = "${" + DEFAULT_AMQP_PROTOCOLS + "}", validValues = {"org.apache.qpid.server.model.port.AmqpPortImpl#getAllAvailableProtocolCombinations()"} )
     Set<Protocol> getProtocols();
 
     VirtualHostImpl getVirtualHost(String name);
+
 }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
index 1fbc0c8bc1..2c958b00d0 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
@@ -25,7 +25,6 @@ import java.security.GeneralSecurityException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -43,6 +42,7 @@ import org.apache.qpid.server.logging.messages.BrokerMessages;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.KeyStore;
 import org.apache.qpid.server.model.ManagedAttributeField;
+import org.apache.qpid.server.model.ManagedContextDefault;
 import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
 import org.apache.qpid.server.model.Protocol;
 import org.apache.qpid.server.model.State;
@@ -53,6 +53,7 @@ import org.apache.qpid.server.plugin.QpidServiceLoader;
 import org.apache.qpid.server.plugin.TransportProviderFactory;
 import org.apache.qpid.server.transport.AcceptingTransport;
 import org.apache.qpid.server.transport.TransportProvider;
+import org.apache.qpid.server.util.ServerScopedRuntimeException;
 import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 import org.apache.qpid.transport.network.security.ssl.QpidMultipleTrustManager;
 
@@ -110,34 +111,6 @@ public class AmqpPortImpl extends AbstractPortWithAuthProvider<AmqpPortImpl> imp
         return (VirtualHostImpl) _broker.findVirtualHostByName(name);
     }
 
-    protected Set<Protocol> getDefaultProtocols()
-    {
-        Set<Protocol> defaultProtocols = EnumSet.of(Protocol.AMQP_0_8, Protocol.AMQP_0_9, Protocol.AMQP_0_9_1,
-                                                    Protocol.AMQP_0_10, Protocol.AMQP_1_0);
-        String excludedProtocols = System.getProperty(BrokerProperties.PROPERTY_BROKER_DEFAULT_AMQP_PROTOCOL_EXCLUDES);
-        if (excludedProtocols != null)
-        {
-            String[] excludes = excludedProtocols.split(",");
-            for (String exclude : excludes)
-            {
-                Protocol protocol = Protocol.valueOf(exclude);
-                defaultProtocols.remove(protocol);
-            }
-        }
-        String includedProtocols = System.getProperty(BrokerProperties.PROPERTY_BROKER_DEFAULT_AMQP_PROTOCOL_INCLUDES);
-        if (includedProtocols != null)
-        {
-            String[] includes = includedProtocols.split(",");
-            for (String include : includes)
-            {
-                Protocol protocol = Protocol.valueOf(include);
-                defaultProtocols.add(protocol);
-            }
-        }
-        return defaultProtocols;
-    }
-
-
     @Override
     protected State onActivate()
     {
@@ -178,7 +151,7 @@ public class AmqpPortImpl extends AbstractPortWithAuthProvider<AmqpPortImpl> imp
             _transport = transportProvider.createTransport(transportSet,
                                                            sslContext,
                                                            this,
-                                                           getAvailableProtocols(),
+                                                           getProtocols(),
                                                            defaultSupportedProtocolReply);
 
             _transport.start();
@@ -363,4 +336,21 @@ public class AmqpPortImpl extends AbstractPortWithAuthProvider<AmqpPortImpl> imp
         }
         return Collections.unmodifiableSet(combinationsAsString);
     }
+
+
+    public static String getInstalledProtocolsAsString()
+    {
+        Set<Protocol> installedProtocols = getInstalledProtocols();
+        ObjectMapper mapper = new ObjectMapper();
+
+        try(StringWriter output = new StringWriter())
+        {
+            mapper.writeValue(output, installedProtocols);
+            return output.toString();
+        }
+        catch (IOException e)
+        {
+            throw new ServerScopedRuntimeException(e);
+        }
+    }
 }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java
index fa2af121ae..51d31cb8ab 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java
@@ -51,7 +51,7 @@ public interface HttpPort<X extends HttpPort<X>> extends Port<X>
                        validValues = {"[ \"TCP\" ]", "[ \"SSL\" ]", "[ \"TCP\", \"SSL\" ]"})
     Set<Transport> getTransports();
 
-    @ManagedAttribute( validValues = { "[ \"HTTP\"]"} )
+    @ManagedAttribute( defaultValue = "HTTP", validValues = { "[ \"HTTP\"]"} )
     Set<Protocol> getProtocols();
 
     void setPortManager(PortManager manager);
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPortImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPortImpl.java
index a89ba9bbff..33abee9bde 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPortImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPortImpl.java
@@ -40,12 +40,6 @@ public class HttpPortImpl extends AbstractPortWithAuthProvider<HttpPortImpl> imp
         super(attributes, broker);
     }
 
-    @Override
-    protected Set<Protocol> getDefaultProtocols()
-    {
-        return Collections.singleton(Protocol.HTTP);
-    }
-
     public void setPortManager(PortManager manager)
     {
         _portManager = manager;
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPort.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPort.java
index 48754e92e4..981d81a342 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPort.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPort.java
@@ -51,7 +51,7 @@ public interface JmxPort<X extends JmxPort<X>> extends Port<X>
                        validValues = {"[ \"TCP\" ]", "[ \"SSL\" ]"})
     Set<Transport> getTransports();
 
-    @ManagedAttribute( validValues = { "[ \"JMX_RMI\"]"} )
+    @ManagedAttribute( defaultValue = "JMX_RMI", validValues = { "[ \"JMX_RMI\"]"} )
     Set<Protocol> getProtocols();
 
     void setPortManager(PortManager manager);
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPortImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPortImpl.java
index ac691c0860..a235613c29 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPortImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPortImpl.java
@@ -48,12 +48,6 @@ public class JmxPortImpl extends AbstractPortWithAuthProvider<JmxPortImpl> imple
     }
 
     @Override
-    protected Set<Protocol> getDefaultProtocols()
-    {
-        return Collections.singleton(Protocol.JMX_RMI);
-    }
-
-    @Override
     public void setPortManager(PortManager manager)
     {
         _portManager = manager;
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/RmiPort.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/RmiPort.java
index d2420aa343..8fad90ada3 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/RmiPort.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/RmiPort.java
@@ -32,7 +32,7 @@ import org.apache.qpid.server.model.Transport;
 public interface RmiPort<X extends RmiPort<X>> extends Port<X>
 {
 
-    @ManagedAttribute( validValues = { "[ \"RMI\"]"} )
+    @ManagedAttribute( defaultValue = "RMI", validValues = { "[ \"RMI\"]"} )
     Set<Protocol> getProtocols();
 
     @ManagedAttribute( defaultValue = "TCP",
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/RmiPortImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/RmiPortImpl.java
index e236b7cb91..82e68d75c8 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/RmiPortImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/RmiPortImpl.java
@@ -56,12 +56,6 @@ public class RmiPortImpl extends AbstractPort<RmiPortImpl> implements RmiPort<Rm
 
     }
 
-    @Override
-    protected Set<Protocol> getDefaultProtocols()
-    {
-        return Collections.singleton(Protocol.RMI);
-    }
-
     public void setPortManager(PortManager manager)
     {
         _portManager = manager;
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
index 450fc30bf2..eacc4f2458 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
@@ -251,7 +251,7 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
         {
             for(Port port :_broker.getPorts())
             {
-                if (Protocol.hasAmqpProtocol(port.getAvailableProtocols()))
+                if (Protocol.hasAmqpProtocol(port.getProtocols()))
                 {
                     _aliases.add(new VirtualHostAliasAdapter(this, port));
                 }
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
index 48681a6075..523203c756 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
@@ -25,16 +25,13 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
-import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
-import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
 import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
 import org.apache.qpid.server.configuration.updater.TaskExecutor;
@@ -100,8 +97,6 @@ public class PortFactoryTest extends QpidTestCase
         }
 
 
-        setTestSystemProperty(BrokerProperties.PROPERTY_BROKER_DEFAULT_AMQP_PROTOCOL_EXCLUDES, null);
-        setTestSystemProperty(BrokerProperties.PROPERTY_BROKER_DEFAULT_AMQP_PROTOCOL_INCLUDES, null);
         _factory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance());
         _attributes.put(Port.ID, _portId);
         _attributes.put(Port.NAME, getName());
@@ -114,62 +109,6 @@ public class PortFactoryTest extends QpidTestCase
         _attributes.put(Port.BINDING_ADDRESS, "127.0.0.1");
     }
 
-    public void testDefaultProtocols()
-    {
-        Map<String, Object> attributes = new HashMap<String, Object>();
-        attributes.put(Port.PORT, 1);
-        attributes.put(Port.NAME, getName());
-        attributes.put(Port.DESIRED_STATE, State.QUIESCED);
-
-        attributes.put(Port.AUTHENTICATION_PROVIDER, _authProviderName);
-        Port<?> port = _factory.create(Port.class, attributes, _broker);
-
-        Collection<Protocol> protocols = port.getAvailableProtocols();
-
-        EnumSet<Protocol> expected = EnumSet.of(Protocol.AMQP_0_8, Protocol.AMQP_0_9, Protocol.AMQP_0_9_1, Protocol.AMQP_0_10,
-                Protocol.AMQP_1_0);
-        assertEquals("Unexpected protocols", new HashSet<Protocol>(expected), new HashSet<Protocol>(protocols));
-    }
-
-    public void testDefaultProtocolsWhenProtocolExcludeSystemPropertyIsSet()
-    {
-        setTestSystemProperty(BrokerProperties.PROPERTY_BROKER_DEFAULT_AMQP_PROTOCOL_EXCLUDES, Protocol.AMQP_1_0.name() + ","
-                + Protocol.AMQP_0_10.name());
-
-        Map<String, Object> attributes = new HashMap<String, Object>();
-        attributes.put(Port.PORT, 1);
-        attributes.put(Port.NAME, getName());
-        attributes.put(Port.AUTHENTICATION_PROVIDER, _authProviderName);
-        attributes.put(Port.DESIRED_STATE, State.QUIESCED);
-        Port<?> port = _factory.create(Port.class, attributes, _broker);
-
-
-        Collection<Protocol> protocols = port.getAvailableProtocols();
-
-        EnumSet<Protocol> expected = EnumSet.of(Protocol.AMQP_0_8, Protocol.AMQP_0_9, Protocol.AMQP_0_9_1);
-        assertEquals("Unexpected protocols", new HashSet<Protocol>(expected), new HashSet<Protocol>(protocols));
-    }
-
-    public void testDefaultProtocolsWhenProtocolIncludeSystemPropertyIsSet()
-    {
-        setTestSystemProperty(BrokerProperties.PROPERTY_BROKER_DEFAULT_AMQP_PROTOCOL_EXCLUDES, Protocol.AMQP_1_0.name() + ","
-                + Protocol.AMQP_0_10.name() + "," + Protocol.AMQP_0_9_1.name());
-        setTestSystemProperty(BrokerProperties.PROPERTY_BROKER_DEFAULT_AMQP_PROTOCOL_INCLUDES, Protocol.AMQP_0_10.name() + ","
-                + Protocol.AMQP_0_9_1.name());
-
-        Map<String, Object> attributes = new HashMap<String, Object>();
-        attributes.put(Port.PORT, 1);
-        attributes.put(Port.NAME, getName());
-        attributes.put(Port.AUTHENTICATION_PROVIDER, _authProviderName);
-        attributes.put(Port.DESIRED_STATE, State.QUIESCED);
-        Port<?> port = _factory.create(Port.class, attributes, _broker);
-
-        Collection<Protocol> protocols = port.getAvailableProtocols();
-
-        EnumSet<Protocol> expected = EnumSet.of(Protocol.AMQP_0_8, Protocol.AMQP_0_9, Protocol.AMQP_0_9_1, Protocol.AMQP_0_10);
-        assertEquals("Unexpected protocols", new HashSet<Protocol>(expected), new HashSet<Protocol>(protocols));
-    }
-
     public void testCreatePortWithMinimumAttributes()
     {
         Map<String, Object> attributes = new HashMap<String, Object>();
@@ -184,8 +123,6 @@ public class PortFactoryTest extends QpidTestCase
         assertTrue(port instanceof AmqpPort);
         assertEquals("Unexpected port", 1, port.getPort());
         assertEquals("Unexpected transports", Collections.singleton(PortFactory.DEFAULT_TRANSPORT), port.getTransports());
-        assertEquals("Unexpected protocols", EnumSet.of(Protocol.AMQP_0_8, Protocol.AMQP_0_9, Protocol.AMQP_0_9_1, Protocol.AMQP_0_10,
-                                                        Protocol.AMQP_1_0), port.getAvailableProtocols());
         assertEquals("Unexpected send buffer size", PortFactory.DEFAULT_AMQP_SEND_BUFFER_SIZE,
                 port.getAttribute(AmqpPort.SEND_BUFFER_SIZE));
         assertEquals("Unexpected receive buffer size", PortFactory.DEFAULT_AMQP_RECEIVE_BUFFER_SIZE,
@@ -333,7 +270,7 @@ public class PortFactoryTest extends QpidTestCase
         {
             assertEquals(_tcpTransports, port.getTransports());
         }
-        assertEquals(amqp010ProtocolSet, port.getAvailableProtocols());
+        assertEquals(amqp010ProtocolSet, port.getProtocols());
         assertEquals("Unexpected send buffer size", 2, port.getAttribute(AmqpPort.SEND_BUFFER_SIZE));
         assertEquals("Unexpected receive buffer size", 1, port.getAttribute(AmqpPort.RECEIVE_BUFFER_SIZE));
         assertEquals("Unexpected need client auth", needClientAuth, port.getAttribute(Port.NEED_CLIENT_AUTH));
@@ -361,7 +298,7 @@ public class PortFactoryTest extends QpidTestCase
         assertEquals(_portId, port.getId());
         assertEquals(_portNumber, port.getPort());
         assertEquals(_tcpTransports, port.getTransports());
-        assertEquals(nonAmqpProtocolSet, port.getAvailableProtocols());
+        assertEquals(nonAmqpProtocolSet, port.getProtocols());
     }
 
     public void testCreateNonAmqpPortWithPartiallySetAttributes()
@@ -382,7 +319,7 @@ public class PortFactoryTest extends QpidTestCase
         assertEquals(_portId, port.getId());
         assertEquals(_portNumber, port.getPort());
         assertEquals(Collections.singleton(PortFactory.DEFAULT_TRANSPORT), port.getTransports());
-        assertEquals(nonAmqpProtocolSet, port.getAvailableProtocols());
+        assertEquals(nonAmqpProtocolSet, port.getProtocols());
 
     }
 
@@ -411,7 +348,7 @@ public class PortFactoryTest extends QpidTestCase
         attributes.put(Port.PROTOCOLS, Collections.singleton(Protocol.RMI));
 
         Port rmiPort = mock(Port.class);
-        when(rmiPort.getAvailableProtocols()).thenReturn(Collections.singleton(Protocol.RMI));
+        when(rmiPort.getProtocols()).thenReturn(Collections.singleton(Protocol.RMI));
         when(_broker.getPorts()).thenReturn(Collections.singletonList(rmiPort));
 
         try
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
index d29144f09b..f55b373119 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
@@ -441,7 +441,7 @@ public class HttpManagement extends AbstractPluginAdapter<HttpManagement> implem
         Collection<Port<?>> httpPorts = new HashSet<>();
         for (Port<?> port : ports)
         {
-            if (port.getAvailableProtocols().contains(Protocol.HTTP))
+            if (port.getProtocols().contains(Protocol.HTTP))
             {
                 httpPorts.add(port);
             }
diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java
index ead6ba6865..98c6d9ffe8 100644
--- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java
@@ -184,12 +184,12 @@ public class JMXManagementPluginImpl
 
     private boolean isConnectorPort(Port<?> port)
     {
-        return port.getAvailableProtocols().contains(Protocol.JMX_RMI);
+        return port.getProtocols().contains(Protocol.JMX_RMI);
     }
 
     private boolean isRegistryPort(Port<?> port)
     {
-        return port.getAvailableProtocols().contains(Protocol.RMI);
+        return port.getProtocols().contains(Protocol.RMI);
     }
 
     @Override
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 0345485167..386cd80f38 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
@@ -550,8 +550,6 @@ public class QpidBrokerTestCase extends QpidTestCase
                 // in to the external broker's QPID_OPTS string.
                 setSystemProperty("amqj.protocol.logging.level");
                 setSystemProperty("root.logging.level");
-                setSystemProperty(BrokerProperties.PROPERTY_BROKER_DEFAULT_AMQP_PROTOCOL_EXCLUDES);
-                setSystemProperty(BrokerProperties.PROPERTY_BROKER_DEFAULT_AMQP_PROTOCOL_INCLUDES);
 
                 setSystemProperty("test.port");
                 setSystemProperty("test.mport");
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
index b94827f249..85a523329a 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
@@ -34,7 +34,6 @@ import org.apache.qpid.configuration.ClientProperties;
 import org.apache.qpid.framing.ProtocolVersion;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.model.Protocol;
-import org.apache.qpid.server.model.adapter.PortFactoryTest;
 import org.apache.qpid.server.plugin.AMQPProtocolVersionWrapper;
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
 
@@ -43,7 +42,6 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase;
  * versions entirely, rather than selectively excluding them on particular ports,
  * and it is possible to configure the reply to an unsupported protocol initiation.
  *<p>
- * Protocol exclusion/inclusion are unit tested as part of {@link PortFactoryTest}
  */
 public class SupportedProtocolVersionsTest extends QpidBrokerTestCase
 {
@@ -55,8 +53,7 @@ public class SupportedProtocolVersionsTest extends QpidBrokerTestCase
     private void clearProtocolSupportManipulations() throws Exception
     {
         //Remove the QBTC provided protocol manipulations, giving only the protocols which default to enabled
-        setSystemProperty(BrokerProperties.PROPERTY_BROKER_DEFAULT_AMQP_PROTOCOL_EXCLUDES, null);
-        setSystemProperty(BrokerProperties.PROPERTY_BROKER_DEFAULT_AMQP_PROTOCOL_INCLUDES, null);
+
         setSystemProperty(QpidBrokerTestCase.TEST_AMQP_PORT_PROTOCOLS_PROPERTY, getProtocolsAsString(getAllAmqpProtocols()));
     }