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

[noreply at shibboleth.net]

Author: lajoie
Date: Wed Jan 11 23:06:28 2012
New Revision: 4101

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4101&view=rev
Log:
port over to use java-support and guava and clean up code

Modified:
    trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/AbstractAttributeDecoder.java
    trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/Attribute.java
    trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/AttributeDecoder.java
    trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/AttributeDecodingException.java
    trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/AttributeEncoder.java
    trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/AttributeEncodingException.java
    trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/AttributeException.java
    trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/AttributeSubcontext.java
    trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/ScopedAttributeValue.java
    trunk/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeTest.java
    trunk/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/ScopedAttributeValueTest.java

Modified: trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/AbstractAttributeDecoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/AbstractAttributeDecoder.java?rev=4101&r1=4100&r2=4101&view=diff
==============================================================================
--- trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/AbstractAttributeDecoder.java (original)
+++ trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/AbstractAttributeDecoder.java Wed Jan 11 23:06:28 2012
@@ -18,18 +18,28 @@
 package net.shibboleth.idp.attribute;
 
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Map.Entry;
-
-import org.opensaml.util.StringSupport;
-import org.opensaml.util.component.AbstractIdentifiableInitializableComponent;
-import org.opensaml.util.component.ComponentInitializationException;
-import org.opensaml.util.component.UnmodifiableComponent;
-import org.opensaml.util.component.UnmodifiableComponentException;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.ThreadSafe;
+
+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.annotation.constraint.Unmodifiable;
+import net.shibboleth.utilities.java.support.collection.TransformedInputMapBuilder;
+import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.component.UnmodifiableComponent;
+import net.shibboleth.utilities.java.support.component.UnmodifiableComponentException;
+import net.shibboleth.utilities.java.support.logic.TrimOrNullStringFunction;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Objects;
 
 /**
  * Base class for {@link AttributeDecoder} implementations.
@@ -37,8 +47,9 @@
  * @param <DecodedType> type of data decoded
  * @param <ValueType> data type of attribute values
  */
-public abstract class AbstractAttributeDecoder<DecodedType, ValueType> extends
-        AbstractIdentifiableInitializableComponent implements AttributeDecoder<DecodedType>, UnmodifiableComponent {
+ at ThreadSafe
+public abstract class AbstractAttributeDecoder<DecodedType, ValueType> extends AbstractInitializableComponent implements
+        AttributeDecoder<DecodedType>, UnmodifiableComponent {
 
     /** Class logger. */
     private Logger log = LoggerFactory.getLogger(AbstractAttributeDecoder.class);
@@ -50,59 +61,36 @@
     private Map<Locale, String> displayDescriptions;
 
     /**
-     * Gets the unmodifiable collection of localized human readable name of the attribute. This collection never
-     * contains entries whose key or value are null.
-     * 
-     * @return human readable name of the attribute, never null
-     */
-    public final Map<Locale, String> getDisplayNames() {
+     * Gets the unmodifiable collection of localized human readable name of the attribute.
+     * 
+     * @return human readable name of the attribute
+     */
+    @Nonnull @NonnullElements @Unmodifiable public final Map<Locale, String> getDisplayNames() {
         return displayNames;
     }
 
     /**
      * Sets he display names for this attribute with the given ones.
      * 
-     * @param newNames the new names for this attribute, may be null
-     */
-    public final synchronized void setDisplayNames(final Map<Locale, String> newNames) {

[... 1641 lines stripped ...]