[java-idp-oidc] 40/44: JOIDC-5 Adapted new package naming from java-oidc-common.

[Henri Mikkonen]

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=39148c33937cc244c6555cb3dc9b27ca15733dc7

commit 39148c33937cc244c6555cb3dc9b27ca15733dc7
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Thu Oct 22 14:09:29 2020 +0300

    JOIDC-5 Adapted new package naming from java-oidc-common.
    
    https://issues.shibboleth.net/jira/browse/JOIDC-5
    
    Forgotten from the previous commit.
---
 .../keyinfo/ext/impl/provider/ClientSecretProvider.java      |  2 +-
 .../ext/impl/provider/ClientSecretReferenceProvider.java     |  2 +-
 .../keyinfo/ext/impl/provider/InlineJwksProvider.java        |  2 +-
 .../keyinfo/ext/impl/provider/JWKSReferenceProvider.java     |  2 +-
 .../oidc/metadata/impl/ClientInformationNodeProcessor.java   | 12 ++++++------
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/ClientSecretProvider.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/ClientSecretProvider.java
index e0dfcb49..4815212e 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/ClientSecretProvider.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/ClientSecretProvider.java
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
 
 import com.nimbusds.oauth2.sdk.auth.Secret;
 
-import net.shibboleth.idp.saml.oidc.xmlobject.ClientSecret;
+import net.shibboleth.oidc.saml.xmlobject.ClientSecret;
 import net.shibboleth.utilities.java.support.collection.LazySet;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/ClientSecretReferenceProvider.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/ClientSecretReferenceProvider.java
index f94c1bae..bfb8ad14 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/ClientSecretReferenceProvider.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/ClientSecretReferenceProvider.java
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
 
 import com.nimbusds.oauth2.sdk.auth.Secret;
 
-import net.shibboleth.idp.saml.oidc.xmlobject.ClientSecretKeyReference;
+import net.shibboleth.oidc.saml.xmlobject.ClientSecretKeyReference;
 import net.shibboleth.utilities.java.support.collection.LazySet;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/InlineJwksProvider.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/InlineJwksProvider.java
index a7df3890..e6bd9034 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/InlineJwksProvider.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/InlineJwksProvider.java
@@ -43,7 +43,7 @@ import com.nimbusds.jose.jwk.JWK;
 import com.nimbusds.jose.jwk.JWKSet;
 import com.nimbusds.jose.jwk.KeyType;
 
-import net.shibboleth.idp.saml.oidc.xmlobject.JwksData;
+import net.shibboleth.oidc.saml.xmlobject.JwksData;
 import net.shibboleth.utilities.java.support.codec.Base64Support;
 import net.shibboleth.utilities.java.support.codec.DecodingException;
 import net.shibboleth.utilities.java.support.collection.LazySet;
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/JWKSReferenceProvider.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/JWKSReferenceProvider.java
index 9b793236..98eb9f52 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/JWKSReferenceProvider.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/keyinfo/ext/impl/provider/JWKSReferenceProvider.java
@@ -34,7 +34,7 @@ import org.opensaml.xmlsec.keyinfo.impl.provider.AbstractKeyInfoProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import net.shibboleth.idp.saml.oidc.xmlobject.JwksUri;
+import net.shibboleth.oidc.saml.xmlobject.JwksUri;
 import net.shibboleth.utilities.java.support.collection.LazySet;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/ClientInformationNodeProcessor.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/ClientInformationNodeProcessor.java
index 1a533564..577206d2 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/ClientInformationNodeProcessor.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/ClientInformationNodeProcessor.java
@@ -69,9 +69,9 @@ import com.nimbusds.openid.connect.sdk.rp.ApplicationType;
 import com.nimbusds.openid.connect.sdk.rp.OIDCClientInformation;
 import com.nimbusds.openid.connect.sdk.rp.OIDCClientMetadata;
 
-import net.shibboleth.idp.saml.oidc.xmlobject.DefaultAcrValue;
-import net.shibboleth.idp.saml.oidc.xmlobject.MetadataValueSAMLObject;
-import net.shibboleth.idp.saml.oidc.xmlobject.OAuthRPExtensions;
+import net.shibboleth.oidc.saml.xmlobject.DefaultAcrValue;
+import net.shibboleth.oidc.saml.xmlobject.MetadataValueSAMLObject;
+import net.shibboleth.oidc.saml.xmlobject.OAuthRPExtensions;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
@@ -423,7 +423,7 @@ public class ClientInformationNodeProcessor implements MetadataNodeProcessor {
      */
     protected @Nonnull Set<GrantType> parseGrantTypes(final @Nonnull OAuthRPExtensions extensions) {
         final Set<GrantType> grantTypes = new HashSet<>();
-        for (final net.shibboleth.idp.saml.oidc.xmlobject.GrantType grantType : extensions.getGrantTypes()) {
+        for (final net.shibboleth.oidc.saml.xmlobject.GrantType grantType : extensions.getGrantTypes()) {
             final String value = getSingleValue(grantType);
             if (value != null) {
                 grantTypes.add(new GrantType(value));
@@ -440,7 +440,7 @@ public class ClientInformationNodeProcessor implements MetadataNodeProcessor {
      */
     protected @Nonnull Set<ResponseType> parseResponseTypes(final @Nonnull OAuthRPExtensions extensions) {
         final Set<ResponseType> responseTypes = new HashSet<>();
-        for (final net.shibboleth.idp.saml.oidc.xmlobject.ResponseType responseType : extensions.getResponseTypes()) {
+        for (final net.shibboleth.oidc.saml.xmlobject.ResponseType responseType : extensions.getResponseTypes()) {
             final String value = getSingleValue(responseType);
             if (value != null) {
                 responseTypes.add(new ResponseType(value));
@@ -457,7 +457,7 @@ public class ClientInformationNodeProcessor implements MetadataNodeProcessor {
      */
     protected @Nonnull Scope parseScope(final @Nonnull OAuthRPExtensions extensions) {
         final Scope scope = new Scope();
-        for (final net.shibboleth.idp.saml.oidc.xmlobject.Scope singleScope : extensions.getScopes()) {
+        for (final net.shibboleth.oidc.saml.xmlobject.Scope singleScope : extensions.getScopes()) {
             final String value = getSingleValue(singleScope);
             if (value != null) {
                 scope.add(value);

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