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

[noreply at shibboleth.net]

Author: rdw
Date: Sun Apr 12 13:05:05 2015
New Revision: 7478

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7478&view=rev
Log:
IDP-682 ScriptedDataConnector was looking for the PRC as a granfather

Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnector.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnectorTest.java
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/context.script
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/jdk8/context.script
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/dc/scriptedConnector.js
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/dc/v8/scriptedConnector.js

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnector.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnector.java?rev=7478&r1=7477&r2=7478&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnector.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnector.java Sun Apr 12 13:05:05 2015
@@ -41,7 +41,6 @@
 import net.shibboleth.idp.attribute.resolver.ad.impl.ScriptedIdPAttributeImpl;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContext;
-import net.shibboleth.idp.profile.context.RelyingPartyContext;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
@@ -54,7 +53,6 @@
 import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Function;
-import com.google.common.base.Functions;
 
 /**
  * A Data Connector which populates a series of attributes from a provided {@link ProfileRequestContext}.
@@ -76,9 +74,7 @@
     /** Constructor. */
     public ScriptedDataConnector() {
         // Defaults to ProfileRequestContext -> RelyingPartyContext -> AttributeContext.
-        prcLookupStrategy =
-                Functions.compose(new ParentContextLookup<RelyingPartyContext, ProfileRequestContext>(),
-                        new ParentContextLookup<AttributeResolutionContext, RelyingPartyContext>());
+        prcLookupStrategy = new ParentContextLookup<>();
     }
 
     /**

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnectorTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnectorTest.java?rev=7478&r1=7477&r2=7478&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnectorTest.java (original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnectorTest.java Sun Apr 12 13:05:05 2015
@@ -33,6 +33,7 @@
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
 
+import org.opensaml.profile.context.ProfileRequestContext;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -66,11 +67,11 @@
 
         connector.initialize();
 
-        final AttributeResolutionContext context = new AttributeResolutionContext();
+        final AttributeResolutionContext context = new ProfileRequestContext<>().getSubcontext(AttributeResolutionContext.class,  true);
         context.getSubcontext(AttributeResolverWorkContext.class, true);
         final Map<String, IdPAttribute> result = connector.resolve(context);
 
-        Assert.assertEquals(result.size(), 2);
+        Assert.assertEquals(result.size(), 3);
         
         List<IdPAttributeValue<?>> values = result.get("ScriptedOne").getValues();
         Assert.assertEquals(values.size(), 2);
@@ -82,6 +83,11 @@
         Assert.assertTrue(values.contains(new StringAttributeValue("1Value")));
         Assert.assertTrue(values.contains(new StringAttributeValue("2Value")));
         Assert.assertTrue(values.contains(new StringAttributeValue("3Value")));
+
+        values = result.get("ThreeScripted").getValues();
+        Assert.assertEquals(values.size(), 1);

[... 80 lines stripped ...]