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

[noreply at shibboleth.net]

Author: lajoie
Date: Sun Mar  4 13:25:43 2012
New Revision: 4118

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4118&view=rev
Log:
synch up with java-support checkin

Modified:
    trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/Attribute.java
    trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/AttributeContext.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterContext.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilteringEngine.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/AttributeFilterContextTest.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicyTest.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/AttributeFilteringEngineTest.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/MockPredicate.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AbstractComposedMatcher.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AndMatcher.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/OrMatcher.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionContext.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseAttributeDefinition.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseResolverPlugin.java

Modified: trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/Attribute.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/Attribute.java?rev=4118&r1=4117&r2=4118&view=diff
==============================================================================
--- trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/Attribute.java (original)
+++ trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/Attribute.java Sun Mar  4 13:25:43 2012
@@ -18,8 +18,12 @@
 package net.shibboleth.idp.attribute;
 
 import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 
 import javax.annotation.Nonnull;
@@ -29,13 +33,15 @@
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.annotation.constraint.NullableElements;
-import net.shibboleth.utilities.java.support.collection.TransformedInputCollectionBuilder;
-import net.shibboleth.utilities.java.support.collection.TransformedInputMapBuilder;
+import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
+import net.shibboleth.utilities.java.support.collection.CollectionSupport;
 import net.shibboleth.utilities.java.support.logic.Assert;
-import net.shibboleth.utilities.java.support.logic.TrimOrNullStringFunction;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import com.google.common.base.Objects;
+import com.google.common.base.Predicates;
+import com.google.common.collect.Constraints;
+import com.google.common.collect.ImmutableMap;
 
 /**
  * Each attribute represents one piece of information about a user and has associated encoders used to turn that
@@ -70,13 +76,11 @@
     public Attribute(@Nonnull @NotEmpty final String attributeId) {
         id = Assert.isNotNull(StringSupport.trimOrNull(attributeId), "Attribute ID may not be null");
 
-        TransformedInputMapBuilder<Locale, String> mapBuilder =
-                new TransformedInputMapBuilder<Locale, String>().valuePreprocessor(TrimOrNullStringFunction.INSTANCE);
-        displayNames = mapBuilder.buildMap();
-        displayDescriptions = mapBuilder.buildMap();
-
-        values = new TransformedInputCollectionBuilder<AttributeValue>().buildSet();
-        encoders = new TransformedInputCollectionBuilder<AttributeEncoder<?>>().buildSet();
+        displayNames = Collections.emptyMap();
+        displayDescriptions = Collections.emptyMap();
+
+        values = Constraints.constrainedSet(new HashSet<AttributeValue>(), Constraints.notNull());
+        encoders = Constraints.constrainedSet(new HashSet<AttributeEncoder<?>>(), Constraints.notNull());
     }
 
     /**
@@ -93,7 +97,7 @@
      * 
      * @return human readable name of the attribute
      */

[... 1730 lines stripped ...]