[java-identity-provider COMMIT] in /trunk: idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/EmptyAttribut...

[noreply at shibboleth.net]

Author: scantor
Date: Sat Jan 24 14:00:29 2015
New Revision: 7278

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7278&view=rev
Log:
Fix some warnings, add some defensive null checks to the Mapped attribute classes.

Modified:
    trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/EmptyAttributeValue.java
    trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/context/AttributeContext.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueRegexpMatcher.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueStringMatcher.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedIdPAttributeImpl.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/MappedAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/mapped/impl/ValueMap.java

Modified: trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/EmptyAttributeValue.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/EmptyAttributeValue.java?rev=7278&r1=7277&r2=7278&view=diff
==============================================================================
--- trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/EmptyAttributeValue.java (original)
+++ trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/EmptyAttributeValue.java Sat Jan 24 14:00:29 2015
@@ -57,7 +57,7 @@
      * @param attributeValue value of the attribute
      */
     public EmptyAttributeValue(@Nonnull final EmptyType attributeValue) {
-        value = Constraint.isNotNull(attributeValue, "Attribute value cannot be null");
+        value = Constraint.isNotNull(attributeValue, "Empty value enumeration cannot be null");
     }
 
     /** {@inheritDoc} */
@@ -97,4 +97,5 @@
     @Override public String toString() {
         return MoreObjects.toStringHelper(this).add("value", value).toString();
     }
-}
+    
+}

Modified: trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/context/AttributeContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/context/AttributeContext.java?rev=7278&r1=7277&r2=7278&view=diff
==============================================================================
--- trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/context/AttributeContext.java (original)
+++ trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/context/AttributeContext.java Sat Jan 24 14:00:29 2015
@@ -70,8 +70,8 @@
             return;
         }
 
-        HashMap<String, IdPAttribute> checkedAttributes = new HashMap<String, IdPAttribute>();
-        for (IdPAttribute attribute : newAttributes) {
+        final HashMap<String,IdPAttribute> checkedAttributes = new HashMap<>();
+        for (final IdPAttribute attribute : newAttributes) {
             if (attribute != null) {
                 checkedAttributes.put(attribute.getId(), attribute);
             }
@@ -79,4 +79,5 @@
 
         attributes = ImmutableMap.copyOf(checkedAttributes);
     }
+    
 }

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueRegexpMatcher.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueRegexpMatcher.java?rev=7278&r1=7277&r2=7278&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueRegexpMatcher.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueRegexpMatcher.java Sat Jan 24 14:00:29 2015
@@ -41,11 +41,8 @@
         
         if (null == value) {
             return false;
-        }
-
-        if (value instanceof EmptyAttributeValue) {
+        } else if (value instanceof EmptyAttributeValue) {
             return false;
-
         } else if (value instanceof StringAttributeValue) {
             return regexpCompare(((StringAttributeValue) value).getValue());
 

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueStringMatcher.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueStringMatcher.java?rev=7278&r1=7277&r2=7278&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/AttributeValueStringMatcher.java (original)

[... 161 lines stripped ...]