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

[noreply at shibboleth.net]

Author: rdw
Date: Mon Nov  4 05:39:03 2013
New Revision: 4925

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4925&view=rev
Log:
IDP 322 Strip redundant setters from the interfaces.  Only concrete implementations care about the setters.  Also remove sourceAttribute from the Attribute definition since that is implementation, not function.

Modified:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeDefinition.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolverPlugin.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverTest.java

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeDefinition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeDefinition.java?rev=4925&r1=4924&r2=4925&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeDefinition.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeDefinition.java Mon Nov  4 05:39:03 2013
@@ -22,13 +22,11 @@
 import java.util.Set;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 
 import net.shibboleth.idp.attribute.AttributeEncoder;
 import net.shibboleth.idp.attribute.IdPAttribute;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.NullableElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
 
 /** Definition of attribute definition resolver plugins. */
@@ -44,26 +42,11 @@
     public boolean isDependencyOnly();
 
     /**
-     * Sets whether this attribute definition is only a dependency and thus its values should never be released outside
-     * the resolver.
-     * 
-     * @param isDependencyOnly whether this attribute definition is only a dependency
-     */
-    public void setDependencyOnly(final boolean isDependencyOnly);
-
-    /**
      * Gets the localized human readable descriptions of attribute.
      * 
      * @return human readable descriptions of attribute
      */
     @Nonnull @NonnullElements @Unmodifiable public Map<Locale, String> getDisplayDescriptions();
-
-    /**
-     * Sets the localized human readable descriptions of attribute.
-     * 
-     * @param descriptions localized human readable descriptions of attribute
-     */
-    public void setDisplayDescriptions(@Nullable @NullableElements Map<Locale, String> descriptions);
 
     /**
      * Gets the localized human readable names of the attribute.
@@ -73,13 +56,6 @@
     @Nonnull @NonnullElements @Unmodifiable public Map<Locale, String> getDisplayNames();
 
     /**
-     * Sets the localized human readable names of the attribute.
-     * 
-     * @param names localized human readable names of the attribute
-     */
-    public void setDisplayNames(@Nullable @NullableElements Map<Locale, String> names);
-
-    /**
      * Gets the unmodifiable encoders used to encode the values of this attribute in to protocol specific formats. The
      * returned collection is never null nor contains any null.
      * 
@@ -87,25 +63,5 @@
      */
     @Nonnull @NonnullElements @Unmodifiable public Set<AttributeEncoder<?>> getAttributeEncoders();
 
-    /**
-     * Sets the encoders used to encode the values of this attribute in to protocol specific formats.
-     * 
-     * @param attributeEncoders encoders used to encode the values of this attribute in to protocol specific formats
-     */
-    public void setAttributeEncoders(@Nullable @NullableElements Set<AttributeEncoder<?>> attributeEncoders);
-
-    /**
-     * Gets the source attribute id.
-     * 
-     * @return the source attribute id
-     */
-    public String getSourceAttributeId();
-
-    /**
-     * Sets the source attribute id.
-     * 
-     * @param attributeId the source attribute id
-     */
-    public void setSourceAttributeId(String attributeId);
 
 }

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolverPlugin.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolverPlugin.java?rev=4925&r1=4924&r2=4925&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolverPlugin.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolverPlugin.java Mon Nov  4 05:39:03 2013
@@ -24,7 +24,6 @@

[... 64 lines stripped ...]