[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: Mon Nov  4 11:32:15 2013
New Revision: 4928

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4928&view=rev
Log:
IDP-326 refactor to reflect the "setup/initialize/run" paradigm.  Also relax the restriction on the interfaces to be @NonnullAfterInit.  The implementations remain @NonNull because they are like that.

Modified:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinition.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractDataConnector.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java
    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

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinition.java?rev=4928&r1=4927&r2=4928&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinition.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinition.java Mon Nov  4 11:32:15 2013
@@ -90,7 +90,7 @@
      * 
      * @param isDependencyOnly whether this attribute definition is only a dependency
      */
-    public synchronized void setDependencyOnly(final boolean isDependencyOnly) {
+    public void setDependencyOnly(final boolean isDependencyOnly) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
 
@@ -111,7 +111,7 @@
      * 
      * @param descriptions localized human readable descriptions of attribute
      */
-    public synchronized void setDisplayDescriptions(@Nullable @NullableElements 
+    public void setDisplayDescriptions(@Nullable @NullableElements 
             final Map<Locale, String> descriptions) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
@@ -142,7 +142,7 @@
      * 
      * @param names localized human readable names of the attribute
      */
-    public synchronized void setDisplayNames(@Nullable @NullableElements final Map<Locale, String> names) {
+    public void setDisplayNames(@Nullable @NullableElements final Map<Locale, String> names) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
 
@@ -173,7 +173,7 @@
      * 
      * @param attributeEncoders encoders used to encode the values of this attribute in to protocol specific formats
      */
-    public synchronized void setAttributeEncoders(
+    public void setAttributeEncoders(
             @Nullable @NullableElements final Set<AttributeEncoder<?>> attributeEncoders) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractDataConnector.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractDataConnector.java?rev=4928&r1=4927&r2=4928&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractDataConnector.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractDataConnector.java Mon Nov  4 11:32:15 2013
@@ -64,7 +64,7 @@
      * @param id ID of the {@link AbstractDataConnector} whose values will be used in the event that this data connector
      *            experiences an error
      */
-    public synchronized void setFailoverDataConnectorId(@Nullable final String id) {
+    public void setFailoverDataConnectorId(@Nullable final String id) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
 

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java?rev=4928&r1=4927&r2=4928&view=diff

[... 128 lines stripped ...]