[java-oidc-common] 14/18: Consolidate interfaces

[Phil Smart]

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=8da9ae78b41cbc21c70ac14c051d91155d55cabf

commit 8da9ae78b41cbc21c70ac14c051d91155d55cabf
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Fri Mar 24 14:45:37 2023 +0000

    Consolidate interfaces
---
 .../config/OIDCDynamicRegistrationProfileConfiguration.java      | 4 +---
 .../oidc/profile/config/OIDCSSOProfileConfiguration.java         | 9 +++------
 .../oidc/profile/config/logic/EncryptionOptionalPredicate.java   | 6 +++---
 .../net/shibboleth/oidc/profile/config/impl/TestInterfaces.java  | 6 +++---
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCDynamicRegistrationProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCDynamicRegistrationProfileConfiguration.java
index 7da0f40..3fb2247 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCDynamicRegistrationProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCDynamicRegistrationProfileConfiguration.java
@@ -27,15 +27,13 @@ import org.opensaml.profile.context.ProfileRequestContext;
 import net.shibboleth.idp.profile.config.OverriddenIssuerProfileConfiguration;
 import net.shibboleth.oidc.metadata.policy.MetadataPolicy;
 import net.shibboleth.oidc.profile.oauth2.config.OAuth2ClientAuthenticableProfileConfiguration;
-import net.shibboleth.oidc.profile.oauth2.config.OAuth2FlowAwareProfileConfiguration;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonNegative;
 
 /**
  * Configuration of OpenID Connect Dynamic Client Registration 1.0. 
  */
 public interface OIDCDynamicRegistrationProfileConfiguration extends OverriddenIssuerProfileConfiguration, 
-    OIDCProfileConfiguration, OIDCFlowAwareProfileConfiguration, OAuth2FlowAwareProfileConfiguration,
-    OAuth2ClientAuthenticableProfileConfiguration {    
+    OIDCFlowAwareProfileConfiguration, OAuth2ClientAuthenticableProfileConfiguration {    
 
     /** OIDC base protocol URI. */
     public static final String PROTOCOL_URI = "https://openid.net/specs/openid-connect-registration-1_0.html";
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCSSOProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCSSOProfileConfiguration.java
index 905fb81..a6d4b5c 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCSSOProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCSSOProfileConfiguration.java
@@ -22,22 +22,19 @@ import javax.annotation.Nullable;
 
 import org.opensaml.profile.context.ProfileRequestContext;
 
-import net.shibboleth.idp.authn.config.AuthenticationProfileConfiguration;
 import net.shibboleth.idp.profile.config.AttributeResolvingProfileConfiguration;
 import net.shibboleth.idp.profile.config.OverriddenIssuerProfileConfiguration;
 import net.shibboleth.oidc.profile.oauth2.config.OAuth2AccessTokenProducingProfileConfiguration;
 import net.shibboleth.oidc.profile.oauth2.config.OAuth2ClientAuthenticableProfileConfiguration;
-import net.shibboleth.oidc.profile.oauth2.config.OAuth2FlowAwareProfileConfiguration;
 import net.shibboleth.oidc.profile.oauth2.config.OAuth2RefreshTokenProducingProfileConfiguration;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 
 /** Profile configuration generic to all OIDC SSO profiles.*/
 public interface OIDCSSOProfileConfiguration extends OIDCTokenEncryptionProfileConfiguration, 
-        OIDCIDTokenProducingProfileConfiguration, AuthenticationProfileConfiguration, 
-        OverriddenIssuerProfileConfiguration, OAuth2AccessTokenProducingProfileConfiguration, 
+        OIDCIDTokenProducingProfileConfiguration, OverriddenIssuerProfileConfiguration, 
+        OAuth2AccessTokenProducingProfileConfiguration, 
         OAuth2RefreshTokenProducingProfileConfiguration, AttributeResolvingProfileConfiguration,
-        OIDCFlowAwareProfileConfiguration, OAuth2FlowAwareProfileConfiguration,
-        OAuth2ClientAuthenticableProfileConfiguration {
+        OIDCFlowAwareProfileConfiguration, OAuth2ClientAuthenticableProfileConfiguration {
     
     /** ID for this profile configuration. */
     @Nonnull @NotEmpty public static final String PROFILE_ID = "http://shibboleth.net/ns/profiles/oidc/sso/browser";
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/EncryptionOptionalPredicate.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/EncryptionOptionalPredicate.java
index 119e79a..820986d 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/EncryptionOptionalPredicate.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/EncryptionOptionalPredicate.java
@@ -24,7 +24,7 @@ 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.logic.AbstractRelyingPartyPredicate;
-import net.shibboleth.oidc.profile.config.OIDCEncryptedTokenProfileConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCTokenEncryptionProfileConfiguration;
 
 /**
  * A predicate implementation that forwards to
@@ -38,8 +38,8 @@ public class EncryptionOptionalPredicate extends AbstractRelyingPartyPredicate {
         final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
         if (rpc != null) {
             final ProfileConfiguration pc = rpc.getProfileConfig();
-            if (pc instanceof OIDCEncryptedTokenProfileConfiguration) {
-                return ((OIDCEncryptedTokenProfileConfiguration) pc).isEncryptionOptional(input);
+            if (pc instanceof OIDCTokenEncryptionProfileConfiguration) {
+                return ((OIDCTokenEncryptionProfileConfiguration) pc).isEncryptionOptional(input);
             }
         }
         return false;
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/TestInterfaces.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/TestInterfaces.java
index 50d3b6a..35d5fdf 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/TestInterfaces.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/TestInterfaces.java
@@ -7,12 +7,12 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import net.shibboleth.oidc.profile.config.OIDCDynamicRegistrationProfileConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCAuthenticationProviderProfileConfiguration;
 
 public class TestInterfaces {
     
     public static void main(final String args[]) {
-        final var concreteClass = new OIDCDynamicRegistrationConfiguration();
+        final var concreteClass = new OIDCAuthorizationConfiguration();
         final Set<String> concreteNames = new HashSet<>();
         for (final Method m: concreteClass.getClass().getMethods()) {
             if (m.getName().startsWith("is") || m.getName().startsWith("get")) {
@@ -21,7 +21,7 @@ public class TestInterfaces {
             }
         }
         final Set<String> interfaceNames = new HashSet<>();
-        for (final Method m: OIDCDynamicRegistrationProfileConfiguration.class.getMethods()) {
+        for (final Method m: OIDCAuthenticationProviderProfileConfiguration.class.getMethods()) {
             if (m.getName().startsWith("is") || m.getName().startsWith("get")) {
                 System.out.println("INT: "+m.getName());
                 interfaceNames.add(m.getName());

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