[java-oidc-common] 13/18: Move method inheritance onto interface
Phil Smart
philip.smart at jisc.ac.uk
Tue Mar 28 15:26:40 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=d4e18136a44a286047b81ca5083085638d1237d6
commit d4e18136a44a286047b81ca5083085638d1237d6
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Fri Mar 24 12:16:44 2023 +0000
Move method inheritance onto interface
---
.../config/OIDCDynamicRegistrationProfileConfiguration.java | 7 ++++++-
.../config/OIDCProviderInformationProfileConfiguration.java | 5 ++++-
.../oidc/profile/config/OIDCUserInfoProfileConfiguration.java | 5 ++++-
.../oidc/profile/oauth2/config/OAuth2ProfileConfiguration.java | 4 +++-
.../profile/config/impl/OIDCDynamicRegistrationConfiguration.java | 3 +--
.../profile/config/impl/OIDCProviderInformationConfiguration.java | 3 +--
.../oidc/profile/config/impl/OIDCUserInfoConfiguration.java | 3 +--
.../net/shibboleth/oidc/profile/config/impl/TestInterfaces.java | 7 +++----
8 files changed, 23 insertions(+), 14 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 d0b2bbc..7da0f40 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
@@ -24,13 +24,18 @@ import javax.annotation.Nullable;
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 OIDCProfileConfiguration {
+public interface OIDCDynamicRegistrationProfileConfiguration extends OverriddenIssuerProfileConfiguration,
+ OIDCProfileConfiguration, OIDCFlowAwareProfileConfiguration, OAuth2FlowAwareProfileConfiguration,
+ 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/OIDCProviderInformationProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCProviderInformationProfileConfiguration.java
index 45644a6..cd55139 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
@@ -17,8 +17,11 @@
package net.shibboleth.oidc.profile.config;
+import net.shibboleth.idp.profile.config.OverriddenIssuerProfileConfiguration;
+
/** OpenID Connect Provider Configuration.*/
-public interface OIDCProviderInformationProfileConfiguration extends OIDCProfileConfiguration {
+public interface OIDCProviderInformationProfileConfiguration extends OverriddenIssuerProfileConfiguration,
+ 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/OIDCUserInfoProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCUserInfoProfileConfiguration.java
index 097ba68..789fc17 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCUserInfoProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCUserInfoProfileConfiguration.java
@@ -24,6 +24,8 @@ import javax.annotation.Nullable;
import org.opensaml.profile.context.ProfileRequestContext;
+import net.shibboleth.idp.profile.config.AttributeResolvingProfileConfiguration;
+import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenValidatingProfileConfiguration;
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;
@@ -31,7 +33,8 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
/**
* Configuration for an OpenID Connect core protocol UserInfo endpoint.
*/
-public interface OIDCUserInfoProfileConfiguration extends OIDCTokenEncryptionProfileConfiguration {
+public interface OIDCUserInfoProfileConfiguration extends AttributeResolvingProfileConfiguration,
+ OIDCTokenEncryptionProfileConfiguration, OAuth2TokenValidatingProfileConfiguration {
/** OIDC base protocol URI. */
@Nonnull @NotEmpty public static final String PROTOCOL_URI = "http://openid.net/specs/openid-connect-core-1_0.html";
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2ProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2ProfileConfiguration.java
index 87f029b..7a59c8e 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2ProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2ProfileConfiguration.java
@@ -17,7 +17,9 @@
package net.shibboleth.oidc.profile.oauth2.config;
+import net.shibboleth.idp.profile.config.ConditionalProfileConfiguration;
+
/** Common interface for OAuth 2.0 Profile Configurations.*/
-public interface OAuth2ProfileConfiguration {
+public interface OAuth2ProfileConfiguration extends ConditionalProfileConfiguration {
}
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCDynamicRegistrationConfiguration.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCDynamicRegistrationConfiguration.java
index a9ba9d1..0a8c158 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCDynamicRegistrationConfiguration.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCDynamicRegistrationConfiguration.java
@@ -26,7 +26,6 @@ import javax.annotation.Nullable;
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.config.OIDCDynamicRegistrationProfileConfiguration;
import net.shibboleth.oidc.profile.oauth2.config.impl.AbstractOAuth2FlowAwareProfileConfiguration;
@@ -39,7 +38,7 @@ import net.shibboleth.utilities.java.support.logic.FunctionSupport;
* Implemenation of a profile configuration for the OpenID Connect dynamic client registration.
*/
public class OIDCDynamicRegistrationConfiguration extends AbstractOAuth2FlowAwareProfileConfiguration
- implements OIDCDynamicRegistrationProfileConfiguration, OverriddenIssuerProfileConfiguration {
+ implements OIDCDynamicRegistrationProfileConfiguration {
/** Lookup function to override issuer value. */
@Nonnull private Function<ProfileRequestContext,String> issuerLookupStrategy;
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCProviderInformationConfiguration.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCProviderInformationConfiguration.java
index 454aed7..4bd176f 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCProviderInformationConfiguration.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCProviderInformationConfiguration.java
@@ -25,7 +25,6 @@ import javax.annotation.Nullable;
import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.config.AbstractConditionalProfileConfiguration;
-import net.shibboleth.idp.profile.config.OverriddenIssuerProfileConfiguration;
import net.shibboleth.oidc.profile.config.OIDCProviderInformationProfileConfiguration;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -35,7 +34,7 @@ import net.shibboleth.utilities.java.support.logic.FunctionSupport;
* Implementation of a profile configuration for the OpenID Connect Provider Configuration.
*/
public class OIDCProviderInformationConfiguration extends AbstractConditionalProfileConfiguration
- implements OIDCProviderInformationProfileConfiguration, OverriddenIssuerProfileConfiguration {
+ implements OIDCProviderInformationProfileConfiguration {
/** Lookup function to override issuer value. */
@Nonnull private Function<ProfileRequestContext,String> issuerLookupStrategy;
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCUserInfoConfiguration.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCUserInfoConfiguration.java
index 33a04df..81add39 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCUserInfoConfiguration.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCUserInfoConfiguration.java
@@ -30,7 +30,6 @@ import org.opensaml.profile.context.ProfileRequestContext;
import com.google.common.base.Predicates;
-import net.shibboleth.idp.profile.config.AttributeResolvingProfileConfiguration;
import net.shibboleth.oidc.profile.config.OIDCUserInfoProfileConfiguration;
import net.shibboleth.oidc.profile.oauth2.config.impl.AbstractOAuth2TokenValidatingConfiguration;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
@@ -45,7 +44,7 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
*/
//TODO deniedUserInfoAttributesLookupStrategy is also common to OIDCUserInfoProfileConfiguration
public class OIDCUserInfoConfiguration extends AbstractOAuth2TokenValidatingConfiguration
- implements OIDCUserInfoProfileConfiguration, AttributeResolvingProfileConfiguration {
+ implements OIDCUserInfoProfileConfiguration {
/** Whether attributes should be resolved in the course of the profile. */
@Nonnull private Predicate<ProfileRequestContext> resolveAttributesPredicate;
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 2c775a8..50d3b6a 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,13 +7,12 @@ import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
-import net.shibboleth.oidc.profile.config.OIDCFlowAwareProfileConfiguration;
-import net.shibboleth.oidc.profile.oauth2.config.impl.AbstractOAuth2FlowAwareProfileConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCDynamicRegistrationProfileConfiguration;
public class TestInterfaces {
public static void main(final String args[]) {
- final var concreteClass = new AbstractOAuth2FlowAwareProfileConfiguration();
+ final var concreteClass = new OIDCDynamicRegistrationConfiguration();
final Set<String> concreteNames = new HashSet<>();
for (final Method m: concreteClass.getClass().getMethods()) {
if (m.getName().startsWith("is") || m.getName().startsWith("get")) {
@@ -22,7 +21,7 @@ public class TestInterfaces {
}
}
final Set<String> interfaceNames = new HashSet<>();
- for (final Method m: OIDCFlowAwareProfileConfiguration.class.getMethods()) {
+ for (final Method m: OIDCDynamicRegistrationProfileConfiguration.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.
More information about the commits
mailing list