[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/re...

[noreply at shibboleth.net]

Author: scantor
Date: Sun Jan 18 15:24:04 2015
New Revision: 7266

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7266&view=rev
Log:
Fix warnings.

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ManagedConnectionParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/StaticDataConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/AbstractPrincipalConnectorParser.java

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ManagedConnectionParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ManagedConnectionParser.java?rev=7266&r1=7265&r2=7266&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ManagedConnectionParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ManagedConnectionParser.java Sun Jan 18 15:24:04 2015
@@ -218,7 +218,7 @@
      */
     @Nullable public static DataSource buildDataSource(final Map<String, String> props, final String resourceName) {
         try {
-            final InitialContext initCtx = new InitialContext(new Hashtable<String, String>(props));
+            final InitialContext initCtx = new InitialContext(new Hashtable<>(props));
             final DataSource dataSource = (DataSource) initCtx.lookup(resourceName);
             return dataSource;
         } catch (NamingException e) {

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/StaticDataConnectorParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/StaticDataConnectorParser.java?rev=7266&r1=7265&r2=7266&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/StaticDataConnectorParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/StaticDataConnectorParser.java Sun Jan 18 15:24:04 2015
@@ -39,10 +39,11 @@
 public class StaticDataConnectorParser extends AbstractDataConnectorParser {
 
     /** Schema type name. */
-    public static final QName TYPE_NAME = new QName(DataConnectorNamespaceHandler.NAMESPACE, "Static");
+    @Nonnull public static final QName TYPE_NAME = new QName(DataConnectorNamespaceHandler.NAMESPACE, "Static");
 
     /** Local name of attribute. */
-    public static final QName ATTRIBUTE_ELEMENT_NAME = new QName(DataConnectorNamespaceHandler.NAMESPACE, "Attribute");
+    @Nonnull public static final QName ATTRIBUTE_ELEMENT_NAME =
+            new QName(DataConnectorNamespaceHandler.NAMESPACE, "Attribute");
 
     /** Class logger. */
     private final Logger log = LoggerFactory.getLogger(StaticDataConnectorParser.class);
@@ -57,20 +58,21 @@
             @Nonnull final BeanDefinitionBuilder builder) {
         super.doParse(config, parserContext, builder);
 
-        List<Element> children = ElementSupport.getChildElements(config, ATTRIBUTE_ELEMENT_NAME);
-        List<BeanDefinition> attributes = new ManagedList<BeanDefinition>(children.size());
+        final List<Element> children = ElementSupport.getChildElements(config, ATTRIBUTE_ELEMENT_NAME);
+        final List<BeanDefinition> attributes = new ManagedList<>(children.size());
 
-        for (Element child : children) {
+        for (final Element child : children) {
 
-            String attrId = child.getAttributeNS(null, "id");
-            BeanDefinitionBuilder attributeDefn = BeanDefinitionBuilder.genericBeanDefinition(IdPAttribute.class);
+            final String attrId = child.getAttributeNS(null, "id");
+            final BeanDefinitionBuilder attributeDefn = BeanDefinitionBuilder.genericBeanDefinition(IdPAttribute.class);
             attributeDefn.addConstructorArgValue(attrId);
 
-            List<Element> values =
+            final List<Element> values =
                     ElementSupport.getChildElementsByTagNameNS(child, DataConnectorNamespaceHandler.NAMESPACE, "Value");
-            ManagedList<BeanDefinition> inValues = new ManagedList<BeanDefinition>(values.size());
-            for (Element val : values) {
-                BeanDefinitionBuilder value = BeanDefinitionBuilder.genericBeanDefinition(StringAttributeValue.class);
+            final ManagedList<BeanDefinition> inValues = new ManagedList<>(values.size());
+            for (final Element val : values) {
+                final BeanDefinitionBuilder value =

[... 20 lines stripped ...]