Author: tv
Date: Fri May 24 09:26:50 2019
New Revision: 1859859
URL: http://svn.apache.org/viewvc?rev=1859859&view=rev
Log:
Use Java7 diamond operator
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/JCS.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/access/CacheAccess.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/access/GroupCacheAccess.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/access/PartitionedCacheAccess.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/admin/JCSAdminBean.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCache.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCache.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDisk.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCache.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheFactory.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskKeyStore.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCache.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheFactory.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskDumper.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCache.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheFactory.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/ShrinkerThread.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/dsfactory/JndiDataSourceFactory.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheFactory.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheFactory.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCache.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheMonitor.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWait.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWaitFacade.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPCacheFactory.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListener.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPService.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteAuxiliaryCache.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCache.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFactory.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheMonitor.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWait.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCache.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheFactory.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheMonitor.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/server/AbstractRemoteCacheService.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheServlet.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServer.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerFactory.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/util/RemoteCacheRequestFactory.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheEventQueueFactory.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheListeners.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheWatchRepairable.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/ElementAttributes.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/PooledCacheEventQueue.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/ZombieCacheServiceNonLocal.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCache.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheConfigurator.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheManager.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/logging/CacheEventLoggerDebugLogger.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/AbstractDoubleLinkedListMemoryCache.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/AbstractMemoryCache.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/soft/SoftReferenceMemoryCache.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/util/SoftReferenceElementDescriptor.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/access/JCSWorker.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/discovery/UDPCleanupRunner.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryManager.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryMessage.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/discovery/UDPDiscoverySenderThread.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryService.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/serialization/SerializationConversionUtil.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/struct/AbstractLRUMap.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/threadpool/ThreadPoolManager.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/JCSConcurrentCacheAccessUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/JCSThrashTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/JCSUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/JCSvsHashtablePerformanceTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/access/CacheAccessUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/MockAuxiliaryCache.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/MockAuxiliaryCacheFactory.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/MockCacheEventLogger.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCacheUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/PurgatoryElementUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheConcurrentUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheKeyStoreUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheSameRegionConcurrentUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheUnitTestAbstract.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskElementDescriptorUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/DiskTestObjectUtil.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexDiskCacheCountUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexDiskCacheSizeUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexDiskCacheUnitTestAbstract.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheConcurrentUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheKeyStoreUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheNoMemoryUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheOptimizationUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheSameRegionConcurrentUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/LRUMapSizeVsCount.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDataSourceFactoryUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheSharedPoolUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheConcurrentUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheHsqlBackedUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWaitFacadeUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPConcurrentRandomTestUtil.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListenerUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPFilterRemoveHashCodeUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPIssueRemoveOnPutUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/TestTCPLateralUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/MockRemoteCacheClient.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/MockRemoteCacheListener.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/MockRemoteCacheService.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheClientTester.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheListenerUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacadeUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/TestRemoteCache.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/ZombieRemoteCacheServiceUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheClientUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheServiceUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheServletUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/server/BasicRemoteCacheClientServerUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/util/RemoteCacheRequestFactoryUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/CacheEventQueueFactoryUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/EventQueueConcurrentLoadTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/MockCacheServiceNonLocal.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/ZombieCacheServiceNonLocalUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/control/CompositeCacheDiskUsageUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/control/CompositeCacheUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/control/MockCompositeCacheManager.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/logging/MockCacheEventLogger.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/match/KeyMatcherPatternImpllUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/MockMemoryCache.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/fifo/FIFOMemoryCacheUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCacheConcurrentUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCacheUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/lru/LRUMemoryCacheConcurrentUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/mru/MRUMemoryCacheUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/shrinking/ShrinkerThreadUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/soft/SoftReferenceMemoryCacheUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/access/JCSWorkerUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/discovery/MockDiscoveryListener.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/discovery/UDPDiscoverySenderUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryServiceUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/serialization/SerializationConversionUtilUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/struct/DoubleLinkedListUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/struct/JCSvsCommonsLRUMapPerformanceTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/struct/LRUMapConcurrentUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/struct/LRUMapPerformanceTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/struct/LRUMapUnitTest.java
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/JCS.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/JCS.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/JCS.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/JCS.java
Fri May 24 09:26:50 2019
@@ -129,7 +129,7 @@ public abstract class JCS
throws CacheException
{
CompositeCache<K, V> cache = getCacheManager().getCache( region );
- return new CacheAccess<K, V>( cache );
+ return new CacheAccess<>( cache );
}
/**
@@ -144,7 +144,7 @@ public abstract class JCS
throws CacheException
{
CompositeCache<K, V> cache = getCacheManager().getCache( region, icca
);
- return new CacheAccess<K, V>( cache );
+ return new CacheAccess<>( cache );
}
/**
@@ -160,7 +160,7 @@ public abstract class JCS
throws CacheException
{
CompositeCache<K, V> cache = getCacheManager().getCache( region, icca,
eattr );
- return new CacheAccess<K, V>( cache );
+ return new CacheAccess<>( cache );
}
/**
@@ -174,7 +174,7 @@ public abstract class JCS
throws CacheException
{
CompositeCache<GroupAttrName<K>, V> cache =
getCacheManager().getCache( region );
- return new GroupCacheAccess<K, V>( cache );
+ return new GroupCacheAccess<>( cache );
}
/**
@@ -189,7 +189,7 @@ public abstract class JCS
throws CacheException
{
CompositeCache<GroupAttrName<K>, V> cache =
getCacheManager().getCache( region, icca );
- return new GroupCacheAccess<K, V>( cache );
+ return new GroupCacheAccess<>( cache );
}
/**
@@ -205,6 +205,6 @@ public abstract class JCS
throws CacheException
{
CompositeCache<GroupAttrName<K>, V> cache =
getCacheManager().getCache( region, icca, eattr );
- return new GroupCacheAccess<K, V>( cache );
+ return new GroupCacheAccess<>( cache );
}
}
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/access/CacheAccess.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/access/CacheAccess.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/access/CacheAccess.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/access/CacheAccess.java
Fri May 24 09:26:50 2019
@@ -118,7 +118,7 @@ public class CacheAccess<K, V>
if ( wrappedResults == null )
{
- unwrappedResults = new HashMap<K, V>();
+ unwrappedResults = new HashMap<>();
}
else
{
@@ -260,7 +260,7 @@ public class CacheAccess<K, V>
// should be wrapped by cache access.
try
{
- CacheElement<K, V> ce = new CacheElement<K, V>(
this.getCacheControl().getCacheName(), key,
+ CacheElement<K, V> ce = new CacheElement<>(
this.getCacheControl().getCacheName(), key,
val );
ce.setElementAttributes( attr );
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/access/GroupCacheAccess.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/access/GroupCacheAccess.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/access/GroupCacheAccess.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/access/GroupCacheAccess.java
Fri May 24 09:26:50 2019
@@ -76,7 +76,7 @@ public class GroupCacheAccess<K, V>
private GroupAttrName<K> getGroupAttrName( String group, K name )
{
GroupId gid = new GroupId( this.getCacheControl().getCacheName(),
group );
- return new GroupAttrName<K>( gid, name );
+ return new GroupAttrName<>( gid, name );
}
/**
@@ -134,7 +134,7 @@ public class GroupCacheAccess<K, V>
{
GroupAttrName<K> key = getGroupAttrName( groupName, name );
CacheElement<GroupAttrName<K>, V> ce =
- new CacheElement<GroupAttrName<K>, V>(
this.getCacheControl().getCacheName(), key, value );
+ new CacheElement<>( this.getCacheControl().getCacheName(),
key, value );
IElementAttributes attributes = (attr == null) ?
this.getCacheControl().getElementAttributes() : attr;
ce.setElementAttributes( attributes );
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/access/PartitionedCacheAccess.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/access/PartitionedCacheAccess.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/access/PartitionedCacheAccess.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/access/PartitionedCacheAccess.java
Fri May 24 09:26:50 2019
@@ -281,12 +281,12 @@ public class PartitionedCacheAccess<K, V
int partition = getPartitionNumberForKey( key );
if ( dividedNames[partition] == null )
{
- dividedNames[partition] = new HashSet<K>();
+ dividedNames[partition] = new HashSet<>();
}
dividedNames[partition].add( key );
}
- Map<K, ICacheElement<K, V>> result = new HashMap<K, ICacheElement<K,
V>>();
+ Map<K, ICacheElement<K, V>> result = new HashMap<>();
for ( int i = 0; i < partitions.length; i++ )
{
if ( dividedNames[i] != null && !dividedNames[i].isEmpty() )
@@ -320,7 +320,7 @@ public class PartitionedCacheAccess<K, V
return null;
}
- Map<K, V> result = new HashMap<K, V>();
+ Map<K, V> result = new HashMap<>();
for (ICacheAccess<K, V> partition : partitions)
{
result.putAll( partition.getMatching( pattern ) );
@@ -349,7 +349,7 @@ public class PartitionedCacheAccess<K, V
return null;
}
- Map<K, ICacheElement<K, V>> result = new HashMap<K, ICacheElement<K,
V>>();
+ Map<K, ICacheElement<K, V>> result = new HashMap<>();
for (ICacheAccess<K, V> partition : partitions)
{
result.putAll( partition.getMatchingCacheElements( pattern ) );
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/admin/JCSAdminBean.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/admin/JCSAdminBean.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/admin/JCSAdminBean.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/admin/JCSAdminBean.java
Fri May 24 09:26:50 2019
@@ -102,7 +102,7 @@ public class JCSAdminBean implements JCS
keys = cache.getMemoryCache().getKeySet().toArray(new
Serializable[0]);
}
- LinkedList<CacheElementInfo> records = new
LinkedList<CacheElementInfo>();
+ LinkedList<CacheElementInfo> records = new LinkedList<>();
ICacheElement<Serializable, Serializable> element;
IElementAttributes attributes;
@@ -147,7 +147,7 @@ public class JCSAdminBean implements JCS
Arrays.sort( cacheNames );
- LinkedList<CacheRegionInfo> cacheInfo = new
LinkedList<CacheRegionInfo>();
+ LinkedList<CacheRegionInfo> cacheInfo = new LinkedList<>();
CacheRegionInfo regionInfo;
CompositeCache<?, ?> cache;
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCache.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCache.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCache.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCache.java
Fri May 24 09:26:50 2019
@@ -45,7 +45,7 @@ public abstract class AbstractAuxiliaryC
private IElementSerializer elementSerializer = new StandardSerializer();
/** Key matcher used by the getMatching API */
- private IKeyMatcher<K> keyMatcher = new KeyMatcherPatternImpl<K>();
+ private IKeyMatcher<K> keyMatcher = new KeyMatcherPatternImpl<>();
/**
* Gets multiple items from the cache based on the given set of keys.
@@ -75,7 +75,7 @@ public abstract class AbstractAuxiliaryC
element -> element));
}
- return new HashMap<K, ICacheElement<K, V>>();
+ return new HashMap<>();
}
/**
@@ -99,7 +99,7 @@ public abstract class AbstractAuxiliaryC
{
if ( cacheEventLogger == null )
{
- return new CacheEvent<K>();
+ return new CacheEvent<>();
}
String diskLocation = getEventLoggingExtraInfo();
String regionName = null;
@@ -125,7 +125,7 @@ public abstract class AbstractAuxiliaryC
{
if ( cacheEventLogger == null )
{
- return new CacheEvent<T>();
+ return new CacheEvent<>();
}
String diskLocation = getEventLoggingExtraInfo();
return cacheEventLogger.createICacheEvent(
getAuxiliaryCacheAttributes().getName(), regionName, eventName,
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCache.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCache.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCache.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCache.java
Fri May 24 09:26:50 2019
@@ -114,7 +114,7 @@ public abstract class AbstractDiskCache<
this.cacheName = attr.getCacheName();
// create queue
- CacheEventQueueFactory<K, V> fact = new CacheEventQueueFactory<K, V>();
+ CacheEventQueueFactory<K, V> fact = new CacheEventQueueFactory<>();
this.cacheEventQueue = fact.createCacheEventQueue( new
MyCacheListener(), CacheInfo.listenerId, cacheName,
diskCacheAttributes.getEventQueuePoolName(),
diskCacheAttributes.getEventQueueType() );
@@ -159,11 +159,11 @@ public abstract class AbstractDiskCache<
{
if ( diskCacheAttributes.getMaxPurgatorySize() >= 0 )
{
- purgatory = new LRUMap<K, PurgatoryElement<K, V>>(
diskCacheAttributes.getMaxPurgatorySize() );
+ purgatory = new LRUMap<>(
diskCacheAttributes.getMaxPurgatorySize() );
}
else
{
- purgatory = new HashMap<K, PurgatoryElement<K, V>>();
+ purgatory = new HashMap<>();
}
}
}
@@ -198,7 +198,7 @@ public abstract class AbstractDiskCache<
try
{
// Wrap the CacheElement in a PurgatoryElement
- PurgatoryElement<K, V> pe = new PurgatoryElement<K, V>(
cacheElement );
+ PurgatoryElement<K, V> pe = new PurgatoryElement<>( cacheElement );
// Indicates the the element is eligible to be spooled to disk,
// this will remain true unless the item is pulled back into
@@ -324,7 +324,7 @@ public abstract class AbstractDiskCache<
// this avoids locking purgatory, but it uses more memory
synchronized ( purgatory )
{
- keyArray = new HashSet<K>(purgatory.keySet());
+ keyArray = new HashSet<>(purgatory.keySet());
}
Set<K> matchingKeys = getKeyMatcher().getMatchingKeysFromArray(
pattern, keyArray );
@@ -512,10 +512,10 @@ public abstract class AbstractDiskCache<
IStats stats = new Stats();
stats.setTypeName( "Abstract Disk Cache" );
- ArrayList<IStatElement<?>> elems = new ArrayList<IStatElement<?>>();
+ ArrayList<IStatElement<?>> elems = new ArrayList<>();
- elems.add(new StatElement<Integer>( "Purgatory Hits",
Integer.valueOf(purgHits) ) );
- elems.add(new StatElement<Integer>( "Purgatory Size",
Integer.valueOf(purgatory.size()) ) );
+ elems.add(new StatElement<>( "Purgatory Hits",
Integer.valueOf(purgHits) ) );
+ elems.add(new StatElement<>( "Purgatory Size",
Integer.valueOf(purgatory.size()) ) );
// get the stats from the event queue too
IStats eqStats = this.cacheEventQueue.getStatistics();
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDisk.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDisk.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDisk.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDisk.java
Fri May 24 09:26:50 2019
@@ -63,7 +63,7 @@ public class BlockDisk
private final AtomicInteger numberOfBlocks = new AtomicInteger(0);
/** Empty blocks that can be reused. */
- private final ConcurrentLinkedQueue<Integer> emptyBlocks = new
ConcurrentLinkedQueue<Integer>();
+ private final ConcurrentLinkedQueue<Integer> emptyBlocks = new
ConcurrentLinkedQueue<>();
/** The serializer. */
private final IElementSerializer elementSerializer;
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCache.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCache.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCache.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCache.java
Fri May 24 09:26:50 2019
@@ -138,7 +138,7 @@ public class BlockDiskCache<K, V>
getElementSerializer() );
}
- keyStore = new BlockDiskKeyStore<K>(
this.blockDiskCacheAttributes, this );
+ keyStore = new BlockDiskKeyStore<>( this.blockDiskCacheAttributes,
this );
boolean alright = verifyDisk();
@@ -234,7 +234,7 @@ public class BlockDiskCache<K, V>
@Override
public Set<K> getKeySet() throws IOException
{
- HashSet<K> keys = new HashSet<K>();
+ HashSet<K> keys = new HashSet<>();
storageLock.readLock().lock();
@@ -264,7 +264,7 @@ public class BlockDiskCache<K, V>
storageLock.readLock().lock();
try
{
- keyArray = new HashSet<K>(keyStore.keySet());
+ keyArray = new HashSet<>(keyStore.keySet());
}
finally
{
@@ -695,29 +695,29 @@ public class BlockDiskCache<K, V>
IStats stats = new Stats();
stats.setTypeName( "Block Disk Cache" );
- ArrayList<IStatElement<?>> elems = new ArrayList<IStatElement<?>>();
+ ArrayList<IStatElement<?>> elems = new ArrayList<>();
- elems.add(new StatElement<Boolean>( "Is Alive",
Boolean.valueOf(isAlive()) ) );
- elems.add(new StatElement<Integer>( "Key Map Size",
Integer.valueOf(this.keyStore.size()) ) );
+ elems.add(new StatElement<>( "Is Alive", Boolean.valueOf(isAlive()) )
);
+ elems.add(new StatElement<>( "Key Map Size",
Integer.valueOf(this.keyStore.size()) ) );
if (this.dataFile != null)
{
try
{
- elems.add(new StatElement<Long>( "Data File Length",
Long.valueOf(this.dataFile.length()) ) );
+ elems.add(new StatElement<>( "Data File Length",
Long.valueOf(this.dataFile.length()) ) );
}
catch ( IOException e )
{
log.error( e );
}
- elems.add(new StatElement<Integer>( "Block Size Bytes",
+ elems.add(new StatElement<>( "Block Size Bytes",
Integer.valueOf(this.dataFile.getBlockSizeBytes()) ) );
- elems.add(new StatElement<Integer>( "Number Of Blocks",
+ elems.add(new StatElement<>( "Number Of Blocks",
Integer.valueOf(this.dataFile.getNumberOfBlocks()) ) );
- elems.add(new StatElement<Long>( "Average Put Size Bytes",
+ elems.add(new StatElement<>( "Average Put Size Bytes",
Long.valueOf(this.dataFile.getAveragePutSizeBytes()) ) );
- elems.add(new StatElement<Integer>( "Empty Blocks",
+ elems.add(new StatElement<>( "Empty Blocks",
Integer.valueOf(this.dataFile.getEmptyBlocks()) ) );
}
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheFactory.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheFactory.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheFactory.java
Fri May 24 09:26:50 2019
@@ -57,7 +57,7 @@ public class BlockDiskCacheFactory
log.debug( "Creating DiskCache for attributes = " + idca );
}
- BlockDiskCache<K, V> cache = new BlockDiskCache<K, V>( idca,
elementSerializer );
+ BlockDiskCache<K, V> cache = new BlockDiskCache<>( idca,
elementSerializer );
cache.setCacheEventLogger( cacheEventLogger );
return cache;
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskKeyStore.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskKeyStore.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskKeyStore.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskKeyStore.java
Fri May 24 09:26:50 2019
@@ -161,7 +161,7 @@ public class BlockDiskKeyStore<K>
// collection makes a copy
for (Map.Entry<K, int[]> entry : keyHash.entrySet())
{
- BlockDiskElementDescriptor<K> descriptor = new
BlockDiskElementDescriptor<K>();
+ BlockDiskElementDescriptor<K> descriptor = new
BlockDiskElementDescriptor<>();
descriptor.setKey(entry.getKey());
descriptor.setBlocks(entry.getValue());
// stream these out in the loop.
@@ -228,7 +228,7 @@ public class BlockDiskKeyStore<K>
{
// If no max size, use a plain map for memory and processing
// efficiency.
- keyHash = new HashMap<K, int[]>();
+ keyHash = new HashMap<>();
// keyHash = Collections.synchronizedMap( new HashMap() );
if (log.isInfoEnabled())
{
@@ -253,7 +253,7 @@ public class BlockDiskKeyStore<K>
// create a key map to use.
initKeyMap();
- HashMap<K, int[]> keys = new HashMap<K, int[]>();
+ HashMap<K, int[]> keys = new HashMap<>();
synchronized (keyFile)
{
@@ -377,7 +377,7 @@ public class BlockDiskKeyStore<K>
*/
private boolean verify()
{
- Map<Integer, Set<K>> blockAllocationMap = new TreeMap<Integer,
Set<K>>();
+ Map<Integer, Set<K>> blockAllocationMap = new TreeMap<>();
for (Entry<K, int[]> e : keyHash.entrySet())
{
for (int block : e.getValue())
@@ -385,7 +385,7 @@ public class BlockDiskKeyStore<K>
Set<K> keys = blockAllocationMap.get(block);
if (keys == null)
{
- keys = new HashSet<K>();
+ keys = new HashSet<>();
blockAllocationMap.put(block, keys);
}
else if (!log.isDebugEnabled())
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCache.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCache.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCache.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCache.java
Fri May 24 09:26:50 2019
@@ -464,7 +464,7 @@ public class IndexedDiskCache<K, V> exte
keyFile.reset();
- HashMap<K, IndexedDiskElementDescriptor> keys = new HashMap<K,
IndexedDiskElementDescriptor>();
+ HashMap<K, IndexedDiskElementDescriptor> keys = new HashMap<>();
keys.putAll(keyHash);
if (keys.size() > 0)
@@ -650,12 +650,12 @@ public class IndexedDiskCache<K, V> exte
@Override
public Map<K, ICacheElement<K, V>> processGetMatching(String pattern)
{
- Map<K, ICacheElement<K, V>> elements = new HashMap<K, ICacheElement<K,
V>>();
+ Map<K, ICacheElement<K, V>> elements = new HashMap<>();
Set<K> keyArray = null;
storageLock.readLock().lock();
try
{
- keyArray = new HashSet<K>(keyHash.keySet());
+ keyArray = new HashSet<>(keyHash.keySet());
}
finally
{
@@ -725,7 +725,7 @@ public class IndexedDiskCache<K, V> exte
@Override
public Set<K> getKeySet() throws IOException
{
- HashSet<K> keys = new HashSet<K>();
+ HashSet<K> keys = new HashSet<>();
storageLock.readLock().lock();
@@ -817,7 +817,7 @@ public class IndexedDiskCache<K, V> exte
boolean removed = false;
// remove all keys of the same name hierarchy.
- List<K> itemsToRemove = new LinkedList<K>();
+ List<K> itemsToRemove = new LinkedList<>();
for (K k : keyHash.keySet())
{
@@ -855,7 +855,7 @@ public class IndexedDiskCache<K, V> exte
boolean removed = false;
// remove all keys of the same name group.
- List<K> itemsToRemove = new LinkedList<K>();
+ List<K> itemsToRemove = new LinkedList<>();
// remove all keys of the same name hierarchy.
for (K k : keyHash.keySet())
@@ -1512,27 +1512,27 @@ public class IndexedDiskCache<K, V> exte
IStats stats = new Stats();
stats.setTypeName("Indexed Disk Cache");
- ArrayList<IStatElement<?>> elems = new ArrayList<IStatElement<?>>();
+ ArrayList<IStatElement<?>> elems = new ArrayList<>();
- elems.add(new StatElement<Boolean>("Is Alive",
Boolean.valueOf(isAlive())));
- elems.add(new StatElement<Integer>("Key Map Size",
Integer.valueOf(this.keyHash != null ? this.keyHash.size() : -1)));
+ elems.add(new StatElement<>("Is Alive", Boolean.valueOf(isAlive())));
+ elems.add(new StatElement<>("Key Map Size",
Integer.valueOf(this.keyHash != null ? this.keyHash.size() : -1)));
try
{
elems
- .add(new StatElement<Long>("Data File Length",
Long.valueOf(this.dataFile != null ? this.dataFile.length() : -1L)));
+ .add(new StatElement<>("Data File Length",
Long.valueOf(this.dataFile != null ? this.dataFile.length() : -1L)));
}
catch (IOException e)
{
log.error(e);
}
- elems.add(new StatElement<Integer>("Max Key Size", this.maxKeySize));
- elems.add(new StatElement<AtomicInteger>("Hit Count", this.hitCount));
- elems.add(new StatElement<AtomicLong>("Bytes Free", this.bytesFree));
- elems.add(new StatElement<Integer>("Optimize Operation Count",
Integer.valueOf(this.removeCount)));
- elems.add(new StatElement<Integer>("Times Optimized",
Integer.valueOf(this.timesOptimized)));
- elems.add(new StatElement<Integer>("Recycle Count",
Integer.valueOf(this.recycleCnt)));
- elems.add(new StatElement<Integer>("Recycle Bin Size",
Integer.valueOf(this.recycle.size())));
- elems.add(new StatElement<Integer>("Startup Size",
Integer.valueOf(this.startupSize)));
+ elems.add(new StatElement<>("Max Key Size", this.maxKeySize));
+ elems.add(new StatElement<>("Hit Count", this.hitCount));
+ elems.add(new StatElement<>("Bytes Free", this.bytesFree));
+ elems.add(new StatElement<>("Optimize Operation Count",
Integer.valueOf(this.removeCount)));
+ elems.add(new StatElement<>("Times Optimized",
Integer.valueOf(this.timesOptimized)));
+ elems.add(new StatElement<>("Recycle Count",
Integer.valueOf(this.recycleCnt)));
+ elems.add(new StatElement<>("Recycle Bin Size",
Integer.valueOf(this.recycle.size())));
+ elems.add(new StatElement<>("Startup Size",
Integer.valueOf(this.startupSize)));
// get the stats from the super too
IStats sStats = super.getStatistics();
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheFactory.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheFactory.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheFactory.java
Fri May 24 09:26:50 2019
@@ -57,7 +57,7 @@ public class IndexedDiskCacheFactory
log.debug( "Creating DiskCache for attributes = " + idca );
}
- IndexedDiskCache<K, V> cache = new IndexedDiskCache<K, V>( idca,
elementSerializer );
+ IndexedDiskCache<K, V> cache = new IndexedDiskCache<>( idca,
elementSerializer );
cache.setCacheEventLogger( cacheEventLogger );
return cache;
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskDumper.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskDumper.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskDumper.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskDumper.java
Fri May 24 09:26:50 2019
@@ -50,7 +50,7 @@ public class IndexedDiskDumper
attr.setCacheName( args[0] );
attr.setDiskPath( args[0] );
- IndexedDiskCache<Serializable, Serializable> dc = new
IndexedDiskCache<Serializable, Serializable>( attr );
+ IndexedDiskCache<Serializable, Serializable> dc = new
IndexedDiskCache<>( attr );
dc.dump( true );
System.exit( 0 );
}
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCache.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCache.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCache.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCache.java
Fri May 24 09:26:50 2019
@@ -465,7 +465,7 @@ public class JDBCDiskCache<K, V>
return null;
}
- Map<K, ICacheElement<K, V>> results = new HashMap<K, ICacheElement<K,
V>>();
+ Map<K, ICacheElement<K, V>> results = new HashMap<>();
try
{
@@ -830,10 +830,10 @@ public class JDBCDiskCache<K, V>
List<IStatElement<?>> elems = stats.getStatElements();
- elems.add(new StatElement<AtomicInteger>( "Update Count", updateCount
) );
- elems.add(new StatElement<AtomicInteger>( "Get Count", getCount ) );
- elems.add(new StatElement<AtomicInteger>( "Get Matching Count",
getMatchingCount ) );
- elems.add(new StatElement<String>( "DB URL",
getJdbcDiskCacheAttributes().getUrl()) );
+ elems.add(new StatElement<>( "Update Count", updateCount ) );
+ elems.add(new StatElement<>( "Get Count", getCount ) );
+ elems.add(new StatElement<>( "Get Matching Count", getMatchingCount )
);
+ elems.add(new StatElement<>( "DB URL",
getJdbcDiskCacheAttributes().getUrl()) );
stats.setStatElements( elems );
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheFactory.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheFactory.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheFactory.java
Fri May 24 09:26:50 2019
@@ -95,7 +95,7 @@ public class JDBCDiskCacheFactory
TableState tableState = getTableState( cattr.getTableName() );
DataSourceFactory dsFactory = getDataSourceFactory(cattr,
compositeCacheManager.getConfigurationProperties());
- JDBCDiskCache<K, V> cache = new JDBCDiskCache<K, V>( cattr, dsFactory,
tableState, compositeCacheManager );
+ JDBCDiskCache<K, V> cache = new JDBCDiskCache<>( cattr, dsFactory,
tableState, compositeCacheManager );
cache.setCacheEventLogger( cacheEventLogger );
cache.setElementSerializer( elementSerializer );
@@ -112,9 +112,9 @@ public class JDBCDiskCacheFactory
public void initialize()
{
super.initialize();
- this.tableStates = new ConcurrentHashMap<String, TableState>();
- this.shrinkerThreadMap = new ConcurrentHashMap<String,
ShrinkerThread>();
- this.dsFactories = new ConcurrentHashMap<String, DataSourceFactory>();
+ this.tableStates = new ConcurrentHashMap<>();
+ this.shrinkerThreadMap = new ConcurrentHashMap<>();
+ this.dsFactories = new ConcurrentHashMap<>();
}
/**
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/ShrinkerThread.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/ShrinkerThread.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/ShrinkerThread.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/ShrinkerThread.java
Fri May 24 09:26:50 2019
@@ -40,7 +40,7 @@ public class ShrinkerThread
/** A set of JDBCDiskCache objects to call deleteExpired on. */
private final Set<JDBCDiskCache<?, ?>> shrinkSet =
- Collections.synchronizedSet( new HashSet<JDBCDiskCache<?, ?>>() );
+ Collections.synchronizedSet( new HashSet<>() );
/** Default time period to use. */
private static final long DEFAULT_PAUSE_BETWEEN_REGION_CALLS_MILLIS = 5000;
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/dsfactory/JndiDataSourceFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/dsfactory/JndiDataSourceFactory.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/dsfactory/JndiDataSourceFactory.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/dsfactory/JndiDataSourceFactory.java
Fri May 24 09:26:50 2019
@@ -138,7 +138,7 @@ public class JndiDataSourceFactory imple
log.debug("Time between context lookups: " + ttl);
}
- Hashtable<String, Object> env = new Hashtable<String, Object>();
+ Hashtable<String, Object> env = new Hashtable<>();
ctx = new InitialContext(env);
if (log.isDebugEnabled())
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheFactory.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheFactory.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheFactory.java
Fri May 24 09:26:50 2019
@@ -79,7 +79,7 @@ public class HSQLDiskCacheFactory
public void initialize()
{
super.initialize();
- this.databases = Collections.synchronizedSet( new HashSet<String>() );
+ this.databases = Collections.synchronizedSet( new HashSet<>() );
}
/**
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheFactory.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheFactory.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheFactory.java
Fri May 24 09:26:50 2019
@@ -68,7 +68,7 @@ public class MySQLDiskCacheFactory
TableState tableState = getTableState( cattr.getTableName() );
DataSourceFactory dsFactory = getDataSourceFactory(cattr,
compositeCacheManager.getConfigurationProperties());
- MySQLDiskCache<K, V> cache = new MySQLDiskCache<K, V>( cattr,
dsFactory, tableState, compositeCacheManager );
+ MySQLDiskCache<K, V> cache = new MySQLDiskCache<>( cattr, dsFactory,
tableState, compositeCacheManager );
cache.setCacheEventLogger( cacheEventLogger );
cache.setElementSerializer( elementSerializer );
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCache.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCache.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCache.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCache.java
Fri May 24 09:26:50 2019
@@ -319,7 +319,7 @@ public class LateralCache<K, V>
{
log.error( "Disabling lateral cache due to error " + msg, ex );
- lateralCacheService = new ZombieCacheServiceNonLocal<K, V>(
lateralCacheAttributes.getZombieQueueMaxSize() );
+ lateralCacheService = new ZombieCacheServiceNonLocal<>(
lateralCacheAttributes.getZombieQueueMaxSize() );
// may want to flush if region specifies
// Notify the cache monitor about the error, and kick off the recovery
// process.
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheMonitor.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheMonitor.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheMonitor.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheMonitor.java
Fri May 24 09:26:50 2019
@@ -69,7 +69,7 @@ public class LateralCacheMonitor extends
{
super("JCS-LateralCacheMonitor");
this.factory = factory;
- this.caches = new ConcurrentHashMap<String, LateralCacheNoWait<?,?>>();
+ this.caches = new ConcurrentHashMap<>();
setIdlePeriod(20000L);
}
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWait.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWait.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWait.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWait.java
Fri May 24 09:26:50 2019
@@ -84,8 +84,8 @@ public class LateralCacheNoWait<K, V>
log.debug( "Constructing LateralCacheNoWait, LateralCache = [" +
cache + "]" );
}
- CacheEventQueueFactory<K, V> fact = new CacheEventQueueFactory<K, V>();
- this.eventQueue = fact.createCacheEventQueue( new CacheAdaptor<K, V>(
cache ), CacheInfo.listenerId, cache
+ CacheEventQueueFactory<K, V> fact = new CacheEventQueueFactory<>();
+ this.eventQueue = fact.createCacheEventQueue( new CacheAdaptor<>(
cache ), CacheInfo.listenerId, cache
.getCacheName(),
cache.getAuxiliaryCacheAttributes().getEventQueuePoolName(), cache
.getAuxiliaryCacheAttributes().getEventQueueType() );
@@ -182,7 +182,7 @@ public class LateralCacheNoWait<K, V>
return elements;
}
- return new HashMap<K, ICacheElement<K, V>>();
+ return new HashMap<>();
}
/**
@@ -360,8 +360,8 @@ public class LateralCacheNoWait<K, V>
{
eventQueue.destroy();
}
- CacheEventQueueFactory<K, V> fact = new CacheEventQueueFactory<K, V>();
- this.eventQueue = fact.createCacheEventQueue( new CacheAdaptor<K, V>(
cache ), CacheInfo.listenerId, cache
+ CacheEventQueueFactory<K, V> fact = new CacheEventQueueFactory<>();
+ this.eventQueue = fact.createCacheEventQueue( new CacheAdaptor<>(
cache ), CacheInfo.listenerId, cache
.getCacheName(),
cache.getAuxiliaryCacheAttributes().getEventQueuePoolName(), cache
.getAuxiliaryCacheAttributes().getEventQueueType() );
}
@@ -405,16 +405,16 @@ public class LateralCacheNoWait<K, V>
IStats stats = new Stats();
stats.setTypeName( "Lateral Cache No Wait" );
- ArrayList<IStatElement<?>> elems = new ArrayList<IStatElement<?>>();
+ ArrayList<IStatElement<?>> elems = new ArrayList<>();
// get the stats from the event queue too
IStats eqStats = this.eventQueue.getStatistics();
elems.addAll(eqStats.getStatElements());
- elems.add(new StatElement<Integer>( "Get Count",
Integer.valueOf(this.getCount) ) );
- elems.add(new StatElement<Integer>( "Remove Count",
Integer.valueOf(this.removeCount) ) );
- elems.add(new StatElement<Integer>( "Put Count",
Integer.valueOf(this.putCount) ) );
- elems.add(new StatElement<AuxiliaryCacheAttributes>( "Attributes",
cache.getAuxiliaryCacheAttributes() ) );
+ elems.add(new StatElement<>( "Get Count",
Integer.valueOf(this.getCount) ) );
+ elems.add(new StatElement<>( "Remove Count",
Integer.valueOf(this.removeCount) ) );
+ elems.add(new StatElement<>( "Put Count",
Integer.valueOf(this.putCount) ) );
+ elems.add(new StatElement<>( "Attributes",
cache.getAuxiliaryCacheAttributes() ) );
stats.setStatElements( elems );
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWaitFacade.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWaitFacade.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWaitFacade.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWaitFacade.java
Fri May 24 09:26:50 2019
@@ -246,7 +246,7 @@ public class LateralCacheNoWaitFacade<K,
return elements;
}
- return new HashMap<K, ICacheElement<K, V>>();
+ return new HashMap<>();
}
/**
@@ -259,7 +259,7 @@ public class LateralCacheNoWaitFacade<K,
@Override
public Map<K, ICacheElement<K, V>> getMatching(String pattern)
{
- Map<K, ICacheElement<K, V>> elements = new HashMap<K, ICacheElement<K,
V>>();
+ Map<K, ICacheElement<K, V>> elements = new HashMap<>();
for (LateralCacheNoWait<K, V> nw : noWaits)
{
elements.putAll( nw.getMatching( pattern ) );
@@ -275,7 +275,7 @@ public class LateralCacheNoWaitFacade<K,
@Override
public Set<K> getKeySet() throws IOException
{
- HashSet<K> allKeys = new HashSet<K>();
+ HashSet<K> allKeys = new HashSet<>();
for (LateralCacheNoWait<K, V> nw : noWaits)
{
if ( nw != null )
@@ -451,11 +451,11 @@ public class LateralCacheNoWaitFacade<K,
IStats stats = new Stats();
stats.setTypeName( "Lateral Cache No Wait Facade" );
- ArrayList<IStatElement<?>> elems = new ArrayList<IStatElement<?>>();
+ ArrayList<IStatElement<?>> elems = new ArrayList<>();
if ( noWaits != null )
{
- elems.add(new StatElement<Integer>( "Number of No Waits",
Integer.valueOf(noWaits.length) ) );
+ elems.add(new StatElement<>( "Number of No Waits",
Integer.valueOf(noWaits.length) ) );
for ( LateralCacheNoWait<K, V> lcnw : noWaits )
{
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPCacheFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPCacheFactory.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPCacheFactory.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPCacheFactory.java
Fri May 24 09:26:50 2019
@@ -89,7 +89,7 @@ public class LateralTCPCacheFactory
ICacheEventLogger cacheEventLogger, IElementSerializer
elementSerializer )
{
ITCPLateralCacheAttributes lac = (ITCPLateralCacheAttributes) iaca;
- ArrayList<ICache<K, V>> noWaits = new ArrayList<ICache<K, V>>();
+ ArrayList<ICache<K, V>> noWaits = new ArrayList<>();
// pairs up the tcp servers and set the tcpServer value and
// get the manager and then get the cache
@@ -125,7 +125,7 @@ public class LateralTCPCacheFactory
@SuppressWarnings("unchecked") // No generic arrays in java
LateralCacheNoWait<K, V>[] lcnwArray = noWaits.toArray( new
LateralCacheNoWait[0] );
LateralCacheNoWaitFacade<K, V> lcnwf =
- new LateralCacheNoWaitFacade<K, V>(listener, lcnwArray, lac );
+ new LateralCacheNoWaitFacade<>(listener, lcnwArray, lac );
// create udp discovery if available.
createDiscoveryService( lac, lcnwf, cacheMgr, cacheEventLogger,
elementSerializer );
@@ -138,7 +138,7 @@ public class LateralTCPCacheFactory
{
ICacheServiceNonLocal<K, V> lateralService = getCSNLInstance(lca);
- LateralCache<K, V> cache = new LateralCache<K, V>( lca,
lateralService, this.monitor );
+ LateralCache<K, V> cache = new LateralCache<>( lca, lateralService,
this.monitor );
cache.setCacheEventLogger( cacheEventLogger );
cache.setElementSerializer( elementSerializer );
@@ -147,7 +147,7 @@ public class LateralTCPCacheFactory
log.debug( "Created cache for noWait, cache [" + cache + "]" );
}
- LateralCacheNoWait<K, V> lateralNoWait = new LateralCacheNoWait<K, V>(
cache );
+ LateralCacheNoWait<K, V> lateralNoWait = new LateralCacheNoWait<>(
cache );
lateralNoWait.setCacheEventLogger( cacheEventLogger );
lateralNoWait.setElementSerializer( elementSerializer );
@@ -166,8 +166,8 @@ public class LateralTCPCacheFactory
@Override
public void initialize()
{
- this.csnlInstances = new ConcurrentHashMap<String,
ICacheServiceNonLocal<?, ?>>();
- this.lTCPDLInstances = new ConcurrentHashMap<String,
LateralTCPDiscoveryListener>();
+ this.csnlInstances = new ConcurrentHashMap<>();
+ this.lTCPDLInstances = new ConcurrentHashMap<>();
// Create the monitoring daemon thread
this.monitor = new LateralCacheMonitor(this);
@@ -253,7 +253,7 @@ public class LateralTCPCacheFactory
log.info( "Creating TCP service, lca = " + lca );
}
- return new LateralTCPService<K, V>( lca );
+ return new LateralTCPService<>( lca );
}
catch ( IOException ex )
{
@@ -263,7 +263,7 @@ public class LateralTCPCacheFactory
log.error( "Failure, lateral instance will use zombie
service", ex );
ICacheServiceNonLocal<K, V> zombieService =
- new ZombieCacheServiceNonLocal<K, V>(
lca.getZombieQueueMaxSize() );
+ new ZombieCacheServiceNonLocal<>(
lca.getZombieQueueMaxSize() );
// Notify the cache monitor about the error, and kick
off
// the recovery process.
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListener.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListener.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListener.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListener.java
Fri May 24 09:26:50 2019
@@ -54,14 +54,14 @@ public class LateralTCPDiscoveryListener
* use laterals.
*/
private final Map<String, LateralCacheNoWaitFacade<?, ?>> facades =
- Collections.synchronizedMap( new HashMap<String,
LateralCacheNoWaitFacade<?, ?>>() );
+ Collections.synchronizedMap( new HashMap<>() );
/**
* List of regions that are configured differently here than on another
server. We keep track of
* this to limit the amount of info logging.
*/
private final Set<String> knownDifferentlyConfiguredRegions =
- Collections.synchronizedSet( new HashSet<String>() );
+ Collections.synchronizedSet( new HashSet<>() );
/** The name of the cache factory */
private String factoryName;
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java
Fri May 24 09:26:50 2019
@@ -70,7 +70,7 @@ public class LateralTCPListener<K, V>
/** Map of available instances, keyed by port */
private static final HashMap<String, ILateralCacheListener<?, ?>>
instances =
- new HashMap<String, ILateralCacheListener<?, ?>>();
+ new HashMap<>();
/** The socket listener */
private ListenerThread receiver;
@@ -120,7 +120,7 @@ public class LateralTCPListener<K, V>
if ( ins == null )
{
- ins = new LateralTCPListener<K, V>( ilca );
+ ins = new LateralTCPListener<>( ilca );
ins.init();
ins.setCacheManager( cacheMgr );
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPService.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPService.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPService.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPService.java
Fri May 24 09:26:50 2019
@@ -125,7 +125,7 @@ public class LateralTCPService<K, V>
// if we shouldn't remove on put, then put
if ( !this.issueRemoveOnPut )
{
- LateralElementDescriptor<K, V> led = new
LateralElementDescriptor<K, V>( item );
+ LateralElementDescriptor<K, V> led = new
LateralElementDescriptor<>( item );
led.requesterId = requesterId;
led.command = LateralCommand.UPDATE;
sender.send( led );
@@ -139,8 +139,8 @@ public class LateralTCPService<K, V>
log.debug( "Issuing a remove for a put" );
}
// set the value to null so we don't send the item
- CacheElement<K, V> ce = new CacheElement<K, V>(
item.getCacheName(), item.getKey(), null );
- LateralElementDescriptor<K, V> led = new
LateralElementDescriptor<K, V>( ce );
+ CacheElement<K, V> ce = new CacheElement<>( item.getCacheName(),
item.getKey(), null );
+ LateralElementDescriptor<K, V> led = new
LateralElementDescriptor<>( ce );
led.requesterId = requesterId;
led.command = LateralCommand.REMOVE;
led.valHashCode = item.getVal().hashCode();
@@ -169,8 +169,8 @@ public class LateralTCPService<K, V>
public void remove( String cacheName, K key, long requesterId )
throws IOException
{
- CacheElement<K, V> ce = new CacheElement<K, V>( cacheName, key, null );
- LateralElementDescriptor<K, V> led = new LateralElementDescriptor<K,
V>( ce );
+ CacheElement<K, V> ce = new CacheElement<>( cacheName, key, null );
+ LateralElementDescriptor<K, V> led = new LateralElementDescriptor<>(
ce );
led.requesterId = requesterId;
led.command = LateralCommand.REMOVE;
sender.send( led );
@@ -230,8 +230,8 @@ public class LateralTCPService<K, V>
// if get is not allowed return
if ( this.allowGet )
{
- CacheElement<K, V> ce = new CacheElement<K, V>( cacheName, key,
null );
- LateralElementDescriptor<K, V> led = new
LateralElementDescriptor<K, V>( ce );
+ CacheElement<K, V> ce = new CacheElement<>( cacheName, key, null );
+ LateralElementDescriptor<K, V> led = new
LateralElementDescriptor<>( ce );
// led.requesterId = requesterId; // later
led.command = LateralCommand.GET;
@SuppressWarnings("unchecked") // Need to cast from Object
@@ -283,8 +283,8 @@ public class LateralTCPService<K, V>
// if get is not allowed return
if ( this.allowGet )
{
- CacheElement<String, String> ce = new CacheElement<String,
String>( cacheName, pattern, null );
- LateralElementDescriptor<String, String> led = new
LateralElementDescriptor<String, String>( ce );
+ CacheElement<String, String> ce = new CacheElement<>( cacheName,
pattern, null );
+ LateralElementDescriptor<String, String> led = new
LateralElementDescriptor<>( ce );
// led.requesterId = requesterId; // later
led.command = LateralCommand.GET_MATCHING;
@@ -334,7 +334,7 @@ public class LateralTCPService<K, V>
public Map<K, ICacheElement<K, V>> getMultiple( String cacheName, Set<K>
keys, long requesterId )
throws IOException
{
- Map<K, ICacheElement<K, V>> elements = new HashMap<K, ICacheElement<K,
V>>();
+ Map<K, ICacheElement<K, V>> elements = new HashMap<>();
if ( keys != null && !keys.isEmpty() )
{
@@ -361,8 +361,8 @@ public class LateralTCPService<K, V>
@SuppressWarnings("unchecked") // Need cast from Object
public Set<K> getKeySet(String cacheName) throws IOException
{
- CacheElement<String, String> ce = new CacheElement<String,
String>(cacheName, null, null);
- LateralElementDescriptor<String, String> led = new
LateralElementDescriptor<String, String>(ce);
+ CacheElement<String, String> ce = new CacheElement<>(cacheName, null,
null);
+ LateralElementDescriptor<String, String> led = new
LateralElementDescriptor<>(ce);
// led.requesterId = requesterId; // later
led.command = LateralCommand.GET_KEYSET;
Object response = sender.sendAndReceive(led);
@@ -394,8 +394,8 @@ public class LateralTCPService<K, V>
public void removeAll( String cacheName, long requesterId )
throws IOException
{
- CacheElement<String, String> ce = new CacheElement<String, String>(
cacheName, "ALL", null );
- LateralElementDescriptor<String, String> led = new
LateralElementDescriptor<String, String>( ce );
+ CacheElement<String, String> ce = new CacheElement<>( cacheName,
"ALL", null );
+ LateralElementDescriptor<String, String> led = new
LateralElementDescriptor<>( ce );
led.requesterId = requesterId;
led.command = LateralCommand.REMOVEALL;
sender.send( led );
@@ -427,8 +427,8 @@ public class LateralTCPService<K, V>
continue;
}
- CacheElement<String, String> ce = new CacheElement<String,
String>( "test", "test", message );
- LateralElementDescriptor<String, String> led = new
LateralElementDescriptor<String, String>( ce );
+ CacheElement<String, String> ce = new CacheElement<>( "test",
"test", message );
+ LateralElementDescriptor<String, String> led = new
LateralElementDescriptor<>( ce );
sender.send( led );
}
}
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteAuxiliaryCache.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteAuxiliaryCache.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteAuxiliaryCache.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteAuxiliaryCache.java
Fri May 24 09:26:50 2019
@@ -270,7 +270,7 @@ public abstract class AbstractRemoteAuxi
public Map<K, ICacheElement<K, V>> processGetMatching( String pattern )
throws IOException
{
- Map<K, ICacheElement<K, V>> results = new HashMap<K, ICacheElement<K,
V>>();
+ Map<K, ICacheElement<K, V>> results = new HashMap<>();
try
{
Map<K, ICacheElement<K, V>> rawResults =
getRemoteCacheService().getMatching( cacheName, pattern, getListenerId() );
@@ -529,25 +529,25 @@ public abstract class AbstractRemoteAuxi
IStats stats = new Stats();
stats.setTypeName( "AbstractRemoteAuxiliaryCache" );
- ArrayList<IStatElement<?>> elems = new ArrayList<IStatElement<?>>();
+ ArrayList<IStatElement<?>> elems = new ArrayList<>();
- elems.add(new StatElement<String>( "Remote Type",
this.getRemoteCacheAttributes().getRemoteTypeName() ) );
+ elems.add(new StatElement<>( "Remote Type",
this.getRemoteCacheAttributes().getRemoteTypeName() ) );
// if ( this.getRemoteCacheAttributes().getRemoteType() ==
RemoteType.CLUSTER )
// {
// // something cluster specific
// }
- elems.add(new StatElement<Boolean>( "UsePoolForGet",
Boolean.valueOf(usePoolForGet) ) );
+ elems.add(new StatElement<>( "UsePoolForGet",
Boolean.valueOf(usePoolForGet) ) );
if ( pool != null )
{
- elems.add(new StatElement<ExecutorService>( "Pool", pool ) );
+ elems.add(new StatElement<>( "Pool", pool ) );
}
if ( getRemoteCacheService() instanceof ZombieCacheServiceNonLocal )
{
- elems.add(new StatElement<Integer>( "Zombie Queue Size",
+ elems.add(new StatElement<>( "Zombie Queue Size",
Integer.valueOf(( (ZombieCacheServiceNonLocal<K, V>)
getRemoteCacheService() ).getQueueSize()) ) );
}
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java
Fri May 24 09:26:50 2019
@@ -71,7 +71,7 @@ public abstract class AbstractRemoteCach
this.remoteCacheAttributes = rca;
setCacheEventLogger( cacheEventLogger );
setElementSerializer( elementSerializer );
- this.noWaits = new ArrayList<RemoteCacheNoWait<K,V>>(noWaits);
+ this.noWaits = new ArrayList<>(noWaits);
for (RemoteCacheNoWait<K,V> nw : this.noWaits)
{
// FIXME: This cast is very brave. Remove this.
@@ -219,7 +219,7 @@ public abstract class AbstractRemoteCach
@Override
public Set<K> getKeySet() throws IOException
{
- HashSet<K> allKeys = new HashSet<K>();
+ HashSet<K> allKeys = new HashSet<>();
for (RemoteCacheNoWait<K, V> nw : noWaits)
{
if ( nw != null )
@@ -407,11 +407,11 @@ public abstract class AbstractRemoteCach
IStats stats = new Stats();
stats.setTypeName( "Remote Cache No Wait Facade" );
- ArrayList<IStatElement<?>> elems = new ArrayList<IStatElement<?>>();
+ ArrayList<IStatElement<?>> elems = new ArrayList<>();
if ( noWaits != null )
{
- elems.add(new StatElement<Integer>( "Number of No Waits",
Integer.valueOf(noWaits.size()) ) );
+ elems.add(new StatElement<>( "Number of No Waits",
Integer.valueOf(noWaits.size()) ) );
for ( RemoteCacheNoWait<K, V> rcnw : noWaits )
{
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCache.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCache.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCache.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCache.java
Fri May 24 09:26:50 2019
@@ -83,10 +83,10 @@ public class RemoteCache<K, V>
IStats stats = new Stats();
stats.setTypeName( "Remote Cache" );
- ArrayList<IStatElement<?>> elems = new ArrayList<IStatElement<?>>();
+ ArrayList<IStatElement<?>> elems = new ArrayList<>();
- elems.add(new StatElement<String>( "Remote Host:Port",
getIPAddressForService() ) );
- elems.add(new StatElement<String>( "Remote Type",
this.getRemoteCacheAttributes().getRemoteTypeName() ) );
+ elems.add(new StatElement<>( "Remote Host:Port",
getIPAddressForService() ) );
+ elems.add(new StatElement<>( "Remote Type",
this.getRemoteCacheAttributes().getRemoteTypeName() ) );
// if ( this.getRemoteCacheAttributes().getRemoteType() ==
RemoteType.CLUSTER )
// {
@@ -144,7 +144,7 @@ public class RemoteCache<K, V>
if ( getRemoteCacheService() == null || !( getRemoteCacheService()
instanceof ZombieCacheServiceNonLocal ) )
{
// TODO make configurable
- setRemoteCacheService( new ZombieCacheServiceNonLocal<K, V>(
getRemoteCacheAttributes().getZombieQueueMaxSize() ) );
+ setRemoteCacheService( new ZombieCacheServiceNonLocal<>(
getRemoteCacheAttributes().getZombieQueueMaxSize() ) );
}
// may want to flush if region specifies
// Notify the cache monitor about the error, and kick off the recovery
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFactory.java?rev=1859859&r1=1859858&r2=1859859&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFactory.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFactory.java
Fri May 24 09:26:50 2019
@@ -74,13 +74,13 @@ public class RemoteCacheFactory
{
RemoteCacheAttributes rca = (RemoteCacheAttributes) iaca;
- ArrayList<RemoteCacheNoWait<K,V>> noWaits = new
ArrayList<RemoteCacheNoWait<K,V>>();
+ ArrayList<RemoteCacheNoWait<K,V>> noWaits = new ArrayList<>();
switch (rca.getRemoteType())
{
case LOCAL:
// a list to be turned into an array of failover server
information
- ArrayList<RemoteLocation> failovers = new
ArrayList<RemoteLocation>();
+ ArrayList<RemoteLocation> failovers = new ArrayList<>();
// not necessary if a failover list is defined
// REGISTER PRIMARY LISTENER
@@ -152,7 +152,7 @@ public class RemoteCacheFactory
}
RemoteCacheNoWaitFacade<K, V> rcnwf =
- new RemoteCacheNoWaitFacade<K, V>(noWaits, rca, cacheEventLogger,
elementSerializer, this );
+ new RemoteCacheNoWaitFacade<>(noWaits, rca, cacheEventLogger,
elementSerializer, this );
return rcnwf;
}
@@ -233,7 +233,7 @@ public class RemoteCacheFactory
{
super.initialize();
- managers = new ConcurrentHashMap<RemoteLocation,
RemoteCacheManager>();
+ managers = new ConcurrentHashMap<>();
managerLock = new ReentrantLock();
monitor = new RemoteCacheMonitor();
