QPID-6068 : Use single mechanism for determining if a port is "using TLS"

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

2 files changed, 26 insertions, 5 deletions

diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractClientAuthCapablePortWithAuthProvider.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractClientAuthCapablePortWithAuthProvider.java
index 73413e7b8d..0871fbb0d9 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractClientAuthCapablePortWithAuthProvider.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractClientAuthCapablePortWithAuthProvider.java
@@ -25,7 +25,6 @@ import org.apache.qpid.server.configuration.IllegalConfigurationException;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.model.ManagedAttributeField;
-import org.apache.qpid.server.model.Transport;
 
 abstract public class AbstractClientAuthCapablePortWithAuthProvider<X extends AbstractClientAuthCapablePortWithAuthProvider<X>> extends AbstractPortWithAuthProvider<X>
         implements ClientAuthCapablePort<X>
@@ -68,7 +67,7 @@ abstract public class AbstractClientAuthCapablePortWithAuthProvider<X extends Ab
             throw new IllegalConfigurationException("Can't create port which requests SSL client certificates but has no trust stores configured.");
         }
 
-        boolean useTLSTransport = getTransports().contains(Transport.SSL) || getTransports().contains(Transport.WSS);
+        boolean useTLSTransport = isUsingTLSTransport();
         if(useClientAuth && !useTLSTransport)
         {
             throw new IllegalConfigurationException(
@@ -84,7 +83,7 @@ abstract public class AbstractClientAuthCapablePortWithAuthProvider<X extends Ab
 
         boolean requiresCertificate = updated.getNeedClientAuth() || updated.getWantClientAuth();
 
-        boolean usesSsl = updated.getTransports().contains(Transport.SSL);
+        boolean usesSsl = isUsingTLSTransport(updated.getTransports());
         if (usesSsl)
         {
             if ((updated.getTrustStores() == null || updated.getTrustStores().isEmpty() ) && requiresCertificate)
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 c90215f141..30b97e9e01 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
@@ -149,7 +149,7 @@ abstract public class AbstractPort<X extends AbstractPort<X>> extends AbstractCo
     {
         super.onValidate();
 
-        boolean useTLSTransport = getTransports().contains(Transport.SSL) || getTransports().contains(Transport.WSS);
+        boolean useTLSTransport = isUsingTLSTransport();
 
         if(useTLSTransport && getKeyStore() == null)
         {
@@ -175,6 +175,28 @@ abstract public class AbstractPort<X extends AbstractPort<X>> extends AbstractCo
         }
     }
 
+    protected final boolean isUsingTLSTransport()
+    {
+        return isUsingTLSTransport(getTransports());
+    }
+
+    protected final boolean isUsingTLSTransport(final Collection<Transport> transports)
+    {
+        boolean usesTLS = false;
+        if(transports != null)
+        {
+            for (Transport transport : transports)
+            {
+                if (transport.isSecure())
+                {
+                    usesTLS = true;
+                    break;
+                }
+            }
+        }
+        return usesTLS;
+    }
+
     @Override
     protected void validateChange(final ConfiguredObject<?> proxyForValidation, final Set<String> changedAttributes)
     {
@@ -215,7 +237,7 @@ abstract public class AbstractPort<X extends AbstractPort<X>> extends AbstractCo
         Collection<Protocol> protocols = updated.getProtocols();
 
 
-        boolean usesSsl = transports != null && transports.contains(Transport.SSL);
+        boolean usesSsl = isUsingTLSTransport(transports);
         if (usesSsl)
         {
             if (updated.getKeyStore() == null)