[java-idp-oidc] 02/02: Move flow test support classes into a separate package.
Codeberg
noreply at shibboleth.net
Thu Jun 25 12:11:16 UTC 2026
This is an automated email from the git hooks/post-receive script.
codeberg pushed a commit to branch main
in repository java-idp-oidc.
View the commit online:
https://codeberg.org/Shibboleth/java-idp-oidc/commit/2e29d84e89df8e8413d2436cc0df8a10ac296450
commit 2e29d84e89df8e8413d2436cc0df8a10ac296450
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Thu Jun 25 15:10:01 2026 +0300
Move flow test support classes into a separate package.
- net.shibboleth.idp.plugin.oidc.op.profile.flow.support
---
.../plugin/oidc/op/profile/flow/AuthorizeFlowTest.java | 3 +++
.../oidc/op/profile/flow/PushedAuthorizeFlowTest.java | 1 +
.../idp/plugin/oidc/op/profile/flow/TokenFlowTest.java | 3 +++
.../AlwaysFalseCustomMetadataPolicyOperator.java | 2 +-
.../AlwaysTrueCustomMetadataPolicyOperator.java | 2 +-
.../flow/{ => support}/PopulateClientInformation.java | 2 +-
.../{ => support}/TestAccessTokenClaimsSetDecorator.java | 2 +-
.../TestAuthorizationCodeClaimsSetDecorator.java | 2 +-
.../{ => support}/TestIdTokenClaimsSetDecorator.java | 2 +-
.../TestRefreshTokenClaimsSetDecorator.java | 2 +-
.../{ => support}/TestRequestObjectClaimsValidator.java | 2 +-
.../{ => support}/TestRequestUriClaimsSetDecorator.java | 2 +-
.../metadata-lookup-ext/lookupext1/lookupext1-beans.xml | 2 +-
.../resources/net/shibboleth/idp/module/conf/global.xml | 16 ++++++++--------
14 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/AuthorizeFlowTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/AuthorizeFlowTest.java
index a7152061..03d70eef 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/AuthorizeFlowTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/AuthorizeFlowTest.java
@@ -64,6 +64,9 @@ import com.nimbusds.openid.connect.sdk.claims.ClaimsSetRequest;
import com.nimbusds.openid.connect.sdk.claims.IDTokenClaimsSet;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientMetadata;
+import net.shibboleth.idp.plugin.oidc.op.profile.flow.support.TestAccessTokenClaimsSetDecorator;
+import net.shibboleth.idp.plugin.oidc.op.profile.flow.support.TestAuthorizationCodeClaimsSetDecorator;
+import net.shibboleth.idp.plugin.oidc.op.profile.flow.support.TestIdTokenClaimsSetDecorator;
import net.shibboleth.idp.plugin.oidc.op.profile.logic.DefaultPushedAuthorizationRequestUriSerializationFunction;
import net.shibboleth.idp.plugin.oidc.op.token.support.AccessTokenClaimsSet;
import net.shibboleth.idp.plugin.oidc.op.token.support.AuthorizeCodeClaimsSet;
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/PushedAuthorizeFlowTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/PushedAuthorizeFlowTest.java
index 4c7211f8..c28dd237 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/PushedAuthorizeFlowTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/PushedAuthorizeFlowTest.java
@@ -48,6 +48,7 @@ import com.nimbusds.oauth2.sdk.PushedAuthorizationSuccessResponse;
import com.nimbusds.oauth2.sdk.Scope;
import com.nimbusds.oauth2.sdk.auth.ClientAuthenticationMethod;
+import net.shibboleth.idp.plugin.oidc.op.profile.flow.support.TestRequestUriClaimsSetDecorator;
import net.shibboleth.idp.plugin.oidc.op.profile.logic.DefaultPushedAuthorizationRequestUriDeserializationFunction;
import net.shibboleth.idp.plugin.oidc.op.token.support.AuthorizeCodeClaimsSet;
import net.shibboleth.idp.session.SessionException;
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/TokenFlowTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/TokenFlowTest.java
index 5a608a12..70a43bfd 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/TokenFlowTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/TokenFlowTest.java
@@ -67,6 +67,9 @@ import com.nimbusds.openid.connect.sdk.claims.IDTokenClaimsSet;
import com.nimbusds.openid.connect.sdk.rp.OIDCClientMetadata;
import net.minidev.json.JSONObject;
+import net.shibboleth.idp.plugin.oidc.op.profile.flow.support.TestAccessTokenClaimsSetDecorator;
+import net.shibboleth.idp.plugin.oidc.op.profile.flow.support.TestIdTokenClaimsSetDecorator;
+import net.shibboleth.idp.plugin.oidc.op.profile.flow.support.TestRefreshTokenClaimsSetDecorator;
import net.shibboleth.idp.plugin.oidc.op.profile.impl.ValidateGrantTest;
import net.shibboleth.idp.plugin.oidc.op.storage.RevocationCacheContexts;
import net.shibboleth.idp.plugin.oidc.op.token.support.AccessTokenClaimsSet;
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/AlwaysFalseCustomMetadataPolicyOperator.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/support/AlwaysFalseCustomMetadataPolicyOperator.java
similarity index 94%
rename from idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/AlwaysFalseCustomMetadataPolicyOperator.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/support/AlwaysFalseCustomMetadataPolicyOperator.java
index 396d846e..84946be0 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/AlwaysFalseCustomMetadataPolicyOperator.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/support/AlwaysFalseCustomMetadataPolicyOperator.java
@@ -12,7 +12,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.oidc.op.profile.flow;
+package net.shibboleth.idp.plugin.oidc.op.profile.flow.support;
import net.shibboleth.oidc.metadata.policy.MetadataPolicy;
import net.shibboleth.oidc.metadata.policy.impl.CustomMetadataPolicyOperator;
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/AlwaysTrueCustomMetadataPolicyOperator.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/support/AlwaysTrueCustomMetadataPolicyOperator.java
similarity index 94%
rename from idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/AlwaysTrueCustomMetadataPolicyOperator.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/support/AlwaysTrueCustomMetadataPolicyOperator.java
index 5f0234bc..cb69d67c 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/AlwaysTrueCustomMetadataPolicyOperator.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/support/AlwaysTrueCustomMetadataPolicyOperator.java
@@ -12,7 +12,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.oidc.op.profile.flow;
+package net.shibboleth.idp.plugin.oidc.op.profile.flow.support;
import net.shibboleth.oidc.metadata.policy.MetadataPolicy;
import net.shibboleth.oidc.metadata.policy.impl.CustomMetadataPolicyOperator;
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/PopulateClientInformation.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/support/PopulateClientInformation.java
similarity index 97%
rename from idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/PopulateClientInformation.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/support/PopulateClientInformation.java
index 25103e48..6cc511a8 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/PopulateClientInformation.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/support/PopulateClientInformation.java
@@ -12,7 +12,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.oidc.op.profile.flow;
+package net.shibboleth.idp.plugin.oidc.op.profile.flow.support;
import java.net.URI;
import java.util.Date;
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/TestAccessTokenClaimsSetDecorator.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/support/TestAccessTokenClaimsSetDecorator.java
similarity index 95%
rename from idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/TestAccessTokenClaimsSetDecorator.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/support/TestAccessTokenClaimsSetDecorator.java
index 95744af7..79946d4f 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/TestAccessTokenClaimsSetDecorator.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/support/TestAccessTokenClaimsSetDecorator.java
@@ -12,7 +12,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.oidc.op.profile.flow;
+package net.shibboleth.idp.plugin.oidc.op.profile.flow.support;
import java.util.Map;
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/TestAuthorizationCodeClaimsSetDecorator.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/support/TestAuthorizationCodeClaimsSetDecorator.java
similarity index 95%
rename from idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/TestAuthorizationCodeClaimsSetDecorator.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/support/TestAuthorizationCodeClaimsSetDecorator.java
index a7ba2850..3e3cff36 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/TestAuthorizationCodeClaimsSetDecorator.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/support/TestAuthorizationCodeClaimsSetDecorator.java
@@ -12,7 +12,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.oidc.op.profile.flow;
+package net.shibboleth.idp.plugin.oidc.op.profile.flow.support;
import java.util.Map;
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/TestIdTokenClaimsSetDecorator.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/support/TestIdTokenClaimsSetDecorator.java
similarity index 95%
rename from idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/TestIdTokenClaimsSetDecorator.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/support/TestIdTokenClaimsSetDecorator.java
index 095a549c..d24239bb 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/TestIdTokenClaimsSetDecorator.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/support/TestIdTokenClaimsSetDecorator.java
@@ -12,7 +12,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.oidc.op.profile.flow;
+package net.shibboleth.idp.plugin.oidc.op.profile.flow.support;
import java.util.Map;
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/TestRefreshTokenClaimsSetDecorator.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/support/TestRefreshTokenClaimsSetDecorator.java
similarity index 95%
rename from idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/TestRefreshTokenClaimsSetDecorator.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/support/TestRefreshTokenClaimsSetDecorator.java
index d0fe7f31..94d86f7c 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/TestRefreshTokenClaimsSetDecorator.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/support/TestRefreshTokenClaimsSetDecorator.java
@@ -12,7 +12,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.oidc.op.profile.flow;
+package net.shibboleth.idp.plugin.oidc.op.profile.flow.support;
import java.util.Map;
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/TestRequestObjectClaimsValidator.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/support/TestRequestObjectClaimsValidator.java
similarity index 97%
rename from idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/TestRequestObjectClaimsValidator.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/support/TestRequestObjectClaimsValidator.java
index 84de97d9..dbdd0b37 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/TestRequestObjectClaimsValidator.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/support/TestRequestObjectClaimsValidator.java
@@ -12,7 +12,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.oidc.op.profile.flow;
+package net.shibboleth.idp.plugin.oidc.op.profile.flow.support;
import java.util.Optional;
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/TestRequestUriClaimsSetDecorator.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/support/TestRequestUriClaimsSetDecorator.java
similarity index 95%
rename from idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/TestRequestUriClaimsSetDecorator.java
rename to idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/support/TestRequestUriClaimsSetDecorator.java
index c2824f1e..c64b53a6 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/TestRequestUriClaimsSetDecorator.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/support/TestRequestUriClaimsSetDecorator.java
@@ -12,7 +12,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.oidc.op.profile.flow;
+package net.shibboleth.idp.plugin.oidc.op.profile.flow.support;
import java.util.Map;
diff --git a/idp-oidc-extension-impl/src/test/resources/META-INF/net/shibboleth/idp/flows/oidc/metadata-lookup-ext/lookupext1/lookupext1-beans.xml b/idp-oidc-extension-impl/src/test/resources/META-INF/net/shibboleth/idp/flows/oidc/metadata-lookup-ext/lookupext1/lookupext1-beans.xml
index 9695caa2..56cb71b8 100644
--- a/idp-oidc-extension-impl/src/test/resources/META-INF/net/shibboleth/idp/flows/oidc/metadata-lookup-ext/lookupext1/lookupext1-beans.xml
+++ b/idp-oidc-extension-impl/src/test/resources/META-INF/net/shibboleth/idp/flows/oidc/metadata-lookup-ext/lookupext1/lookupext1-beans.xml
@@ -15,7 +15,7 @@
</bean>
<bean id="PopulateClientInformation" scope="prototype"
- class="net.shibboleth.idp.plugin.oidc.op.profile.flow.PopulateClientInformation">
+ class="net.shibboleth.idp.plugin.oidc.op.profile.flow.support.PopulateClientInformation">
<property name="clientIDLookupStrategy">
<bean class="net.shibboleth.idp.plugin.oidc.op.profile.logic.DefaultMetadataLookupExtensionContextClientIDLookupFunction" />
</property>
diff --git a/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/module/conf/global.xml b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/module/conf/global.xml
index 4b7b0f9e..bec49b6d 100644
--- a/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/module/conf/global.xml
+++ b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/module/conf/global.xml
@@ -109,9 +109,9 @@
</property>
</bean>
- <bean id="alwaysTruePolicyOperator" class="net.shibboleth.idp.plugin.oidc.op.profile.flow.AlwaysTrueCustomMetadataPolicyOperator" />
+ <bean id="alwaysTruePolicyOperator" class="net.shibboleth.idp.plugin.oidc.op.profile.flow.support.AlwaysTrueCustomMetadataPolicyOperator" />
- <bean id="alwaysFalsePolicyOperator" class="net.shibboleth.idp.plugin.oidc.op.profile.flow.AlwaysFalseCustomMetadataPolicyOperator" />
+ <bean id="alwaysFalsePolicyOperator" class="net.shibboleth.idp.plugin.oidc.op.profile.flow.support.AlwaysFalseCustomMetadataPolicyOperator" />
<bean p:id="oidc/metadata-lookup-ext/lookupext1" parent="shibboleth.oidc.MetadataLookupExtensionFlow" />
<bean p:id="oidc/metadata-lookup-ext/lookupext2" parent="shibboleth.oidc.MetadataLookupExtensionFlow" />
@@ -119,7 +119,7 @@
<bean class="net.shibboleth.idp.plugin.oidc.op.security.jwt.claims.RequestObjectClaimsValidator">
<constructor-arg>
<bean id="testRequestObjectClaimsValidation"
- class="net.shibboleth.idp.plugin.oidc.op.profile.flow.TestRequestObjectClaimsValidator"/>
+ class="net.shibboleth.idp.plugin.oidc.op.profile.flow.support.TestRequestObjectClaimsValidator"/>
</constructor-arg>
</bean>
@@ -167,9 +167,9 @@
</property>
</bean>
- <bean class="net.shibboleth.idp.plugin.oidc.op.profile.flow.TestIdTokenClaimsSetDecorator" />
- <bean class="net.shibboleth.idp.plugin.oidc.op.profile.flow.TestRequestUriClaimsSetDecorator" />
- <bean class="net.shibboleth.idp.plugin.oidc.op.profile.flow.TestAccessTokenClaimsSetDecorator" />
- <bean class="net.shibboleth.idp.plugin.oidc.op.profile.flow.TestRefreshTokenClaimsSetDecorator" />
- <bean class="net.shibboleth.idp.plugin.oidc.op.profile.flow.TestAuthorizationCodeClaimsSetDecorator" />
+ <bean class="net.shibboleth.idp.plugin.oidc.op.profile.flow.support.TestIdTokenClaimsSetDecorator" />
+ <bean class="net.shibboleth.idp.plugin.oidc.op.profile.flow.support.TestRequestUriClaimsSetDecorator" />
+ <bean class="net.shibboleth.idp.plugin.oidc.op.profile.flow.support.TestAccessTokenClaimsSetDecorator" />
+ <bean class="net.shibboleth.idp.plugin.oidc.op.profile.flow.support.TestRefreshTokenClaimsSetDecorator" />
+ <bean class="net.shibboleth.idp.plugin.oidc.op.profile.flow.support.TestAuthorizationCodeClaimsSetDecorator" />
</beans>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list