This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-jcs.git
The following commit(s) were added to refs/heads/master by this push: new 8d1fe0ae Make private static classes final 8d1fe0ae is described below commit 8d1fe0aefae67a990a9ea705f2854d5f01072da1 Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Wed Oct 11 07:19:23 2023 -0400 Make private static classes final --- .../commons/jcs3/engine/ZombieCacheServiceNonLocal.java | 6 +++--- .../jcs3/io/ObjectInputStreamClassLoaderAware.java | 2 +- .../java/org/apache/commons/jcs3/log/LogManager.java | 2 +- .../commons/jcs3/utils/threadpool/ThreadPoolManager.java | 2 +- .../apache/commons/jcs3/TestLogConfigurationUtil.java | 2 +- .../indexed/IndexedDiskCacheDefragPerformanceTest.java | 2 +- .../commons/jcs3/auxiliary/disk/jdbc/HsqlSetupUtil.java | 2 +- .../jcs3/jcache/extras/writer/AsyncCacheWriter.java | 2 +- .../apache/commons/jcs3/jcache/JCSCachingManager.java | 2 +- .../jcache/jmx/ConfigurableMBeanServerIdBuilder.java | 4 ++-- .../apache/commons/jcs3/jcache/ExpiryListenerTest.java | 2 +- .../jcs/auxiliary/disk/file/FileDiskCacheManager.java | 16 ++++++++++++++++ 12 files changed, 30 insertions(+), 14 deletions(-) diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/ZombieCacheServiceNonLocal.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/ZombieCacheServiceNonLocal.java index 8c16847e..3ef39ccd 100644 --- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/ZombieCacheServiceNonLocal.java +++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/ZombieCacheServiceNonLocal.java @@ -258,7 +258,7 @@ public class ZombieCacheServiceNonLocal<K, V> /** * A basic put event. */ - private static class PutEvent<K, V> + private static final class PutEvent<K, V> extends ZombieEvent { /** The element to put */ @@ -279,7 +279,7 @@ public class ZombieCacheServiceNonLocal<K, V> /** * A basic Remove event. */ - private static class RemoveEvent<K> + private static final class RemoveEvent<K> extends ZombieEvent { /** The key to remove */ @@ -302,7 +302,7 @@ public class ZombieCacheServiceNonLocal<K, V> /** * A basic RemoveAll event. */ - private static class RemoveAllEvent + private static final class RemoveAllEvent extends ZombieEvent { /** diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/io/ObjectInputStreamClassLoaderAware.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/io/ObjectInputStreamClassLoaderAware.java index d00b170e..c853da31 100644 --- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/io/ObjectInputStreamClassLoaderAware.java +++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/io/ObjectInputStreamClassLoaderAware.java @@ -51,7 +51,7 @@ public class ObjectInputStreamClassLoaderAware extends ObjectInputStream { } } - private static class BlacklistClassResolver { + private static final class BlacklistClassResolver { private static final BlacklistClassResolver DEFAULT = new BlacklistClassResolver( toArray(System.getProperty( "jcs.serialization.class.blacklist", diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/LogManager.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/LogManager.java index 2a8b4f0a..7abaec39 100644 --- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/LogManager.java +++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/LogManager.java @@ -43,7 +43,7 @@ public class LogManager /** * The SPI LogFactory */ - private static class LogFactoryHolder + private static final class LogFactoryHolder { static final LogFactory INSTANCE = createLogFactory(); diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/threadpool/ThreadPoolManager.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/threadpool/ThreadPoolManager.java index 35854de4..739ccf53 100644 --- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/threadpool/ThreadPoolManager.java +++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/threadpool/ThreadPoolManager.java @@ -94,7 +94,7 @@ public class ThreadPoolManager /** * The ThreadPoolManager instance (holder pattern) */ - private static class ThreadPoolManagerHolder + private static final class ThreadPoolManagerHolder { static final ThreadPoolManager INSTANCE = new ThreadPoolManager(); } diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/TestLogConfigurationUtil.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/TestLogConfigurationUtil.java index c21beb00..cd73f92c 100644 --- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/TestLogConfigurationUtil.java +++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/TestLogConfigurationUtil.java @@ -46,7 +46,7 @@ public class TestLogConfigurationUtil rootLogger.setLevel(Level.FINE); } - private static class MockLogHandler extends Handler + private static final class MockLogHandler extends Handler { private final StringWriter writer; diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheDefragPerformanceTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheDefragPerformanceTest.java index 3e94ffea..1bb49655 100644 --- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheDefragPerformanceTest.java +++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheDefragPerformanceTest.java @@ -135,7 +135,7 @@ public class IndexedDiskCacheDefragPerformanceTest /** * Resembles a cached image. */ - private static class Tile + private static final class Tile implements Serializable { /** Don't change */ diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/HsqlSetupUtil.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/HsqlSetupUtil.java index b3f0bad6..2b9fb22a 100644 --- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/HsqlSetupUtil.java +++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/HsqlSetupUtil.java @@ -29,7 +29,7 @@ import org.apache.commons.jcs3.auxiliary.disk.jdbc.hsql.HSQLDiskCacheFactory; /** Can use this to setup a table. */ public final class HsqlSetupUtil { - private static class HSQLDiskCacheFactoryHelper extends HSQLDiskCacheFactory + private static final class HSQLDiskCacheFactoryHelper extends HSQLDiskCacheFactory { @Override protected synchronized void setupTable(Connection cConn, String tableName) throws SQLException diff --git a/commons-jcs3-jcache-extras/src/main/java/org/apache/commons/jcs3/jcache/extras/writer/AsyncCacheWriter.java b/commons-jcs3-jcache-extras/src/main/java/org/apache/commons/jcs3/jcache/extras/writer/AsyncCacheWriter.java index 0646d836..ff223a78 100644 --- a/commons-jcs3-jcache-extras/src/main/java/org/apache/commons/jcs3/jcache/extras/writer/AsyncCacheWriter.java +++ b/commons-jcs3-jcache-extras/src/main/java/org/apache/commons/jcs3/jcache/extras/writer/AsyncCacheWriter.java @@ -119,7 +119,7 @@ public class AsyncCacheWriter<K, V> implements CacheWriter<K, V>, Closeable, Fac } // avoid dep on impl - private static class DaemonThreadFactory implements ThreadFactory + private static final class DaemonThreadFactory implements ThreadFactory { private final AtomicInteger index = new AtomicInteger(1); private final String prefix; diff --git a/commons-jcs3-jcache/src/main/java/org/apache/commons/jcs3/jcache/JCSCachingManager.java b/commons-jcs3-jcache/src/main/java/org/apache/commons/jcs3/jcache/JCSCachingManager.java index eca680b4..7dbc5394 100644 --- a/commons-jcs3-jcache/src/main/java/org/apache/commons/jcs3/jcache/JCSCachingManager.java +++ b/commons-jcs3-jcache/src/main/java/org/apache/commons/jcs3/jcache/JCSCachingManager.java @@ -66,7 +66,7 @@ public class JCSCachingManager implements CacheManager jcs.default.elementattributes.IsLateral=true """; - private static class InternalManager extends CompositeCacheManager + private static final class InternalManager extends CompositeCacheManager { protected static InternalManager create() { diff --git a/commons-jcs3-jcache/src/main/java/org/apache/commons/jcs3/jcache/jmx/ConfigurableMBeanServerIdBuilder.java b/commons-jcs3-jcache/src/main/java/org/apache/commons/jcs3/jcache/jmx/ConfigurableMBeanServerIdBuilder.java index ab888a8d..2d62555c 100644 --- a/commons-jcs3-jcache/src/main/java/org/apache/commons/jcs3/jcache/jmx/ConfigurableMBeanServerIdBuilder.java +++ b/commons-jcs3-jcache/src/main/java/org/apache/commons/jcs3/jcache/jmx/ConfigurableMBeanServerIdBuilder.java @@ -34,7 +34,7 @@ public class ConfigurableMBeanServerIdBuilder extends MBeanServerBuilder { private static final ConcurrentMap<Key, MBeanServer> JVM_SINGLETONS = new ConcurrentHashMap<>(); - private static class Key + private static final class Key { private final String domain; private final MBeanServer outer; @@ -87,7 +87,7 @@ public class ConfigurableMBeanServerIdBuilder extends MBeanServerBuilder return server; } - private static class ForceIdMBeanServerDelegate extends MBeanServerDelegate + private static final class ForceIdMBeanServerDelegate extends MBeanServerDelegate { private final MBeanServerDelegate delegate; diff --git a/commons-jcs3-jcache/src/test/java/org/apache/commons/jcs3/jcache/ExpiryListenerTest.java b/commons-jcs3-jcache/src/test/java/org/apache/commons/jcs3/jcache/ExpiryListenerTest.java index a065e26b..8b0f9235 100644 --- a/commons-jcs3-jcache/src/test/java/org/apache/commons/jcs3/jcache/ExpiryListenerTest.java +++ b/commons-jcs3-jcache/src/test/java/org/apache/commons/jcs3/jcache/ExpiryListenerTest.java @@ -65,7 +65,7 @@ public class ExpiryListenerTest { assertEquals(1, listener.events.size()); } - private static class CacheEntryExpiredListenerImpl implements CacheEntryExpiredListener<String, String>, Serializable { + private static final class CacheEntryExpiredListenerImpl implements CacheEntryExpiredListener<String, String>, Serializable { /** * */ diff --git a/commons-jcs3-sandbox/commons-jcs3-filecache/src/main/java/org/apache/commons/jcs/auxiliary/disk/file/FileDiskCacheManager.java b/commons-jcs3-sandbox/commons-jcs3-filecache/src/main/java/org/apache/commons/jcs/auxiliary/disk/file/FileDiskCacheManager.java index f66e5825..753cd78d 100644 --- a/commons-jcs3-sandbox/commons-jcs3-filecache/src/main/java/org/apache/commons/jcs/auxiliary/disk/file/FileDiskCacheManager.java +++ b/commons-jcs3-sandbox/commons-jcs3-filecache/src/main/java/org/apache/commons/jcs/auxiliary/disk/file/FileDiskCacheManager.java @@ -1,3 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.commons.jcs.auxiliary.disk.file; /*