[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: Wed May  7 17:36:06 2014
New Revision: 5873

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5873&view=rev
Log:
Alter base class.

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

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/RelyingPartyIdLookupFunction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/RelyingPartyIdLookupFunction.java?rev=5873&r1=5872&r2=5873&view=diff
==============================================================================
--- trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/RelyingPartyIdLookupFunction.java (original)
+++ trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/RelyingPartyIdLookupFunction.java Wed May  7 17:36:06 2014
@@ -24,6 +24,7 @@
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
 import org.opensaml.messaging.context.navigate.ChildContextLookup;
+import org.opensaml.messaging.context.navigate.ContextDataLookupFunction;
 import org.opensaml.profile.context.ProfileRequestContext;
 
 import com.google.common.base.Function;
@@ -34,17 +35,16 @@
  * 
  * <p>If a specific setting is unavailable, a null value is returned.</p>
  */
-public class RelyingPartyIdLookupFunction implements Function<ProfileRequestContext, String> {
+public class RelyingPartyIdLookupFunction implements ContextDataLookupFunction<ProfileRequestContext,String> {
 
     /**
      * Strategy used to locate the {@link RelyingPartyContext} associated with a given {@link ProfileRequestContext}.
      */
-    @Nonnull private Function<ProfileRequestContext, RelyingPartyContext> relyingPartyContextLookupStrategy;
+    @Nonnull private Function<ProfileRequestContext,RelyingPartyContext> relyingPartyContextLookupStrategy;
     
     /** Constructor. */
     public RelyingPartyIdLookupFunction() {
-        relyingPartyContextLookupStrategy =
-                new ChildContextLookup<ProfileRequestContext, RelyingPartyContext>(RelyingPartyContext.class, false);
+        relyingPartyContextLookupStrategy = new ChildContextLookup<>(RelyingPartyContext.class);
     }
 
     /**
@@ -55,7 +55,7 @@
      *            {@link ProfileRequestContext}
      */
     public synchronized void setRelyingPartyContextLookupStrategy(
-            @Nonnull final Function<ProfileRequestContext, RelyingPartyContext> strategy) {
+            @Nonnull final Function<ProfileRequestContext,RelyingPartyContext> strategy) {
         relyingPartyContextLookupStrategy =
                 Constraint.isNotNull(strategy, "RelyingPartyContext lookup strategy cannot be null");
     }

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/ResponderIdLookupFunction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/ResponderIdLookupFunction.java?rev=5873&r1=5872&r2=5873&view=diff
==============================================================================
--- trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/ResponderIdLookupFunction.java (original)
+++ trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/ResponderIdLookupFunction.java Wed May  7 17:36:06 2014
@@ -24,6 +24,7 @@
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
 import org.opensaml.messaging.context.navigate.ChildContextLookup;
+import org.opensaml.messaging.context.navigate.ContextDataLookupFunction;
 import org.opensaml.profile.context.ProfileRequestContext;
 
 import com.google.common.base.Function;
@@ -34,17 +35,16 @@
  * 
  * <p>If a specific setting is unavailable, a null value is returned.</p>
  */
-public class ResponderIdLookupFunction implements Function<ProfileRequestContext, String> {
+public class ResponderIdLookupFunction implements ContextDataLookupFunction<ProfileRequestContext, String> {
 
     /**
      * Strategy used to locate the {@link RelyingPartyContext} associated with a given {@link ProfileRequestContext}.
      */
-    @Nonnull private Function<ProfileRequestContext, RelyingPartyContext> relyingPartyContextLookupStrategy;
+    @Nonnull private Function<ProfileRequestContext,RelyingPartyContext> relyingPartyContextLookupStrategy;
     
     /** Constructor. */
     public ResponderIdLookupFunction() {
-        relyingPartyContextLookupStrategy =
-                new ChildContextLookup<ProfileRequestContext, RelyingPartyContext>(RelyingPartyContext.class, false);
+        relyingPartyContextLookupStrategy = new ChildContextLookup<>(RelyingPartyContext.class);
     }
 
     /**
@@ -55,7 +55,7 @@
      *            {@link ProfileRequestContext}
      */
     public synchronized void setRelyingPartyContextLookupStrategy(

[... 6 lines stripped ...]