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 f8c45235 Simplify
f8c45235 is described below
commit f8c45235ea3c43badd9d9ba08c487f5e24efa1e3
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Feb 9 18:18:00 2024 -0500
Simplify
---
.../jcs3/auxiliary/disk/block/BlockDisk.java | 2 +-
.../auxiliary/disk/block/BlockDiskKeyStore.java | 2 +-
.../auxiliary/disk/indexed/IndexedDiskCache.java | 4 +--
.../jcs3/auxiliary/disk/jdbc/JDBCDiskCache.java | 6 ++--
.../jcs3/engine/control/CompositeCacheManager.java | 2 +-
.../jcs3/utils/discovery/UDPDiscoveryReceiver.java | 2 +-
.../jcs3/JCSConcurrentCacheAccessUnitTest.java | 2 +-
.../extras/loader/CacheLoaderAdapterTest.java | 2 +-
.../extras/loader/CompositeCacheLoaderTest.java | 2 +-
.../commons/jcs/yajcache/core/CacheManager.java | 14 ++++----
.../commons/jcs/yajcache/file/CacheFileDAO.java | 14 ++++----
.../jcs/yajcache/lang/ref/KeyedRefCollector.java | 2 +-
.../commons/jcs/yajcache/soft/SoftRefCache.java | 12 +++----
.../jcs/yajcache/soft/SoftRefFileCache.java | 40 +++++++++++-----------
.../util/concurrent/locks/KeyedReadWriteLock.java | 14 ++++----
15 files changed, 60 insertions(+), 60 deletions(-)
diff --git
a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDisk.java
b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDisk.java
index 95fdf497..7ce075b2 100644
---
a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDisk.java
+++
b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDisk.java
@@ -56,7 +56,7 @@ public class BlockDisk implements AutoCloseable
* the total number of blocks that have been used. If there are no free,
we will use this to
* calculate the position of the next block.
*/
- private final AtomicInteger numberOfBlocks = new AtomicInteger(0);
+ private final AtomicInteger numberOfBlocks = new AtomicInteger();
/** Empty blocks that can be reused. */
private final ConcurrentLinkedQueue<Integer> emptyBlocks = new
ConcurrentLinkedQueue<>();
diff --git
a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskKeyStore.java
b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskKeyStore.java
index 10692ff7..9e64063e 100644
---
a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskKeyStore.java
+++
b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskKeyStore.java
@@ -119,7 +119,7 @@ public class BlockDiskKeyStore<K>
public LRUMapSizeLimited(final int maxSize)
{
this.maxSize = maxSize;
- this.contentSize = new AtomicInteger(0);
+ this.contentSize = new AtomicInteger();
}
// keep the content size in kB, so 2^31 kB is reasonable value
diff --git
a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCache.java
b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCache.java
index c4262250..7760a934 100644
---
a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCache.java
+++
b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCache.java
@@ -123,7 +123,7 @@ public class IndexedDiskCache<K, V> extends
AbstractDiskCache<K, V>
public LRUMapSizeLimited(final int maxKeySize)
{
this.maxSize = maxKeySize;
- this.contentSize = new AtomicInteger(0);
+ this.contentSize = new AtomicInteger();
}
// keep the content size in kB, so 2^31 kB is reasonable value
@@ -283,7 +283,7 @@ public class IndexedDiskCache<K, V> extends
AbstractDiskCache<K, V>
private DiskLimitType diskLimitType = DiskLimitType.COUNT;
/** Simple stat */
- private final AtomicInteger hitCount = new AtomicInteger(0);
+ private final AtomicInteger hitCount = new AtomicInteger();
/**
* Use this lock to synchronize reads and writes to the underlying storage
mechanism.
diff --git
a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCache.java
b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCache.java
index fc8f76e0..70c6cdbf 100644
---
a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCache.java
+++
b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCache.java
@@ -86,13 +86,13 @@ public class JDBCDiskCache<K, V>
private JDBCDiskCacheAttributes jdbcDiskCacheAttributes;
/** # of times update was called */
- private final AtomicInteger updateCount = new AtomicInteger(0);
+ private final AtomicInteger updateCount = new AtomicInteger();
/** # of times get was called */
- private final AtomicInteger getCount = new AtomicInteger(0);
+ private final AtomicInteger getCount = new AtomicInteger();
/** # of times getMatching was called */
- private final AtomicInteger getMatchingCount = new AtomicInteger(0);
+ private final AtomicInteger getMatchingCount = new AtomicInteger();
/** Db connection pool */
private final DataSourceFactory dsFactory;
diff --git
a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCacheManager.java
b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCacheManager.java
index 2706302f..cc9ec303 100644
---
a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCacheManager.java
+++
b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCacheManager.java
@@ -179,7 +179,7 @@ public class CompositeCacheManager
private final ConcurrentMap<String, ICache<?, ?>> caches = new
ConcurrentHashMap<>();
/** Number of clients accessing this cache manager */
- private final AtomicInteger clients = new AtomicInteger(0);
+ private final AtomicInteger clients = new AtomicInteger();
/** Default cache attributes for this cache manager */
private ICompositeCacheAttributes defaultCacheAttr = new
CompositeCacheAttributes();
diff --git
a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryReceiver.java
b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryReceiver.java
index dd9a3304..4c0d3380 100644
---
a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryReceiver.java
+++
b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryReceiver.java
@@ -73,7 +73,7 @@ public class UDPDiscoveryReceiver
private final ExecutorService pooledExecutor;
/** Number of messages received. For debugging and testing. */
- private final AtomicInteger cnt = new AtomicInteger(0);
+ private final AtomicInteger cnt = new AtomicInteger();
/** Service to get cache names and handle request broadcasts */
private final UDPDiscoveryService service;
diff --git
a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSConcurrentCacheAccessUnitTest.java
b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSConcurrentCacheAccessUnitTest.java
index bf39d6fa..8fd524e9 100644
---
a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSConcurrentCacheAccessUnitTest.java
+++
b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSConcurrentCacheAccessUnitTest.java
@@ -136,7 +136,7 @@ public class JCSConcurrentCacheAccessUnitTest{
{
JCS.setConfigFilename( "/TestJCS-73.ccf" );
cache = JCS.getGroupCacheInstance( "cache" );
- errcount = new AtomicInteger(0);
+ errcount = new AtomicInteger();
valueMismatchList = new CopyOnWriteArrayList<>();
}
diff --git
a/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/loader/CacheLoaderAdapterTest.java
b/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/loader/CacheLoaderAdapterTest.java
index f36fd317..a4244480 100644
---
a/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/loader/CacheLoaderAdapterTest.java
+++
b/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/loader/CacheLoaderAdapterTest.java
@@ -39,7 +39,7 @@ public class CacheLoaderAdapterTest
@Rule
public final InternalCacheRule rule = new InternalCacheRule(this);
- private final AtomicInteger count = new AtomicInteger(0);
+ private final AtomicInteger count = new AtomicInteger();
private final Configuration<?, ?> config = new
MutableConfiguration<String,
String>().setStoreByValue(false).setReadThrough(true).setCacheLoaderFactory(new
CacheLoaderAdapter<String, String>()
{
private static final long serialVersionUID = 5824701188219321027L;
diff --git
a/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/loader/CompositeCacheLoaderTest.java
b/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/loader/CompositeCacheLoaderTest.java
index beb7a366..e8855bb2 100644
---
a/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/loader/CompositeCacheLoaderTest.java
+++
b/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/loader/CompositeCacheLoaderTest.java
@@ -36,7 +36,7 @@ public class CompositeCacheLoaderTest
@Rule
public final InternalCacheRule rule = new InternalCacheRule(this);
- private final AtomicInteger count = new AtomicInteger(0);
+ private final AtomicInteger count = new AtomicInteger();
private final CacheLoaderAdapter<String, String> loader1 = new
CacheLoaderAdapter<>()
{
diff --git
a/commons-jcs3-sandbox/commons-jcs3-yajcache/src/main/java/org/apache/commons/jcs/yajcache/core/CacheManager.java
b/commons-jcs3-sandbox/commons-jcs3-yajcache/src/main/java/org/apache/commons/jcs/yajcache/core/CacheManager.java
index bede5517..3730cb61 100644
---
a/commons-jcs3-sandbox/commons-jcs3-yajcache/src/main/java/org/apache/commons/jcs/yajcache/core/CacheManager.java
+++
b/commons-jcs3-sandbox/commons-jcs3-yajcache/src/main/java/org/apache/commons/jcs/yajcache/core/CacheManager.java
@@ -40,15 +40,15 @@ public enum CacheManager {
inst;
private static final boolean debug = true;
- private AtomicInteger countGetCache = new AtomicInteger(0);
+ private AtomicInteger countGetCache = new AtomicInteger();
- private AtomicInteger countCreateCache = new AtomicInteger(0);
- private AtomicInteger countCreateCacheRace = new AtomicInteger(0);
- private AtomicInteger countCreateFileCache = new AtomicInteger(0);
- private AtomicInteger countCreateFileCacheRace = new AtomicInteger(0);
+ private AtomicInteger countCreateCache = new AtomicInteger();
+ private AtomicInteger countCreateCacheRace = new AtomicInteger();
+ private AtomicInteger countCreateFileCache = new AtomicInteger();
+ private AtomicInteger countCreateFileCacheRace = new AtomicInteger();
- private AtomicInteger countRemoveCache = new AtomicInteger(0);
- private AtomicInteger countRemoveFileCache = new AtomicInteger(0);
+ private AtomicInteger countRemoveCache = new AtomicInteger();
+ private AtomicInteger countRemoveFileCache = new AtomicInteger();
// Cache name to Cache mapping.
private final ConcurrentMap<String,ICache<?>> map =
diff --git
a/commons-jcs3-sandbox/commons-jcs3-yajcache/src/main/java/org/apache/commons/jcs/yajcache/file/CacheFileDAO.java
b/commons-jcs3-sandbox/commons-jcs3-yajcache/src/main/java/org/apache/commons/jcs/yajcache/file/CacheFileDAO.java
index d52d8894..586d4117 100644
---
a/commons-jcs3-sandbox/commons-jcs3-yajcache/src/main/java/org/apache/commons/jcs/yajcache/file/CacheFileDAO.java
+++
b/commons-jcs3-sandbox/commons-jcs3-yajcache/src/main/java/org/apache/commons/jcs/yajcache/file/CacheFileDAO.java
@@ -37,13 +37,13 @@ import org.apache.commons.logging.LogFactory;
public enum CacheFileDAO {
inst;
- private AtomicInteger countWriteIOException = new AtomicInteger(0);
- private AtomicInteger countWriteCloseException = new AtomicInteger(0);
- private AtomicInteger countReadIOException = new AtomicInteger(0);
- private AtomicInteger countReadCloseException = new AtomicInteger(0);
- private AtomicInteger countCorruptMinLength = new AtomicInteger(0);
- private AtomicInteger countCorruptLength = new AtomicInteger(0);
- private AtomicInteger countCorruptInvalid = new AtomicInteger(0);
+ private AtomicInteger countWriteIOException = new AtomicInteger();
+ private AtomicInteger countWriteCloseException = new AtomicInteger();
+ private AtomicInteger countReadIOException = new AtomicInteger();
+ private AtomicInteger countReadCloseException = new AtomicInteger();
+ private AtomicInteger countCorruptMinLength = new AtomicInteger();
+ private AtomicInteger countCorruptLength = new AtomicInteger();
+ private AtomicInteger countCorruptInvalid = new AtomicInteger();
private Log log = LogFactory.getLog(this.getClass());
diff --git
a/commons-jcs3-sandbox/commons-jcs3-yajcache/src/main/java/org/apache/commons/jcs/yajcache/lang/ref/KeyedRefCollector.java
b/commons-jcs3-sandbox/commons-jcs3-yajcache/src/main/java/org/apache/commons/jcs/yajcache/lang/ref/KeyedRefCollector.java
index e561707c..1e0201ff 100644
---
a/commons-jcs3-sandbox/commons-jcs3-yajcache/src/main/java/org/apache/commons/jcs/yajcache/lang/ref/KeyedRefCollector.java
+++
b/commons-jcs3-sandbox/commons-jcs3-yajcache/src/main/java/org/apache/commons/jcs/yajcache/lang/ref/KeyedRefCollector.java
@@ -42,7 +42,7 @@ public class KeyedRefCollector<K> implements Runnable {
private Log log = debug ? LogFactory.getLog(this.getClass()) : null;
private final @NonNullable ReferenceQueue q;
private final @NonNullable ConcurrentMap<K, ? extends IKey<K>> synMap;
- private final AtomicInteger count = new AtomicInteger(0);
+ private final AtomicInteger count = new AtomicInteger();
/**
* Constructs with a given reference queue and concurrent map.
*/
diff --git
a/commons-jcs3-sandbox/commons-jcs3-yajcache/src/main/java/org/apache/commons/jcs/yajcache/soft/SoftRefCache.java
b/commons-jcs3-sandbox/commons-jcs3-yajcache/src/main/java/org/apache/commons/jcs/yajcache/soft/SoftRefCache.java
index 54de278a..5cae12ad 100644
---
a/commons-jcs3-sandbox/commons-jcs3-yajcache/src/main/java/org/apache/commons/jcs/yajcache/soft/SoftRefCache.java
+++
b/commons-jcs3-sandbox/commons-jcs3-yajcache/src/main/java/org/apache/commons/jcs/yajcache/soft/SoftRefCache.java
@@ -58,13 +58,13 @@ public class SoftRefCache<V> implements ICache<V> {
private final @NonNullable KeyedRefCollector<String> collector;
private @NonNullable PerCacheConfig config;
- private AtomicInteger countGet = new AtomicInteger(0);
- private AtomicInteger countGetHitMemory = new AtomicInteger(0);
- private AtomicInteger countGetMiss = new AtomicInteger(0);
- private AtomicInteger countGetEmptyRef = new AtomicInteger(0);
+ private AtomicInteger countGet = new AtomicInteger();
+ private AtomicInteger countGetHitMemory = new AtomicInteger();
+ private AtomicInteger countGetMiss = new AtomicInteger();
+ private AtomicInteger countGetEmptyRef = new AtomicInteger();
- private AtomicInteger countPut = new AtomicInteger(0);
- private AtomicInteger countRemove = new AtomicInteger(0);
+ private AtomicInteger countPut = new AtomicInteger();
+ private AtomicInteger countRemove = new AtomicInteger();
/** Returns the cache name. */
public @NonNullable String getName() {
return this.name;
diff --git
a/commons-jcs3-sandbox/commons-jcs3-yajcache/src/main/java/org/apache/commons/jcs/yajcache/soft/SoftRefFileCache.java
b/commons-jcs3-sandbox/commons-jcs3-yajcache/src/main/java/org/apache/commons/jcs/yajcache/soft/SoftRefFileCache.java
index 183c9916..96bd2cb1 100644
---
a/commons-jcs3-sandbox/commons-jcs3-yajcache/src/main/java/org/apache/commons/jcs/yajcache/soft/SoftRefFileCache.java
+++
b/commons-jcs3-sandbox/commons-jcs3-yajcache/src/main/java/org/apache/commons/jcs/yajcache/soft/SoftRefFileCache.java
@@ -76,26 +76,26 @@ public class SoftRefFileCache<V> implements ICache<V>
private final @NonNullable CacheChangeSupport<V> cacheChangeSupport =
new CacheChangeSupport<V>(this);
- private AtomicInteger countGet = new AtomicInteger(0);
-
- private AtomicInteger countGetHitMemory = new AtomicInteger(0);
- private AtomicInteger countGetHitFile = new AtomicInteger(0);
-
- private AtomicInteger countGetMissMemory = new AtomicInteger(0);
- private AtomicInteger countGetMiss = new AtomicInteger(0);
- private AtomicInteger countGetCorruptedFile = new AtomicInteger(0);
- private AtomicInteger countGetEmptyRef = new AtomicInteger(0);
-
- private AtomicInteger countPut = new AtomicInteger(0);
- private AtomicInteger countPutClearRef = new AtomicInteger(0);
- private AtomicInteger countPutMissMemory = new AtomicInteger(0);
- private AtomicInteger countPutNewMemoryValue = new AtomicInteger(0);
- private AtomicInteger countPutNewFileValue = new AtomicInteger(0);
- private AtomicInteger countPutSerializable = new AtomicInteger(0);
- private AtomicInteger countPutReadFile = new AtomicInteger(0);
- private AtomicInteger countPutWriteFile = new AtomicInteger(0);
-
- private AtomicInteger countRemove = new AtomicInteger(0);
+ private AtomicInteger countGet = new AtomicInteger();
+
+ private AtomicInteger countGetHitMemory = new AtomicInteger();
+ private AtomicInteger countGetHitFile = new AtomicInteger();
+
+ private AtomicInteger countGetMissMemory = new AtomicInteger();
+ private AtomicInteger countGetMiss = new AtomicInteger();
+ private AtomicInteger countGetCorruptedFile = new AtomicInteger();
+ private AtomicInteger countGetEmptyRef = new AtomicInteger();
+
+ private AtomicInteger countPut = new AtomicInteger();
+ private AtomicInteger countPutClearRef = new AtomicInteger();
+ private AtomicInteger countPutMissMemory = new AtomicInteger();
+ private AtomicInteger countPutNewMemoryValue = new AtomicInteger();
+ private AtomicInteger countPutNewFileValue = new AtomicInteger();
+ private AtomicInteger countPutSerializable = new AtomicInteger();
+ private AtomicInteger countPutReadFile = new AtomicInteger();
+ private AtomicInteger countPutWriteFile = new AtomicInteger();
+
+ private AtomicInteger countRemove = new AtomicInteger();
public @NonNullable String getName() {
return this.name;
diff --git
a/commons-jcs3-sandbox/commons-jcs3-yajcache/src/main/java/org/apache/commons/jcs/yajcache/util/concurrent/locks/KeyedReadWriteLock.java
b/commons-jcs3-sandbox/commons-jcs3-yajcache/src/main/java/org/apache/commons/jcs/yajcache/util/concurrent/locks/KeyedReadWriteLock.java
index 5d36d979..d72cc70b 100644
---
a/commons-jcs3-sandbox/commons-jcs3-yajcache/src/main/java/org/apache/commons/jcs/yajcache/util/concurrent/locks/KeyedReadWriteLock.java
+++
b/commons-jcs3-sandbox/commons-jcs3-yajcache/src/main/java/org/apache/commons/jcs/yajcache/util/concurrent/locks/KeyedReadWriteLock.java
@@ -49,14 +49,14 @@ public class KeyedReadWriteLock<K> implements
IKeyedReadWriteLock<K> {
private final @NonNullable KeyedRefCollector<K> collector =
new KeyedRefCollector<K>(refQ, rwlMap);
- private final AtomicInteger countRWLockCreate = new AtomicInteger(0);
- private final AtomicInteger countReadLock = new AtomicInteger(0);
- private final AtomicInteger countWriteLock = new AtomicInteger(0);
+ private final AtomicInteger countRWLockCreate = new AtomicInteger();
+ private final AtomicInteger countReadLock = new AtomicInteger();
+ private final AtomicInteger countWriteLock = new AtomicInteger();
- private final AtomicInteger countKeyHit = new AtomicInteger(0);
- private final AtomicInteger countLockRefEmpty = new AtomicInteger(0);
- private final AtomicInteger countLockNew = new AtomicInteger(0);
- private final AtomicInteger countLockExist = new AtomicInteger(0);
+ private final AtomicInteger countKeyHit = new AtomicInteger();
+ private final AtomicInteger countLockRefEmpty = new AtomicInteger();
+ private final AtomicInteger countLockNew = new AtomicInteger();
+ private final AtomicInteger countLockExist = new AtomicInteger();
public KeyedReadWriteLock() {
this.rwlClass = ReentrantReadWriteLock.class;
