This is an automated email from the ASF dual-hosted git repository. tv pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-jcs.git
commit 8954ba19a3dcf588f2c073047011dcd563928e82 Author: Thomas Vandahl <[email protected]> AuthorDate: Tue Feb 17 18:56:40 2026 +0100 Fix SpotBugs and PMD complaints --- .../auxiliary/AbstractAuxiliaryCacheMonitor.java | 2 +- .../remote/AbstractRemoteCacheListener.java | 2 +- .../auxiliary/remote/server/RemoteCacheServer.java | 20 +++++++++----------- .../remote/server/RemoteCacheServerFactory.java | 18 +++++++++++------- .../jcs4/engine/control/CompositeCacheManager.java | 3 +-- .../engine/logging/behavior/ICacheEventLogger.java | 4 ++-- .../jcs4/engine/memory/lru/LHMLRUMemoryCache.java | 5 ++--- .../jcs4/engine/memory/shrinking/ShrinkerThread.java | 1 - .../main/java/org/apache/commons/jcs4/log/Log.java | 2 +- .../commons/jcs4/utils/config/OptionConverter.java | 2 +- 10 files changed, 29 insertions(+), 30 deletions(-) diff --git a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/AbstractAuxiliaryCacheMonitor.java b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/AbstractAuxiliaryCacheMonitor.java index bfddc4e4..b5b0bd04 100644 --- a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/AbstractAuxiliaryCacheMonitor.java +++ b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/AbstractAuxiliaryCacheMonitor.java @@ -170,7 +170,7 @@ public abstract class AbstractAuxiliaryCacheMonitor extends Thread // run immediately and sleep here. log.debug( "Cache monitor sleeping for {0} between runs.", idlePeriod ); - Thread.sleep( idlePeriod ); + sleep( idlePeriod ); } catch ( final InterruptedException ex ) { diff --git a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/remote/AbstractRemoteCacheListener.java b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/remote/AbstractRemoteCacheListener.java index 4368366f..ea39f08a 100644 --- a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/remote/AbstractRemoteCacheListener.java +++ b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/remote/AbstractRemoteCacheListener.java @@ -41,7 +41,7 @@ public abstract class AbstractRemoteCacheListener<K, V> private static final Log log = Log.getLog( AbstractRemoteCacheListener.class ); /** The cached name of the local host. The remote server gets this for logging purposes. */ - private static String localHostName; + private String localHostName; /** * The cache manager used to put items in different regions. This is set lazily and should not diff --git a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/remote/server/RemoteCacheServer.java b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/remote/server/RemoteCacheServer.java index 0266afa7..3d76988c 100644 --- a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/remote/server/RemoteCacheServer.java +++ b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/remote/server/RemoteCacheServer.java @@ -467,7 +467,7 @@ public class RemoteCacheServer<K, V> final List<ICacheEventQueue<K, V>> list = new ArrayList<>(cacheListeners.eventQMap.values()); // Only return qualified event queues - list.removeIf(q -> (!q.isWorking() || q.getListenerId() == requesterId)); + list.removeIf(q -> !q.isWorking() || q.getListenerId() == requesterId); return list; } @@ -1421,21 +1421,19 @@ public class RemoteCacheServer<K, V> { log.info( "Received shutdown request. Shutting down server." ); - synchronized (listenerId) + final long maxListenerId = listenerId.get(0); + for (final String cacheName : cacheListenersMap.keySet()) { - for (final String cacheName : cacheListenersMap.keySet()) + for (long i = 0; i <= maxListenerId; i++) { - for (long i = 0; i <= listenerId.get(0); i++) - { - removeCacheListener( cacheName, i ); - } - - log.info( "Removing listener for cache [{0}]", cacheName ); + removeCacheListener( cacheName, i ); } - cacheListenersMap.clear(); - clusterListenersMap.clear(); + log.info( "Removing listener for cache [{0}]", cacheName ); } + + cacheListenersMap.clear(); + clusterListenersMap.clear(); RemoteCacheServerFactory.shutdownImpl( host, port ); this.cacheManager.shutDown(); } diff --git a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/remote/server/RemoteCacheServerFactory.java b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/remote/server/RemoteCacheServerFactory.java index e68b1269..fba068d0 100644 --- a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/remote/server/RemoteCacheServerFactory.java +++ b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/remote/server/RemoteCacheServerFactory.java @@ -29,6 +29,7 @@ import java.rmi.RemoteException; import java.rmi.registry.Registry; import java.rmi.server.RMISocketFactory; import java.rmi.server.UnicastRemoteObject; +import java.util.Arrays; import java.util.Objects; import java.util.Properties; import java.util.concurrent.Executors; @@ -51,7 +52,6 @@ import org.apache.commons.jcs4.utils.threadpool.DaemonThreadFactory; * requests to a running server. */ public class RemoteCacheServerFactory - implements IRemoteCacheConstants { /** The logger */ private static final Log log = Log.getLog( RemoteCacheServerFactory.class ); @@ -90,12 +90,13 @@ public class RemoteCacheServerFactory protected static RMISocketFactory configureObjectSpecificCustomFactory( final Properties props ) { final RMISocketFactory customRMISocketFactory = - OptionConverter.instantiateByKey( props, CUSTOM_RMI_SOCKET_FACTORY_PROPERTY_PREFIX, null ); + OptionConverter.instantiateByKey( props, + IRemoteCacheConstants.CUSTOM_RMI_SOCKET_FACTORY_PROPERTY_PREFIX, null ); if ( customRMISocketFactory != null ) { - PropertySetter.setProperties( customRMISocketFactory, props, CUSTOM_RMI_SOCKET_FACTORY_PROPERTY_PREFIX - + "." ); + PropertySetter.setProperties( customRMISocketFactory, props, + IRemoteCacheConstants.CUSTOM_RMI_SOCKET_FACTORY_PROPERTY_PREFIX + "." ); log.info( "Will use server specific custom socket factory. {0}", customRMISocketFactory ); } @@ -119,7 +120,8 @@ public class RemoteCacheServerFactory final RemoteCacheServerAttributes rcsa = new RemoteCacheServerAttributes(); // configure automatically - PropertySetter.setProperties( rcsa, prop, CACHE_SERVER_ATTRIBUTES_PROPERTY_PREFIX + "." ); + PropertySetter.setProperties( rcsa, prop, + IRemoteCacheConstants.CACHE_SERVER_ATTRIBUTES_PROPERTY_PREFIX + "." ); return rcsa; } @@ -239,7 +241,9 @@ public class RemoteCacheServerFactory */ private static ICacheServiceAdmin lookupCacheServiceAdmin(final Properties config, final int port) throws Exception { - final String remoteServiceName = config.getProperty( REMOTE_CACHE_SERVICE_NAME, REMOTE_CACHE_SERVICE_VAL ).trim(); + final String remoteServiceName = config.getProperty( + IRemoteCacheConstants.REMOTE_CACHE_SERVICE_NAME, + IRemoteCacheConstants.REMOTE_CACHE_SERVICE_VAL ).trim(); final String registry = RemoteUtils.getNamingURL("", port, remoteServiceName); log.debug( "looking up server {0}", registry ); @@ -300,7 +304,7 @@ public class RemoteCacheServerFactory try { - log.debug( admin.getStatistics().toString() ); + log.debug(Arrays.deepToString(admin.getStatistics())); } catch ( final IOException es ) { diff --git a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/control/CompositeCacheManager.java b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/control/CompositeCacheManager.java index c4283bd8..e7706fed 100644 --- a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/control/CompositeCacheManager.java +++ b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/control/CompositeCacheManager.java @@ -391,8 +391,7 @@ public class CompositeCacheManager final ElapsedTimer timer = new ElapsedTimer(); // set default value list - this.defaultAuxValues = OptionConverter.findAndSubst( CompositeCacheManager.DEFAULT_REGION, - properties ); + this.defaultAuxValues = OptionConverter.findAndSubst( DEFAULT_REGION, properties ); log.info( "Setting default auxiliaries to \"{0}\"", this.defaultAuxValues ); diff --git a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/logging/behavior/ICacheEventLogger.java b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/logging/behavior/ICacheEventLogger.java index 09731240..cc4a4d2f 100644 --- a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/logging/behavior/ICacheEventLogger.java +++ b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/logging/behavior/ICacheEventLogger.java @@ -30,7 +30,7 @@ import org.apache.commons.jcs4.engine.logging.CacheEvent; */ public interface ICacheEventLogger { - public enum CacheEventType + enum CacheEventType { /** ICache update */ UPDATE_EVENT("update"), @@ -85,7 +85,7 @@ public interface ICacheEventLogger public final String label; - private CacheEventType(String label) + CacheEventType(String label) { this.label = label; } diff --git a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/memory/lru/LHMLRUMemoryCache.java b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/memory/lru/LHMLRUMemoryCache.java index 805fc2a4..fcd3eecb 100644 --- a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/memory/lru/LHMLRUMemoryCache.java +++ b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/memory/lru/LHMLRUMemoryCache.java @@ -40,8 +40,7 @@ public class LHMLRUMemoryCache<K, V> /** * Implements removeEldestEntry from {@link LinkedHashMap}. */ - protected class LHMSpooler - extends java.util.LinkedHashMap<K, MemoryElementDescriptor<K, V>> + protected class LHMSpooler extends LinkedHashMap<K, MemoryElementDescriptor<K, V>> { /** Don't change. */ private static final long serialVersionUID = -1255907868906762484L; @@ -76,7 +75,7 @@ public class LHMLRUMemoryCache<K, V> waterfall( element ); - log.debug( "LHMLRU size: {0}", () -> map.size() ); + log.debug( "LHMLRU size: {0}", map::size ); return true; } } diff --git a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/memory/shrinking/ShrinkerThread.java b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/memory/shrinking/ShrinkerThread.java index 4773d78a..dc2a3d34 100644 --- a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/memory/shrinking/ShrinkerThread.java +++ b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/memory/shrinking/ShrinkerThread.java @@ -192,7 +192,6 @@ public class ShrinkerThread<K, V> // It is up to the IMemoryCache to return an array of keys // stop for now - return; } } } diff --git a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/log/Log.java b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/log/Log.java index a5ce5d94..024e7cde 100644 --- a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/log/Log.java +++ b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/log/Log.java @@ -383,6 +383,6 @@ public interface Log */ static Log getLog(final Class<?> clazz) { - return Log.getLog(clazz.getName()); + return getLog(clazz.getName()); } } \ No newline at end of file diff --git a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/utils/config/OptionConverter.java b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/utils/config/OptionConverter.java index 403e4c9c..315f48f2 100644 --- a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/utils/config/OptionConverter.java +++ b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/utils/config/OptionConverter.java @@ -159,7 +159,7 @@ public class OptionConverter return defaultValue; } // Trim className to avoid trailing spaces that cause problems. - return OptionConverter.instantiateByClassName( className.trim(), defaultValue ); + return instantiateByClassName( className.trim(), defaultValue ); } /**
