[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: Sat May  4 10:05:03 2013
New Revision: 4465

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4465&view=rev
Log:
IDP-273  Remove Optional from the Attribute resolver APIs.  Dependency API looses them now

Modified:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/PluginDependencySupport.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolverPluginDependency.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/BaseAttributeDefinitionTest.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/ResolverPluginDependencyTest.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/DependencyTest.java

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/PluginDependencySupport.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/PluginDependencySupport.java?rev=4465&r1=4464&r2=4465&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/PluginDependencySupport.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/PluginDependencySupport.java Sat May  4 10:05:03 2013
@@ -77,12 +77,12 @@
             ResolvedDataConnector dataConnector =
                     resolutionContext.getResolvedDataConnectors().get(dependency.getDependencyPluginId());
             if (dataConnector != null) {
-                Constraint.isTrue(dependency.getDependencyAttributeId().isPresent(), "Data connector dependencies "
+                Constraint.isTrue(dependency.getDependencyAttributeId() != null, "Data connector dependencies "
                         + "must specify a dependant attribute ID");
 
                 if (null != dataConnector.getResolvedAttributes()) {
                     resolvedAttribute =
-                            dataConnector.getResolvedAttributes().get(dependency.getDependencyAttributeId().get());
+                            dataConnector.getResolvedAttributes().get(dependency.getDependencyAttributeId());
                     addAttributeValues(resolvedAttribute, values);
                     continue;
                 }

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolverPluginDependency.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolverPluginDependency.java?rev=4465&r1=4464&r2=4465&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolverPluginDependency.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolverPluginDependency.java Sat May  4 10:05:03 2013
@@ -26,7 +26,6 @@
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import com.google.common.base.Objects;
-import com.google.common.base.Optional;
 
 /** Represents the dependency of one {@link BaseResolverPlugin} upon another plugin. */
 @ThreadSafe
@@ -36,7 +35,7 @@
     private final String dependencyPluginId;
 
     /** ID of the attribute, produced by the identified plugin, whose values will be used by the dependent plugin. */
-    private Optional<String> dependencyAttributeId = Optional.absent();
+    private String dependencyAttributeId;
 
     /**
      * Constructor.
@@ -64,7 +63,7 @@
      *            dependent plugin
      */
     public void setDependencyAttributeId(@Nullable String attributeId) {
-        dependencyAttributeId = Optional.fromNullable(StringSupport.trimOrNull(attributeId));
+        dependencyAttributeId =StringSupport.trimOrNull(attributeId);
     }
 
     /**
@@ -74,7 +73,7 @@
      * @return ID of the attribute, produced by the identified plugin, whose values will be used by the dependent
      *         plugin, never null or empty
      */
-    @Nonnull public Optional<String> getDependencyAttributeId() {
+    @Nullable public String getDependencyAttributeId() {
         return dependencyAttributeId;
     }
 

Modified: trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/BaseAttributeDefinitionTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/BaseAttributeDefinitionTest.java?rev=4465&r1=4464&r2=4465&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/BaseAttributeDefinitionTest.java (original)

[... 61 lines stripped ...]