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

[noreply at shibboleth.net]

Author: rdw
Date: Mon Jan 26 09:42:38 2015
New Revision: 728

URL: http://svn.shibboleth.net/view/utilities?rev=728&view=rev
Log:
Remove some generic type warnings

Modified:
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/BaseSpringNamespaceHandler.java
    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/BaseSpringNamespaceHandler.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/BaseSpringNamespaceHandler.java?rev=728&r1=727&r2=728&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/BaseSpringNamespaceHandler.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/util/BaseSpringNamespaceHandler.java Mon Jan 26 09:42:38 2015
@@ -53,19 +53,19 @@
      * Stores the {@link BeanDefinitionParser} implementations keyed by the local name of the {@link Element Elements}
      * they handle.
      */
-    private Map<QName, BeanDefinitionParser> parsers = new HashMap<QName, BeanDefinitionParser>();
+    private Map<QName, BeanDefinitionParser> parsers = new HashMap<>();
 
     /**
      * Stores the {@link BeanDefinitionDecorator} implementations keyed by the local name of the {@link Element
      * Elements} they handle.
      */
-    private Map<QName, BeanDefinitionDecorator> decorators = new HashMap<QName, BeanDefinitionDecorator>();
+    private Map<QName, BeanDefinitionDecorator> decorators = new HashMap<>();
 
     /**
      * Stores the {@link BeanDefinitionParser} implementations keyed by the local name of the {@link Attr Attrs} they
      * handle.
      */
-    private Map<QName, BeanDefinitionDecorator> attributeDecorators = new HashMap<QName, BeanDefinitionDecorator>();
+    private Map<QName, BeanDefinitionDecorator> attributeDecorators = new HashMap<>();
 
     /**
      * Decorates the supplied {@link Node} by delegating to the {@link BeanDefinitionDecorator} that is registered to

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=728&r1=727&r2=728&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 Mon Jan 26 09:42:38 2015
@@ -26,8 +26,8 @@
 import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
+import net.shibboleth.ext.spring.config.DurationToLongConverter;
 import net.shibboleth.ext.spring.config.StringBooleanToPredicateConverter;
-import net.shibboleth.ext.spring.config.DurationToLongConverter;
 import net.shibboleth.ext.spring.config.StringToIPRangeConverter;
 import net.shibboleth.ext.spring.context.FilesystemGenericApplicationContext;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
@@ -147,7 +147,7 @@
             return null;
         }
 
-        ManagedList<BeanDefinition> definitions = new ManagedList<BeanDefinition>(elements.size());
+        ManagedList<BeanDefinition> definitions = new ManagedList<>(elements.size());
         for (Element e : elements) {
             // TODO null check e
             definitions.add(parserContext.getDelegate().parseCustomElement(e));