[utilities COMMIT] in /java-support/trunk/src: main/java/net/shibboleth/utilities/java/support/security/IPRangeAccess...

[noreply at shibboleth.net]

Author: scantor
Date: Sat Feb  7 13:21:54 2015
New Revision: 740

URL: http://svn.shibboleth.net/view/utilities?rev=740&view=rev
Log:
IDP-536 -  Cleanup Guava's Lists.newArrayList() methods

Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/IPRangeAccessControl.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/SelfSignedCertificateGenerator.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/SchemaBuilder.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/logic/AllMatchPredicateTest.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/logic/AnyMatchPredicateTest.java

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/IPRangeAccessControl.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/IPRangeAccessControl.java?rev=740&r1=739&r2=740&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/IPRangeAccessControl.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/IPRangeAccessControl.java Sat Feb  7 13:21:54 2015
@@ -17,6 +17,7 @@
 
 package net.shibboleth.utilities.java.support.security;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 
@@ -35,7 +36,6 @@
 
 import com.google.common.base.Predicates;
 import com.google.common.collect.Collections2;
-import com.google.common.collect.Lists;
 import com.google.common.net.InetAddresses;
 
 /**
@@ -66,7 +66,7 @@
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         Constraint.isNotNull(ranges, "IPRange collection cannot be null");
         
-        allowedRanges = Lists.newArrayList(Collections2.filter(ranges, Predicates.notNull()));
+        allowedRanges = new ArrayList<>(Collections2.filter(ranges, Predicates.notNull()));
     }
 
     /** {@inheritDoc} */

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/SelfSignedCertificateGenerator.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/SelfSignedCertificateGenerator.java?rev=740&r1=739&r2=740&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/SelfSignedCertificateGenerator.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/SelfSignedCertificateGenerator.java Sat Feb  7 13:21:54 2015
@@ -62,7 +62,6 @@
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.converters.BaseConverter;
-import com.google.common.collect.Lists;
 
 /**
  * A helper class to generate self-signed keypairs.
@@ -181,7 +180,7 @@
      * @param altNames collection of subject alt names.
      */
     public void setDNSSubjectAltNames(@Nonnull @NonnullElements final Collection<String> altNames) {
-        args.dnsSubjectAltNames = Lists.newArrayList(StringSupport.normalizeStringCollection(altNames));
+        args.dnsSubjectAltNames = new ArrayList<>(StringSupport.normalizeStringCollection(altNames));
     }
 
     /**
@@ -190,7 +189,7 @@
      * @param altNames collection of subject alt names.
      */
     public void setURISubjectAltNames(@Nonnull @NonnullElements final Collection<String> altNames) {
-        args.uriSubjectAltNames = Lists.newArrayList(StringSupport.normalizeStringCollection(altNames));
+        args.uriSubjectAltNames = new ArrayList<>(StringSupport.normalizeStringCollection(altNames));
     }
     
     /**

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/SchemaBuilder.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/SchemaBuilder.java?rev=740&r1=739&r2=740&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/SchemaBuilder.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/SchemaBuilder.java Sat Feb  7 13:21:54 2015
@@ -18,7 +18,9 @@
 package net.shibboleth.utilities.java.support.xml;
 
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -42,9 +44,6 @@
 import org.w3c.dom.ls.LSResourceResolver;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 
 /**
  * A class for building a {@link Schema} from a set of inputs, allowing for
@@ -108,9 +107,9 @@
     /** Constructor. */

[... 106 lines stripped ...]