[java-shib-attribute] branch main updated: JSATTR-29 - Data connector caching improvements

[Scott Cantor]

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

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

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-attribute.git;a=commit;h=e0a3442f6c4cea2f2a409d50cde666b1a1cd69e5

The following commit(s) were added to refs/heads/main by this push:
     new e0a3442f6 JSATTR-29 - Data connector caching improvements
e0a3442f6 is described below

commit e0a3442f6c4cea2f2a409d50cde666b1a1cd69e5
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jul 29 10:01:01 2024 -0400

    JSATTR-29 - Data connector caching improvements
    
    https://shibboleth.atlassian.net/browse/JSATTR-29
    
    Adjust logging, cache instance has no suitable toString method.
---
 .../resolver/dc/impl/AbstractSearchDataConnector.java        | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/AbstractSearchDataConnector.java b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/AbstractSearchDataConnector.java
index 641c794fd..b7db75068 100644
--- a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/AbstractSearchDataConnector.java
+++ b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/AbstractSearchDataConnector.java
@@ -183,19 +183,17 @@ public abstract class AbstractSearchDataConnector<T1 extends ExecutableSearch,T2
                 resolvedAttributes = cache.getIfPresent(cacheKey);
 
                 if (resolvedAttributes == null) {
-                    log.debug("{} Cache key did not found anything in cache {}", new Object[] {getLogPrefix(), resultsCache,});
+                    log.debug("{} Cache key not found", getLogPrefix());
                     resolvedAttributes = retrieveAttributes(executable);
                     log.debug("{} Resolved attributes {}", getLogPrefix(), resolvedAttributes);
-                    cache.put(cacheKey, resolvedAttributes != null ? resolvedAttributes
-                            : CollectionSupport.<String,IdPAttribute>emptyMap());
+                    cache.put(cacheKey, resolvedAttributes != null ? resolvedAttributes : CollectionSupport.emptyMap());
                 } else if (resolvedAttributes.isEmpty()){
-                    log.debug("{} Cache key found empty (negative) result using cache {}", new Object[] {getLogPrefix(), resultsCache,});
+                    log.debug("{} Cache key found empty (negative) result", getLogPrefix());
                 } else {
-                    log.debug("{} Cache key returned resolved attributes {} using cache {}", new Object[] {getLogPrefix(),
-                            resolvedAttributes, resultsCache,});
+                    log.debug("{} Cache key returned resolved attributes {}", getLogPrefix());
                 }
             } else {
-                log.debug("No cache key returned, will not check for cached results");
+                log.debug("No cache key returned, skipping check for cached results");
                 resolvedAttributes = retrieveAttributes(executable);
                 log.debug("{} Resolved attributes: {}", getLogPrefix(), resolvedAttributes);
             }

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