[java-oidc-common] branch dev/JCOMOIDC-66 updated: Fix interface hierarchy.

Phil Smart philip.smart at jisc.ac.uk
Thu Mar 23 19:33:22 UTC 2023 

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

philsmart pushed a commit to branch dev/JCOMOIDC-66
in repository java-oidc-common.

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

The following commit(s) were added to refs/heads/dev/JCOMOIDC-66 by this push:
     new b1f1eaf  Fix interface hierarchy.
b1f1eaf is described below

commit b1f1eaf72fcb69c60847d768a4543f95af864cab
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Thu Mar 23 19:33:12 2023 +0000

    Fix interface hierarchy.
---
 .../profile/config/OIDCAuthenticationProfileConfiguration.java    | 4 ++--
 .../profile/config/OIDCEncryptedTokenProfileConfiguration.java    | 2 +-
 .../profile/config/OIDCIDTokenProducingProfileConfiguration.java  | 2 +-
 .../config/OIDCProviderInformationProfileConfiguration.java       | 2 +-
 .../profile/config/OIDCPublishKeySetProfileConfiguration.java     | 2 +-
 .../profile/config/navigate/EncodedAttributesLookupFunction.java  | 8 ++++----
 .../config/OAuth2AccessTokenProducingProfileConfiguration.java    | 2 +-
 .../OAuth2AuthorizationCodeProducingProfileConfiguration.java     | 2 +-
 .../config/OAuth2RefreshTokenProducingProfileConfiguration.java   | 2 +-
 ...guration.java => OAuth2TokenEndpointProfileConfiguration.java} | 4 ++--
 .../config/OAuth2TokenIntrospectionProfileConfiguration.java      | 2 +-
 .../oauth2/config/OAuth2TokenRevocationProfileConfiguration.java  | 2 +-
 .../oauth2/config/OAuth2TokenValidatingProfileConfiguration.java  | 2 +-
 .../oidc/profile/config/impl/OIDCAuthorizationConfiguration.java  | 4 ++--
 14 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCAuthenticationProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCAuthenticationProfileConfiguration.java
index 6fcd98d..c160dc2 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCAuthenticationProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCAuthenticationProfileConfiguration.java
@@ -33,7 +33,7 @@ public interface OIDCAuthenticationProfileConfiguration extends OAuth2Authorizat
     
     
     /**
-     * Get the function used to translate AMRs in the inbound id_token into an appropriate set of
+     * Get the function used to translate AMRs in the id_token into an appropriate set of
      * custom {@link Principal} objects to populate into the subject.
      *
      * @param prc current profile request context
@@ -46,7 +46,7 @@ public interface OIDCAuthenticationProfileConfiguration extends OAuth2Authorizat
             getAuthenticationMethodsReferencesTranslationStrategy(@Nullable final ProfileRequestContext prc);
     
     /**
-     * Get the function used to translate ACRs in the inbound id_token into an appropriate set of
+     * Get the function used to translate ACRs in the id_token into an appropriate set of
      * custom {@link Principal} objects to populate into the subject.
      *
      * @param prc current profile request context
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCEncryptedTokenProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCEncryptedTokenProfileConfiguration.java
index 28b9ec7..d736048 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCEncryptedTokenProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCEncryptedTokenProfileConfiguration.java
@@ -24,7 +24,7 @@ import org.opensaml.profile.context.ProfileRequestContext;
 /**
  * Profile configuration for token endpoints that deal with token encryption.
  */
