[java-idp-plugin-oidc-rp] branch main updated: JCOMOIDC-60 - JWT class naming convention

[Phil Smart]

This is an automated email from the git hooks/post-receive script.

philsmart pushed a commit to branch main
in repository java-idp-plugin-oidc-rp.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-oidc-rp.git;a=commit;h=d95b1718a158b9d5f1630239a71276b213d9a699

The following commit(s) were added to refs/heads/main by this push:
     new d95b171  JCOMOIDC-60 - JWT class naming convention
d95b171 is described below

commit d95b1718a158b9d5f1630239a71276b213d9a699
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Wed Jan 11 17:28:17 2023 +0000

    JCOMOIDC-60 - JWT class naming convention
    
     - Update RP to work with latest commons name changes
    
    https://shibboleth.atlassian.net/browse/JCOMOIDC-60
---
 .../rp/impl/RelyingPartyProxySigningParametersResolver.java  |  4 ++--
 .../impl/RelyingPartyProxySigningParametersResolverTest.java | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/RelyingPartyProxySigningParametersResolver.java b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/RelyingPartyProxySigningParametersResolver.java
index a606032..cd0ba2c 100644
--- a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/RelyingPartyProxySigningParametersResolver.java
+++ b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/RelyingPartyProxySigningParametersResolver.java
@@ -37,10 +37,10 @@ import com.nimbusds.jose.JWSAlgorithm;
 import com.nimbusds.jose.jwk.Curve;
 import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata;
 
-import net.shibboleth.oidc.security.criterion.ProviderMetadataCriterion;
-import net.shibboleth.oidc.security.criterion.StaticCredentialCriterion;
 import net.shibboleth.oidc.security.impl.CredentialConversionUtil;
 import net.shibboleth.oidc.security.jose.SignatureSigningParameters;
+import net.shibboleth.oidc.security.jose.criterion.ProviderMetadataCriterion;
+import net.shibboleth.oidc.security.jose.criterion.StaticCredentialCriterion;
 import net.shibboleth.oidc.security.jose.impl.BasicSignatureSigningParametersResolver;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.logic.FunctionSupport;
diff --git a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/RelyingPartyProxySigningParametersResolverTest.java b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/RelyingPartyProxySigningParametersResolverTest.java
index eb89ba3..975e193 100644
--- a/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/RelyingPartyProxySigningParametersResolverTest.java
+++ b/idp-oidc-rp-impl/src/test/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/RelyingPartyProxySigningParametersResolverTest.java
@@ -56,11 +56,11 @@ import net.shibboleth.oidc.jwa.support.SignatureConstants;
 import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
 import net.shibboleth.oidc.security.credential.BasicExpiringJWKCredential;
 import net.shibboleth.oidc.security.credential.JWKCredential;
-import net.shibboleth.oidc.security.criterion.JWTSignatureSigningConfigurationCriterion;
-import net.shibboleth.oidc.security.criterion.ProviderMetadataCriterion;
-import net.shibboleth.oidc.security.criterion.StaticCredentialCriterion;
 import net.shibboleth.oidc.security.impl.JWSAssemblyUtils;
 import net.shibboleth.oidc.security.jose.SignatureSigningParameters;
+import net.shibboleth.oidc.security.jose.criterion.ProviderMetadataCriterion;
+import net.shibboleth.oidc.security.jose.criterion.SignatureSigningConfigurationCriterion;
+import net.shibboleth.oidc.security.jose.criterion.StaticCredentialCriterion;
 import net.shibboleth.oidc.security.jose.impl.BasicSignatureSigningConfiguration;
 import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
 import net.shibboleth.utilities.java.support.resolver.ResolverException;
@@ -179,7 +179,7 @@ public class RelyingPartyProxySigningParametersResolverTest extends AbstractOIDC
         // Add an RSA type to the security config
         final BasicSignatureSigningConfiguration config = 
                 (BasicSignatureSigningConfiguration) 
-                criteria.get(JWTSignatureSigningConfigurationCriterion.class).getConfigurations().get(0);
+                criteria.get(SignatureSigningConfigurationCriterion.class).getConfigurations().get(0);
         
         config.setSigningCredentials(List.of(createRSASigningCredential(new RSAKeyGenerator(2048)
                 .keyID("1")
@@ -212,7 +212,7 @@ public class RelyingPartyProxySigningParametersResolverTest extends AbstractOIDC
         // Add an RSA type to the security config
         final BasicSignatureSigningConfiguration config = 
                 (BasicSignatureSigningConfiguration) 
-                criteria.get(JWTSignatureSigningConfigurationCriterion.class).getConfigurations().get(0);
+                criteria.get(SignatureSigningConfigurationCriterion.class).getConfigurations().get(0);
         
         config.setSigningCredentials(List.of(createRSASigningCredential(
                 new ECKeyGenerator(Curve.P_256).keyID("123").generate())));
@@ -236,7 +236,7 @@ public class RelyingPartyProxySigningParametersResolverTest extends AbstractOIDC
         final CriteriaSet crit = new CriteriaSet();
         final BasicSignatureSigningConfiguration config = new BasicSignatureSigningConfiguration();
         config.setSignatureAlgorithms(supportedSigningAlgos);
-        crit.add(new JWTSignatureSigningConfigurationCriterion(List.of(config)));
+        crit.add(new SignatureSigningConfigurationCriterion(List.of(config)));
         return crit;
     }
     

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