[java-idp-oidc] branch master updated: IDP-1527 - Initial OIDC plugin port to V4 APIs

[Scott Cantor]

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

scantor pushed a commit to branch master
in repository java-idp-oidc.

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

The following commit(s) were added to refs/heads/master by this push:
       new  ca16ff0   IDP-1527 - Initial OIDC plugin port to V4 APIs
ca16ff0 is described below

commit ca16ff0dc912fe86dcb913440795bd5a6470de07
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Jan 9 17:03:10 2020 -0500

    IDP-1527 - Initial OIDC plugin port to V4 APIs
    
    https://issues.shibboleth.net/jira/browse/IDP-1527
    
    Inject ApplicationContext when creating a resolver chain.
---
 .../impl/ClientInformationResolverServiceStrategy.java        |  1 +
 .../impl/ProviderMetadataResolverServiceStrategy.java         |  4 ++--
 .../metadata/impl/CredentialMetadataValueResolverTest.java    | 11 +++++------
 .../impl/DynamicFilesystemProviderMetadataResolverTest.java   |  2 +-
 .../metadata/impl/FilesystemMetadataValueResolverTest.java    |  2 --
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ClientInformationResolverServiceStrategy.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ClientInformationResolverServiceStrategy.java
index 73faf9e..0193850 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ClientInformationResolverServiceStrategy.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ClientInformationResolverServiceStrategy.java
@@ -78,6 +78,7 @@ public class ClientInformationResolverServiceStrategy extends AbstractIdentifiab
             chain.initialize();
             final RelyingPartyClientInformationProvider result = new RelyingPartyClientInformationProvider();
             result.setEmbeddedResolver(chain);
+            result.setApplicationContext(appContext);
             result.initialize();
             return result;
         } catch (final ResolverException | ComponentInitializationException e) {
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ProviderMetadataResolverServiceStrategy.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ProviderMetadataResolverServiceStrategy.java
index 055ac6a..bbe03c5 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ProviderMetadataResolverServiceStrategy.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/profile/spring/relyingparty/metadata/impl/ProviderMetadataResolverServiceStrategy.java
@@ -54,6 +54,6 @@ public class ProviderMetadataResolverServiceStrategy extends AbstractIdentifiabl
 
         throw new ServiceException(
                 "Reload did produce more than one bean of type" + ServiceableProviderMetadataProvider.class.getName());
-
     }
-}
+
+}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/metadata/impl/CredentialMetadataValueResolverTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/metadata/impl/CredentialMetadataValueResolverTest.java
index a9a2f2b..93977e5 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/metadata/impl/CredentialMetadataValueResolverTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/metadata/impl/CredentialMetadataValueResolverTest.java
@@ -34,7 +34,6 @@ import org.testng.annotations.Test;
 import net.minidev.json.JSONArray;
 import net.minidev.json.JSONObject;
 import net.shibboleth.idp.profile.RequestContextBuilder;
-import net.shibboleth.idp.profile.config.ProfileConfiguration;
 import net.shibboleth.idp.profile.config.SecurityConfiguration;
 import net.shibboleth.idp.profile.context.RelyingPartyContext;
 import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
@@ -58,14 +57,14 @@ public class CredentialMetadataValueResolverTest {
         final BasicJWKCredentialFactoryBean factory = new BasicJWKCredentialFactoryBean();
         factory.setJWKResource(new FileSystemResource(new File(fileName)));
         factory.afterPropertiesSet();
-        Credential credential = factory.getObject();
+        final Credential credential = factory.getObject();
         final CredentialMetadataValueResolver resolver = new CredentialMetadataValueResolver();
         resolver.setId("mockId");
         resolver.initialize();
-        RelyingPartyContext rpCtx = profileRequestCtx.getSubcontext(RelyingPartyContext.class, true);
-        OIDCProviderInformationConfiguration profileConfig = new OIDCProviderInformationConfiguration();
-        SecurityConfiguration secConfig = new SecurityConfiguration();
-        SignatureSigningConfiguration signConfig = Mockito.mock(SignatureSigningConfiguration.class);
+        final RelyingPartyContext rpCtx = profileRequestCtx.getSubcontext(RelyingPartyContext.class, true);
+        final OIDCProviderInformationConfiguration profileConfig = new OIDCProviderInformationConfiguration();
+        final SecurityConfiguration secConfig = new SecurityConfiguration();
+        final SignatureSigningConfiguration signConfig = Mockito.mock(SignatureSigningConfiguration.class);
         Mockito.when(signConfig.getSigningCredentials()).thenReturn(Arrays.asList(credential));
         secConfig.setSignatureSigningConfiguration(signConfig);
         profileConfig.setSecurityConfiguration(secConfig);
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/metadata/impl/DynamicFilesystemProviderMetadataResolverTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/metadata/impl/DynamicFilesystemProviderMetadataResolverTest.java
index 07a7c94..a969687 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/metadata/impl/DynamicFilesystemProviderMetadataResolverTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/metadata/impl/DynamicFilesystemProviderMetadataResolverTest.java
@@ -44,7 +44,7 @@ public class DynamicFilesystemProviderMetadataResolverTest extends FilesystemPro
         ((DynamicFilesystemProviderMetadataResolver)resolver).initialize();
         name = "mockName";
         value = "mockValue";
-        FilesystemMetadataValueResolver valueResolver = new FilesystemMetadataValueResolver(
+        final FilesystemMetadataValueResolver valueResolver = new FilesystemMetadataValueResolver(
                 new ClassPathResource("/org/geant/idpextension/oidc/metadata/impl/dyn-value1.json"));
         valueResolver.setId("mock");
         valueResolver.initialize();
diff --git a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/metadata/impl/FilesystemMetadataValueResolverTest.java b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/metadata/impl/FilesystemMetadataValueResolverTest.java
index c5edbb4..d444a39 100644
--- a/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/metadata/impl/FilesystemMetadataValueResolverTest.java
+++ b/idp-oidc-extension-impl/src/test/java/org/geant/idpextension/oidc/metadata/impl/FilesystemMetadataValueResolverTest.java
@@ -16,8 +16,6 @@
 
 package org.geant.idpextension.oidc.metadata.impl;
 
-import java.io.File;
-
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.testng.Assert;

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