You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2019/05/29 12:19:00 UTC
svn commit: r1860336 [6/7] - in /commons/proper/jcs:
branches/generics-interface/src/java/org/apache/jcs/auxiliary/remote/util/
branches/generics-interface/src/java/org/apache/jcs/auxiliary/remote/value/
branches/generics-interface/src/java/org/apache/...
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/ZombieRemoteCacheServiceUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/ZombieRemoteCacheServiceUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/ZombieRemoteCacheServiceUnitTest.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/ZombieRemoteCacheServiceUnitTest.java Wed May 29 12:18:56 2019
@@ -39,14 +39,14 @@ public class ZombieRemoteCacheServiceUni
throws Exception
{
// SETUP
- MockRemoteCacheService<String, String> service = new MockRemoteCacheService<>();
+ MockRemoteCacheService<String, String> service = new MockRemoteCacheService<String, String>();
- ZombieCacheServiceNonLocal<String, String> zombie = new ZombieCacheServiceNonLocal<>( 10 );
+ ZombieCacheServiceNonLocal<String, String> zombie = new ZombieCacheServiceNonLocal<String, String>( 10 );
String cacheName = "testUpdate";
// DO WORK
- ICacheElement<String, String> element = new CacheElement<>( cacheName, "key", "value" );
+ ICacheElement<String, String> element = new CacheElement<String, String>( cacheName, "key", "value" );
zombie.update( element, 123l );
zombie.propagateEvents( service );
@@ -63,14 +63,14 @@ public class ZombieRemoteCacheServiceUni
throws Exception
{
// SETUP
- MockRemoteCacheService<String, String> service = new MockRemoteCacheService<>();
+ MockRemoteCacheService<String, String> service = new MockRemoteCacheService<String, String>();
- ZombieCacheServiceNonLocal<String, String> zombie = new ZombieCacheServiceNonLocal<>( 0 );
+ ZombieCacheServiceNonLocal<String, String> zombie = new ZombieCacheServiceNonLocal<String, String>( 0 );
String cacheName = "testUpdate";
// DO WORK
- ICacheElement<String, String> element = new CacheElement<>( cacheName, "key", "value" );
+ ICacheElement<String, String> element = new CacheElement<String, String>( cacheName, "key", "value" );
zombie.update( element, 123l );
zombie.propagateEvents( service );
@@ -87,9 +87,9 @@ public class ZombieRemoteCacheServiceUni
throws Exception
{
// SETUP
- MockRemoteCacheService<String, String> service = new MockRemoteCacheService<>();
+ MockRemoteCacheService<String, String> service = new MockRemoteCacheService<String, String>();
- ZombieCacheServiceNonLocal<String, String> zombie = new ZombieCacheServiceNonLocal<>( 10 );
+ ZombieCacheServiceNonLocal<String, String> zombie = new ZombieCacheServiceNonLocal<String, String>( 10 );
String cacheName = "testRemoveThenWalk";
String key = "myKey";
@@ -111,9 +111,9 @@ public class ZombieRemoteCacheServiceUni
throws Exception
{
// SETUP
- MockRemoteCacheService<String, String> service = new MockRemoteCacheService<>();
+ MockRemoteCacheService<String, String> service = new MockRemoteCacheService<String, String>();
- ZombieCacheServiceNonLocal<String, String> zombie = new ZombieCacheServiceNonLocal<>( 10 );
+ ZombieCacheServiceNonLocal<String, String> zombie = new ZombieCacheServiceNonLocal<String, String>( 10 );
String cacheName = "testRemoveThenWalk";
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheClientUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheClientUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheClientUnitTest.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheClientUnitTest.java Wed May 29 12:18:56 2019
@@ -45,7 +45,7 @@ public class RemoteHttpCacheClientUnitTe
{
// SETUP
RemoteHttpCacheAttributes attributes = new RemoteHttpCacheAttributes();
- RemoteHttpCacheClient<String, String> client = new RemoteHttpCacheClient<>( attributes );
+ RemoteHttpCacheClient<String, String> client = new RemoteHttpCacheClient<String, String>( attributes );
MockRemoteCacheDispatcher mockDispatcher = new MockRemoteCacheDispatcher();
client.setRemoteDispatcher( mockDispatcher );
@@ -74,7 +74,7 @@ public class RemoteHttpCacheClientUnitTe
{
// SETUP
RemoteHttpCacheAttributes attributes = new RemoteHttpCacheAttributes();
- RemoteHttpCacheClient<String, String> client = new RemoteHttpCacheClient<>( attributes );
+ RemoteHttpCacheClient<String, String> client = new RemoteHttpCacheClient<String, String>( attributes );
MockRemoteCacheDispatcher mockDispatcher = new MockRemoteCacheDispatcher();
client.setRemoteDispatcher( mockDispatcher );
@@ -82,9 +82,9 @@ public class RemoteHttpCacheClientUnitTe
String cacheName = "test";
String key = "key";
- ICacheElement<String, String> expected = new CacheElement<>( cacheName, key, "value" );
+ ICacheElement<String, String> expected = new CacheElement<String, String>( cacheName, key, "value" );
RemoteCacheResponse<ICacheElement<String, String>> remoteHttpCacheResponse =
- new RemoteCacheResponse<>();
+ new RemoteCacheResponse<ICacheElement<String,String>>();
remoteHttpCacheResponse.setPayload( expected );
mockDispatcher.setupRemoteCacheResponse = remoteHttpCacheResponse;
@@ -108,7 +108,7 @@ public class RemoteHttpCacheClientUnitTe
{
// SETUP
RemoteHttpCacheAttributes attributes = new RemoteHttpCacheAttributes();
- RemoteHttpCacheClient<String, String> client = new RemoteHttpCacheClient<>( attributes );
+ RemoteHttpCacheClient<String, String> client = new RemoteHttpCacheClient<String, String>( attributes );
MockRemoteCacheDispatcher mockDispatcher = new MockRemoteCacheDispatcher();
client.setRemoteDispatcher( mockDispatcher );
@@ -116,11 +116,11 @@ public class RemoteHttpCacheClientUnitTe
String cacheName = "test";
String pattern = "key";
- ICacheElement<String, String> expected = new CacheElement<>( cacheName, "key", "value" );
- Map<String, ICacheElement<String, String>> expectedMap = new HashMap<>();
+ ICacheElement<String, String> expected = new CacheElement<String, String>( cacheName, "key", "value" );
+ Map<String, ICacheElement<String, String>> expectedMap = new HashMap<String, ICacheElement<String,String>>();
expectedMap.put( "key", expected );
RemoteCacheResponse<Map<String, ICacheElement<String, String>>> remoteHttpCacheResponse =
- new RemoteCacheResponse<>();
+ new RemoteCacheResponse<Map<String,ICacheElement<String,String>>>();
remoteHttpCacheResponse.setPayload( expectedMap );
mockDispatcher.setupRemoteCacheResponse = remoteHttpCacheResponse;
@@ -144,7 +144,7 @@ public class RemoteHttpCacheClientUnitTe
{
// SETUP
RemoteHttpCacheAttributes attributes = new RemoteHttpCacheAttributes();
- RemoteHttpCacheClient<String, String> client = new RemoteHttpCacheClient<>( attributes );
+ RemoteHttpCacheClient<String, String> client = new RemoteHttpCacheClient<String, String>( attributes );
MockRemoteCacheDispatcher mockDispatcher = new MockRemoteCacheDispatcher();
client.setRemoteDispatcher( mockDispatcher );
@@ -152,11 +152,11 @@ public class RemoteHttpCacheClientUnitTe
String cacheName = "test";
Set<String> keys = Collections.emptySet();
- ICacheElement<String, String> expected = new CacheElement<>( cacheName, "key", "value" );
- Map<String, ICacheElement<String, String>> expectedMap = new HashMap<>();
+ ICacheElement<String, String> expected = new CacheElement<String, String>( cacheName, "key", "value" );
+ Map<String, ICacheElement<String, String>> expectedMap = new HashMap<String, ICacheElement<String,String>>();
expectedMap.put( "key", expected );
RemoteCacheResponse<Map<String, ICacheElement<String, String>>> remoteHttpCacheResponse =
- new RemoteCacheResponse<>();
+ new RemoteCacheResponse<Map<String,ICacheElement<String,String>>>();
remoteHttpCacheResponse.setPayload( expectedMap );
mockDispatcher.setupRemoteCacheResponse = remoteHttpCacheResponse;
@@ -180,7 +180,7 @@ public class RemoteHttpCacheClientUnitTe
{
// SETUP
RemoteHttpCacheAttributes attributes = new RemoteHttpCacheAttributes();
- RemoteHttpCacheClient<String, String> client = new RemoteHttpCacheClient<>( attributes );
+ RemoteHttpCacheClient<String, String> client = new RemoteHttpCacheClient<String, String>( attributes );
MockRemoteCacheDispatcher mockDispatcher = new MockRemoteCacheDispatcher();
client.setRemoteDispatcher( mockDispatcher );
@@ -206,7 +206,7 @@ public class RemoteHttpCacheClientUnitTe
{
// SETUP
RemoteHttpCacheAttributes attributes = new RemoteHttpCacheAttributes();
- RemoteHttpCacheClient<String, String> client = new RemoteHttpCacheClient<>( attributes );
+ RemoteHttpCacheClient<String, String> client = new RemoteHttpCacheClient<String, String>( attributes );
MockRemoteCacheDispatcher mockDispatcher = new MockRemoteCacheDispatcher();
client.setRemoteDispatcher( mockDispatcher );
@@ -231,14 +231,14 @@ public class RemoteHttpCacheClientUnitTe
{
// SETUP
RemoteHttpCacheAttributes attributes = new RemoteHttpCacheAttributes();
- RemoteHttpCacheClient<String, String> client = new RemoteHttpCacheClient<>( attributes );
+ RemoteHttpCacheClient<String, String> client = new RemoteHttpCacheClient<String, String>( attributes );
MockRemoteCacheDispatcher mockDispatcher = new MockRemoteCacheDispatcher();
client.setRemoteDispatcher( mockDispatcher );
String cacheName = "test";
- ICacheElement<String, String> element = new CacheElement<>( cacheName, "key", "value" );
+ ICacheElement<String, String> element = new CacheElement<String, String>( cacheName, "key", "value" );
// DO WORK
client.update( element );
@@ -258,7 +258,7 @@ public class RemoteHttpCacheClientUnitTe
{
// SETUP
RemoteHttpCacheAttributes attributes = new RemoteHttpCacheAttributes();
- RemoteHttpCacheClient<String, String> client = new RemoteHttpCacheClient<>( attributes );
+ RemoteHttpCacheClient<String, String> client = new RemoteHttpCacheClient<String, String>( attributes );
MockRemoteCacheDispatcher mockDispatcher = new MockRemoteCacheDispatcher();
client.setRemoteDispatcher( mockDispatcher );
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheServiceUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheServiceUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheServiceUnitTest.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheServiceUnitTest.java Wed May 29 12:18:56 2019
@@ -44,12 +44,12 @@ public class RemoteHttpCacheServiceUnitT
RemoteHttpCacheServerAttributes rcsa = new RemoteHttpCacheServerAttributes();
RemoteHttpCacheService<String, String> server =
- new RemoteHttpCacheService<>( manager, rcsa, cacheEventLogger );
+ new RemoteHttpCacheService<String, String>( manager, rcsa, cacheEventLogger );
String cacheName = "test";
String key = "key";
long requesterId = 2;
- CacheElement<String, String> element = new CacheElement<>( cacheName, key, null );
+ CacheElement<String, String> element = new CacheElement<String, String>( cacheName, key, null );
// DO WORK
server.update( element, requesterId );
@@ -73,7 +73,7 @@ public class RemoteHttpCacheServiceUnitT
RemoteHttpCacheServerAttributes rcsa = new RemoteHttpCacheServerAttributes();
RemoteHttpCacheService<String, String> server =
- new RemoteHttpCacheService<>( manager, rcsa, cacheEventLogger );
+ new RemoteHttpCacheService<String, String>( manager, rcsa, cacheEventLogger );
// DO WORK
server.get( "region", "key" );
@@ -97,7 +97,7 @@ public class RemoteHttpCacheServiceUnitT
RemoteHttpCacheServerAttributes rcsa = new RemoteHttpCacheServerAttributes();
RemoteHttpCacheService<String, String> server =
- new RemoteHttpCacheService<>( manager, rcsa, cacheEventLogger );
+ new RemoteHttpCacheService<String, String>( manager, rcsa, cacheEventLogger );
// DO WORK
server.getMatching( "region", "pattern", 0 );
@@ -121,10 +121,10 @@ public class RemoteHttpCacheServiceUnitT
RemoteHttpCacheServerAttributes rcsa = new RemoteHttpCacheServerAttributes();
RemoteHttpCacheService<String, String> server =
- new RemoteHttpCacheService<>( manager, rcsa, cacheEventLogger );
+ new RemoteHttpCacheService<String, String>( manager, rcsa, cacheEventLogger );
// DO WORK
- server.getMultiple( "region", new HashSet<>() );
+ server.getMultiple( "region", new HashSet<String>() );
// VERIFY
assertEquals( "Start should have been called.", 1, cacheEventLogger.startICacheEventCalls );
@@ -145,7 +145,7 @@ public class RemoteHttpCacheServiceUnitT
RemoteHttpCacheServerAttributes rcsa = new RemoteHttpCacheServerAttributes();
RemoteHttpCacheService<String, String> server =
- new RemoteHttpCacheService<>( manager, rcsa, cacheEventLogger );
+ new RemoteHttpCacheService<String, String>( manager, rcsa, cacheEventLogger );
// DO WORK
server.remove( "region", "key" );
@@ -169,7 +169,7 @@ public class RemoteHttpCacheServiceUnitT
RemoteHttpCacheServerAttributes rcsa = new RemoteHttpCacheServerAttributes();
RemoteHttpCacheService<String, String> server =
- new RemoteHttpCacheService<>( manager, rcsa, cacheEventLogger );
+ new RemoteHttpCacheService<String, String>( manager, rcsa, cacheEventLogger );
// DO WORK
server.removeAll( "region" );
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheServletUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheServletUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheServletUnitTest.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheServletUnitTest.java Wed May 29 12:18:56 2019
@@ -48,7 +48,7 @@ public class RemoteHttpCacheServletUnitT
servlet = new RemoteHttpCacheServlet();
servlet.init(null);
- remoteHttpCacheService = new MockRemoteCacheService<>();
+ remoteHttpCacheService = new MockRemoteCacheService<Serializable, Serializable>();
servlet.setRemoteCacheService( remoteHttpCacheService );
}
@@ -133,7 +133,7 @@ public class RemoteHttpCacheServletUnitT
String cacheName = "test";
String key = "key";
long requesterId = 2;
- CacheElement<Serializable, Serializable> element = new CacheElement<>( cacheName, key, null );
+ CacheElement<Serializable, Serializable> element = new CacheElement<Serializable, Serializable>( cacheName, key, null );
RemoteCacheRequest<Serializable, Serializable> request = RemoteCacheRequestFactory.createUpdateRequest( element, requesterId );
// DO WORK
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/server/BasicRemoteCacheClientServerUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/server/BasicRemoteCacheClientServerUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/server/BasicRemoteCacheClientServerUnitTest.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/server/BasicRemoteCacheClientServerUnitTest.java Wed May 29 12:18:56 2019
@@ -152,7 +152,7 @@ public class BasicRemoteCacheClientServe
// DO WORK
int numPutsPrior = server.getPutCount();
- ICacheElement<String, String> element = new CacheElement<>(cache.getCacheName(), "key", "value");
+ ICacheElement<String, String> element = new CacheElement<String, String>(cache.getCacheName(), "key", "value");
cache.update(element);
SleepUtil.sleepAtLeast(200);
@@ -201,7 +201,7 @@ public class BasicRemoteCacheClientServe
// DO WORK
int numPutsPrior = server.getPutCount();
- ICacheElement<String, String> element = new CacheElement<>(cache.getCacheName(), "key", "value");
+ ICacheElement<String, String> element = new CacheElement<String, String>(cache.getCacheName(), "key", "value");
cache.update(element);
SleepUtil.sleepAtLeast(50);
@@ -253,12 +253,12 @@ public class BasicRemoteCacheClientServe
RemoteCacheManager remoteCacheManager = factory.getManager(attributes, compositeCacheManager, new MockCacheEventLogger(), new MockElementSerializer());
AuxiliaryCache<String, String> cache = remoteCacheManager.getCache(attributes);
- MockRemoteCacheListener<String, String> listener = new MockRemoteCacheListener<>();
+ MockRemoteCacheListener<String, String> listener = new MockRemoteCacheListener<String, String>();
server.addCacheListener(cache.getCacheName(), listener);
// DO WORK
int numPutsPrior = server.getPutCount();
- ICacheElement<String, String> element = new CacheElement<>(cache.getCacheName(), "key", "value");
+ ICacheElement<String, String> element = new CacheElement<String, String>(cache.getCacheName(), "key", "value");
cache.update(element);
SleepUtil.sleepAtLeast(50);
@@ -302,7 +302,7 @@ public class BasicRemoteCacheClientServe
RemoteCacheManager remoteCacheManager = factory.getManager(attributes, compositeCacheManager, new MockCacheEventLogger(), new MockElementSerializer());
AuxiliaryCache<String, String> cache = remoteCacheManager.getCache(attributes);
- MockRemoteCacheListener<String, String> listener = new MockRemoteCacheListener<>();
+ MockRemoteCacheListener<String, String> listener = new MockRemoteCacheListener<String, String>();
server.addCacheListener(cache.getCacheName(), listener);
// DO WORK
@@ -310,7 +310,7 @@ public class BasicRemoteCacheClientServe
int numToPut = 100;
for (int i = 0; i < numToPut; i++)
{
- ICacheElement<String, String> element = new CacheElement<>(cache.getCacheName(), "key" + 1, "value" + i);
+ ICacheElement<String, String> element = new CacheElement<String, String>(cache.getCacheName(), "key" + 1, "value" + i);
cache.update(element);
}
SleepUtil.sleepAtLeast(500);
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerUnitTest.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerUnitTest.java Wed May 29 12:18:56 2019
@@ -57,7 +57,7 @@ public class RemoteCacheServerUnitTest
IRemoteCacheServerAttributes rcsa = new RemoteCacheServerAttributes();
rcsa.setConfigFileName( "/TestRemoteCacheServer.ccf" );
Properties config = RemoteUtils.loadProps(rcsa.getConfigFileName());
- this.server = new RemoteCacheServer<>( rcsa, config );
+ this.server = new RemoteCacheServer<String, String>( rcsa, config );
}
@Override
@@ -77,10 +77,10 @@ public class RemoteCacheServerUnitTest
public void testAddListenerToCache_LOCALtype()
throws Exception
{
- MockRemoteCacheListener<String, String> mockListener1 = new MockRemoteCacheListener<>();
+ MockRemoteCacheListener<String, String> mockListener1 = new MockRemoteCacheListener<String, String>();
mockListener1.remoteType = RemoteType.LOCAL;
mockListener1.localAddress = expectedIp1;
- MockRemoteCacheListener<String, String> mockListener2 = new MockRemoteCacheListener<>();
+ MockRemoteCacheListener<String, String> mockListener2 = new MockRemoteCacheListener<String, String>();
mockListener1.remoteType = RemoteType.LOCAL;
mockListener2.localAddress = expectedIp2;
@@ -106,10 +106,10 @@ public class RemoteCacheServerUnitTest
public void testAddListenerToCache_CLUSTERtype()
throws Exception
{
- MockRemoteCacheListener<String, String> mockListener1 = new MockRemoteCacheListener<>();
+ MockRemoteCacheListener<String, String> mockListener1 = new MockRemoteCacheListener<String, String>();
mockListener1.remoteType = RemoteType.CLUSTER;
mockListener1.localAddress = expectedIp1;
- MockRemoteCacheListener<String, String> mockListener2 = new MockRemoteCacheListener<>();
+ MockRemoteCacheListener<String, String> mockListener2 = new MockRemoteCacheListener<String, String>();
mockListener1.remoteType = RemoteType.CLUSTER;
mockListener2.localAddress = expectedIp2;
@@ -136,9 +136,9 @@ public class RemoteCacheServerUnitTest
// public void testAddListener_ToAll()
// throws Exception
// {
-// MockRemoteCacheListener<String, String> mockListener1 = new MockRemoteCacheListener<>();
+// MockRemoteCacheListener<String, String> mockListener1 = new MockRemoteCacheListener<String, String>();
// mockListener1.localAddress = expectedIp1;
-// MockRemoteCacheListener<String, String> mockListener2 = new MockRemoteCacheListener<>();
+// MockRemoteCacheListener<String, String> mockListener2 = new MockRemoteCacheListener<String, String>();
// mockListener2.localAddress = expectedIp2;
//
// // DO WORK
@@ -163,8 +163,8 @@ public class RemoteCacheServerUnitTest
public void testAddListener_ToAllThenRemove()
throws Exception
{
- MockRemoteCacheListener<String, String> mockListener1 = new MockRemoteCacheListener<>();
- MockRemoteCacheListener<String, String> mockListener2 = new MockRemoteCacheListener<>();
+ MockRemoteCacheListener<String, String> mockListener1 = new MockRemoteCacheListener<String, String>();
+ MockRemoteCacheListener<String, String> mockListener2 = new MockRemoteCacheListener<String, String>();
String cacheName = "testAddListenerToAllThenRemove";
@@ -192,9 +192,9 @@ public class RemoteCacheServerUnitTest
public void testAddListener_ToAllThenRemove_clusterType()
throws Exception
{
- MockRemoteCacheListener<String, String> mockListener1 = new MockRemoteCacheListener<>();
+ MockRemoteCacheListener<String, String> mockListener1 = new MockRemoteCacheListener<String, String>();
mockListener1.remoteType = RemoteType.CLUSTER;
- MockRemoteCacheListener<String, String> mockListener2 = new MockRemoteCacheListener<>();
+ MockRemoteCacheListener<String, String> mockListener2 = new MockRemoteCacheListener<String, String>();
mockListener2.remoteType = RemoteType.CLUSTER;
String cacheName = "testAddListenerToAllThenRemove";
@@ -227,19 +227,19 @@ public class RemoteCacheServerUnitTest
rcsa.setConfigFileName( "/TestRemoteCacheServer.ccf" );
Properties config = RemoteUtils.loadProps(rcsa.getConfigFileName());
- MockRemoteCacheListener<String, Long> mockListener = new MockRemoteCacheListener<>();
- RemoteCacheServer<String, Long> server = new RemoteCacheServer<>( rcsa, config );
+ MockRemoteCacheListener<String, Long> mockListener = new MockRemoteCacheListener<String, Long>();
+ RemoteCacheServer<String, Long> server = new RemoteCacheServer<String, Long>( rcsa, config );
String cacheName = "testSimpleRegisterListenerAndPut";
server.addCacheListener( cacheName, mockListener );
// DO WORK
- List<ICacheElement<String, Long>> inputItems = new LinkedList<>();
+ List<ICacheElement<String, Long>> inputItems = new LinkedList<ICacheElement<String, Long>>();
int numToPut = 10;
for ( int i = 0; i < numToPut; i++ )
{
- ICacheElement<String, Long> element = new CacheElement<>( cacheName, String.valueOf( i ), Long.valueOf( i ) );
+ ICacheElement<String, Long> element = new CacheElement<String, Long>( cacheName, String.valueOf( i ), Long.valueOf( i ) );
inputItems.add( element );
server.update( element, 9999 );
}
@@ -273,14 +273,14 @@ public class RemoteCacheServerUnitTest
rcsa.setLocalClusterConsistency( true );
rcsa.setConfigFileName( "/TestRemoteCacheServer.ccf" );
Properties config = RemoteUtils.loadProps(rcsa.getConfigFileName());
- RemoteCacheServer<String, Long> server = new RemoteCacheServer<>( rcsa, config );
+ RemoteCacheServer<String, Long> server = new RemoteCacheServer<String, Long>( rcsa, config );
// this is to get the listener id for inserts.
- MockRemoteCacheListener<String, Long> clusterListener = new MockRemoteCacheListener<>();
+ MockRemoteCacheListener<String, Long> clusterListener = new MockRemoteCacheListener<String, Long>();
clusterListener.remoteType = RemoteType.CLUSTER;
// this should get the updates
- MockRemoteCacheListener<String, Long> localListener = new MockRemoteCacheListener<>();
+ MockRemoteCacheListener<String, Long> localListener = new MockRemoteCacheListener<String, Long>();
localListener.remoteType = RemoteType.LOCAL;
String cacheName = "testSimpleRegisterListenerAndPut_FromClusterWithLCC";
@@ -288,12 +288,12 @@ public class RemoteCacheServerUnitTest
server.addCacheListener( cacheName, localListener );
// DO WORK
- List<ICacheElement<String, Long>> inputItems = new LinkedList<>();
+ List<ICacheElement<String, Long>> inputItems = new LinkedList<ICacheElement<String,Long>>();
int numToPut = 10;
for ( int i = 0; i < numToPut; i++ )
{
- ICacheElement<String, Long> element = new CacheElement<>( cacheName, String.valueOf( i ), Long.valueOf( i ) );
+ ICacheElement<String, Long> element = new CacheElement<String, Long>( cacheName, String.valueOf( i ), Long.valueOf( i ) );
inputItems.add( element );
// update using the cluster listener id
server.update( element, clusterListener.getListenerId() );
@@ -321,7 +321,7 @@ public class RemoteCacheServerUnitTest
public void testSimpleRegisterListenerAndRemove()
throws Exception
{
- MockRemoteCacheListener<String, String> mockListener = new MockRemoteCacheListener<>();
+ MockRemoteCacheListener<String, String> mockListener = new MockRemoteCacheListener<String, String>();
String cacheName = "testSimpleRegisterListenerAndPut";
server.addCacheListener( cacheName, mockListener );
@@ -358,7 +358,7 @@ public class RemoteCacheServerUnitTest
MockCacheEventLogger cacheEventLogger = new MockCacheEventLogger();
server.setCacheEventLogger( cacheEventLogger );
- ICacheElement<String, String> item = new CacheElement<>( "region", "key", "value" );
+ ICacheElement<String, String> item = new CacheElement<String, String>( "region", "key", "value" );
// DO WORK
server.update( item );
@@ -418,7 +418,7 @@ public class RemoteCacheServerUnitTest
server.setCacheEventLogger( cacheEventLogger );
// DO WORK
- server.getMultiple( "region", new HashSet<>() );
+ server.getMultiple( "region", new HashSet<String>() );
// VERIFY
assertEquals( "Start should have been called.", 1, cacheEventLogger.startICacheEventCalls );
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/util/RemoteCacheRequestFactoryUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/util/RemoteCacheRequestFactoryUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/util/RemoteCacheRequestFactoryUnitTest.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/util/RemoteCacheRequestFactoryUnitTest.java Wed May 29 12:18:56 2019
@@ -130,7 +130,7 @@ public class RemoteCacheRequestFactoryUn
long requesterId = 2;
CacheElement<Serializable, Serializable> element =
- new CacheElement<>( cacheName, key, null );
+ new CacheElement<Serializable, Serializable>( cacheName, key, null );
// DO WORK
RemoteCacheRequest<Serializable, Serializable> result =
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/CacheEventQueueFactoryUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/CacheEventQueueFactoryUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/CacheEventQueueFactoryUnitTest.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/CacheEventQueueFactoryUnitTest.java Wed May 29 12:18:56 2019
@@ -35,10 +35,10 @@ public class CacheEventQueueFactoryUnitT
{
// SETUP
QueueType eventQueueType = QueueType.SINGLE;
- ICacheListener<String, String> listener = new MockRemoteCacheListener<>();
+ ICacheListener<String, String> listener = new MockRemoteCacheListener<String, String>();
long listenerId = 1;
- CacheEventQueueFactory<String, String> factory = new CacheEventQueueFactory<>();
+ CacheEventQueueFactory<String, String> factory = new CacheEventQueueFactory<String, String>();
// DO WORK
ICacheEventQueue<String, String> result = factory.createCacheEventQueue( listener, listenerId, "cacheName", "threadPoolName", eventQueueType );
@@ -53,10 +53,10 @@ public class CacheEventQueueFactoryUnitT
{
// SETUP
QueueType eventQueueType = QueueType.POOLED;
- ICacheListener<String, String> listener = new MockRemoteCacheListener<>();
+ ICacheListener<String, String> listener = new MockRemoteCacheListener<String, String>();
long listenerId = 1;
- CacheEventQueueFactory<String, String> factory = new CacheEventQueueFactory<>();
+ CacheEventQueueFactory<String, String> factory = new CacheEventQueueFactory<String, String>();
// DO WORK
ICacheEventQueue<String, String> result = factory.createCacheEventQueue( listener, listenerId, "cacheName", "threadPoolName", eventQueueType );
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/EventQueueConcurrentLoadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/EventQueueConcurrentLoadTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/EventQueueConcurrentLoadTest.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/EventQueueConcurrentLoadTest.java Wed May 29 12:18:56 2019
@@ -148,8 +148,8 @@ public class EventQueueConcurrentLoadTes
@Override
public void setUp()
{
- listen = new CacheListenerImpl<>();
- queue = new CacheEventQueue<>( listen, 1L, "testCache1", maxFailure, waitBeforeRetry );
+ listen = new CacheListenerImpl<String, String>();
+ queue = new CacheEventQueue<String, String>( listen, 1L, "testCache1", maxFailure, waitBeforeRetry );
queue.setWaitToDieMillis( idleTime );
}
@@ -165,7 +165,7 @@ public class EventQueueConcurrentLoadTes
{
for ( int i = 0; i <= end; i++ )
{
- CacheElement<String, String> elem = new CacheElement<>( "testCache1", i + ":key", i + "data" );
+ CacheElement<String, String> elem = new CacheElement<String, String>( "testCache1", i + ":key", i + "data" );
queue.addPutEvent( elem );
}
@@ -221,7 +221,7 @@ public class EventQueueConcurrentLoadTes
System.out.println( "queue is empty, begin" );
// get it going
- CacheElement<String, String> elem = new CacheElement<>( "testCache1", "a:key", "adata" );
+ CacheElement<String, String> elem = new CacheElement<String, String>( "testCache1", "a:key", "adata" );
queue.addPutEvent( elem );
for ( int i = 0; i <= end; i++ )
@@ -237,7 +237,7 @@ public class EventQueueConcurrentLoadTes
this.wait( idleTime / 2 );
}
}
- CacheElement<String, String> elem2 = new CacheElement<>( "testCache1", i + ":key", i + "data" );
+ CacheElement<String, String> elem2 = new CacheElement<String, String>( "testCache1", i + ":key", i + "data" );
queue.addPutEvent( elem2 );
}
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/MockCacheServiceNonLocal.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/MockCacheServiceNonLocal.java?rev=1860336&r1=1860335&r2=1860336&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/MockCacheServiceNonLocal.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/MockCacheServiceNonLocal.java Wed May 29 12:18:56 2019
@@ -49,10 +49,10 @@ public class MockCacheServiceNonLocal<K,
public ICacheElement<K, V> lastUpdate;
/** List of updates. */
- public List<ICacheElement<K, V>> updateRequestList = new ArrayList<>();
+ public List<ICacheElement<K, V>> updateRequestList = new ArrayList<ICacheElement<K,V>>();
/** List of request ids. */
- public List<Long> updateRequestIdList = new ArrayList<>();
+ public List<Long> updateRequestIdList = new ArrayList<Long>();
/** The key that was last passed to remove. */
public K lastRemoveKey;
@@ -80,7 +80,7 @@ public class MockCacheServiceNonLocal<K,
@Override
public Set<K> getKeySet( String cacheName )
{
- return new HashSet<>();
+ return new HashSet<K>();
}
/**
@@ -199,7 +199,7 @@ public class MockCacheServiceNonLocal<K,
public Map<K, ICacheElement<K, V>> getMultiple( String cacheName, Set<K> keys, long requesterId )
{
lastGetMultipleKeys = keys;
- return new HashMap<>();
+ return new HashMap<K, ICacheElement<K, V>>();
}
/**
@@ -240,6 +240,6 @@ public class MockCacheServiceNonLocal<K,
throws IOException
{
lastGetMatchingPattern = pattern;
- return new HashMap<>();
+ return new HashMap<K, ICacheElement<K, V>>();
}
}
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/ZombieCacheServiceNonLocalUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/ZombieCacheServiceNonLocalUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/ZombieCacheServiceNonLocalUnitTest.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/ZombieCacheServiceNonLocalUnitTest.java Wed May 29 12:18:56 2019
@@ -37,14 +37,14 @@ public class ZombieCacheServiceNonLocalU
throws Exception
{
// SETUP
- MockCacheServiceNonLocal<String, String> service = new MockCacheServiceNonLocal<>();
+ MockCacheServiceNonLocal<String, String> service = new MockCacheServiceNonLocal<String, String>();
- ZombieCacheServiceNonLocal<String, String> zombie = new ZombieCacheServiceNonLocal<>( 10 );
+ ZombieCacheServiceNonLocal<String, String> zombie = new ZombieCacheServiceNonLocal<String, String>( 10 );
String cacheName = "testUpdate";
// DO WORK
- ICacheElement<String, String> element = new CacheElement<>( cacheName, "key", "value" );
+ ICacheElement<String, String> element = new CacheElement<String, String>( cacheName, "key", "value" );
zombie.update( element, 123l );
zombie.propagateEvents( service );
@@ -61,14 +61,14 @@ public class ZombieCacheServiceNonLocalU
throws Exception
{
// SETUP
- MockCacheServiceNonLocal<String, String> service = new MockCacheServiceNonLocal<>();
+ MockCacheServiceNonLocal<String, String> service = new MockCacheServiceNonLocal<String, String>();
- ZombieCacheServiceNonLocal<String, String> zombie = new ZombieCacheServiceNonLocal<>( 0 );
+ ZombieCacheServiceNonLocal<String, String> zombie = new ZombieCacheServiceNonLocal<String, String>( 0 );
String cacheName = "testUpdate";
// DO WORK
- ICacheElement<String, String> element = new CacheElement<>( cacheName, "key", "value" );
+ ICacheElement<String, String> element = new CacheElement<String, String>( cacheName, "key", "value" );
zombie.update( element, 123l );
zombie.propagateEvents( service );
@@ -85,9 +85,9 @@ public class ZombieCacheServiceNonLocalU
throws Exception
{
// SETUP
- MockCacheServiceNonLocal<String, String> service = new MockCacheServiceNonLocal<>();
+ MockCacheServiceNonLocal<String, String> service = new MockCacheServiceNonLocal<String, String>();
- ZombieCacheServiceNonLocal<String, String> zombie = new ZombieCacheServiceNonLocal<>( 10 );
+ ZombieCacheServiceNonLocal<String, String> zombie = new ZombieCacheServiceNonLocal<String, String>( 10 );
String cacheName = "testRemoveThenWalk";
String key = "myKey";
@@ -109,9 +109,9 @@ public class ZombieCacheServiceNonLocalU
throws Exception
{
// SETUP
- MockCacheServiceNonLocal<String, String> service = new MockCacheServiceNonLocal<>();
+ MockCacheServiceNonLocal<String, String> service = new MockCacheServiceNonLocal<String, String>();
- ZombieCacheServiceNonLocal<String, String> zombie = new ZombieCacheServiceNonLocal<>( 10 );
+ ZombieCacheServiceNonLocal<String, String> zombie = new ZombieCacheServiceNonLocal<String, String>( 10 );
String cacheName = "testRemoveThenWalk";
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/control/CompositeCacheDiskUsageUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/control/CompositeCacheDiskUsageUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/control/CompositeCacheDiskUsageUnitTest.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/control/CompositeCacheDiskUsageUnitTest.java Wed May 29 12:18:56 2019
@@ -103,16 +103,16 @@ public class CompositeCacheDiskUsageUnit
IElementAttributes attr = new ElementAttributes();
- CompositeCache<String, String> cache = new CompositeCache<>( cattr, attr );
+ CompositeCache<String, String> cache = new CompositeCache<String, String>( cattr, attr );
- MockAuxCache<String, String> mock = new MockAuxCache<>();
+ MockAuxCache<String, String> mock = new MockAuxCache<String, String>();
mock.cacheType = CacheType.DISK_CACHE;
@SuppressWarnings("unchecked")
AuxiliaryCache<String, String>[] auxArray = new AuxiliaryCache[] { mock };
cache.setAuxCaches( auxArray );
- ICacheElement<String, String> inputElement = new CacheElement<>( CACHE_NAME, "key", "value" );
+ ICacheElement<String, String> inputElement = new CacheElement<String, String>( CACHE_NAME, "key", "value" );
// DO WORK
cache.spoolToDisk( inputElement );
@@ -135,16 +135,16 @@ public class CompositeCacheDiskUsageUnit
IElementAttributes attr = new ElementAttributes();
- CompositeCache<String, String> cache = new CompositeCache<>( cattr, attr );
+ CompositeCache<String, String> cache = new CompositeCache<String, String>( cattr, attr );
- MockAuxCache<String, String> mock = new MockAuxCache<>();
+ MockAuxCache<String, String> mock = new MockAuxCache<String, String>();
mock.cacheType = CacheType.DISK_CACHE;
@SuppressWarnings("unchecked")
AuxiliaryCache<String, String>[] auxArray = new AuxiliaryCache[] { mock };
cache.setAuxCaches( auxArray );
- ICacheElement<String, String> inputElement = new CacheElement<>( CACHE_NAME, "key", "value" );
+ ICacheElement<String, String> inputElement = new CacheElement<String, String>( CACHE_NAME, "key", "value" );
// DO WORK
cache.spoolToDisk( inputElement );
@@ -171,16 +171,16 @@ public class CompositeCacheDiskUsageUnit
IElementAttributes attr = new ElementAttributes();
- CompositeCache<String, String> cache = new CompositeCache<>( cattr, attr );
+ CompositeCache<String, String> cache = new CompositeCache<String, String>( cattr, attr );
- MockAuxCache<String, String> mock = new MockAuxCache<>();
+ MockAuxCache<String, String> mock = new MockAuxCache<String, String>();
mock.cacheType = CacheType.DISK_CACHE;
@SuppressWarnings("unchecked")
AuxiliaryCache<String, String>[] auxArray = new AuxiliaryCache[] { mock };
cache.setAuxCaches( auxArray );
- ICacheElement<String, String> inputElement = new CacheElement<>( CACHE_NAME, "key", "value" );
+ ICacheElement<String, String> inputElement = new CacheElement<String, String>( CACHE_NAME, "key", "value" );
// DO WORK
cache.updateAuxiliaries( inputElement, true );
@@ -209,16 +209,16 @@ public class CompositeCacheDiskUsageUnit
IElementAttributes attr = new ElementAttributes();
- CompositeCache<String, String> cache = new CompositeCache<>( cattr, attr );
+ CompositeCache<String, String> cache = new CompositeCache<String, String>( cattr, attr );
- MockAuxCache<String, String> mock = new MockAuxCache<>();
+ MockAuxCache<String, String> mock = new MockAuxCache<String, String>();
mock.cacheType = CacheType.DISK_CACHE;
@SuppressWarnings("unchecked")
AuxiliaryCache<String, String>[] auxArray = new AuxiliaryCache[] { mock };
cache.setAuxCaches( auxArray );
- ICacheElement<String, String> inputElement = new CacheElement<>( CACHE_NAME, "key", "value" );
+ ICacheElement<String, String> inputElement = new CacheElement<String, String>( CACHE_NAME, "key", "value" );
// DO WORK
cache.updateAuxiliaries( inputElement, false );
@@ -247,16 +247,16 @@ public class CompositeCacheDiskUsageUnit
IElementAttributes attr = new ElementAttributes();
- CompositeCache<String, String> cache = new CompositeCache<>( cattr, attr );
+ CompositeCache<String, String> cache = new CompositeCache<String, String>( cattr, attr );
- MockAuxCache<String, String> mock = new MockAuxCache<>();
+ MockAuxCache<String, String> mock = new MockAuxCache<String, String>();
mock.cacheType = CacheType.DISK_CACHE;
@SuppressWarnings("unchecked")
AuxiliaryCache<String, String>[] auxArray = new AuxiliaryCache[] { mock };
cache.setAuxCaches( auxArray );
- ICacheElement<String, String> inputElement = new CacheElement<>( CACHE_NAME, "key", "value" );
+ ICacheElement<String, String> inputElement = new CacheElement<String, String>( CACHE_NAME, "key", "value" );
// DO WORK
cache.updateAuxiliaries( inputElement, true );
@@ -283,19 +283,19 @@ public class CompositeCacheDiskUsageUnit
IElementAttributes attr = new ElementAttributes();
- CompositeCache<String, String> cache = new CompositeCache<>( cattr, attr );
+ CompositeCache<String, String> cache = new CompositeCache<String, String>( cattr, attr );
- MockAuxCache<String, String> mock = new MockAuxCache<>();
+ MockAuxCache<String, String> mock = new MockAuxCache<String, String>();
mock.cacheType = CacheType.DISK_CACHE;
- MockAuxCache<String, String> mockLateral = new MockAuxCache<>();
+ MockAuxCache<String, String> mockLateral = new MockAuxCache<String, String>();
mockLateral.cacheType = CacheType.LATERAL_CACHE;
@SuppressWarnings("unchecked")
AuxiliaryCache<String, String>[] auxArray = new AuxiliaryCache[] { mock, mockLateral };
cache.setAuxCaches( auxArray );
- ICacheElement<String, String> inputElement = new CacheElement<>( CACHE_NAME, "key", "value" );
+ ICacheElement<String, String> inputElement = new CacheElement<String, String>( CACHE_NAME, "key", "value" );
// DO WORK
cache.updateAuxiliaries( inputElement, false );
@@ -366,7 +366,7 @@ public class CompositeCacheDiskUsageUnit
@Override
public Map<K, ICacheElement<K, V>> getMultiple(Set<K> keys)
{
- return new HashMap<>();
+ return new HashMap<K, ICacheElement<K, V>>();
}
/**
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/control/CompositeCacheUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/control/CompositeCacheUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/control/CompositeCacheUnitTest.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/control/CompositeCacheUnitTest.java Wed May 29 12:18:56 2019
@@ -59,9 +59,9 @@ public class CompositeCacheUnitTest
IElementAttributes attr = new ElementAttributes();
- CompositeCache<String, Integer> cache = new CompositeCache<>( cattr, attr );
+ CompositeCache<String, Integer> cache = new CompositeCache<String, Integer>( cattr, attr );
- MockAuxiliaryCache<String, Integer> diskMock = new MockAuxiliaryCache<>();
+ MockAuxiliaryCache<String, Integer> diskMock = new MockAuxiliaryCache<String, Integer>();
diskMock.cacheType = CacheType.DISK_CACHE;
@SuppressWarnings("unchecked")
AuxiliaryCache<String, Integer>[] aux = new AuxiliaryCache[] { diskMock };
@@ -71,7 +71,7 @@ public class CompositeCacheUnitTest
int numToInsert = 10;
for ( int i = 0; i < numToInsert; i++ )
{
- ICacheElement<String, Integer> element = new CacheElement<>( cacheName, String.valueOf( i ), Integer.valueOf( i ) );
+ ICacheElement<String, Integer> element = new CacheElement<String, Integer>( cacheName, String.valueOf( i ), Integer.valueOf( i ) );
cache.update( element, false );
}
@@ -99,9 +99,9 @@ public class CompositeCacheUnitTest
IElementAttributes attr = new ElementAttributes();
- CompositeCache<String, Integer> cache = new CompositeCache<>( cattr, attr );
+ CompositeCache<String, Integer> cache = new CompositeCache<String, Integer>( cattr, attr );
- MockAuxiliaryCache<String, Integer> diskMock = new MockAuxiliaryCache<>();
+ MockAuxiliaryCache<String, Integer> diskMock = new MockAuxiliaryCache<String, Integer>();
diskMock.cacheType = CacheType.REMOTE_CACHE;
@SuppressWarnings("unchecked")
AuxiliaryCache<String, Integer>[] aux = new AuxiliaryCache[] { diskMock };
@@ -111,7 +111,7 @@ public class CompositeCacheUnitTest
int numToInsert = 10;
for ( int i = 0; i < numToInsert; i++ )
{
- ICacheElement<String, Integer> element = new CacheElement<>( cacheName, String.valueOf( i ), Integer.valueOf( i ) );
+ ICacheElement<String, Integer> element = new CacheElement<String, Integer>( cacheName, String.valueOf( i ), Integer.valueOf( i ) );
cache.update( element, false );
}
@@ -142,9 +142,9 @@ public class CompositeCacheUnitTest
IElementAttributes attr = new ElementAttributes();
- CompositeCache<String, Integer> cache = new CompositeCache<>( cattr, attr );
+ CompositeCache<String, Integer> cache = new CompositeCache<String, Integer>( cattr, attr );
- MockAuxiliaryCache<String, Integer> diskMock = new MockAuxiliaryCache<>();
+ MockAuxiliaryCache<String, Integer> diskMock = new MockAuxiliaryCache<String, Integer>();
diskMock.cacheType = CacheType.DISK_CACHE;
@SuppressWarnings("unchecked")
AuxiliaryCache<String, Integer>[] aux = new AuxiliaryCache[] { diskMock };
@@ -155,7 +155,7 @@ public class CompositeCacheUnitTest
// insert with prefix1
for ( int i = 0; i < numToInsertPrefix1; i++ )
{
- ICacheElement<String, Integer> element = new CacheElement<>( cacheName, keyprefix1 + String.valueOf( i ), Integer.valueOf( i ) );
+ ICacheElement<String, Integer> element = new CacheElement<String, Integer>( cacheName, keyprefix1 + String.valueOf( i ), Integer.valueOf( i ) );
cache.update( element, false );
}
@@ -163,7 +163,7 @@ public class CompositeCacheUnitTest
// insert with prefix1
for ( int i = 0; i < numToInsertPrefix2; i++ )
{
- ICacheElement<String, Integer> element = new CacheElement<>( cacheName, keyprefix2 + String.valueOf( i ), Integer.valueOf( i ) );
+ ICacheElement<String, Integer> element = new CacheElement<String, Integer>( cacheName, keyprefix2 + String.valueOf( i ), Integer.valueOf( i ) );
cache.update( element, false );
}
@@ -194,9 +194,9 @@ public class CompositeCacheUnitTest
IElementAttributes attr = new ElementAttributes();
- CompositeCache<String, Integer> cache = new CompositeCache<>( cattr, attr );
+ CompositeCache<String, Integer> cache = new CompositeCache<String, Integer>( cattr, attr );
- MockAuxiliaryCache<String, Integer> diskMock = new MockAuxiliaryCache<>();
+ MockAuxiliaryCache<String, Integer> diskMock = new MockAuxiliaryCache<String, Integer>();
diskMock.cacheType = CacheType.DISK_CACHE;
@SuppressWarnings("unchecked")
AuxiliaryCache<String, Integer>[] aux = new AuxiliaryCache[] { diskMock };
@@ -228,9 +228,9 @@ public class CompositeCacheUnitTest
IElementAttributes attr = new ElementAttributes();
- CompositeCache<String, Integer> cache = new CompositeCache<>( cattr, attr );
+ CompositeCache<String, Integer> cache = new CompositeCache<String, Integer>( cattr, attr );
- MockAuxiliaryCache<String, Integer> diskMock = new MockAuxiliaryCache<>();
+ MockAuxiliaryCache<String, Integer> diskMock = new MockAuxiliaryCache<String, Integer>();
diskMock.cacheType = CacheType.REMOTE_CACHE;
@SuppressWarnings("unchecked")
AuxiliaryCache<String, Integer>[] aux = new AuxiliaryCache[] { diskMock };
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/control/MockCompositeCacheManager.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/control/MockCompositeCacheManager.java?rev=1860336&r1=1860335&r2=1860336&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/control/MockCompositeCacheManager.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/control/MockCompositeCacheManager.java Wed May 29 12:18:56 2019
@@ -49,7 +49,7 @@ public class MockCompositeCacheManager
{
// System.out.println( "Creating mock cache" );
CompositeCache<K, V> newCache =
- new CompositeCache<>( new CompositeCacheAttributes(), new ElementAttributes() );
+ new CompositeCache<K, V>( new CompositeCacheAttributes(), new ElementAttributes() );
this.setCache( newCache );
}
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/logging/MockCacheEventLogger.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/logging/MockCacheEventLogger.java?rev=1860336&r1=1860335&r2=1860336&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/logging/MockCacheEventLogger.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/logging/MockCacheEventLogger.java Wed May 29 12:18:56 2019
@@ -65,7 +65,7 @@ public class MockCacheEventLogger
public <T> ICacheEvent<T> createICacheEvent( String source, String region, String eventName, String optionalDetails,
T key )
{
- return new CacheEvent<>();
+ return new CacheEvent<T>();
}
/**
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/match/KeyMatcherPatternImpllUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/match/KeyMatcherPatternImpllUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/match/KeyMatcherPatternImpllUnitTest.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/match/KeyMatcherPatternImpllUnitTest.java Wed May 29 12:18:56 2019
@@ -35,7 +35,7 @@ public class KeyMatcherPatternImpllUnitT
{
// SETUP
int numToInsertPrefix1 = 10;
- Set<String> keyArray = new HashSet<>();
+ Set<String> keyArray = new HashSet<String>();
String keyprefix1 = "MyPrefixC";
@@ -45,7 +45,7 @@ public class KeyMatcherPatternImpllUnitT
keyArray.add(keyprefix1 + String.valueOf( i ));
}
- KeyMatcherPatternImpl<String> keyMatcher = new KeyMatcherPatternImpl<>();
+ KeyMatcherPatternImpl<String> keyMatcher = new KeyMatcherPatternImpl<String>();
// DO WORK
Set<String> result1 = keyMatcher.getMatchingKeysFromArray( keyprefix1 + ".", keyArray );
@@ -61,7 +61,7 @@ public class KeyMatcherPatternImpllUnitT
{
// SETUP
int numToInsertPrefix1 = 10;
- Set<String> keyArray = new HashSet<>();
+ Set<String> keyArray = new HashSet<String>();
String keyprefix1 = "MyPrefixC";
@@ -71,7 +71,7 @@ public class KeyMatcherPatternImpllUnitT
keyArray.add(keyprefix1 + String.valueOf( i ));
}
- KeyMatcherPatternImpl<String> keyMatcher = new KeyMatcherPatternImpl<>();
+ KeyMatcherPatternImpl<String> keyMatcher = new KeyMatcherPatternImpl<String>();
// DO WORK
Set<String> result1 = keyMatcher.getMatchingKeysFromArray( keyprefix1 + "\\S+", keyArray );
@@ -88,7 +88,7 @@ public class KeyMatcherPatternImpllUnitT
// SETUP
int numToInsertPrefix1 = 10;
int numToInsertPrefix2 = 50;
- Set<String> keyArray = new HashSet<>();
+ Set<String> keyArray = new HashSet<String>();
String keyprefix1 = "MyPrefixA";
String keyprefix2 = "MyPrefixB";
@@ -105,7 +105,7 @@ public class KeyMatcherPatternImpllUnitT
keyArray.add(keyprefix2 + String.valueOf( i ));
}
- KeyMatcherPatternImpl<String> keyMatcher = new KeyMatcherPatternImpl<>();
+ KeyMatcherPatternImpl<String> keyMatcher = new KeyMatcherPatternImpl<String>();
// DO WORK
Set<String> result1 = keyMatcher.getMatchingKeysFromArray( keyprefix1 + ".+", keyArray );
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/MockMemoryCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/MockMemoryCache.java?rev=1860336&r1=1860335&r2=1860336&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/MockMemoryCache.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/MockMemoryCache.java Wed May 29 12:18:56 2019
@@ -44,7 +44,7 @@ public class MockMemoryCache<K, V>
private ICompositeCacheAttributes cacheAttr;
/** Internal map */
- private final HashMap<K, ICacheElement<K, V>> map = new HashMap<>();
+ private final HashMap<K, ICacheElement<K, V>> map = new HashMap<K, ICacheElement<K, V>>();
/** The number of times waterfall was called. */
public int waterfallCallCount = 0;
@@ -93,7 +93,7 @@ public class MockMemoryCache<K, V>
@Override
public Set<K> getKeySet()
{
- return new LinkedHashSet<>(map.keySet());
+ return new LinkedHashSet<K>(map.keySet());
}
/**
@@ -139,7 +139,7 @@ public class MockMemoryCache<K, V>
public Map<K, ICacheElement<K, V>> getMultiple(Set<K> keys)
throws IOException
{
- Map<K, ICacheElement<K, V>> elements = new HashMap<>();
+ Map<K, ICacheElement<K, V>> elements = new HashMap<K, ICacheElement<K, V>>();
if ( keys != null && !keys.isEmpty() )
{
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/fifo/FIFOMemoryCacheUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/fifo/FIFOMemoryCacheUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/fifo/FIFOMemoryCacheUnitTest.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/fifo/FIFOMemoryCacheUnitTest.java Wed May 29 12:18:56 2019
@@ -50,16 +50,16 @@ public class FIFOMemoryCacheUnitTest
attributes.setMaxObjects( maxObjects );
attributes.setSpoolChunkSize( 1 );
- FIFOMemoryCache<String, String> cache = new FIFOMemoryCache<>();
- cache.initialize( new CompositeCache<>( attributes, new ElementAttributes() ) );
+ FIFOMemoryCache<String, String> cache = new FIFOMemoryCache<String, String>();
+ cache.initialize( new CompositeCache<String, String>( attributes, new ElementAttributes() ) );
for ( int i = 0; i <= maxObjects; i++ )
{
- CacheElement<String, String> element = new CacheElement<>( cacheName, "key" + i, "value" + i );
+ CacheElement<String, String> element = new CacheElement<String, String>( cacheName, "key" + i, "value" + i );
cache.update( element );
}
- CacheElement<String, String> oneMoreElement = new CacheElement<>( cacheName, "onemore", "onemore" );
+ CacheElement<String, String> oneMoreElement = new CacheElement<String, String>( cacheName, "onemore", "onemore" );
// DO WORK
cache.update( oneMoreElement );
@@ -91,13 +91,13 @@ public class FIFOMemoryCacheUnitTest
attributes.setMaxObjects( maxObjects );
attributes.setSpoolChunkSize( 1 );
- FIFOMemoryCache<String, String> cache = new FIFOMemoryCache<>();
- cache.initialize( new CompositeCache<>( attributes, new ElementAttributes() ) );
+ FIFOMemoryCache<String, String> cache = new FIFOMemoryCache<String, String>();
+ cache.initialize( new CompositeCache<String, String>( attributes, new ElementAttributes() ) );
// DO WORK
for ( int i = 0; i <= (maxObjects * 2); i++ )
{
- CacheElement<String, String> element = new CacheElement<>( cacheName, "key" + i, "value" + i );
+ CacheElement<String, String> element = new CacheElement<String, String>( cacheName, "key" + i, "value" + i );
cache.update( element );
}
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCacheConcurrentUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCacheConcurrentUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCacheConcurrentUnitTest.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCacheConcurrentUnitTest.java Wed May 29 12:18:56 2019
@@ -113,14 +113,14 @@ public class LHMLRUMemoryCacheConcurrent
cacheMgr.configure( "/TestLHMLRUCache.ccf" );
CompositeCache<String, String> cache = cacheMgr.getCache( region );
- LRUMemoryCache<String, String> lru = new LRUMemoryCache<>();
+ LRUMemoryCache<String, String> lru = new LRUMemoryCache<String, String>();
lru.initialize( cache );
// Add items to cache
for ( int i = 0; i < items; i++ )
{
- ICacheElement<String, String> ice = new CacheElement<>( cache.getCacheName(), i + ":key", region + " data " + i );
+ ICacheElement<String, String> ice = new CacheElement<String, String>( cache.getCacheName(), i + ":key", region + " data " + i );
ice.setElementAttributes( cache.getElementAttributes() );
lru.update( ice );
}
@@ -139,7 +139,7 @@ public class LHMLRUMemoryCacheConcurrent
}
// Test that getMultiple returns all the items remaining in cache and none of the missing ones
- Set<String> keys = new HashSet<>();
+ Set<String> keys = new HashSet<String>();
for ( int i = 0; i < items; i++ )
{
keys.add( i + ":key" );
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCacheUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCacheUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCacheUnitTest.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCacheUnitTest.java Wed May 29 12:18:56 2019
@@ -95,7 +95,7 @@ public class LHMLRUMemoryCacheUnitTest
}
// Test that getMultiple returns all the items remaining in cache and none of the missing ones
- Set<String> keys = new HashSet<>();
+ Set<String> keys = new HashSet<String>();
for ( int i = 0; i < items; i++ )
{
keys.add( i + ":key" );
@@ -252,7 +252,7 @@ public class LHMLRUMemoryCacheUnitTest
cacheMgr.configure( "/TestLHMLRUCache.ccf" );
CompositeCache<String, String> cache = cacheMgr.getCache( "testGetKeyArray" );
- LHMLRUMemoryCache<String, String> mru = new LHMLRUMemoryCache<>();
+ LHMLRUMemoryCache<String, String> mru = new LHMLRUMemoryCache<String, String>();
mru.initialize( cache );
int max = cache.getCacheAttributes().getMaxObjects();
@@ -260,7 +260,7 @@ public class LHMLRUMemoryCacheUnitTest
for ( int i = 0; i < items; i++ )
{
- ICacheElement<String, String> ice = new CacheElement<>( cache.getCacheName(), i + ":key", cache.getCacheName() + " data " + i );
+ ICacheElement<String, String> ice = new CacheElement<String, String>( cache.getCacheName(), i + ":key", cache.getCacheName() + " data " + i );
ice.setElementAttributes( cache.getElementAttributes() );
mru.update( ice );
}
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/lru/LRUMemoryCacheConcurrentUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/lru/LRUMemoryCacheConcurrentUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/lru/LRUMemoryCacheConcurrentUnitTest.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/lru/LRUMemoryCacheConcurrentUnitTest.java Wed May 29 12:18:56 2019
@@ -112,14 +112,14 @@ public class LRUMemoryCacheConcurrentUni
cacheMgr.configure( "/TestDiskCache.ccf" );
CompositeCache<String, String> cache = cacheMgr.getCache( region );
- LRUMemoryCache<String, String> lru = new LRUMemoryCache<>();
+ LRUMemoryCache<String, String> lru = new LRUMemoryCache<String, String>();
lru.initialize( cache );
// Add items to cache
for ( int i = 0; i < items; i++ )
{
- ICacheElement<String, String> ice = new CacheElement<>( cache.getCacheName(), i + ":key", region + " data " + i );
+ ICacheElement<String, String> ice = new CacheElement<String, String>( cache.getCacheName(), i + ":key", region + " data " + i );
ice.setElementAttributes( cache.getElementAttributes() );
lru.update( ice );
}
@@ -138,7 +138,7 @@ public class LRUMemoryCacheConcurrentUni
}
// Test that getMultiple returns all the items remaining in cache and none of the missing ones
- Set<String> keys = new HashSet<>();
+ Set<String> keys = new HashSet<String>();
for ( int i = 0; i < items; i++ )
{
keys.add( i + ":key" );
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/mru/MRUMemoryCacheUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/mru/MRUMemoryCacheUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/mru/MRUMemoryCacheUnitTest.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/mru/MRUMemoryCacheUnitTest.java Wed May 29 12:18:56 2019
@@ -95,7 +95,7 @@ public class MRUMemoryCacheUnitTest
}
// Test that getMultiple returns all the items remaining in cache and none of the missing ones
- Set<String> keys = new HashSet<>();
+ Set<String> keys = new HashSet<String>();
for ( int i = 0; i < items; i++ )
{
keys.add( i + ":key" );
@@ -252,7 +252,7 @@ public class MRUMemoryCacheUnitTest
cacheMgr.configure( "/TestMRUCache.ccf" );
CompositeCache<String, String> cache = cacheMgr.getCache( "testGetKeyArray" );
- MRUMemoryCache<String, String> mru = new MRUMemoryCache<>();
+ MRUMemoryCache<String, String> mru = new MRUMemoryCache<String, String>();
mru.initialize( cache );
int max = cache.getCacheAttributes().getMaxObjects();
@@ -260,7 +260,7 @@ public class MRUMemoryCacheUnitTest
for ( int i = 0; i < items; i++ )
{
- ICacheElement<String, String> ice = new CacheElement<>( cache.getCacheName(), i + ":key", cache.getCacheName() + " data " + i );
+ ICacheElement<String, String> ice = new CacheElement<String, String>( cache.getCacheName(), i + ":key", cache.getCacheName() + " data " + i );
ice.setElementAttributes( cache.getElementAttributes() );
mru.update( ice );
}
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/shrinking/ShrinkerThreadUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/shrinking/ShrinkerThreadUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/shrinking/ShrinkerThreadUnitTest.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/shrinking/ShrinkerThreadUnitTest.java Wed May 29 12:18:56 2019
@@ -51,12 +51,12 @@ public class ShrinkerThreadUnitTest
cacheAttr.setMaxMemoryIdleTimeSeconds( 10 );
cacheAttr.setMaxSpoolPerRun( 10 );
- CompositeCache<String, String> cache = new CompositeCache<>(cacheAttr, new ElementAttributes());
+ CompositeCache<String, String> cache = new CompositeCache<String, String>(cacheAttr, new ElementAttributes());
String key = "key";
String value = "value";
- ICacheElement<String, String> element = new CacheElement<>( "testRegion", key, value );
+ ICacheElement<String, String> element = new CacheElement<String, String>( "testRegion", key, value );
ElementAttributes elementAttr = new ElementAttributes();
elementAttr.setIsEternal( false );
element.setElementAttributes( elementAttr );
@@ -86,12 +86,12 @@ public class ShrinkerThreadUnitTest
cacheAttr.setMaxMemoryIdleTimeSeconds( 10 );
cacheAttr.setMaxSpoolPerRun( 10 );
- CompositeCache<String, String> cache = new CompositeCache<>(cacheAttr, new ElementAttributes());
+ CompositeCache<String, String> cache = new CompositeCache<String, String>(cacheAttr, new ElementAttributes());
String key = "key";
String value = "value";
- ICacheElement<String, String> element = new CacheElement<>( "testRegion", key, value );
+ ICacheElement<String, String> element = new CacheElement<String, String>( "testRegion", key, value );
ElementAttributes elementAttr = new ElementAttributes();
elementAttr.setIsEternal( false );
element.setElementAttributes( elementAttr );
@@ -121,12 +121,12 @@ public class ShrinkerThreadUnitTest
cacheAttr.setMaxMemoryIdleTimeSeconds( 10 );
cacheAttr.setMaxSpoolPerRun( 10 );
- CompositeCache<String, String> cache = new CompositeCache<>(cacheAttr, new ElementAttributes());
+ CompositeCache<String, String> cache = new CompositeCache<String, String>(cacheAttr, new ElementAttributes());
String key = "key";
String value = "value";
- ICacheElement<String, String> element = new CacheElement<>( "testRegion", key, value );
+ ICacheElement<String, String> element = new CacheElement<String, String>( "testRegion", key, value );
ElementAttributes elementAttr = new ElementAttributes();
elementAttr.setIsEternal( false );
element.setElementAttributes( elementAttr );
@@ -157,12 +157,12 @@ public class ShrinkerThreadUnitTest
cacheAttr.setMaxMemoryIdleTimeSeconds( 10 );
cacheAttr.setMaxSpoolPerRun( 10 );
- CompositeCache<String, String> cache = new CompositeCache<>(cacheAttr, new ElementAttributes());
+ CompositeCache<String, String> cache = new CompositeCache<String, String>(cacheAttr, new ElementAttributes());
String key = "key";
String value = "value";
- ICacheElement<String, String> element = new CacheElement<>( "testRegion", key, value );
+ ICacheElement<String, String> element = new CacheElement<String, String>( "testRegion", key, value );
ElementAttributes elementAttr = new ElementAttributes();
elementAttr.setIsEternal( false );
element.setElementAttributes( elementAttr );
@@ -198,13 +198,13 @@ public class ShrinkerThreadUnitTest
cacheAttr.setMaxMemoryIdleTimeSeconds( 1 );
cacheAttr.setMaxSpoolPerRun( 10 );
- CompositeCache<String, String> cache = new CompositeCache<>(cacheAttr, new ElementAttributes());
+ CompositeCache<String, String> cache = new CompositeCache<String, String>(cacheAttr, new ElementAttributes());
MockMemoryCache<String, String> memory = (MockMemoryCache<String, String>)cache.getMemoryCache();
String key = "key";
String value = "value";
- ICacheElement<String, String> element = new CacheElement<>( "testRegion", key, value );
+ ICacheElement<String, String> element = new CacheElement<String, String>( "testRegion", key, value );
ElementAttributes elementAttr = new ElementAttributes();
elementAttr.setIsEternal( false );
@@ -219,7 +219,7 @@ public class ShrinkerThreadUnitTest
ElementAttributesUtils.setLastAccessTime( elementAttr, System.currentTimeMillis() - 2000 );
// DO WORK
- ShrinkerThread<String, String> shrinker = new ShrinkerThread<>( cache );
+ ShrinkerThread<String, String> shrinker = new ShrinkerThread<String, String>( cache );
shrinker.run();
Thread.sleep( 500 );
@@ -245,7 +245,7 @@ public class ShrinkerThreadUnitTest
cacheAttr.setMaxMemoryIdleTimeSeconds( 1 );
cacheAttr.setMaxSpoolPerRun( 3 );
- CompositeCache<String, String> cache = new CompositeCache<>(cacheAttr, new ElementAttributes());
+ CompositeCache<String, String> cache = new CompositeCache<String, String>(cacheAttr, new ElementAttributes());
MockMemoryCache<String, String> memory = (MockMemoryCache<String, String>)cache.getMemoryCache();
for ( int i = 0; i < 10; i++ )
@@ -253,7 +253,7 @@ public class ShrinkerThreadUnitTest
String key = "key" + i;
String value = "value";
- ICacheElement<String, String> element = new CacheElement<>( "testRegion", key, value );
+ ICacheElement<String, String> element = new CacheElement<String, String>( "testRegion", key, value );
ElementAttributes elementAttr = new ElementAttributes();
elementAttr.setIsEternal( false );
@@ -269,7 +269,7 @@ public class ShrinkerThreadUnitTest
}
// DO WORK
- ShrinkerThread<String, String> shrinker = new ShrinkerThread<>( cache );
+ ShrinkerThread<String, String> shrinker = new ShrinkerThread<String, String>( cache );
shrinker.run();
// VERIFY
@@ -295,7 +295,7 @@ public class ShrinkerThreadUnitTest
cacheAttr.setMaxMemoryIdleTimeSeconds( 1 );
cacheAttr.setMaxSpoolPerRun( 3 );
- CompositeCache<String, String> cache = new CompositeCache<>(cacheAttr, new ElementAttributes());
+ CompositeCache<String, String> cache = new CompositeCache<String, String>(cacheAttr, new ElementAttributes());
MockMemoryCache<String, String> memory = (MockMemoryCache<String, String>)cache.getMemoryCache();
ElementEventHandlerMockImpl handler = new ElementEventHandlerMockImpl();
@@ -305,7 +305,7 @@ public class ShrinkerThreadUnitTest
String key = "key" + i;
String value = "value";
- ICacheElement<String, String> element = new CacheElement<>( "testRegion", key, value );
+ ICacheElement<String, String> element = new CacheElement<String, String>( "testRegion", key, value );
ElementAttributes elementAttr = new ElementAttributes();
elementAttr.addElementEventHandler( handler );
@@ -322,7 +322,7 @@ public class ShrinkerThreadUnitTest
}
// DO WORK
- ShrinkerThread<String, String> shrinker = new ShrinkerThread<>( cache );
+ ShrinkerThread<String, String> shrinker = new ShrinkerThread<String, String>( cache );
shrinker.run();
// VERIFY
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/soft/SoftReferenceMemoryCacheUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/soft/SoftReferenceMemoryCacheUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/soft/SoftReferenceMemoryCacheUnitTest.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/soft/SoftReferenceMemoryCacheUnitTest.java Wed May 29 12:18:56 2019
@@ -98,7 +98,7 @@ public class SoftReferenceMemoryCacheUni
}
// Test that getMultiple returns all the items remaining in cache and none of the missing ones
- Set<String> keys = new HashSet<>();
+ Set<String> keys = new HashSet<String>();
for ( int i = 0; i < items; i++ )
{
keys.add( i + ":key" );
@@ -187,7 +187,7 @@ public class SoftReferenceMemoryCacheUni
cacheMgr.configure( "/TestSoftReferenceCache.ccf" );
CompositeCache<String, String> cache = cacheMgr.getCache( "testGetKeyArray" );
- SoftReferenceMemoryCache<String, String> srmc = new SoftReferenceMemoryCache<>();
+ SoftReferenceMemoryCache<String, String> srmc = new SoftReferenceMemoryCache<String, String>();
srmc.initialize( cache );
int max = cache.getCacheAttributes().getMaxObjects();
@@ -195,7 +195,7 @@ public class SoftReferenceMemoryCacheUni
for ( int i = 0; i < items; i++ )
{
- ICacheElement<String, String> ice = new CacheElement<>( cache.getCacheName(), i + ":key", cache.getCacheName() + " data " + i );
+ ICacheElement<String, String> ice = new CacheElement<String, String>( cache.getCacheName(), i + ":key", cache.getCacheName() + " data " + i );
ice.setElementAttributes( cache.getElementAttributes() );
srmc.update( ice );
}
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/access/JCSWorkerUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/access/JCSWorkerUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/access/JCSWorkerUnitTest.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/access/JCSWorkerUnitTest.java Wed May 29 12:18:56 2019
@@ -42,7 +42,7 @@ public class JCSWorkerUnitTest
public void testSimpleGet()
throws Exception
{
- JCSWorker<String, Long> cachingWorker = new JCSWorker<>( "example region" );
+ JCSWorker<String, Long> cachingWorker = new JCSWorker<String, Long>( "example region" );
// This is the helper.
JCSWorkerHelper<Long> helper = new AbstractJCSWorkerHelper<Long>()
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/discovery/MockDiscoveryListener.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/discovery/MockDiscoveryListener.java?rev=1860336&r1=1860335&r2=1860336&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/discovery/MockDiscoveryListener.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/discovery/MockDiscoveryListener.java Wed May 29 12:18:56 2019
@@ -29,7 +29,7 @@ public class MockDiscoveryListener
implements IDiscoveryListener
{
/** discovered services. */
- public List<DiscoveredService> discoveredServices = new ArrayList<>();
+ public List<DiscoveredService> discoveredServices = new ArrayList<DiscoveredService>();
/**
* Adds the entry to a list. I'm not using a set. I want to see if we get dupes.
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/discovery/UDPDiscoverySenderUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/discovery/UDPDiscoverySenderUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/discovery/UDPDiscoverySenderUnitTest.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/discovery/UDPDiscoverySenderUnitTest.java Wed May 29 12:18:56 2019
@@ -87,7 +87,7 @@ public class UDPDiscoverySenderUnitTest
throws Exception
{
// SETUP
- ArrayList<String> cacheNames = new ArrayList<>();
+ ArrayList<String> cacheNames = new ArrayList<String>();
// DO WORK
sender.passiveBroadcast( SENDING_HOST, SENDING_PORT, cacheNames, 1L );
@@ -114,7 +114,7 @@ public class UDPDiscoverySenderUnitTest
throws Exception
{
// SETUP
- ArrayList<String> cacheNames = new ArrayList<>();
+ ArrayList<String> cacheNames = new ArrayList<String>();
// DO WORK
sender.removeBroadcast( SENDING_HOST, SENDING_PORT, cacheNames, 1L );
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryServiceUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryServiceUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryServiceUnitTest.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryServiceUnitTest.java Wed May 29 12:18:56 2019
@@ -48,7 +48,7 @@ public class UDPDiscoveryServiceUnitTest
DiscoveredService discoveredService = new DiscoveredService();
discoveredService.setServiceAddress( host );
- discoveredService.setCacheNames( new ArrayList<>() );
+ discoveredService.setCacheNames( new ArrayList<String>() );
discoveredService.setServicePort( 1000 );
discoveredService.setLastHearFromTime( 100 );
@@ -81,7 +81,7 @@ public class UDPDiscoveryServiceUnitTest
MockDiscoveryListener discoveryListener = new MockDiscoveryListener();
service.addDiscoveryListener( discoveryListener );
- ArrayList<String> sametCacheNames = new ArrayList<>();
+ ArrayList<String> sametCacheNames = new ArrayList<String>();
sametCacheNames.add( "name1" );
DiscoveredService discoveredService = new DiscoveredService();
@@ -146,11 +146,11 @@ public class UDPDiscoveryServiceUnitTest
DiscoveredService discoveredService = new DiscoveredService();
discoveredService.setServiceAddress( host );
- discoveredService.setCacheNames( new ArrayList<>() );
+ discoveredService.setCacheNames( new ArrayList<String>() );
discoveredService.setServicePort( 1000 );
discoveredService.setLastHearFromTime( 100 );
- ArrayList<String> differentCacheNames = new ArrayList<>();
+ ArrayList<String> differentCacheNames = new ArrayList<String>();
differentCacheNames.add( "name1" );
DiscoveredService discoveredService2 = new DiscoveredService();
discoveredService2.setServiceAddress( host );
@@ -208,7 +208,7 @@ public class UDPDiscoveryServiceUnitTest
DiscoveredService discoveredService = new DiscoveredService();
discoveredService.setServiceAddress( host );
- discoveredService.setCacheNames( new ArrayList<>() );
+ discoveredService.setCacheNames( new ArrayList<String>() );
discoveredService.setServicePort( 1000 );
discoveredService.setLastHearFromTime( 100 );