[java-opensaml COMMIT] in /trunk: opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityAttrib...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Jan 13 16:56:07 2017
New Revision: 4600

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4600&view=rev
Log:
OSJ-173 - Audit Guava Collections transform and filter for problematic usage

https://issues.shibboleth.net/jira/browse/OSJ-173

Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicate.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractBatchMetadataResolver.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/tls/CertificateNameOptions.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/BasicX509CredentialNameEvaluator.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BlacklistPredicate.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/WhitelistPredicate.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicate.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicate.java?rev=4600&r1=4599&r2=4600&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicate.java	(original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/EntityAttributesPredicate.java	Fri Jan 13 16:56:07 2017
@@ -305,8 +305,7 @@
          */
         public void setRegexps(@Nonnull @NonnullElements final Collection<Pattern> exps) {
             Constraint.isNotNull(exps, "Regular expressions collection cannot be null");
-            regexps = new ArrayList<>(exps.size());
-            regexps.addAll(Collections2.filter(exps, Predicates.notNull()));
+            regexps = new ArrayList<>(Collections2.filter(exps, Predicates.notNull()));
         }
     }
     

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractBatchMetadataResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractBatchMetadataResolver.java?rev=4600&r1=4599&r2=4600&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractBatchMetadataResolver.java	(original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractBatchMetadataResolver.java	Fri Jan 13 16:56:07 2017
@@ -125,7 +125,8 @@
         if (newIndexes == null) {
             indexes = Collections.emptySet();
         } else {
-            indexes = new HashSet<>(Collections2.filter(newIndexes, Predicates.notNull()));
+            indexes = new HashSet<>();
+            indexes.addAll(Collections2.filter(newIndexes, Predicates.notNull()));
         }
     }
 

Modified: trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/tls/CertificateNameOptions.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/tls/CertificateNameOptions.java?rev=4600&r1=4599&r2=4600&view=diff
==============================================================================
--- trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/tls/CertificateNameOptions.java	(original)
+++ trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/tls/CertificateNameOptions.java	Fri Jan 13 16:56:07 2017
@@ -124,7 +124,8 @@
             return;
         }
         
-        subjectAltNames = new HashSet<>(Collections2.filter(names, Predicates.notNull()));
+        subjectAltNames = new HashSet<>();
+        subjectAltNames.addAll(Collections2.filter(names, Predicates.notNull()));
     }
 
     /**

Modified: trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/BasicX509CredentialNameEvaluator.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/BasicX509CredentialNameEvaluator.java?rev=4600&r1=4599&r2=4600&view=diff
==============================================================================
--- trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/BasicX509CredentialNameEvaluator.java	(original)
+++ trunk/opensaml-security-impl/src/main/java/org/opensaml/security/x509/impl/BasicX509CredentialNameEvaluator.java	Fri Jan 13 16:56:07 2017
@@ -138,7 +138,8 @@
         if (nameTypes == null) {
             subjectAltNameTypes = Collections.emptySet();
         } else {
-            subjectAltNameTypes = new HashSet<>(Collections2.filter(nameTypes, Predicates.notNull()));
+            subjectAltNameTypes = new HashSet<>();
+            subjectAltNameTypes.addAll(Collections2.filter(nameTypes, Predicates.notNull()));
         }
     }
 


[... 66 lines stripped ...]