[java-shib-attribute] branch main updated: JSATTR-52 - CacheConfigParser need not be type-specific

[Codeberg]

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

codeberg pushed a commit to branch main
in repository java-shib-attribute.

View the commit online:
https://codeberg.org/Shibboleth/java-shib-attribute/commit/76b88af9ec7e78a9d673db425c3b091e70627600

The following commit(s) were added to refs/heads/main by this push:
     new 76b88af9e JSATTR-52 - CacheConfigParser need not be type-specific
76b88af9e is described below

commit 76b88af9ec7e78a9d673db425c3b091e70627600
Author: Scott Cantor <scott at restingparrotsoftware.com>
AuthorDate: Thu Aug 27 17:03:57 2026 -0400

    JSATTR-52 - CacheConfigParser need not be type-specific
    
    https://shibboleth.atlassian.net/browse/JSATTR-52
    
    Genericized the object returned by Spring parser.
---
 .../idp/attribute/resolver/spring/dc/impl/CacheConfigParser.java    | 6 ++----
 .../resolver/spring/dc/ldap/impl/LDAPDataConnectorParserTest.java   | 1 +
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/CacheConfigParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/CacheConfigParser.java
index 05802cb63..df367c21e 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/CacheConfigParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/CacheConfigParser.java
@@ -16,7 +16,6 @@ package net.shibboleth.idp.attribute.resolver.spring.dc.impl;
 
 import java.time.Duration;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import javax.annotation.Nonnull;
@@ -31,7 +30,6 @@ import org.w3c.dom.Element;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 
-import net.shibboleth.idp.attribute.IdPAttribute;
 import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
 import net.shibboleth.shared.logic.Constraint;
 import net.shibboleth.shared.primitive.LoggerFactory;
@@ -156,7 +154,7 @@ public class CacheConfigParser {
      * 
      * @return cache
      */
-    @Nullable public static Cache<String, Map<String, IdPAttribute>> buildCacheAccess(@Nullable final String timeToLive,
+    @Nullable public static Cache<?,?> buildCacheAccess(@Nullable final String timeToLive,
             @Nullable final String maximumSize) {
         
         return CacheBuilder.newBuilder()
@@ -176,7 +174,7 @@ public class CacheConfigParser {
      * 
      * @return cache
      */
-    @Nullable public static Cache<String, Map<String, IdPAttribute>> buildCacheWrite(@Nullable final String timeToLive,
+    @Nullable public static Cache<?,?> buildCacheWrite(@Nullable final String timeToLive,
             @Nullable final String maximumSize) {
         
         return CacheBuilder.newBuilder()
diff --git a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParserTest.java b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParserTest.java
index 31ec10529..31bb1e4de 100644
--- a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParserTest.java
+++ b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParserTest.java
@@ -190,6 +190,7 @@ public class LDAPDataConnectorParserTest {
                 getLdapDataConnector(new String[] {"net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-multi.xml",
                         "net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-context.xml"});
         assertNotNull(dataConnector);
+        assertNotNull(dataConnector.getResultsCache());
         doTest(dataConnector);
     }
 

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