[utilities COMMIT] /java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/SSLConnectionSo...

[noreply at shibboleth.net]

Author: putmanb
Date: Mon May 18 19:07:30 2015
New Revision: 792

URL: http://svn.shibboleth.net/view/utilities?rev=792&view=rev
Log:
Add normalization to setters on builder.

Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/SSLConnectionSocketFactoryBuilder.java

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/SSLConnectionSocketFactoryBuilder.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/SSLConnectionSocketFactoryBuilder.java?rev=792&r1=791&r2=792&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/SSLConnectionSocketFactoryBuilder.java	(original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/SSLConnectionSocketFactoryBuilder.java	Mon May 18 19:07:30 2015
@@ -21,6 +21,7 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 import java.security.SecureRandom;
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.annotation.Nonnull;
@@ -29,8 +30,13 @@
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
+
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 import org.apache.http.conn.ssl.X509HostnameVerifier;
+
+import com.google.common.base.Predicates;
+import com.google.common.collect.Collections2;
 
 /**
  * A builder for instances of {@link SSLConnectionSocketFactory} which allows easy specification
@@ -90,7 +96,7 @@
      * @param protocol the protocol, may be null
      */
     public void setSSLContextProtocol(@Nullable final String protocol) {
-        sslContextProtocol = protocol;
+        sslContextProtocol = StringSupport.trimOrNull(protocol);
     }
 
     /**
@@ -110,7 +116,7 @@
      * @param provider the provider name, may be null
      */
     public void setSSLContextProvider(@Nullable final String provider) {
-        sslContextProvider = provider;
+        sslContextProvider = StringSupport.trimOrNull(provider);
     }
 
     /**
@@ -130,7 +136,14 @@
      * @param managers the list of key managers, or null
      */
     public void setKeyManagers(@Nullable final List<KeyManager> managers) {
-        keyManagers = managers;
+        if (managers == null) {
+            keyManagers = null;
+        } else {
+            keyManagers = new ArrayList<>(Collections2.filter(managers, Predicates.notNull()));
+            if (keyManagers.isEmpty()) {
+                keyManagers = null;
+            }
+        }
     }
 
     /**
@@ -150,7 +163,14 @@
      * @param managers the list of trust managers, or null
      */
     public void setTrustManagers(@Nullable final List<TrustManager> managers) {
-        trustManagers = managers;
+        if (managers == null) {
+            trustManagers = null;
+        } else {
+            trustManagers = new ArrayList<>(Collections2.filter(managers, Predicates.notNull()));
+            if (trustManagers.isEmpty()) {
+                trustManagers = null;
+            }
+        }
     }
 
     /**
@@ -210,7 +230,10 @@
      * @param protocols the list of protocols, or null
      */
     public void setEnabledProtocols(@Nullable final List<String> protocols) {
-        enabledProtocols = protocols;
+        enabledProtocols = new ArrayList<>(StringSupport.normalizeStringCollection(protocols));
+        if (enabledProtocols.isEmpty()) {
+            enabledProtocols = null;
+        }
     }
 
     /**
@@ -228,7 +251,10 @@
      * @param cipherSuites the list of cipher suites, or null
      */
     public void setEnabledCipherSuites(@Nullable final List<String> cipherSuites) {
-        enabledCipherSuites = cipherSuites;
+        enabledCipherSuites = new ArrayList<>(StringSupport.normalizeStringCollection(cipherSuites));
+        if (enabledCipherSuites.isEmpty()) {
+            enabledCipherSuites = null;
+        }
     }
 
     /**