[utilities COMMIT] /spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java

[noreply at shibboleth.net]

Author: scantor
Date: Sun Feb  8 20:06:26 2015
New Revision: 743

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

Modified:
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java?rev=743&r1=742&r2=743&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java Sun Feb  8 20:06:26 2015
@@ -19,7 +19,9 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 
 import javax.annotation.Nonnull;
@@ -59,7 +61,6 @@
 import org.xml.sax.InputSource;
 
 import com.google.common.base.Strings;
-import com.google.common.collect.Sets;
 
 /**
  * Helper class for performing some common Spring-related functions.
@@ -102,8 +103,8 @@
         context.setDisplayName("ApplicationContext:" + name);
 
         final ConversionServiceFactoryBean service = new ConversionServiceFactoryBean();
-        service.setConverters(Sets.newHashSet(new DurationToLongConverter(), new StringToIPRangeConverter(),
-                new StringBooleanToPredicateConverter()));
+        service.setConverters(new HashSet<>(Arrays.asList(new DurationToLongConverter(), new StringToIPRangeConverter(),
+                new StringBooleanToPredicateConverter())));
         service.afterPropertiesSet();
 
         for (final BeanFactoryPostProcessor bfpp : factoryPostProcessors) {