[java-idp-oidc] 01/02: Moved OIDCSecurityConfiguration from ..profile.api to .profile.config
Henri Mikkonen
henri.mikkonen at iki.fi
Mon Mar 8 07:41:56 UTC 2021
This is an automated email from the git hooks/post-receive script.
hjmikkon pushed a commit to branch main
in repository java-idp-oidc.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=c073f7f56caa36758155c37e6643e5330579ab2f
commit c073f7f56caa36758155c37e6643e5330579ab2f
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Mon Mar 8 09:23:48 2021 +0200
Moved OIDCSecurityConfiguration from ..profile.api to .profile.config
No need to a separate package for this single class.
---
.../oidc/op/profile/{api => config}/OIDCSecurityConfiguration.java | 2 +-
.../op/profile/{api => config}/OIDCSecurityConfigurationTest.java | 4 +---
.../navigate/RequestObjectDecryptionConfigurationLookupFunction.java | 2 +-
.../RequestObjectSignatureValidationConfigurationLookupFunction.java | 2 +-
...okenEndpointJwtSignatureValidationConfigurationLookupFunction.java | 2 +-
.../oidc/op/profile/impl/FormOutboundKeySetResponseMessage.java | 2 +-
.../META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml | 4 ++--
.../oidc/op/profile/impl/FormOutboundKeySetResponseMessageTest.java | 2 +-
8 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/api/OIDCSecurityConfiguration.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/config/OIDCSecurityConfiguration.java
similarity index 98%
rename from idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/api/OIDCSecurityConfiguration.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/config/OIDCSecurityConfiguration.java
index cd221b07..f7a4d680 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/api/OIDCSecurityConfiguration.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/config/OIDCSecurityConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.oidc.op.profile.api;
+package net.shibboleth.idp.plugin.oidc.op.profile.config;
import javax.annotation.Nullable;
import org.opensaml.xmlsec.EncryptionConfiguration;
diff --git a/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/api/OIDCSecurityConfigurationTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/config/OIDCSecurityConfigurationTest.java
similarity index 94%
rename from idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/api/OIDCSecurityConfigurationTest.java
rename to idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/config/OIDCSecurityConfigurationTest.java
index bf10a244..1d9cf914 100644
--- a/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/api/OIDCSecurityConfigurationTest.java
+++ b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/config/OIDCSecurityConfigurationTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.oidc.op.profile.api;
+package net.shibboleth.idp.plugin.oidc.op.profile.config;
import org.mockito.Mockito;
import org.opensaml.xmlsec.EncryptionConfiguration;
@@ -24,8 +24,6 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import net.shibboleth.idp.plugin.oidc.op.profile.api.OIDCSecurityConfiguration;
-
/**
* Unit tests for {@link OIDCSecurityConfiguration}
*/
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/RequestObjectDecryptionConfigurationLookupFunction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/RequestObjectDecryptionConfigurationLookupFunction.java
index b601d39a..9dc11acc 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/RequestObjectDecryptionConfigurationLookupFunction.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/RequestObjectDecryptionConfigurationLookupFunction.java
@@ -22,7 +22,7 @@ import java.util.List;
import javax.annotation.Nullable;
-import net.shibboleth.idp.plugin.oidc.op.profile.api.OIDCSecurityConfiguration;
+import net.shibboleth.idp.plugin.oidc.op.profile.config.OIDCSecurityConfiguration;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/RequestObjectSignatureValidationConfigurationLookupFunction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/RequestObjectSignatureValidationConfigurationLookupFunction.java
index e8537d0a..67d92505 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/RequestObjectSignatureValidationConfigurationLookupFunction.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/RequestObjectSignatureValidationConfigurationLookupFunction.java
@@ -22,7 +22,7 @@ import java.util.List;
import javax.annotation.Nullable;
-import net.shibboleth.idp.plugin.oidc.op.profile.api.OIDCSecurityConfiguration;
+import net.shibboleth.idp.plugin.oidc.op.profile.config.OIDCSecurityConfiguration;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/TokenEndpointJwtSignatureValidationConfigurationLookupFunction.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/TokenEndpointJwtSignatureValidationConfigurationLookupFunction.java
index 65fd0d9a..93afac1e 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/TokenEndpointJwtSignatureValidationConfigurationLookupFunction.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/navigate/TokenEndpointJwtSignatureValidationConfigurationLookupFunction.java
@@ -22,7 +22,7 @@ import java.util.List;
import javax.annotation.Nullable;
-import net.shibboleth.idp.plugin.oidc.op.profile.api.OIDCSecurityConfiguration;
+import net.shibboleth.idp.plugin.oidc.op.profile.config.OIDCSecurityConfiguration;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundKeySetResponseMessage.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundKeySetResponseMessage.java
index 104de06c..956a7fc5 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundKeySetResponseMessage.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundKeySetResponseMessage.java
@@ -39,7 +39,7 @@ import com.nimbusds.jose.jwk.JWKSet;
import net.minidev.json.JSONObject;
import net.shibboleth.idp.plugin.oidc.op.messaging.JSONSuccessResponse;
-import net.shibboleth.idp.plugin.oidc.op.profile.api.OIDCSecurityConfiguration;
+import net.shibboleth.idp.plugin.oidc.op.profile.config.OIDCSecurityConfiguration;
import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.idp.profile.IdPEventIds;
import net.shibboleth.idp.profile.config.SecurityConfiguration;
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
index a7b41064..e0b722b7 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
@@ -314,7 +314,7 @@
-->
<bean id="shibboleth.oidc.DefaultSecurityConfiguration"
- class="net.shibboleth.idp.plugin.oidc.op.profile.api.OIDCSecurityConfiguration">
+ class="net.shibboleth.idp.plugin.oidc.op.profile.config.OIDCSecurityConfiguration">
<property name="signatureSigningConfiguration">
<ref bean="#{'%{idp.oidc.signing.config:shibboleth.oidc.SigningConfiguration}'.trim()}" />
</property>
@@ -504,7 +504,7 @@
<!-- Configuration for publishing key set. -->
<bean id="shibboleth.oidc.PublishKeySetSecurityConfiguration"
- class="net.shibboleth.idp.plugin.oidc.op.profile.api.OIDCSecurityConfiguration">
+ class="net.shibboleth.idp.plugin.oidc.op.profile.config.OIDCSecurityConfiguration">
<property name="signatureSigningConfiguration">
<ref bean="shibboleth.oidc.PublishKeySetSigningConfiguration" />
</property>
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundKeySetResponseMessageTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundKeySetResponseMessageTest.java
index 4e7d3ba4..4525ea8b 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundKeySetResponseMessageTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/FormOutboundKeySetResponseMessageTest.java
@@ -25,7 +25,7 @@ import net.minidev.json.JSONArray;
import net.minidev.json.JSONObject;
import net.shibboleth.idp.plugin.oidc.op.config.OIDCPublishKeySetConfiguration;
import net.shibboleth.idp.plugin.oidc.op.messaging.JSONSuccessResponse;
-import net.shibboleth.idp.plugin.oidc.op.profile.api.OIDCSecurityConfiguration;
+import net.shibboleth.idp.plugin.oidc.op.profile.config.OIDCSecurityConfiguration;
import net.shibboleth.idp.plugin.oidc.op.profile.impl.FormOutboundKeySetResponseMessage;
import net.shibboleth.idp.plugin.oidc.op.profile.spring.factory.BasicJWKCredentialFactoryBean;
import net.shibboleth.idp.profile.IdPEventIds;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list