-public interface OIDCEncryptedTokenProfileConfiguration {
+public interface OIDCEncryptedTokenProfileConfiguration extends OIDCProfileConfiguration {
 
     /**
      * Get whether encryption is optional in the face of a missing key, etc.
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCIDTokenProducingProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCIDTokenProducingProfileConfiguration.java
index 89159ff..d2ca4ac 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCIDTokenProducingProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCIDTokenProducingProfileConfiguration.java
@@ -34,7 +34,7 @@ import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
 /** 
  * Configuration common to ID Token producing profiles.
  */
-public interface OIDCIDTokenProducingProfileConfiguration extends OIDCTokenEncryptionProfileConfiguration {
+public interface OIDCIDTokenProducingProfileConfiguration extends OIDCProfileConfiguration {
  
     /**
      * Get ID token lifetime.
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCProviderInformationProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCProviderInformationProfileConfiguration.java
index 5c6f441..45644a6 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCProviderInformationProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCProviderInformationProfileConfiguration.java
@@ -18,7 +18,7 @@
 package net.shibboleth.oidc.profile.config;
 
 /** OpenID Connect Provider Configuration.*/
-public interface OIDCProviderInformationProfileConfiguration {
+public interface OIDCProviderInformationProfileConfiguration extends OIDCProfileConfiguration {
     
     /** OIDC base protocol URI. Section 4 is relevant. */
     public static final String PROTOCOL_URI = "http://openid.net/specs/openid-connect-discovery-1_0.html";
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCPublishKeySetProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCPublishKeySetProfileConfiguration.java
index a09812e..1db1b92 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCPublishKeySetProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCPublishKeySetProfileConfiguration.java
@@ -20,7 +20,7 @@ package net.shibboleth.oidc.profile.config;
 /** 
  * Configuration of an OpenID published key set document. 
  */
-public interface OIDCPublishKeySetProfileConfiguration {
+public interface OIDCPublishKeySetProfileConfiguration extends OIDCProfileConfiguration {
 
     /** OIDC base protocol URI. Section 3 jwks_uri is the relevant. */
     public static final String PROTOCOL_URI =
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/EncodedAttributesLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/EncodedAttributesLookupFunction.java
index 3c42703..71bf251 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/EncodedAttributesLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/EncodedAttributesLookupFunction.java
@@ -26,11 +26,11 @@ import org.opensaml.profile.context.ProfileRequestContext;
 import net.shibboleth.idp.profile.config.ProfileConfiguration;
 import net.shibboleth.idp.profile.context.RelyingPartyContext;
 import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
-import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenHandlingProfileConfiguration;
+import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenEndpointProfileConfiguration;
 
 /**
  * A function that obtains
- * {@link OAuth2TokenHandlingProfileConfiguration#getEncodedAttributes(ProfileRequestContext)}
+ * {@link OAuth2TokenEndpointProfileConfiguration#getEncodedAttributes(ProfileRequestContext)}
  * if such a profile is available from a {@link RelyingPartyContext} obtained via a lookup function,
  * by default a child of the {@link ProfileRequestContext}.
  * 
@@ -45,8 +45,8 @@ public class EncodedAttributesLookupFunction
         final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
         if (rpc != null) {
             final ProfileConfiguration pc = rpc.getProfileConfig();
-            if (pc instanceof OAuth2TokenHandlingProfileConfiguration) {
-                return ((OAuth2TokenHandlingProfileConfiguration)pc).getEncodedAttributes(input);
+            if (pc instanceof OAuth2TokenEndpointProfileConfiguration) {
+                return ((OAuth2TokenEndpointProfileConfiguration)pc).getEncodedAttributes(input);
             }
         }
         
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2AccessTokenProducingProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2AccessTokenProducingProfileConfiguration.java
index 0c795be..be06b1f 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2AccessTokenProducingProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2AccessTokenProducingProfileConfiguration.java
@@ -32,7 +32,7 @@ import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
 /** 
  * Configuration common to access token producing profiles.
  */
-public interface OAuth2AccessTokenProducingProfileConfiguration {
+public interface OAuth2AccessTokenProducingProfileConfiguration extends OAuth2ProfileConfiguration {
     
     
     /**
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2AuthorizationCodeProducingProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2AuthorizationCodeProducingProfileConfiguration.java
index bf04487..cec5ea6 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2AuthorizationCodeProducingProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2AuthorizationCodeProducingProfileConfiguration.java
@@ -31,7 +31,7 @@ import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
 /** 
  * Configuration common to authorizaton code producing profiles.
  */
-public interface OAuth2AuthorizationCodeProducingProfileConfiguration {
+public interface OAuth2AuthorizationCodeProducingProfileConfiguration extends OAuth2ProfileConfiguration {
     
     
     /**
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2RefreshTokenProducingProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2RefreshTokenProducingProfileConfiguration.java
index e56eb28..ef3b9e6 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2RefreshTokenProducingProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2RefreshTokenProducingProfileConfiguration.java
@@ -29,7 +29,7 @@ import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
 /** 
  * Configuration common to refresh token producing profiles.
  */
-public interface OAuth2RefreshTokenProducingProfileConfiguration {
+public interface OAuth2RefreshTokenProducingProfileConfiguration extends OAuth2ProfileConfiguration {
 
     /**
      * Get refresh token lifetime.
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenHandlingProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenEndpointProfileConfiguration.java
similarity index 93%
rename from oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenHandlingProfileConfiguration.java
rename to oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenEndpointProfileConfiguration.java
index 1c2efa5..0f82586 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenHandlingProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenEndpointProfileConfiguration.java
@@ -28,8 +28,8 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElemen
 import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
 import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
 
-/** Profile configuration common to generic Token handling.*/
-public interface OAuth2TokenHandlingProfileConfiguration {
+/** Profile configuration common to generic token endpoints.*/
+public interface OAuth2TokenEndpointProfileConfiguration extends OAuth2ProfileConfiguration {
         
 
     /**
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenIntrospectionProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenIntrospectionProfileConfiguration.java
index 62f01f9..effe1b9 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenIntrospectionProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenIntrospectionProfileConfiguration.java
@@ -24,7 +24,7 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 /**
  * Profile configuration for OAuth2 Token Introspection.
  */
-public interface OAuth2TokenIntrospectionProfileConfiguration {    
+public interface OAuth2TokenIntrospectionProfileConfiguration extends OAuth2ProfileConfiguration {    
 
     /** OAuth2 Token Revocation URI. */
     @Nonnull @NotEmpty public static final String PROTOCOL_URI = "https://tools.ietf.org/html/rfc7662";
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenRevocationProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenRevocationProfileConfiguration.java
index 1e4b32b..19e9faa 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenRevocationProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenRevocationProfileConfiguration.java
@@ -31,7 +31,7 @@ import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
 /**
  * Configuration for the OAuth 2.0 Token Revocation profile.
  */
-public interface OAuth2TokenRevocationProfileConfiguration {
+public interface OAuth2TokenRevocationProfileConfiguration extends OAuth2ProfileConfiguration {
     
     /** OAuth2 Token Revocation URI. */
     @Nonnull @NotEmpty public static final String PROTOCOL_URI = "https://tools.ietf.org/html/rfc7009";
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenValidatingProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenValidatingProfileConfiguration.java
index d9a7086..7281466 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenValidatingProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenValidatingProfileConfiguration.java
@@ -27,7 +27,7 @@ import net.shibboleth.oidc.jwt.claims.ClaimsValidator;
 /**
  *  Profile configuration for OIDC-aware OAuth 2.0 token endpoints. 
  */
-public interface OAuth2TokenValidatingProfileConfiguration {
+public interface OAuth2TokenValidatingProfileConfiguration extends OAuth2ProfileConfiguration {
     
     /**
      * Get the {@link ClaimsValidator} to apply to issued JWT-based tokens being validated by this profile.
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCAuthorizationConfiguration.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCAuthorizationConfiguration.java
index d683443..1d84ddd 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCAuthorizationConfiguration.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCAuthorizationConfiguration.java
@@ -40,7 +40,7 @@ import net.shibboleth.oidc.profile.config.OIDCAuthenticationProviderProfileConfi
 import net.shibboleth.oidc.profile.config.OIDCAuthenticationRelyingPartyProxyProfileConfiguration;
 import net.shibboleth.oidc.profile.config.OIDCSSOProfileConfiguration;
 import net.shibboleth.oidc.profile.oauth2.config.OAuth2AuthorizationCodeProducingProfileConfiguration;
-import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenHandlingProfileConfiguration;
+import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenEndpointProfileConfiguration;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
@@ -58,7 +58,7 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
 public class OIDCAuthorizationConfiguration extends AbstractOIDCSSOConfiguration
         implements OIDCAuthenticationRelyingPartyProxyProfileConfiguration, 
         OIDCAuthenticationProviderProfileConfiguration, OAuth2AuthorizationCodeProducingProfileConfiguration, 
-        OAuth2TokenHandlingProfileConfiguration, AuthenticationProfileConfiguration, 
+        OAuth2TokenEndpointProfileConfiguration, AuthenticationProfileConfiguration, 
         OverriddenIssuerProfileConfiguration {
 
     /** Whether all acr claim requests should be treated as Essential. */

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

More information about the commits mailing list