[java-plugin-shibd-oidc] branch main updated: Cleanup builder strategies

[Phil Smart]

This is an automated email from the git hooks/post-receive script.

philsmart pushed a commit to branch main
in repository java-plugin-shibd-oidc.

View the commit online:
http://git.shibboleth.net/view/?p=java-plugin-shibd-oidc.git;a=commit;h=ffb9d727d7e77166c8a4c06257d4d8139c4d38b5

The following commit(s) were added to refs/heads/main by this push:
     new ffb9d72  Cleanup builder strategies
ffb9d72 is described below

commit ffb9d727d7e77166c8a4c06257d4d8139c4d38b5
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Tue Sep 30 14:47:07 2025 +0100

    Cleanup builder strategies
    
     - Move the PRC lookup function to the abstract class
---
 .../impl/AbstractAgentAndRelyingPartyContextLookupFunction.java     | 5 +++++
 .../oidc/profile/impl/AbstractProviderMetadataLookupFunction.java   | 3 ++-
 .../shibboleth/sp/oidc/profile/impl/PKCEOptionsLookupStrategy.java  | 6 ------
 .../sp/oidc/profile/impl/RequestedClaimsLookupStrategy.java         | 6 ------
 .../shibboleth/sp/oidc/profile/impl/ResponseModeLookupStrategy.java | 6 ------
 5 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/sp-oidc-impl/src/main/java/net/shibboleth/sp/oidc/profile/impl/AbstractAgentAndRelyingPartyContextLookupFunction.java b/sp-oidc-impl/src/main/java/net/shibboleth/sp/oidc/profile/impl/AbstractAgentAndRelyingPartyContextLookupFunction.java
index c003197..69d1f4d 100644
--- a/sp-oidc-impl/src/main/java/net/shibboleth/sp/oidc/profile/impl/AbstractAgentAndRelyingPartyContextLookupFunction.java
+++ b/sp-oidc-impl/src/main/java/net/shibboleth/sp/oidc/profile/impl/AbstractAgentAndRelyingPartyContextLookupFunction.java
@@ -23,6 +23,7 @@ import org.opensaml.messaging.context.MessageContext;
 import org.opensaml.messaging.context.navigate.ChildContextLookup;
 import org.opensaml.messaging.context.navigate.ParentContextLookup;
 import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.profile.context.navigate.ParentProfileRequestContextLookup;
 
 import net.shibboleth.oidc.profile.config.OIDCAuthenticationRelyingPartyProfileConfiguration;
 import net.shibboleth.profile.context.RelyingPartyContext;
