[java-idp-oidc] branch main updated: Adapted into new generic (spec-driven) MetadataCacheBuilder.

[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=ec4d4e3be731fc17618291395352ae3b3ed639ee

The following commit(s) were added to refs/heads/main by this push:
     new ec4d4e3b Adapted into new generic (spec-driven) MetadataCacheBuilder.
ec4d4e3b is described below

commit ec4d4e3be731fc17618291395352ae3b3ed639ee
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Wed Mar 9 17:37:38 2022 +0200

    Adapted into new generic (spec-driven) MetadataCacheBuilder.
---
 .../src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml  | 5 +++++
 .../issue-registration-access-token-beans.xml                      | 7 +------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
index 2e9355f1..ea8b3590 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
@@ -287,4 +287,9 @@
     <bean id="shibboleth.oidc.EmptyResponseHeaderFilter"
         class="net.shibboleth.utilities.java.support.net.DynamicResponseHeaderFilter" />
 
+    <bean id="cacheFactory" class="net.shibboleth.oidc.metadata.cache.impl.MetadataCacheBuilder$Builder"/>
+
+    <bean id="shibboleth.oidc.CacheBuilder" factory-bean="cacheFactory" factory-method="build"
+        abstract="true"/>
+
 </beans>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/issue-registration-access-token/issue-registration-access-token-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/issue-registration-access-token/issue-registration-access-token-beans.xml
index 320a0391..b6c19e6e 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/issue-registration-access-token/issue-registration-access-token-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/oidc/issue-registration-access-token/issue-registration-access-token-beans.xml
@@ -53,7 +53,7 @@
     <bean id="shibboleth.oidc.admin.DefaultMetadataPolicyResolver"
         parent="shibboleth.oidc.admin.BaseMetadataPolicyResolver">
         <constructor-arg>
-            <bean parent="shibboleth.oidc.admin.CacheBuilder">
+            <bean parent="shibboleth.oidc.CacheBuilder">
                 <constructor-arg>
                     <bean p:cacheId="AdminMetadataPolicyCache" parent="shibboleth.oidc.admin.BaseCacheBuilderSpec" />
                 </constructor-arg>
@@ -78,11 +78,6 @@
                 c:expression="#custom.getAttribute('opensamlProfileRequestContext')" />
         </constructor-arg>
     </bean>
-
-    <bean id="fetchThroughCacheFactory" class="net.shibboleth.oidc.metadata.cache.impl.FetchThroughMetadataCacheBuilder$Builder"/>
-    
-    <bean id="shibboleth.oidc.admin.CacheBuilder" factory-bean="fetchThroughCacheFactory" factory-method="build"
-        abstract="true"/>
     
     <bean class="net.shibboleth.oidc.metadata.cache.impl.FetchThroughMetadataCacheBuilderSpec"
         id="shibboleth.oidc.admin.BaseCacheBuilderSpec" abstract="true"

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