Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.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/RemoteCacheManager.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.java Fri May 24 09:26:50 2019 @@ -54,7 +54,7 @@ public class RemoteCacheManager /** Contains instances of RemoteCacheNoWait managed by a RemoteCacheManager instance. */ private final ConcurrentMap<String, RemoteCacheNoWait<?, ?>> caches = - new ConcurrentHashMap<String, RemoteCacheNoWait<?, ?>>(); + new ConcurrentHashMap<>(); /** The event logger. */ private final ICacheEventLogger cacheEventLogger; @@ -151,7 +151,7 @@ public class RemoteCacheManager // Failed to connect to the remote server. // Configure this RemoteCacheManager instance to use the "zombie" // services. - this.remoteService = new ZombieCacheServiceNonLocal<String, String>(); + this.remoteService = new ZombieCacheServiceNonLocal<>(); remoteWatch.setCacheWatch( new ZombieCacheWatch() ); throw new IOException( "Problem finding server at [" + registry + "]", ex ); } @@ -268,7 +268,7 @@ public class RemoteCacheManager RemoteCacheListener<K, V> listener = null; try { - listener = new RemoteCacheListener<K, V>( cattr, cacheMgr, elementSerializer ); + listener = new RemoteCacheListener<>( cattr, cacheMgr, elementSerializer ); addRemoteCacheListener( cattr, listener ); } catch ( IOException ioe ) @@ -283,11 +283,11 @@ public class RemoteCacheManager } IRemoteCacheClient<K, V> remoteCacheClient = - new RemoteCache<K, V>( cattr, (ICacheServiceNonLocal<K, V>) remoteService, listener, monitor ); + new RemoteCache<>( cattr, (ICacheServiceNonLocal<K, V>) remoteService, listener, monitor ); remoteCacheClient.setCacheEventLogger( cacheEventLogger ); remoteCacheClient.setElementSerializer( elementSerializer ); - remoteCacheNoWait = new RemoteCacheNoWait<K, V>( remoteCacheClient ); + remoteCacheNoWait = new RemoteCacheNoWait<>( remoteCacheClient ); remoteCacheNoWait.setCacheEventLogger( cacheEventLogger ); remoteCacheNoWait.setElementSerializer( elementSerializer );
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheMonitor.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheMonitor.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/RemoteCacheMonitor.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheMonitor.java Fri May 24 09:26:50 2019 @@ -44,7 +44,7 @@ public class RemoteCacheMonitor extends public RemoteCacheMonitor() { super("JCS-RemoteCacheMonitor"); - this.managers = new ConcurrentHashMap<RemoteCacheManager, RemoteCacheManager>(); + this.managers = new ConcurrentHashMap<>(); setIdlePeriod(30000L); } Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWait.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWait.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/RemoteCacheNoWait.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWait.java Fri May 24 09:26:50 2019 @@ -113,9 +113,9 @@ public class RemoteCacheNoWait<K, V> */ private ICacheEventQueue<K, V> createCacheEventQueue( IRemoteCacheClient<K, V> client ) { - CacheEventQueueFactory<K, V> factory = new CacheEventQueueFactory<K, V>(); + CacheEventQueueFactory<K, V> factory = new CacheEventQueueFactory<>(); ICacheEventQueue<K, V> ceq = factory.createCacheEventQueue( - new CacheAdaptor<K, V>( client ), + new CacheAdaptor<>( client ), client.getListenerId(), client.getCacheName(), client.getAuxiliaryCacheAttributes().getEventQueuePoolName(), @@ -282,7 +282,7 @@ public class RemoteCacheNoWait<K, V> throw ex; } - return new HashMap<K, ICacheElement<K, V>>(); + return new HashMap<>(); } /** @@ -498,9 +498,9 @@ public class RemoteCacheNoWait<K, V> IStats stats = new Stats(); stats.setTypeName( "Remote Cache No Wait" ); - ArrayList<IStatElement<?>> elems = new ArrayList<IStatElement<?>>(); + ArrayList<IStatElement<?>> elems = new ArrayList<>(); - elems.add(new StatElement<CacheStatus>( "Status", getStatus() ) ); + elems.add(new StatElement<>( "Status", getStatus() ) ); // get the stats from the cache queue too IStats cStats = this.remoteCacheClient.getStatistics(); @@ -513,11 +513,11 @@ public class RemoteCacheNoWait<K, V> IStats eqStats = this.cacheEventQueue.getStatistics(); elems.addAll(eqStats.getStatElements()); - elems.add(new StatElement<Integer>( "Get Count", Integer.valueOf(this.getCount) ) ); - elems.add(new StatElement<Integer>( "GetMatching Count", Integer.valueOf(this.getMatchingCount) ) ); - elems.add(new StatElement<Integer>( "GetMultiple Count", Integer.valueOf(this.getMultipleCount) ) ); - 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<>( "Get Count", Integer.valueOf(this.getCount) ) ); + elems.add(new StatElement<>( "GetMatching Count", Integer.valueOf(this.getMatchingCount) ) ); + elems.add(new StatElement<>( "GetMultiple Count", Integer.valueOf(this.getMultipleCount) ) ); + elems.add(new StatElement<>( "Remove Count", Integer.valueOf(this.removeCount) ) ); + elems.add(new StatElement<>( "Put Count", Integer.valueOf(this.putCount) ) ); stats.setStatElements( elems ); Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.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/RemoteCacheNoWaitFacade.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java Fri May 24 09:26:50 2019 @@ -83,7 +83,7 @@ public class RemoteCacheNoWaitFacade<K, if ( rcnw.getStatus() == CacheStatus.ERROR ) { // start failover, primary recovery process - RemoteCacheFailoverRunner<K, V> runner = new RemoteCacheFailoverRunner<K, V>( this, this.cacheFactory ); + RemoteCacheFailoverRunner<K, V> runner = new RemoteCacheFailoverRunner<>( this, this.cacheFactory ); runner.setDaemon( true ); runner.start(); runner.notifyError(); Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCache.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCache.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/http/client/RemoteHttpCache.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCache.java Fri May 24 09:26:50 2019 @@ -82,7 +82,7 @@ public class RemoteHttpCache<K, V> logError( cacheName, "", message ); log.error( message, ex ); - setRemoteCacheService( new ZombieCacheServiceNonLocal<K, V>( getRemoteCacheAttributes().getZombieQueueMaxSize() ) ); + setRemoteCacheService( new ZombieCacheServiceNonLocal<>( getRemoteCacheAttributes().getZombieQueueMaxSize() ) ); monitor.notifyError( this ); } Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheFactory.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheFactory.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/http/client/RemoteHttpCacheFactory.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheFactory.java Fri May 24 09:26:50 2019 @@ -70,16 +70,16 @@ public class RemoteHttpCacheFactory // TODO, use the configured value. rca.setRemoteType( RemoteType.LOCAL ); - RemoteHttpClientListener<K, V> listener = new RemoteHttpClientListener<K, V>( rca, cacheMgr, elementSerializer ); + RemoteHttpClientListener<K, V> listener = new RemoteHttpClientListener<>( rca, cacheMgr, elementSerializer ); IRemoteHttpCacheClient<K, V> remoteService = createRemoteHttpCacheClientForAttributes(rca); IRemoteCacheClient<K, V> remoteCacheClient = - new RemoteHttpCache<K, V>( rca, remoteService, listener, monitor ); + new RemoteHttpCache<>( rca, remoteService, listener, monitor ); remoteCacheClient.setCacheEventLogger( cacheEventLogger ); remoteCacheClient.setElementSerializer( elementSerializer ); - RemoteCacheNoWait<K, V> remoteCacheNoWait = new RemoteCacheNoWait<K, V>( remoteCacheClient ); + RemoteCacheNoWait<K, V> remoteCacheNoWait = new RemoteCacheNoWait<>( remoteCacheClient ); remoteCacheNoWait.setCacheEventLogger( cacheEventLogger ); remoteCacheNoWait.setElementSerializer( elementSerializer ); @@ -104,7 +104,7 @@ public class RemoteHttpCacheFactory { log.info( "Creating the default client for " + cattr.getCacheName()); } - remoteService = new RemoteHttpCacheClient<K, V>( ); + remoteService = new RemoteHttpCacheClient<>( ); } remoteService.initialize( cattr ); Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheMonitor.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheMonitor.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/http/client/RemoteHttpCacheMonitor.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheMonitor.java Fri May 24 09:26:50 2019 @@ -49,7 +49,7 @@ public class RemoteHttpCacheMonitor exte { super("JCS-RemoteHttpCacheMonitor"); this.factory = factory; - this.remoteHttpCaches = new ConcurrentHashMap<RemoteHttpCache<?, ?>, RemoteHttpCache<?, ?>>(); + this.remoteHttpCaches = new ConcurrentHashMap<>(); setIdlePeriod(3000L); } Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/server/AbstractRemoteCacheService.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/server/AbstractRemoteCacheService.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/http/server/AbstractRemoteCacheService.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/server/AbstractRemoteCacheService.java Fri May 24 09:26:50 2019 @@ -495,7 +495,7 @@ public abstract class AbstractRemoteCach { if ( cacheEventLogger == null ) { - return new CacheEvent<ICacheElement<K, V>>(); + return new CacheEvent<>(); } String ipAddress = getExtraInfoForRequesterId( requesterId ); return cacheEventLogger.createICacheEvent( getEventLogSourceName(), item.getCacheName(), eventName, ipAddress, @@ -515,7 +515,7 @@ public abstract class AbstractRemoteCach { if ( cacheEventLogger == null ) { - return new CacheEvent<T>(); + return new CacheEvent<>(); } String ipAddress = getExtraInfoForRequesterId( requesterId ); return cacheEventLogger.createICacheEvent( getEventLogSourceName(), cacheName, eventName, ipAddress, key ); Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheServlet.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheServlet.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/http/server/RemoteHttpCacheServlet.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheServlet.java Fri May 24 09:26:50 2019 @@ -214,7 +214,7 @@ public class RemoteHttpCacheServlet */ protected RemoteCacheResponse<Object> processRequest( RemoteCacheRequest<Serializable, Serializable> request ) { - RemoteCacheResponse<Object> response = new RemoteCacheResponse<Object>(); + RemoteCacheResponse<Object> response = new RemoteCacheResponse<>(); if ( request == null ) { @@ -239,7 +239,7 @@ public class RemoteHttpCacheServlet remoteCacheService.getMultiple( request.getCacheName(), request.getKeySet(), request.getRequesterId() ); if ( elementMap != null ) { - Map<Serializable, ICacheElement<Serializable, Serializable>> map = new HashMap<Serializable, ICacheElement<Serializable, Serializable>>(); + Map<Serializable, ICacheElement<Serializable, Serializable>> map = new HashMap<>(); map.putAll(elementMap); response.setPayload(map); } @@ -249,7 +249,7 @@ public class RemoteHttpCacheServlet remoteCacheService.getMatching( request.getCacheName(), request.getPattern(), request.getRequesterId() ); if ( elementMapMatching != null ) { - Map<Serializable, ICacheElement<Serializable, Serializable>> map = new HashMap<Serializable, ICacheElement<Serializable, Serializable>>(); + Map<Serializable, ICacheElement<Serializable, Serializable>> map = new HashMap<>(); map.putAll(elementMapMatching); response.setPayload(map); } @@ -304,7 +304,7 @@ public class RemoteHttpCacheServlet ICacheEventLogger cacheEventLogger = configureCacheEventLogger( props ); RemoteHttpCacheServerAttributes attributes = configureRemoteHttpCacheServerAttributes( props ); - RemoteHttpCacheService<K, V> service = new RemoteHttpCacheService<K, V>( cacheManager, attributes, cacheEventLogger ); + RemoteHttpCacheService<K, V> service = new RemoteHttpCacheService<>( cacheManager, attributes, cacheEventLogger ); if ( log.isInfoEnabled() ) { log.info( "Created new RemoteHttpCacheService " + service ); Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServer.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServer.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/server/RemoteCacheServer.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServer.java Fri May 24 09:26:50 2019 @@ -86,20 +86,20 @@ public class RemoteCacheServer<K, V> /** Maps cache name to CacheListeners object. association of listeners (regions). */ private final transient ConcurrentMap<String, CacheListeners<K, V>> cacheListenersMap = - new ConcurrentHashMap<String, CacheListeners<K, V>>(); + new ConcurrentHashMap<>(); /** maps cluster listeners to regions. */ private final transient ConcurrentMap<String, CacheListeners<K, V>> clusterListenersMap = - new ConcurrentHashMap<String, CacheListeners<K, V>>(); + new ConcurrentHashMap<>(); /** The central hub */ private transient CompositeCacheManager cacheManager; /** relates listener id with a type */ - private final ConcurrentMap<Long, RemoteType> idTypeMap = new ConcurrentHashMap<Long, RemoteType>(); + private final ConcurrentMap<Long, RemoteType> idTypeMap = new ConcurrentHashMap<>(); /** relates listener id with an ip address */ - private final ConcurrentMap<Long, String> idIPMap = new ConcurrentHashMap<Long, String>(); + private final ConcurrentMap<Long, String> idIPMap = new ConcurrentHashMap<>(); /** Used to get the next listener id. */ private final int[] listenerId = new int[1]; @@ -171,7 +171,7 @@ public class RemoteCacheServer<K, V> { String name = list[i]; CompositeCache<K, V> cache = cacheManager.getCache( name ); - cacheListenersMap.put( name, new CacheListeners<K, V>( cache ) ); + cacheListenersMap.put( name, new CacheListeners<>( cache ) ); } } @@ -1152,7 +1152,7 @@ public class RemoteCacheServer<K, V> { CacheListeners<K, V> cacheListeners = cacheListenersMap.computeIfAbsent(cacheName, key -> { CompositeCache<K, V> cache = cacheManager.getCache(key); - return new CacheListeners<K, V>( cache ); + return new CacheListeners<>( cache ); }); return cacheListeners; @@ -1169,7 +1169,7 @@ public class RemoteCacheServer<K, V> { CacheListeners<K, V> cacheListeners = clusterListenersMap.computeIfAbsent(cacheName, key -> { CompositeCache<K, V> cache = cacheManager.getCache( cacheName ); - return new CacheListeners<K, V>( cache ); + return new CacheListeners<>( cache ); }); return cacheListeners; @@ -1342,7 +1342,7 @@ public class RemoteCacheServer<K, V> } } - CacheEventQueueFactory<KK, VV> fact = new CacheEventQueueFactory<KK, VV>(); + CacheEventQueueFactory<KK, VV> fact = new CacheEventQueueFactory<>(); ICacheEventQueue<KK, VV> q = fact.createCacheEventQueue( listener, id, cacheName, remoteCacheServerAttributes .getEventQueuePoolName(), remoteCacheServerAttributes.getEventQueueType() ); @@ -1594,7 +1594,7 @@ public class RemoteCacheServer<K, V> { if ( cacheEventLogger == null ) { - return new CacheEvent<ICacheElement<K, V>>(); + return new CacheEvent<>(); } String ipAddress = getExtraInfoForRequesterId( requesterId ); return cacheEventLogger @@ -1614,7 +1614,7 @@ public class RemoteCacheServer<K, V> { if ( cacheEventLogger == null ) { - return new CacheEvent<T>(); + return new CacheEvent<>(); } String ipAddress = getExtraInfoForRequesterId( requesterId ); return cacheEventLogger.createICacheEvent( "RemoteCacheServer", cacheName, eventName, ipAddress, key ); Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerFactory.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerFactory.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/server/RemoteCacheServerFactory.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerFactory.java Fri May 24 09:26:50 2019 @@ -139,11 +139,11 @@ public class RemoteCacheServerFactory // CREATE SERVER if ( customRMISocketFactory != null ) { - remoteCacheServer = new RemoteCacheServer<Serializable, Serializable>( rcsa, props, customRMISocketFactory ); + remoteCacheServer = new RemoteCacheServer<>( rcsa, props, customRMISocketFactory ); } else { - remoteCacheServer = new RemoteCacheServer<Serializable, Serializable>( rcsa, props ); + remoteCacheServer = new RemoteCacheServer<>( rcsa, props ); } remoteCacheServer.setCacheEventLogger( cacheEventLogger ); Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/util/RemoteCacheRequestFactory.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/util/RemoteCacheRequestFactory.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/util/RemoteCacheRequestFactory.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/util/RemoteCacheRequestFactory.java Fri May 24 09:26:50 2019 @@ -45,7 +45,7 @@ public class RemoteCacheRequestFactory */ private static <K, V> RemoteCacheRequest<K, V> createRequest(String cacheName, RemoteRequestType requestType, long requesterId) { - RemoteCacheRequest<K, V> request = new RemoteCacheRequest<K, V>(); + RemoteCacheRequest<K, V> request = new RemoteCacheRequest<>(); request.setCacheName( cacheName ); request.setRequestType( requestType ); request.setRequesterId( requesterId ); Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheEventQueueFactory.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheEventQueueFactory.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheEventQueueFactory.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheEventQueueFactory.java Fri May 24 09:26:50 2019 @@ -75,11 +75,11 @@ public class CacheEventQueueFactory<K, V ICacheEventQueue<K, V> eventQueue = null; if ( poolType == null || ICacheEventQueue.QueueType.SINGLE == poolType ) { - eventQueue = new CacheEventQueue<K, V>( listener, listenerId, cacheName, maxFailure, waitBeforeRetry ); + eventQueue = new CacheEventQueue<>( listener, listenerId, cacheName, maxFailure, waitBeforeRetry ); } else if ( ICacheEventQueue.QueueType.POOLED == poolType ) { - eventQueue = new PooledCacheEventQueue<K, V>( listener, listenerId, cacheName, maxFailure, waitBeforeRetry, + eventQueue = new PooledCacheEventQueue<>( listener, listenerId, cacheName, maxFailure, waitBeforeRetry, threadPoolName ); } Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheListeners.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheListeners.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheListeners.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheListeners.java Fri May 24 09:26:50 2019 @@ -17,7 +17,7 @@ public class CacheListeners<K, V> /** Map ICacheListener to ICacheEventQueue */ public final ConcurrentMap<Long, ICacheEventQueue<K, V>> eventQMap = - new ConcurrentHashMap<Long, ICacheEventQueue<K, V>>(); + new ConcurrentHashMap<>(); /** * Constructs with the given cache. Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheWatchRepairable.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheWatchRepairable.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheWatchRepairable.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheWatchRepairable.java Fri May 24 09:26:50 2019 @@ -47,7 +47,7 @@ public class CacheWatchRepairable /** Map of cache regions. */ private final ConcurrentMap<String, Set<ICacheListener<?, ?>>> cacheMap = - new ConcurrentHashMap<String, Set<ICacheListener<?, ?>>>(); + new ConcurrentHashMap<>(); /** * Replaces the underlying cache watch service and re-attaches all existing listeners to the new @@ -95,7 +95,7 @@ public class CacheWatchRepairable // Record the added cache listener locally, regardless of whether the // remote add-listener operation succeeds or fails. Set<ICacheListener<?, ?>> listenerSet = cacheMap.computeIfAbsent(cacheName, key -> { - return new CopyOnWriteArraySet<ICacheListener<?, ?>>(); + return new CopyOnWriteArraySet<>(); }); listenerSet.add( obj ); Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/ElementAttributes.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/ElementAttributes.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/ElementAttributes.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/ElementAttributes.java Fri May 24 09:26:50 2019 @@ -365,7 +365,7 @@ public class ElementAttributes // lazy here, no concurrency problems expected if ( this.eventHandlers == null ) { - this.eventHandlers = new ArrayList<IElementEventHandler>(); + this.eventHandlers = new ArrayList<>(); } this.eventHandlers.add( eventHandler ); } Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/PooledCacheEventQueue.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/PooledCacheEventQueue.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/PooledCacheEventQueue.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/PooledCacheEventQueue.java Fri May 24 09:26:50 2019 @@ -145,15 +145,15 @@ public class PooledCacheEventQueue<K, V> IStats stats = new Stats(); stats.setTypeName( "Pooled Cache Event Queue" ); - ArrayList<IStatElement<?>> elems = new ArrayList<IStatElement<?>>(); + ArrayList<IStatElement<?>> elems = new ArrayList<>(); - elems.add(new StatElement<Boolean>( "Working", Boolean.valueOf(isWorking()) ) ); - elems.add(new StatElement<Boolean>( "Empty", Boolean.valueOf(this.isEmpty()) ) ); + elems.add(new StatElement<>( "Working", Boolean.valueOf(isWorking()) ) ); + elems.add(new StatElement<>( "Empty", Boolean.valueOf(this.isEmpty()) ) ); if ( queue != null ) { - elems.add(new StatElement<Integer>( "Queue Size", Integer.valueOf(queue.size()) ) ); - elems.add(new StatElement<Integer>( "Queue Capacity", Integer.valueOf(queue.remainingCapacity()) ) ); + elems.add(new StatElement<>( "Queue Size", Integer.valueOf(queue.size()) ) ); + elems.add(new StatElement<>( "Queue Capacity", Integer.valueOf(queue.remainingCapacity()) ) ); } stats.setStatElements( elems ); Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/ZombieCacheServiceNonLocal.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/ZombieCacheServiceNonLocal.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/ZombieCacheServiceNonLocal.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/ZombieCacheServiceNonLocal.java Fri May 24 09:26:50 2019 @@ -59,7 +59,7 @@ public class ZombieCacheServiceNonLocal< */ public ZombieCacheServiceNonLocal() { - queue = new ConcurrentLinkedQueue<ZombieEvent>(); + queue = new ConcurrentLinkedQueue<>(); } /** @@ -70,7 +70,7 @@ public class ZombieCacheServiceNonLocal< public ZombieCacheServiceNonLocal( int maxQueueSize ) { this.maxQueueSize = maxQueueSize; - queue = new ConcurrentLinkedQueue<ZombieEvent>(); + queue = new ConcurrentLinkedQueue<>(); } /** @@ -103,7 +103,7 @@ public class ZombieCacheServiceNonLocal< { if ( maxQueueSize > 0 ) { - PutEvent<K, V> event = new PutEvent<K, V>( item, listenerId ); + PutEvent<K, V> event = new PutEvent<>( item, listenerId ); addQueue( event ); } // Zombies have no inner life @@ -121,7 +121,7 @@ public class ZombieCacheServiceNonLocal< { if ( maxQueueSize > 0 ) { - RemoveEvent<K> event = new RemoveEvent<K>( cacheName, key, listenerId ); + RemoveEvent<K> event = new RemoveEvent<>( cacheName, key, listenerId ); addQueue( event ); } // Zombies have no inner life @@ -186,7 +186,7 @@ public class ZombieCacheServiceNonLocal< @Override public Map<K, ICacheElement<K, V>> getMultiple( String cacheName, Set<K> keys, long requesterId ) { - return new HashMap<K, ICacheElement<K, V>>(); + return new HashMap<>(); } /** Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCache.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCache.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCache.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCache.java Fri May 24 09:26:50 2019 @@ -122,7 +122,7 @@ public class CompositeCache<K, V> private IMemoryCache<K, V> memCache; /** Key matcher used by the getMatching API */ - private IKeyMatcher<K> keyMatcher = new KeyMatcherPatternImpl<K>(); + private IKeyMatcher<K> keyMatcher = new KeyMatcherPatternImpl<>(); private ScheduledFuture<?> future; @@ -181,7 +181,7 @@ public class CompositeCache<K, V> if (cacheAttr.isUseMemoryShrinker()) { future = scheduledExecutor.scheduleAtFixedRate( - new ShrinkerThread<K, V>(this), 0, cacheAttr.getShrinkerIntervalSeconds(), + new ShrinkerThread<>(this), 0, cacheAttr.getShrinkerIntervalSeconds(), TimeUnit.SECONDS); } } @@ -675,7 +675,7 @@ public class CompositeCache<K, V> */ protected Map<K, ICacheElement<K, V>> getMultiple(Set<K> keys, boolean localOnly) { - Map<K, ICacheElement<K, V>> elements = new HashMap<K, ICacheElement<K, V>>(); + Map<K, ICacheElement<K, V>> elements = new HashMap<>(); if (log.isDebugEnabled()) { @@ -763,15 +763,15 @@ public class CompositeCache<K, V> private Map<K, ICacheElement<K, V>> getMultipleFromAuxiliaryCaches(Set<K> keys, boolean localOnly) throws IOException { - Map<K, ICacheElement<K, V>> elements = new HashMap<K, ICacheElement<K, V>>(); - Set<K> remainingKeys = new HashSet<K>(keys); + Map<K, ICacheElement<K, V>> elements = new HashMap<>(); + Set<K> remainingKeys = new HashSet<>(keys); for (AuxiliaryCache<K, V> aux : auxCaches) { if (aux != null) { Map<K, ICacheElement<K, V>> elementsFromAuxiliary = - new HashMap<K, ICacheElement<K, V>>(); + new HashMap<>(); CacheType cacheType = aux.getCacheType(); @@ -877,7 +877,7 @@ public class CompositeCache<K, V> log.error("Problem encountered getting elements.", e); } - return new HashMap<K, ICacheElement<K, V>>(); + return new HashMap<>(); } /** @@ -916,7 +916,7 @@ public class CompositeCache<K, V> private Map<K, ICacheElement<K, V>> getMatchingFromAuxiliaryCaches(String pattern, boolean localOnly) throws IOException { - Map<K, ICacheElement<K, V>> elements = new HashMap<K, ICacheElement<K, V>>(); + Map<K, ICacheElement<K, V>> elements = new HashMap<>(); for (int i = auxCaches.length - 1; i >= 0; i--) { @@ -925,7 +925,7 @@ public class CompositeCache<K, V> if (aux != null) { Map<K, ICacheElement<K, V>> elementsFromAuxiliary = - new HashMap<K, ICacheElement<K, V>>(); + new HashMap<>(); CacheType cacheType = aux.getCacheType(); @@ -1048,7 +1048,7 @@ public class CompositeCache<K, V> */ private Set<K> pruneKeysFound(Set<K> keys, Map<K, ICacheElement<K, V>> foundElements) { - Set<K> remainingKeys = new HashSet<K>(keys); + Set<K> remainingKeys = new HashSet<>(keys); remainingKeys.removeAll(foundElements.keySet()); return remainingKeys; @@ -1073,7 +1073,7 @@ public class CompositeCache<K, V> */ public Set<K> getKeySet(boolean localOnly) { - HashSet<K> allKeys = new HashSet<K>(); + HashSet<K> allKeys = new HashSet<>(); allKeys.addAll(memCache.getKeySet()); for (AuxiliaryCache<K, V> aux : auxCaches) @@ -1473,16 +1473,16 @@ public class CompositeCache<K, V> stats.setRegionName(this.getCacheName()); // store the composite cache stats first - ArrayList<IStatElement<?>> elems = new ArrayList<IStatElement<?>>(); + ArrayList<IStatElement<?>> elems = new ArrayList<>(); - elems.add(new StatElement<Long>("HitCountRam", Long.valueOf(getHitCountRam()))); - elems.add(new StatElement<Long>("HitCountAux", Long.valueOf(getHitCountAux()))); + elems.add(new StatElement<>("HitCountRam", Long.valueOf(getHitCountRam()))); + elems.add(new StatElement<>("HitCountAux", Long.valueOf(getHitCountAux()))); stats.setStatElements(elems); // memory + aux, memory is not considered an auxiliary internally int total = auxCaches.length + 1; - ArrayList<IStats> auxStats = new ArrayList<IStats>(total); + ArrayList<IStats> auxStats = new ArrayList<>(total); auxStats.add(getMemoryCache().getStatistics()); @@ -1674,7 +1674,7 @@ public class CompositeCache<K, V> log.warn("No element event queue available for cache " + getCacheName()); return; } - IElementEvent<ICacheElement<K, V>> event = new ElementEvent<ICacheElement<K, V>>(element, eventType); + IElementEvent<ICacheElement<K, V>> event = new ElementEvent<>(element, eventType); for (IElementEventHandler hand : eventHandlers) { try @@ -1712,7 +1712,7 @@ public class CompositeCache<K, V> { log.warn("Failed to init mem cache, using: LRUMemoryCache", e); - this.memCache = new LRUMemoryCache<K, V>(); + this.memCache = new LRUMemoryCache<>(); this.memCache.initialize(this); } } Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheConfigurator.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheConfigurator.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheConfigurator.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheConfigurator.java Fri May 24 09:26:50 2019 @@ -121,7 +121,7 @@ public class CompositeCacheConfigurator */ protected void parseRegions( Properties props, CompositeCacheManager ccm ) { - List<String> regionNames = new ArrayList<String>(); + List<String> regionNames = new ArrayList<>(); for (String key : props.stringPropertyNames() ) { @@ -225,7 +225,7 @@ public class CompositeCacheConfigurator if (auxiliaries != null) { // Next, create the auxiliaries for the new cache - List<AuxiliaryCache<K, V>> auxList = new ArrayList<AuxiliaryCache<K, V>>(); + List<AuxiliaryCache<K, V>> auxList = new ArrayList<>(); if ( log.isDebugEnabled() ) { @@ -285,7 +285,7 @@ public class CompositeCacheConfigurator protected <K, V> CompositeCache<K, V> newCache( ICompositeCacheAttributes cca, IElementAttributes ea) { - return new CompositeCache<K, V>( cca, ea ); + return new CompositeCache<>( cca, ea ); } /** @@ -565,7 +565,7 @@ public class CompositeCacheConfigurator else { // use the default standard serializer - keyMatcher = new KeyMatcherPatternImpl<K>(); + keyMatcher = new KeyMatcherPatternImpl<>(); if ( log.isInfoEnabled() ) { log.info( "Using standard key matcher [" + keyMatcher + "] for auxiliary [" + auxPrefix + "]" ); Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheManager.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheManager.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheManager.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheManager.java Fri May 24 09:26:50 2019 @@ -83,7 +83,7 @@ public class CompositeCacheManager /** Caches managed by this cache manager */ private final ConcurrentMap<String, ICache<?, ?>> caches = - new ConcurrentHashMap<String, ICache<?, ?>>(); + new ConcurrentHashMap<>(); /** Number of clients accessing this cache manager */ private final AtomicInteger clients = new AtomicInteger(0); @@ -96,15 +96,15 @@ public class CompositeCacheManager /** Used to keep track of configured auxiliaries */ private final ConcurrentMap<String, AuxiliaryCacheFactory> auxiliaryFactoryRegistry = - new ConcurrentHashMap<String, AuxiliaryCacheFactory>( ); + new ConcurrentHashMap<>( ); /** Used to keep track of attributes for auxiliaries. */ private final ConcurrentMap<String, AuxiliaryCacheAttributes> auxiliaryAttributeRegistry = - new ConcurrentHashMap<String, AuxiliaryCacheAttributes>( ); + new ConcurrentHashMap<>( ); /** Used to keep track of configured auxiliaries */ private final ConcurrentMap<String, AuxiliaryCache<?, ?>> auxiliaryCaches = - new ConcurrentHashMap<String, AuxiliaryCache<?, ?>>( ); + new ConcurrentHashMap<>( ); /** Properties with which this manager was configured. This is exposed for other managers. */ private Properties configurationProperties; @@ -122,7 +122,7 @@ public class CompositeCacheManager private static final boolean DEFAULT_FORCE_RECONFIGURATION = false; /** Stack for those waiting for notification of a shutdown. */ - private final LinkedBlockingDeque<IShutdownObserver> shutdownObservers = new LinkedBlockingDeque<IShutdownObserver>(); + private final LinkedBlockingDeque<IShutdownObserver> shutdownObservers = new LinkedBlockingDeque<>(); /** The central background scheduler. */ private ScheduledExecutorService scheduledExecutor; @@ -839,7 +839,7 @@ public class CompositeCacheManager */ public ICacheStats[] getStatistics() { - ArrayList<ICacheStats> cacheStats = new ArrayList<ICacheStats>(); + ArrayList<ICacheStats> cacheStats = new ArrayList<>(); for (ICache<?, ?> c : caches.values()) { CompositeCache<?, ?> cache = (CompositeCache<?, ?>) c; Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/logging/CacheEventLoggerDebugLogger.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/logging/CacheEventLoggerDebugLogger.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/logging/CacheEventLoggerDebugLogger.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/logging/CacheEventLoggerDebugLogger.java Fri May 24 09:26:50 2019 @@ -49,7 +49,7 @@ public class CacheEventLoggerDebugLogger public <T> ICacheEvent<T> createICacheEvent( String source, String region, String eventName, String optionalDetails, T key ) { - ICacheEvent<T> event = new CacheEvent<T>(); + ICacheEvent<T> event = new CacheEvent<>(); event.setSource( source ); event.setRegion( region ); event.setEventName( eventName ); Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/AbstractDoubleLinkedListMemoryCache.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/AbstractDoubleLinkedListMemoryCache.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/AbstractDoubleLinkedListMemoryCache.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/AbstractDoubleLinkedListMemoryCache.java Fri May 24 09:26:50 2019 @@ -61,7 +61,7 @@ public abstract class AbstractDoubleLink public void initialize(CompositeCache<K, V> hub) { super.initialize(hub); - list = new DoubleLinkedList<MemoryElementDescriptor<K, V>>(); + list = new DoubleLinkedList<>(); log.info("initialized MemoryCache for " + getCacheName()); } @@ -77,7 +77,7 @@ public abstract class AbstractDoubleLink @Override public ConcurrentMap<K, MemoryElementDescriptor<K, V>> createMap() { - return new ConcurrentHashMap<K, MemoryElementDescriptor<K, V>>(); + return new ConcurrentHashMap<>(); } /** @@ -341,7 +341,7 @@ public abstract class AbstractDoubleLink lock.lock(); try { - MemoryElementDescriptor<K, V> me = new MemoryElementDescriptor<K, V>(ce); + MemoryElementDescriptor<K, V> me = new MemoryElementDescriptor<>(ce); list.addFirst(me); if ( log.isDebugEnabled() ) { @@ -368,7 +368,7 @@ public abstract class AbstractDoubleLink lock.lock(); try { - MemoryElementDescriptor<K, V> me = new MemoryElementDescriptor<K, V>(ce); + MemoryElementDescriptor<K, V> me = new MemoryElementDescriptor<>(ce); list.addLast(me); if ( log.isDebugEnabled() ) { @@ -517,7 +517,7 @@ public abstract class AbstractDoubleLink List<IStatElement<?>> elems = stats.getStatElements(); - elems.add(new StatElement<Integer>("List Size", Integer.valueOf(list.size()))); + elems.add(new StatElement<>("List Size", Integer.valueOf(list.size()))); return stats; } Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/AbstractMemoryCache.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/AbstractMemoryCache.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/AbstractMemoryCache.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/AbstractMemoryCache.java Fri May 24 09:26:50 2019 @@ -135,7 +135,7 @@ public abstract class AbstractMemoryCach element -> element)); } - return new HashMap<K, ICacheElement<K, V>>(); + return new HashMap<>(); } /** @@ -231,13 +231,13 @@ public abstract class AbstractMemoryCach IStats stats = new Stats(); stats.setTypeName( "Abstract Memory Cache" ); - ArrayList<IStatElement<?>> elems = new ArrayList<IStatElement<?>>(); + ArrayList<IStatElement<?>> elems = new ArrayList<>(); stats.setStatElements(elems); - elems.add(new StatElement<AtomicLong>("Put Count", putCnt)); - elems.add(new StatElement<AtomicLong>("Hit Count", hitCnt)); - elems.add(new StatElement<AtomicLong>("Miss Count", missCnt)); - elems.add(new StatElement<Integer>( "Map Size", Integer.valueOf(getSize()) ) ); + elems.add(new StatElement<>("Put Count", putCnt)); + elems.add(new StatElement<>("Hit Count", hitCnt)); + elems.add(new StatElement<>("Miss Count", missCnt)); + elems.add(new StatElement<>( "Map Size", Integer.valueOf(getSize()) ) ); return stats; } @@ -457,7 +457,7 @@ public abstract class AbstractMemoryCach @Override public Set<K> getKeySet() { - return new LinkedHashSet<K>(map.keySet()); + return new LinkedHashSet<>(map.keySet()); } /** Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java Fri May 24 09:26:50 2019 @@ -74,7 +74,7 @@ public class LHMLRUMemoryCache<K, V> throws IOException { putCnt.incrementAndGet(); - map.put( ce.getKey(), new MemoryElementDescriptor<K, V>(ce) ); + map.put( ce.getKey(), new MemoryElementDescriptor<>(ce) ); } /** Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/soft/SoftReferenceMemoryCache.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/soft/SoftReferenceMemoryCache.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/soft/SoftReferenceMemoryCache.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/soft/SoftReferenceMemoryCache.java Fri May 24 09:26:50 2019 @@ -74,7 +74,7 @@ public class SoftReferenceMemoryCache<K, public synchronized void initialize( CompositeCache<K, V> hub ) { super.initialize( hub ); - strongReferences = new LinkedBlockingQueue<ICacheElement<K, V>>(); + strongReferences = new LinkedBlockingQueue<>(); log.info( "initialized Soft Reference Memory Cache for " + getCacheName() ); } @@ -84,7 +84,7 @@ public class SoftReferenceMemoryCache<K, @Override public ConcurrentMap<K, MemoryElementDescriptor<K, V>> createMap() { - return new ConcurrentHashMap<K, MemoryElementDescriptor<K, V>>(); + return new ConcurrentHashMap<>(); } /** @@ -93,7 +93,7 @@ public class SoftReferenceMemoryCache<K, @Override public Set<K> getKeySet() { - Set<K> keys = new HashSet<K>(); + Set<K> keys = new HashSet<>(); for (Map.Entry<K, MemoryElementDescriptor<K, V>> e : map.entrySet()) { SoftReferenceElementDescriptor<K, V> sred = (SoftReferenceElementDescriptor<K, V>) e.getValue(); @@ -137,8 +137,8 @@ public class SoftReferenceMemoryCache<K, List<IStatElement<?>> elems = stats.getStatElements(); int emptyrefs = map.size() - getSize(); - elems.add(new StatElement<Integer>("Empty References", Integer.valueOf(emptyrefs))); - elems.add(new StatElement<Integer>("Strong References", Integer.valueOf(strongReferences.size()))); + elems.add(new StatElement<>("Empty References", Integer.valueOf(emptyrefs))); + elems.add(new StatElement<>("Strong References", Integer.valueOf(strongReferences.size()))); return stats; } @@ -198,7 +198,7 @@ public class SoftReferenceMemoryCache<K, try { - map.put(ce.getKey(), new SoftReferenceElementDescriptor<K, V>(ce)); + map.put(ce.getKey(), new SoftReferenceElementDescriptor<>(ce)); strongReferences.add(ce); trimStrongReferences(); } Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/util/SoftReferenceElementDescriptor.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/util/SoftReferenceElementDescriptor.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/util/SoftReferenceElementDescriptor.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/util/SoftReferenceElementDescriptor.java Fri May 24 09:26:50 2019 @@ -43,7 +43,7 @@ public class SoftReferenceElementDescrip public SoftReferenceElementDescriptor( ICacheElement<K, V> ce ) { super( null ); - this.srce = new SoftReference<ICacheElement<K, V>>(ce); + this.srce = new SoftReference<>(ce); } /** Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/access/JCSWorker.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/access/JCSWorker.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/access/JCSWorker.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/access/JCSWorker.java Fri May 24 09:26:50 2019 @@ -105,7 +105,7 @@ public class JCSWorker<K, V> /** * Map to hold who's doing work presently. */ - private volatile ConcurrentMap<String, JCSWorkerHelper<V>> map = new ConcurrentHashMap<String, JCSWorkerHelper<V>>(); + private volatile ConcurrentMap<String, JCSWorkerHelper<V>> map = new ConcurrentHashMap<>(); /** * Region for the JCS cache. Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/discovery/UDPCleanupRunner.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/discovery/UDPCleanupRunner.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/discovery/UDPCleanupRunner.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/discovery/UDPCleanupRunner.java Fri May 24 09:26:50 2019 @@ -72,7 +72,7 @@ public class UDPCleanupRunner // html // TODO this should get a copy. you can't simply remove from this. // the listeners need to be notified. - Set<DiscoveredService> toRemove = new HashSet<DiscoveredService>(); + Set<DiscoveredService> toRemove = new HashSet<>(); // can't remove via the iterator. must remove directly for (DiscoveredService service : discoveryService.getDiscoveredServices()) { Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryManager.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryManager.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryManager.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryManager.java Fri May 24 09:26:50 2019 @@ -42,7 +42,7 @@ public class UDPDiscoveryManager private static UDPDiscoveryManager INSTANCE = new UDPDiscoveryManager(); /** Known services */ - private final Map<String, UDPDiscoveryService> services = new HashMap<String, UDPDiscoveryService>(); + private final Map<String, UDPDiscoveryService> services = new HashMap<>(); /** private for singleton */ private UDPDiscoveryManager() Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryMessage.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryMessage.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryMessage.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryMessage.java Fri May 24 09:26:50 2019 @@ -63,7 +63,7 @@ public class UDPDiscoveryMessage private long requesterId; /** Names of regions */ - private ArrayList<String> cacheNames = new ArrayList<String>(); + private ArrayList<String> cacheNames = new ArrayList<>(); /** * @param port The port to set. Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/discovery/UDPDiscoverySenderThread.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/discovery/UDPDiscoverySenderThread.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/discovery/UDPDiscoverySenderThread.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/discovery/UDPDiscoverySenderThread.java Fri May 24 09:26:50 2019 @@ -40,7 +40,7 @@ public class UDPDiscoverySenderThread private final UDPDiscoveryAttributes attributes; /** List of known regions. */ - private ArrayList<String> cacheNames = new ArrayList<String>(); + private ArrayList<String> cacheNames = new ArrayList<>(); /** * @param cacheNames The cacheNames to set. Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryService.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryService.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryService.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryService.java Fri May 24 09:26:50 2019 @@ -66,13 +66,13 @@ public class UDPDiscoveryService private boolean shutdown = false; /** This is a set of services that have been discovered. */ - private Set<DiscoveredService> discoveredServices = new CopyOnWriteArraySet<DiscoveredService>(); + private Set<DiscoveredService> discoveredServices = new CopyOnWriteArraySet<>(); /** This a list of regions that are configured to use discovery. */ - private final Set<String> cacheNames = new CopyOnWriteArraySet<String>(); + private final Set<String> cacheNames = new CopyOnWriteArraySet<>(); /** Set of listeners. */ - private final Set<IDiscoveryListener> discoveryListeners = new CopyOnWriteArraySet<IDiscoveryListener>(); + private final Set<IDiscoveryListener> discoveryListeners = new CopyOnWriteArraySet<>(); /** * @param attributes @@ -274,7 +274,7 @@ public class UDPDiscoveryService */ protected ArrayList<String> getCacheNames() { - ArrayList<String> names = new ArrayList<String>(); + ArrayList<String> names = new ArrayList<>(); names.addAll( cacheNames ); return names; } @@ -378,7 +378,7 @@ public class UDPDiscoveryService */ public Set<IDiscoveryListener> getCopyOfDiscoveryListeners() { - Set<IDiscoveryListener> copy = new HashSet<IDiscoveryListener>(); + Set<IDiscoveryListener> copy = new HashSet<>(); copy.addAll( getDiscoveryListeners() ); return copy; } Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/serialization/SerializationConversionUtil.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/serialization/SerializationConversionUtil.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/serialization/SerializationConversionUtil.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/serialization/SerializationConversionUtil.java Fri May 24 09:26:50 2019 @@ -89,7 +89,7 @@ public class SerializationConversionUtil throw new IOException( "Could not serialize object. The ElementSerializer is null." ); } } - ICacheElementSerialized<K, V> serialized = new CacheElementSerialized<K, V>( + ICacheElementSerialized<K, V> serialized = new CacheElementSerialized<>( element.getCacheName(), element.getKey(), serializedValue, element.getElementAttributes() ); return serialized; @@ -142,7 +142,7 @@ public class SerializationConversionUtil // we could just use the default. log.warn( "ElementSerializer is null. Could not serialize object." ); } - ICacheElement<K, V> deSerialized = new CacheElement<K, V>( serialized.getCacheName(), serialized.getKey(), deSerializedValue ); + ICacheElement<K, V> deSerialized = new CacheElement<>( serialized.getCacheName(), serialized.getKey(), deSerializedValue ); deSerialized.setElementAttributes( serialized.getElementAttributes() ); return deSerialized; Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/struct/AbstractLRUMap.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/struct/AbstractLRUMap.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/struct/AbstractLRUMap.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/struct/AbstractLRUMap.java Fri May 24 09:26:50 2019 @@ -62,11 +62,11 @@ public abstract class AbstractLRUMap<K, */ public AbstractLRUMap() { - list = new DoubleLinkedList<LRUElementDescriptor<K, V>>(); + list = new DoubleLinkedList<>(); // normal hashtable is faster for // sequential keys. - map = new ConcurrentHashMap<K, LRUElementDescriptor<K, V>>(); + map = new ConcurrentHashMap<>(); } @@ -278,7 +278,7 @@ public abstract class AbstractLRUMap<K, putCnt++; LRUElementDescriptor<K, V> old = null; - LRUElementDescriptor<K, V> me = new LRUElementDescriptor<K, V>(key, value); + LRUElementDescriptor<K, V> me = new LRUElementDescriptor<>(key, value); lock.lock(); try @@ -490,13 +490,13 @@ public abstract class AbstractLRUMap<K, IStats stats = new Stats(); stats.setTypeName( "LRUMap" ); - ArrayList<IStatElement<?>> elems = new ArrayList<IStatElement<?>>(); + ArrayList<IStatElement<?>> elems = new ArrayList<>(); - elems.add(new StatElement<Integer>( "List Size", Integer.valueOf(list.size()) ) ); - elems.add(new StatElement<Integer>( "Map Size", Integer.valueOf(map.size()) ) ); - elems.add(new StatElement<Long>( "Put Count", Long.valueOf(putCnt) ) ); - elems.add(new StatElement<Long>( "Hit Count", Long.valueOf(hitCnt) ) ); - elems.add(new StatElement<Long>( "Miss Count", Long.valueOf(missCnt) ) ); + elems.add(new StatElement<>( "List Size", Integer.valueOf(list.size()) ) ); + elems.add(new StatElement<>( "Map Size", Integer.valueOf(map.size()) ) ); + elems.add(new StatElement<>( "Put Count", Long.valueOf(putCnt) ) ); + elems.add(new StatElement<>( "Hit Count", Long.valueOf(hitCnt) ) ); + elems.add(new StatElement<>( "Miss Count", Long.valueOf(missCnt) ) ); stats.setStatElements( elems ); Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/threadpool/ThreadPoolManager.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/threadpool/ThreadPoolManager.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/threadpool/ThreadPoolManager.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/threadpool/ThreadPoolManager.java Fri May 24 09:26:50 2019 @@ -91,8 +91,8 @@ public class ThreadPoolManager */ private ThreadPoolManager() { - this.pools = new ConcurrentHashMap<String, ExecutorService>(); - this.schedulerPools = new ConcurrentHashMap<String, ScheduledExecutorService>(); + this.pools = new ConcurrentHashMap<>(); + this.schedulerPools = new ConcurrentHashMap<>(); configure(); } @@ -126,7 +126,7 @@ public class ThreadPoolManager log.debug( "Creating a Bounded Buffer to use for the pool" ); } - queue = new LinkedBlockingQueue<Runnable>(config.getBoundarySize()); + queue = new LinkedBlockingQueue<>(config.getBoundarySize()); } else { @@ -134,7 +134,7 @@ public class ThreadPoolManager { log.debug( "Creating a non bounded Linked Queue to use for the pool" ); } - queue = new LinkedBlockingQueue<Runnable>(); + queue = new LinkedBlockingQueue<>(); } ThreadPoolExecutor pool = new ThreadPoolExecutor( @@ -295,7 +295,7 @@ public class ThreadPoolManager */ public ArrayList<String> getPoolNames() { - return new ArrayList<String>(pools.keySet()); + return new ArrayList<>(pools.keySet()); } /** Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/JCSConcurrentCacheAccessUnitTest.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/JCSConcurrentCacheAccessUnitTest.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/JCSConcurrentCacheAccessUnitTest.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/JCSConcurrentCacheAccessUnitTest.java Fri May 24 09:26:50 2019 @@ -37,7 +37,7 @@ import org.apache.commons.jcs.access.exc */ public class JCSConcurrentCacheAccessUnitTest extends TestCase { - private final static int THREADS = 10; + private final static int THREADS = 20; private final static int LOOPS = 10000; /** @@ -67,7 +67,7 @@ public class JCSConcurrentCacheAccessUni JCS.setConfigFilename( "/TestJCS-73.ccf" ); cache = JCS.getGroupCacheInstance( "cache" ); errcount = new AtomicInteger(0); - valueMismatchList = Collections.synchronizedList(new ArrayList<String>()); + valueMismatchList = Collections.synchronizedList(new ArrayList<>()); } @Override Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/JCSThrashTest.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/JCSThrashTest.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/JCSThrashTest.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/JCSThrashTest.java Fri May 24 09:26:50 2019 @@ -169,7 +169,7 @@ public class JCSThrashTest jcs.put( key, value ); // Create 15 threads that read the keys; - final List<Executable> executables = new ArrayList<Executable>(); + final List<Executable> executables = new ArrayList<>(); for ( int i = 0; i < 15; i++ ) { final JCSThrashTest.Executable executable = new JCSThrashTest.Executable() Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/JCSUnitTest.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/JCSUnitTest.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/JCSUnitTest.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/JCSUnitTest.java Fri May 24 09:26:50 2019 @@ -82,7 +82,7 @@ public class JCSUnitTest */ private LinkedList<HashMap<String, String>> buildList() { - LinkedList<HashMap<String, String>> list = new LinkedList<HashMap<String,String>>(); + LinkedList<HashMap<String, String>> list = new LinkedList<>(); for ( int i = 0; i < 100; i++ ) { @@ -97,7 +97,7 @@ public class JCSUnitTest */ private HashMap<String, String> buildMap() { - HashMap<String, String> map = new HashMap<String, String>(); + HashMap<String, String> map = new HashMap<>(); byte[] keyBytes = new byte[32]; byte[] valBytes = new byte[128]; Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/JCSvsHashtablePerformanceTest.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/JCSvsHashtablePerformanceTest.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/JCSvsHashtablePerformanceTest.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/JCSvsHashtablePerformanceTest.java Fri May 24 09:26:50 2019 @@ -144,7 +144,7 @@ public class JCSvsHashtablePerformanceTe // ///////////////////////////////////////////////////////////// name = "Hashtable"; - Hashtable<String, String> cache2 = new Hashtable<String, String>(); + Hashtable<String, String> cache2 = new Hashtable<>(); start = System.currentTimeMillis(); for ( int i = 0; i < tries; i++ ) { Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/access/CacheAccessUnitTest.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/access/CacheAccessUnitTest.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/access/CacheAccessUnitTest.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/access/CacheAccessUnitTest.java Fri May 24 09:26:50 2019 @@ -177,7 +177,7 @@ public class CacheAccessUnitTest access.put( keyTwo, valueTwo ); access.put( keyThree, valueThree ); - Set<String> input = new HashSet<String>(); + Set<String> input = new HashSet<>(); input.add( keyOne ); input.add( keyTwo ); Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/MockAuxiliaryCache.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/MockAuxiliaryCache.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/MockAuxiliaryCache.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/MockAuxiliaryCache.java Fri May 24 09:26:50 2019 @@ -80,7 +80,7 @@ public class MockAuxiliaryCache<K, V> throws IOException { getMatchingCallCount++; - return new HashMap<K, ICacheElement<K, V>>(); + return new HashMap<>(); } /** @@ -93,7 +93,7 @@ public class MockAuxiliaryCache<K, V> @Override public Map<K, ICacheElement<K, V>> getMultiple(Set<K> keys) { - return new HashMap<K, ICacheElement<K, V>>(); + return new HashMap<>(); } /** Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/MockAuxiliaryCacheFactory.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/MockAuxiliaryCacheFactory.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/MockAuxiliaryCacheFactory.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/MockAuxiliaryCacheFactory.java Fri May 24 09:26:50 2019 @@ -44,7 +44,7 @@ public class MockAuxiliaryCacheFactory createCache( AuxiliaryCacheAttributes attr, ICompositeCacheManager cacheMgr, ICacheEventLogger cacheEventLogger, IElementSerializer elementSerializer ) { - MockAuxiliaryCache<K, V> auxCache = new MockAuxiliaryCache<K, V>(); + MockAuxiliaryCache<K, V> auxCache = new MockAuxiliaryCache<>(); auxCache.setCacheEventLogger( cacheEventLogger ); auxCache.setElementSerializer( elementSerializer ); return auxCache; Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/MockCacheEventLogger.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/MockCacheEventLogger.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/MockCacheEventLogger.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/MockCacheEventLogger.java Fri May 24 09:26:50 2019 @@ -46,7 +46,7 @@ public class MockCacheEventLogger public int errorEventCalls = 0; /** list of messages */ - public List<String> errorMessages = new ArrayList<String>(); + public List<String> errorMessages = new ArrayList<>(); /** * @param source @@ -93,6 +93,6 @@ public class MockCacheEventLogger String eventName, String optionalDetails, T key ) { startICacheEventCalls++; - return new CacheEvent<T>(); + return new CacheEvent<>(); } } Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCacheUnitTest.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCacheUnitTest.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCacheUnitTest.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCacheUnitTest.java Fri May 24 09:26:50 2019 @@ -56,12 +56,12 @@ public class AbstractDiskCacheUnitTest IDiskCacheAttributes diskCacheAttributes = new IndexedDiskCacheAttributes(); diskCacheAttributes.setCacheName( cacheName ); - AbstractDiskCacheTestInstance<String, String> diskCache = new AbstractDiskCacheTestInstance<String, String>( diskCacheAttributes ); + AbstractDiskCacheTestInstance<String, String> diskCache = new AbstractDiskCacheTestInstance<>( diskCacheAttributes ); String key = "myKey"; String value = "myValue"; IElementAttributes elementAttributes = new ElementAttributes(); - ICacheElement<String, String> cacheElement = new CacheElement<String, String>( cacheName, key, value, elementAttributes ); + ICacheElement<String, String> cacheElement = new CacheElement<>( cacheName, key, value, elementAttributes ); diskCache.update( cacheElement ); @@ -86,12 +86,12 @@ public class AbstractDiskCacheUnitTest IDiskCacheAttributes diskCacheAttributes = new IndexedDiskCacheAttributes(); diskCacheAttributes.setCacheName( cacheName ); - AbstractDiskCacheTestInstance<String, String> diskCache = new AbstractDiskCacheTestInstance<String, String>( diskCacheAttributes ); + AbstractDiskCacheTestInstance<String, String> diskCache = new AbstractDiskCacheTestInstance<>( diskCacheAttributes ); String key = "myKey"; String value = "myValue"; IElementAttributes elementAttributes = new ElementAttributes(); - ICacheElement<String, String> cacheElement = new CacheElement<String, String>( cacheName, key, value, elementAttributes ); + ICacheElement<String, String> cacheElement = new CacheElement<>( cacheName, key, value, elementAttributes ); diskCache.update( cacheElement ); @@ -118,13 +118,13 @@ public class AbstractDiskCacheUnitTest IDiskCacheAttributes diskCacheAttributes = new IndexedDiskCacheAttributes(); diskCacheAttributes.setAllowRemoveAll( false ); - AbstractDiskCacheTestInstance<String, String> diskCache = new AbstractDiskCacheTestInstance<String, String>( diskCacheAttributes ); + AbstractDiskCacheTestInstance<String, String> diskCache = new AbstractDiskCacheTestInstance<>( diskCacheAttributes ); String cacheName = "testRemoveAll_notAllowed"; String key = "myKey"; String value = "myValue"; IElementAttributes elementAttributes = new ElementAttributes(); - ICacheElement<String, String> cacheElement = new CacheElement<String, String>( cacheName, key, value, elementAttributes ); + ICacheElement<String, String> cacheElement = new CacheElement<>( cacheName, key, value, elementAttributes ); diskCache.update( cacheElement ); @@ -149,13 +149,13 @@ public class AbstractDiskCacheUnitTest IDiskCacheAttributes diskCacheAttributes = new IndexedDiskCacheAttributes(); diskCacheAttributes.setAllowRemoveAll( true ); - AbstractDiskCacheTestInstance<String, String> diskCache = new AbstractDiskCacheTestInstance<String, String>( diskCacheAttributes ); + AbstractDiskCacheTestInstance<String, String> diskCache = new AbstractDiskCacheTestInstance<>( diskCacheAttributes ); String cacheName = "testRemoveAll_allowed"; String key = "myKey"; String value = "myValue"; IElementAttributes elementAttributes = new ElementAttributes(); - ICacheElement<String, String> cacheElement = new CacheElement<String, String>( cacheName, key, value, elementAttributes ); + ICacheElement<String, String> cacheElement = new CacheElement<>( cacheName, key, value, elementAttributes ); diskCache.update( cacheElement ); @@ -171,7 +171,7 @@ public class AbstractDiskCacheUnitTest extends AbstractDiskCache<K, V> { /** Internal map */ - protected Map<K, ICacheElement<K, V>> map = new HashMap<K, ICacheElement<K, V>>(); + protected Map<K, ICacheElement<K, V>> map = new HashMap<>(); /** used by the abstract aux class */ protected IDiskCacheAttributes diskCacheAttributes; @@ -207,7 +207,7 @@ public class AbstractDiskCacheUnitTest @Override public Set<K> getKeySet() throws IOException { - return new HashSet<K>(map.keySet()); + return new HashSet<>(map.keySet()); } /** Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/PurgatoryElementUnitTest.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/PurgatoryElementUnitTest.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/PurgatoryElementUnitTest.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/PurgatoryElementUnitTest.java Fri May 24 09:26:50 2019 @@ -37,8 +37,8 @@ public class PurgatoryElementUnitTest String key = "myKey"; String value = "myValue"; IElementAttributes elementAttributes = new ElementAttributes(); - ICacheElement<String, String> cacheElement = new CacheElement<String, String>( cacheName, key, value, elementAttributes ); - PurgatoryElement<String, String> purgatoryElement = new PurgatoryElement<String, String>( cacheElement ); + ICacheElement<String, String> cacheElement = new CacheElement<>( cacheName, key, value, elementAttributes ); + PurgatoryElement<String, String> purgatoryElement = new PurgatoryElement<>( cacheElement ); purgatoryElement.setSpoolable( false ); // DO WORK @@ -57,8 +57,8 @@ public class PurgatoryElementUnitTest String value = "myValue"; IElementAttributes elementAttributes = new ElementAttributes(); - ICacheElement<String, String> cacheElement = new CacheElement<String, String>( cacheName, key, value ); - PurgatoryElement<String, String> purgatoryElement = new PurgatoryElement<String, String>( cacheElement ); + ICacheElement<String, String> cacheElement = new CacheElement<>( cacheName, key, value ); + PurgatoryElement<String, String> purgatoryElement = new PurgatoryElement<>( cacheElement ); purgatoryElement.setElementAttributes( elementAttributes ); // DO WORK @@ -76,8 +76,8 @@ public class PurgatoryElementUnitTest String key = "myKey"; String value = "myValue"; IElementAttributes elementAttributes = new ElementAttributes(); - ICacheElement<String, String> cacheElement = new CacheElement<String, String>( cacheName, key, value, elementAttributes ); - PurgatoryElement<String, String> purgatoryElement = new PurgatoryElement<String, String>( cacheElement ); + ICacheElement<String, String> cacheElement = new CacheElement<>( cacheName, key, value, elementAttributes ); + PurgatoryElement<String, String> purgatoryElement = new PurgatoryElement<>( cacheElement ); // DO WORK String result = purgatoryElement.toString(); Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheConcurrentUnitTest.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheConcurrentUnitTest.java?rev=1859859&r1=1859858&r2=1859859&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheConcurrentUnitTest.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheConcurrentUnitTest.java Fri May 24 09:26:50 2019 @@ -164,7 +164,7 @@ public class BlockDiskCacheConcurrentUni } // Test that getElements returns all the expected values - Set<String> keys = new HashSet<String>(); + Set<String> keys = new HashSet<>(); for ( int i = 0; i <= items; i++ ) { keys.add( i + ":key" ); @@ -225,7 +225,7 @@ public class BlockDiskCacheConcurrentUni } // Test that getElements returns all the expected values - Set<String> keys = new HashSet<String>(); + Set<String> keys = new HashSet<>(); for ( int i = start; i <= end; i++ ) { keys.add( i + ":key" );
