[java-idp-oidc] branch master updated: IDP-1553 - Deprecate HttpClient parent beans

[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=571091355d5bf7024fa580e18d4662b652832d74

The following commit(s) were added to refs/heads/master by this push:
       new  5710913   IDP-1553 - Deprecate HttpClient parent beans
5710913 is described below

commit 571091355d5bf7024fa580e18d4662b652832d74
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Feb 17 15:42:06 2020 -0500

    IDP-1553 - Deprecate HttpClient parent beans
    
    https://issues.shibboleth.net/jira/browse/IDP-1553
---
 .../src/main/resources/conf/oidc-metadata-providers.xml               | 2 +-
 .../net/shibboleth/idp/flows/oidc/authorize/authorize-beans.xml       | 2 +-
 .../net/shibboleth/idp/flows/oidc/register/register-beans.xml         | 4 ++--
 .../src/test/resources/conf/oidc-metadata-providers.xml               | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/idp-oidc-extension-distribution/src/main/resources/conf/oidc-metadata-providers.xml b/idp-oidc-extension-distribution/src/main/resources/conf/oidc-metadata-providers.xml
index d1e1bf4..8c190f3 100644
--- a/idp-oidc-extension-distribution/src/main/resources/conf/oidc-metadata-providers.xml
+++ b/idp-oidc-extension-distribution/src/main/resources/conf/oidc-metadata-providers.xml
@@ -23,7 +23,7 @@
     <bean id="shibboleth.oidc.RemoteJwkSetCache"
         class="org.geant.idpextension.oidc.metadata.resolver.RemoteJwkSetCache"
         p:storage-ref="#{'%{idp.oidc.jwk.StorageService:shibboleth.StorageService}'.trim()}"
-        p:httpClient="#{getObject('shibboleth.oidc.NonBrowser.HttpClient') ?: getObject('shibboleth.NonCachingHttpClient')}"
+        p:httpClient="#{getObject('shibboleth.oidc.NonBrowser.HttpClient') ?: getObject('shibboleth.InternalHttpClient')}"
         p:httpClientSecurityParameters="#{getObject('shibboleth.oidc.NonBrowser.HttpClientSecurityParameters')}" />
 
     <bean id="shibboleth.oidc.ChainingClientInformationResolver"
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-beans.xml
index 6159baa..a7b6cae 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-beans.xml
@@ -102,7 +102,7 @@
 
     <bean id="SetRequestObjectToResponseContext"
         class="org.geant.idpextension.oidc.profile.impl.SetRequestObjectToResponseContext" scope="prototype"
-        p:httpClient="#{getObject('shibboleth.oidc.NonBrowser.HttpClient') ?: getObject('shibboleth.NonCachingHttpClient')}"
+        p:httpClient="#{getObject('shibboleth.oidc.NonBrowser.HttpClient') ?: getObject('shibboleth.InternalHttpClient')}"
         p:httpClientSecurityParameters="#{getObject('shibboleth.oidc.NonBrowser.HttpClientSecurityParameters')}" />
 
     <bean id="DecryptRequestObject" class="org.geant.idpextension.oidc.profile.impl.DecryptRequestObject"
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/register/register-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/register/register-beans.xml
index 10c03d0..4dca27c 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/register/register-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/register/register-beans.xml
@@ -30,7 +30,7 @@
     <bean id="CheckRedirectURIs"
         class="org.geant.idpextension.oidc.profile.impl.CheckRedirectURIs"
         scope="prototype"
-        p:httpClient="#{getObject('shibboleth.oidc.NonBrowser.HttpClient') ?: getObject('shibboleth.NonCachingHttpClient')}"
+        p:httpClient="#{getObject('shibboleth.oidc.NonBrowser.HttpClient') ?: getObject('shibboleth.InternalHttpClient')}"
         p:httpClientSecurityParameters="#{getObject('shibboleth.oidc.NonBrowser.HttpClientSecurityParameters')}" />
 
     <bean id="GenerateClientID"
@@ -95,7 +95,7 @@
     <bean id="AddJwksToClientMetadata"
         class="org.geant.idpextension.oidc.profile.impl.AddJwksToClientMetadata"
         scope="prototype"
-        p:httpClient="#{getObject('shibboleth.oidc.NonBrowser.HttpClient') ?: getObject('shibboleth.NonCachingHttpClient')}"
+        p:httpClient="#{getObject('shibboleth.oidc.NonBrowser.HttpClient') ?: getObject('shibboleth.InternalHttpClient')}"
         p:httpClientSecurityParameters="#{getObject('shibboleth.oidc.NonBrowser.HttpClientSecurityParameters')}" />
 
     <bean id="AddLogoUrisToClientMetadata"
diff --git a/idp-oidc-extension-impl/src/test/resources/conf/oidc-metadata-providers.xml b/idp-oidc-extension-impl/src/test/resources/conf/oidc-metadata-providers.xml
index 9b10844..a596b18 100644
--- a/idp-oidc-extension-impl/src/test/resources/conf/oidc-metadata-providers.xml
+++ b/idp-oidc-extension-impl/src/test/resources/conf/oidc-metadata-providers.xml
@@ -22,7 +22,7 @@
     <bean id="shibboleth.oidc.RemoteJwkSetCache"
         class="org.geant.idpextension.oidc.metadata.resolver.RemoteJwkSetCache"
         p:storage-ref="#{'%{idp.oidc.jwk.StorageService:shibboleth.StorageService}'.trim()}"
-        p:httpClient="#{getObject('shibboleth.oidc.NonBrowser.HttpClient') ?: getObject('shibboleth.NonCachingHttpClient')}"
+        p:httpClient="#{getObject('shibboleth.oidc.NonBrowser.HttpClient') ?: getObject('shibboleth.InternalHttpClient')}"
         p:httpClientSecurityParameters="#{getObject('shibboleth.oidc.NonBrowser.HttpClientSecurityParameters')}" />
 
     <bean id="shibboleth.oidc.ChainingClientInformationResolver"

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