@@ -47,6 +48,10 @@ import net.shibboleth.sp.ddf.DDF;
 public abstract class AbstractAgentAndRelyingPartyContextLookupFunction<ResultType>
                                         extends AbstractRelyingPartyLookupFunction<ResultType>{
     
+    /** Lookup function for parent ProfileRequestContext. */
+    @Nonnull protected static final ParentProfileRequestContextLookup<MessageContext> PRC_LOOKUP
+        = new ParentProfileRequestContextLookup<>();
+    
     /** Lookup strategy for {@link AgentRequestContext}. */
     @Nonnull private Function<MessageContext,AgentRequestContext> agentRequestContextLookupStrategy;
     
diff --git a/sp-oidc-impl/src/main/java/net/shibboleth/sp/oidc/profile/impl/AbstractProviderMetadataLookupFunction.java b/sp-oidc-impl/src/main/java/net/shibboleth/sp/oidc/profile/impl/AbstractProviderMetadataLookupFunction.java
index 1e6660f..44e0997 100644
--- a/sp-oidc-impl/src/main/java/net/shibboleth/sp/oidc/profile/impl/AbstractProviderMetadataLookupFunction.java
+++ b/sp-oidc-impl/src/main/java/net/shibboleth/sp/oidc/profile/impl/AbstractProviderMetadataLookupFunction.java
@@ -32,7 +32,8 @@ import net.shibboleth.shared.logic.Constraint;
 /**
  * An abstract base class for pulling out the Provider metadata
  */
-public abstract class AbstractProviderMetadataLookupFunction<F extends BaseContext, T> implements Function<F, T> {
+public abstract class AbstractProviderMetadataLookupFunction<F extends BaseContext, ResultType> 
+    extends AbstractAgentAndRelyingPartyContextLookupFunction<ResultType> {
     
     /** Lookup strategy to locate the OpenID Provider metadata to use.*/
     @Nonnull private Function<MessageContext, OIDCProviderMetadataContext> providerMetadataLookupStrategy;
diff --git a/sp-oidc-impl/src/main/java/net/shibboleth/sp/oidc/profile/impl/PKCEOptionsLookupStrategy.java b/sp-oidc-impl/src/main/java/net/shibboleth/sp/oidc/profile/impl/PKCEOptionsLookupStrategy.java
index 837b33d..5f290fa 100644
--- a/sp-oidc-impl/src/main/java/net/shibboleth/sp/oidc/profile/impl/PKCEOptionsLookupStrategy.java
+++ b/sp-oidc-impl/src/main/java/net/shibboleth/sp/oidc/profile/impl/PKCEOptionsLookupStrategy.java
@@ -14,12 +14,10 @@
 
 package net.shibboleth.sp.oidc.profile.impl;
 
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import org.opensaml.messaging.context.MessageContext;
 import org.opensaml.profile.context.ProfileRequestContext;
-import org.opensaml.profile.context.navigate.ParentProfileRequestContextLookup;
 
 import net.shibboleth.oidc.profile.config.OIDCAuthenticationRelyingPartyProfileConfiguration;
 import net.shibboleth.sp.oidc.profile.request.impl.PKCEOptions;
@@ -34,10 +32,6 @@ import net.shibboleth.sp.oidc.profile.request.impl.PKCEOptions;
  */
 public class PKCEOptionsLookupStrategy extends AbstractAgentAndRelyingPartyContextLookupFunction<PKCEOptions> {
     
-    /** Lookup function for parent ProfileRequestContext. */
-    @Nonnull private static final ParentProfileRequestContextLookup<MessageContext> PRC_LOOKUP
-        = new ParentProfileRequestContextLookup<>();
-
     /** {@inheritDoc} */
     @Override
     public PKCEOptions apply(@Nullable final MessageContext messageContext) {
diff --git a/sp-oidc-impl/src/main/java/net/shibboleth/sp/oidc/profile/impl/RequestedClaimsLookupStrategy.java b/sp-oidc-impl/src/main/java/net/shibboleth/sp/oidc/profile/impl/RequestedClaimsLookupStrategy.java
index 6a0718e..11f5cfd 100644
--- a/sp-oidc-impl/src/main/java/net/shibboleth/sp/oidc/profile/impl/RequestedClaimsLookupStrategy.java
+++ b/sp-oidc-impl/src/main/java/net/shibboleth/sp/oidc/profile/impl/RequestedClaimsLookupStrategy.java
@@ -14,11 +14,9 @@
 
 package net.shibboleth.sp.oidc.profile.impl;
 
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import org.opensaml.messaging.context.MessageContext;
-import org.opensaml.profile.context.navigate.ParentProfileRequestContextLookup;
 
 import com.nimbusds.openid.connect.sdk.OIDCClaimsRequest;
 
@@ -36,10 +34,6 @@ import net.shibboleth.profile.context.RelyingPartyContext;
  */
 public class RequestedClaimsLookupStrategy extends AbstractAgentAndRelyingPartyContextLookupFunction<OIDCClaimsRequest> {
     
-    /** Lookup function for parent ProfileRequestContext. */
-    @Nonnull private static final ParentProfileRequestContextLookup<MessageContext> PRC_LOOKUP
-        = new ParentProfileRequestContextLookup<>();
-
     /** {@inheritDoc} */
     @Override
     public OIDCClaimsRequest apply(@Nullable final MessageContext messageContext) {
diff --git a/sp-oidc-impl/src/main/java/net/shibboleth/sp/oidc/profile/impl/ResponseModeLookupStrategy.java b/sp-oidc-impl/src/main/java/net/shibboleth/sp/oidc/profile/impl/ResponseModeLookupStrategy.java
index d761469..d9e8f1b 100644
--- a/sp-oidc-impl/src/main/java/net/shibboleth/sp/oidc/profile/impl/ResponseModeLookupStrategy.java
+++ b/sp-oidc-impl/src/main/java/net/shibboleth/sp/oidc/profile/impl/ResponseModeLookupStrategy.java
@@ -14,11 +14,9 @@
 
 package net.shibboleth.sp.oidc.profile.impl;
 
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import org.opensaml.messaging.context.MessageContext;
-import org.opensaml.profile.context.navigate.ParentProfileRequestContextLookup;
 
 import com.nimbusds.oauth2.sdk.ResponseMode;
 
@@ -36,10 +34,6 @@ import net.shibboleth.profile.context.RelyingPartyContext;
  * </p>
  */
 public class ResponseModeLookupStrategy extends AbstractAgentAndRelyingPartyContextLookupFunction<ResponseMode> {
-    
-    /** Lookup function for parent ProfileRequestContext. */
-    @Nonnull private static final ParentProfileRequestContextLookup<MessageContext> PRC_LOOKUP
-        = new ParentProfileRequestContextLookup<>();
 
     /** {@inheritDoc} */
     @Override

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.