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

[noreply at shibboleth.net]

Author: rdw
Date: Fri Sep  9 05:35:53 2016
New Revision: 8379

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8379&view=rev
Log: (empty)

Modified:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeResolutionContext.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeResolverWorkContext.java

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeResolutionContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeResolutionContext.java?rev=8379&r1=8378&r2=8379&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeResolutionContext.java	(original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeResolutionContext.java	Fri Sep  9 05:35:53 2016
@@ -46,7 +46,6 @@
 import com.google.common.base.Predicates;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.MapConstraints;
 
 /** A context supplying input to the {@link net.shibboleth.idp.attribute.resolver.AttributeResolver} interface. */
 @NotThreadSafe
@@ -77,8 +76,7 @@
     public AttributeResolutionContext() {
         allowCachedResults = true;
         requestedAttributeNames = new HashSet<>();
-        resolvedAttributes =
-                MapConstraints.constrainedMap(new HashMap<String, IdPAttribute>(), MapConstraints.notNull());
+        resolvedAttributes = new HashMap<String, IdPAttribute>();
     }
     
     /**
@@ -117,7 +115,7 @@
      * 
      * @param value the attribute issuer associated with this resolution.
      */
-    @Nullable public void setAttributeIssuerID(@Nullable String value) {
+    @Nullable public void setAttributeIssuerID(@Nullable final String value) {
         attributeIssuerID = value;
     }
 
@@ -135,7 +133,7 @@
      * 
      * @param value the attribute recipient associated with this resolution.
      */
-    @Nullable public void setAttributeRecipientID(@Nullable String value) {
+    @Nullable public void setAttributeRecipientID(@Nullable final String value) {
         attributeRecipientID = value;
     }
 
@@ -153,7 +151,7 @@
      * 
      * @param method The principalAuthenticationMethod to set.
      */
-    public void setPrincipalAuthenticationMethod(@Nullable String method) {
+    public void setPrincipalAuthenticationMethod(@Nullable final String method) {
         principalAuthenticationMethod = method;
     }
 
@@ -171,7 +169,7 @@
      * 
      * @param who The principal to set.
      */
-    public void setPrincipal(@Nullable String who) {
+    public void setPrincipal(@Nullable final String who) {
         principal = who;
     }
 
@@ -213,7 +211,7 @@
         resolvedAttributes = new HashMap<>();
 
         if (attributes != null) {
-            for (IdPAttribute attribute : attributes) {
+            for (final IdPAttribute attribute : attributes) {
                 if (attribute != null) {
                     resolvedAttributes.put(attribute.getId(), attribute);
                 }

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeResolverWorkContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeResolverWorkContext.java?rev=8379&r1=8378&r2=8379&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeResolverWorkContext.java	(original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeResolverWorkContext.java	Fri Sep  9 05:35:53 2016
@@ -37,8 +37,6 @@
 
 import org.opensaml.messaging.context.BaseContext;
 
-import com.google.common.collect.MapConstraints;
-
 /**
  * A context which carries and collects information through the attribute resolution process, and coordinates data
  * between the resolver implementation and the various resolver plugin implementations.
@@ -58,12 +56,9 @@
 
     /** Constructor. */
     public AttributeResolverWorkContext() {
-        resolvedAttributeDefinitions =
-                MapConstraints.constrainedMap(new HashMap<String, ResolvedAttributeDefinition>(),
-                        MapConstraints.notNull());
+        resolvedAttributeDefinitions = new HashMap<String, ResolvedAttributeDefinition>();
 
-        resolvedDataConnectors =
-                MapConstraints.constrainedMap(new HashMap<String, ResolvedDataConnector>(), MapConstraints.notNull());
+        resolvedDataConnectors = new HashMap<String, ResolvedDataConnector>();
     }
 
     /**