[java-identity-provider COMMIT] in /trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate: ...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jul 18 22:45:40 2016
New Revision: 8295

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8295&view=rev
Log:
Switch primary context variable from "context" to "input" to avoid Rhino conflict.

Modified:
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/ScriptedContextLookupFunction.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/SpringExpressionContextLookupFunction.java

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/ScriptedContextLookupFunction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/ScriptedContextLookupFunction.java?rev=8295&r1=8294&r2=8295&view=diff
==============================================================================
--- trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/ScriptedContextLookupFunction.java	(original)
+++ trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/ScriptedContextLookupFunction.java	Mon Jul 18 22:45:40 2016
@@ -32,19 +32,18 @@
 
 import org.opensaml.messaging.context.BaseContext;
 import org.opensaml.messaging.context.MessageContext;
+import org.opensaml.messaging.context.navigate.ContextDataLookupFunction;
 import org.opensaml.profile.context.ProfileRequestContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.io.Resource;
 
-import com.google.common.base.Function;
-
 /**
  * A {@link Function} over a {@link BaseContext} which calls out to a supplied script.
  * 
- * @param <T> The specific type of context (either {@link ProfileRequestContext} or {@link MessageContext})
+ * @param <T> the specific type of context
  */
-public class ScriptedContextLookupFunction<T extends BaseContext> implements Function<T, Object> {
+public class ScriptedContextLookupFunction<T extends BaseContext> implements ContextDataLookupFunction<T, Object> {
 
     /** The default language is Javascript. */
     @Nonnull @NotEmpty public static final String DEFAULT_ENGINE = "JavaScript";
@@ -147,8 +146,9 @@
 
         final SimpleScriptContext scriptContext = new SimpleScriptContext();
         // We don't actually know that the context is a PRC, but we'll keep this for compatibility.
+        // We can't use the variable name "context" because Rhino appears to reserve that name.
         scriptContext.setAttribute("profileContext", context, ScriptContext.ENGINE_SCOPE);
-        scriptContext.setAttribute("context", context, ScriptContext.ENGINE_SCOPE);
+        scriptContext.setAttribute("input", context, ScriptContext.ENGINE_SCOPE);
         scriptContext.setAttribute("custom", getCustomObject(), ScriptContext.ENGINE_SCOPE);
 
         try {

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/SpringExpressionContextLookupFunction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/SpringExpressionContextLookupFunction.java?rev=8295&r1=8294&r2=8295&view=diff
==============================================================================
--- trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/SpringExpressionContextLookupFunction.java	(original)
+++ trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/SpringExpressionContextLookupFunction.java	Mon Jul 18 22:45:40 2016
@@ -24,8 +24,7 @@
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
 import org.opensaml.messaging.context.BaseContext;
-import org.opensaml.messaging.context.MessageContext;
-import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.messaging.context.navigate.ContextDataLookupFunction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.expression.EvaluationException;
@@ -34,14 +33,13 @@
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 
-import com.google.common.base.Function;
-
 /**
  * A {@link Function} over a {@link BaseContext} which calls out to a Spring Expression.
  * 
- * @param <T> The specific type of context (either {@link ProfileRequestContext} or {@link MessageContext})
+ * @param <T> the specific type of context
  */
-public class SpringExpressionContextLookupFunction<T extends BaseContext> implements Function<T, Object> {
+public class SpringExpressionContextLookupFunction<T extends BaseContext>
+    implements ContextDataLookupFunction<T, Object> {
 
     /** Class logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(SpringExpressionContextLookupFunction.class);
@@ -126,7 +124,7 @@
             final ExpressionParser parser = new SpelExpressionParser();
             final StandardEvaluationContext eval = new StandardEvaluationContext();
             eval.setVariable("custom", customObject);

[... 6 lines stripped ...]