[java-opensaml] branch master updated: Reduce parameter strictness on setters.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-opensaml.

View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=3b483bfe9dd083193f6bc31a60c74cd4fb1d7e77

The following commit(s) were added to refs/heads/master by this push:
       new  3b483bf   Reduce parameter strictness on setters.
3b483bf is described below

commit 3b483bfe9dd083193f6bc31a60c74cd4fb1d7e77
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Sat May 20 18:25:11 2017 -0400

    Reduce parameter strictness on setters.
---
 .../httpclient/HttpClientSecurityParameters.java      | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/httpclient/HttpClientSecurityParameters.java b/opensaml-security-api/src/main/java/org/opensaml/security/httpclient/HttpClientSecurityParameters.java
index 3a3cc51..8c14104 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/httpclient/HttpClientSecurityParameters.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/httpclient/HttpClientSecurityParameters.java
@@ -18,6 +18,7 @@
 package org.opensaml.security.httpclient;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import javax.annotation.Nullable;
@@ -39,25 +40,25 @@ import org.opensaml.security.x509.X509Credential;
 public class HttpClientSecurityParameters {
     
     /** HttpClient credentials provider. */
-    private CredentialsProvider credentialsProvider;
+    @Nullable private CredentialsProvider credentialsProvider;
     
     /** Optional trust engine used in evaluating server TLS credentials. */
-    private TrustEngine<? super X509Credential> tlsTrustEngine;
+    @Nullable private TrustEngine<? super X509Credential> tlsTrustEngine;
     
     /** Optional criteria set used in evaluating server TLS credentials. */
-    private CriteriaSet tlsCriteriaSet;
+    @Nullable private CriteriaSet tlsCriteriaSet;
     
     /** TLS Protocols. */
-    private List<String> tlsProtocols;
+    @Nullable private List<String> tlsProtocols;
     
     /** TLS cipher suites. */
-    private List<String> tlsCipherSuites;
+    @Nullable private List<String> tlsCipherSuites;
     
     /** The hostname verifier. */
-    private X509HostnameVerifier hostnameVerifier;
+    @Nullable private X509HostnameVerifier hostnameVerifier;
     
     /** The X509 credential used for client TLS. */
-    private X509Credential clientTLSCredential;
+    @Nullable private X509Credential clientTLSCredential;
     
     /**
      * Get an instance of {@link CredentialsProvider} used for authentication by the HttpClient instance.
@@ -176,7 +177,7 @@ public class HttpClientSecurityParameters {
      * 
      * @param protocols the TLS protocols or null
      */
-    public void setTLSProtocols(@Nullable final List<String> protocols) {
+    public void setTLSProtocols(@Nullable final Collection<String> protocols) {
         tlsProtocols = new ArrayList<>(StringSupport.normalizeStringCollection(protocols));
         if (tlsProtocols.isEmpty()) {
             tlsProtocols = null;
@@ -197,7 +198,7 @@ public class HttpClientSecurityParameters {
      * 
      * @param cipherSuites the TLS cipher suites, or null
      */
-    public void setTLSCipherSuites(@Nullable final List<String> cipherSuites) {
+    public void setTLSCipherSuites(@Nullable final Collection<String> cipherSuites) {
         tlsCipherSuites = new ArrayList<>(StringSupport.normalizeStringCollection(cipherSuites));
         if (tlsCipherSuites.isEmpty()) {
             tlsCipherSuites = null;

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.