[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 Mar 26 14:27:19 2012
New Revision: 4137

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4137&view=rev
Log:
Breath life into tests.  Fix a couple of regressions caused by the rework of Attribute

Modified:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverTest.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/BaseDataConnectorTest.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/ResolverPluginDependencyTest.java

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java?rev=4137&r1=4136&r2=4137&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java Mon Mar 26 14:27:19 2012
@@ -306,7 +306,6 @@
         assert resolutionContext != null : "Attribute resolution context can not be null";
 
         log.debug("Attribute Resolver {}: beginning to resolve data connector {}", getId(), connectorId);
-
         if (resolutionContext.getResolvedDataConnectors().containsKey(connectorId)) {
             log.debug("Attribute Resolver {}: data connector {} was already resolved, nothing to do", getId(),
                     connectorId);
@@ -321,7 +320,6 @@
         }
 
         resolveDependencies(connector, resolutionContext);
-
         Optional<Map<String, Attribute>> resolvedAttributes = Optional.absent();
         try {
             log.debug("Attribute Resolver {}: resolving data connector {}", getId(), connectorId);
@@ -329,9 +327,9 @@
         } catch (AttributeResolutionException e) {
             final Optional<String> failoverDataConnectorId = connector.getFailoverDataConnectorId();
             if (failoverDataConnectorId.isPresent()) {
-                log.debug(
-                        "Attribute Resolver {}: data connector {} failed to resolve, invoking failover data connector {}.  Reason for the failure was: {}",
-                        new Object[] {getId(), connectorId, failoverDataConnectorId.get(), e});
+                log.debug("Attribute Resolver {}: data connector {} failed to resolve, invoking failover data"
+                        + " connector {}.  Reason for the failure was: {}", new Object[] {getId(), connectorId,
+                        failoverDataConnectorId.get(), e,});
                 resolveDataConnector(failoverDataConnectorId.get(), resolutionContext);
                 return;
             } else {
@@ -442,24 +440,26 @@
      */
     protected boolean validateDataConnector(@Nonnull BaseDataConnector connector,
             @Nonnull LazyList<String> invalidDataConnectors) {
+        assert connector != null;
+        assert invalidDataConnectors != null;
         try {
             connector.validate();
             log.debug("Attribute resolver {}: data connector {} is valid", getId(), connector.getId());
             return true;
         } catch (ComponentValidationException e) {
-            if (connector.getFailoverDataConnectorId() != null) {
-                if (invalidDataConnectors.contains(connector.getFailoverDataConnectorId())) {
+            if (connector.getFailoverDataConnectorId().isPresent()) {
+                String id = connector.getFailoverDataConnectorId().get();
+                if (invalidDataConnectors.contains(id)) {
                     log.warn("Attribute resolver {}: data connector {} is not valid for the following reason"
                             + " and failover data connector {} has already been found to be inavlid", new Object[] {
-                            getId(), connector.getId(), connector.getFailoverDataConnectorId(), e,});
+                            getId(), connector.getId(), id, e,});
                     invalidDataConnectors.add(connector.getId());
                     return false;
                 } else {
                     log.warn("Attribute resolver {}: data connector {} is not valid for the following reason,"
                             + " checking if failover data connector {} is valid",
-                            new Object[] {getId(), connector.getId(), connector.getFailoverDataConnectorId(), e,});
-                    return validateDataConnector(dataConnectors.get(connector.getFailoverDataConnectorId()),
-                            invalidDataConnectors);
+                            new Object[] {getId(), connector.getId(), id, e,});

[... 216 lines stripped ...]