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

[noreply at shibboleth.net]

Author: scantor
Date: Sun Feb  8 20:06:13 2015
New Revision: 742

URL: http://svn.shibboleth.net/view/utilities?rev=742&view=rev
Log:
IDP-536 -  Cleanup Guava Set/Map methods.

Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/CookieBufferingFilter.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/BasicAccessControlService.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/primitive/StringSupportTest.java

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/CookieBufferingFilter.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/CookieBufferingFilter.java?rev=742&r1=741&r2=742&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/CookieBufferingFilter.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/CookieBufferingFilter.java Sun Feb  8 20:06:13 2015
@@ -19,6 +19,7 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.HashMap;
 import java.util.Map;
 
 import javax.annotation.Nonnull;
@@ -33,8 +34,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
-
-import com.google.common.collect.Maps;
 
 import net.shibboleth.utilities.java.support.annotation.constraint.Live;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
@@ -84,7 +83,7 @@
          */
         public CookieBufferingHttpServletResponseProxy(@Nonnull final HttpServletResponse response) {
             super(response);
-            cookieMap = Maps.newHashMap();
+            cookieMap = new HashMap<>();
         }
     
         /** {@inheritDoc} */

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/BasicAccessControlService.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/BasicAccessControlService.java?rev=742&r1=741&r2=742&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/BasicAccessControlService.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/BasicAccessControlService.java Sun Feb  8 20:06:13 2015
@@ -17,6 +17,8 @@
 
 package net.shibboleth.utilities.java.support.security;
 
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 
 import javax.annotation.Nonnull;
@@ -24,8 +26,6 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
-import com.google.common.collect.Maps;
 
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
@@ -45,7 +45,7 @@
     
     /** Constructor. */
     public BasicAccessControlService() {
-        policyMap = Maps.newHashMap();
+        policyMap = Collections.emptyMap();
     }
     
     /**
@@ -57,7 +57,7 @@
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         Constraint.isNotNull(map, "Policy map cannot be null");
         
-        policyMap = Maps.newHashMapWithExpectedSize(map.size());
+        policyMap = new HashMap<>(map.size());
         
         for (final Map.Entry<String,AccessControl> entry : map.entrySet()) {
             final String trimmed = StringSupport.trimOrNull(entry.getKey());

Modified: java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/primitive/StringSupportTest.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/primitive/StringSupportTest.java?rev=742&r1=741&r2=742&view=diff
==============================================================================
--- java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/primitive/StringSupportTest.java (original)
+++ java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/primitive/StringSupportTest.java Sun Feb  8 20:06:13 2015
@@ -26,8 +26,6 @@
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
-
-import com.google.common.collect.Sets;
 
 /**
  * test for the various methods inside {@link StringSupport}
@@ -108,18 +106,18 @@
     @Test public void testNormalizeStringCollection() {
         Collection<String> output;
         
-        output = StringSupport.normalizeStringCollection(Sets.newHashSet("foo", "bar", "baz"));
+        output = StringSupport.normalizeStringCollection(new HashSet<>(Arrays.asList("foo", "bar", "baz")));
         Assert.assertEquals(output.size(), 3);
         Assert.assertTrue(output.contains("foo"));
         Assert.assertTrue(output.contains("bar"));

[... 14 lines stripped ...]