Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexDiskCacheUnitTestAbstract.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexDiskCacheUnitTestAbstract.java?rev=1860336&r1=1860335&r2=1860336&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexDiskCacheUnitTestAbstract.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexDiskCacheUnitTestAbstract.java Wed May 29 12:18:56 2019 @@ -57,7 +57,7 @@ public abstract class IndexDiskCacheUnit cattr.setCacheName("testSimplePutAndGet"); cattr.setMaxKeySize(1000); cattr.setDiskPath("target/test-sandbox/IndexDiskCacheUnitTest"); - IndexedDiskCache<String, String> disk = new IndexedDiskCache<>(cattr); + IndexedDiskCache<String, String> disk = new IndexedDiskCache<String, String>(cattr); disk.processRemoveAll(); @@ -66,7 +66,7 @@ public abstract class IndexDiskCacheUnit { IElementAttributes eAttr = new ElementAttributes(); eAttr.setIsSpool(true); - ICacheElement<String, String> element = new CacheElement<>("testSimplePutAndGet", "key:" + i, "data:" + i); + ICacheElement<String, String> element = new CacheElement<String, String>("testSimplePutAndGet", "key:" + i, "data:" + i); element.setElementAttributes(eAttr); disk.processUpdate(element); } @@ -79,7 +79,7 @@ public abstract class IndexDiskCacheUnit } // Test that getMultiple returns all the expected values - Set<String> keys = new HashSet<>(); + Set<String> keys = new HashSet<String>(); for (int i = 0; i < cnt; i++) { keys.add("key:" + i); @@ -106,7 +106,7 @@ public abstract class IndexDiskCacheUnit cattr.setCacheName("testRemoveItems"); cattr.setMaxKeySize(100); cattr.setDiskPath("target/test-sandbox/IndexDiskCacheUnitTest"); - IndexedDiskCache<String, String> disk = new IndexedDiskCache<>(cattr); + IndexedDiskCache<String, String> disk = new IndexedDiskCache<String, String>(cattr); disk.processRemoveAll(); @@ -115,7 +115,7 @@ public abstract class IndexDiskCacheUnit { IElementAttributes eAttr = new ElementAttributes(); eAttr.setIsSpool(true); - ICacheElement<String, String> element = new CacheElement<>("testRemoveItems", "key:" + i, "data:" + i); + ICacheElement<String, String> element = new CacheElement<String, String>("testRemoveItems", "key:" + i, "data:" + i); element.setElementAttributes(eAttr); disk.processUpdate(element); } @@ -145,7 +145,7 @@ public abstract class IndexDiskCacheUnit IndexedDiskCacheAttributes cattr = getCacheAttributes(); cattr.setCacheName("testCheckForDedOverlaps_noOverlap"); cattr.setDiskPath("target/test-sandbox/UnitTest"); - IndexedDiskCache<String, String> disk = new IndexedDiskCache<>(cattr); + IndexedDiskCache<String, String> disk = new IndexedDiskCache<String, String>(cattr); int numDescriptors = 5; int pos = 0; @@ -173,7 +173,7 @@ public abstract class IndexDiskCacheUnit IndexedDiskCacheAttributes cattr = getCacheAttributes(); cattr.setCacheName("testCheckForDedOverlaps_overlaps"); cattr.setDiskPath("target/test-sandbox/UnitTest"); - IndexedDiskCache<String, String> disk = new IndexedDiskCache<>(cattr); + IndexedDiskCache<String, String> disk = new IndexedDiskCache<String, String>(cattr); int numDescriptors = 5; int pos = 0; @@ -206,7 +206,7 @@ public abstract class IndexDiskCacheUnit IndexedDiskCacheAttributes cattr = getCacheAttributes(); cattr.setCacheName("testFileSize"); cattr.setDiskPath("target/test-sandbox/UnitTest"); - IndexedDiskCache<Integer, DiskTestObject> disk = new IndexedDiskCache<>(cattr); + IndexedDiskCache<Integer, DiskTestObject> disk = new IndexedDiskCache<Integer, DiskTestObject>(cattr); int numberToInsert = 20; int bytes = 24; @@ -248,7 +248,7 @@ public abstract class IndexDiskCacheUnit cattr.setOptimizeAtRemoveCount(numberToInsert); cattr.setMaxKeySize(numberToInsert * 2); cattr.setMaxPurgatorySize(numberToInsert); - IndexedDiskCache<Integer, DiskTestObject> disk = new IndexedDiskCache<>(cattr); + IndexedDiskCache<Integer, DiskTestObject> disk = new IndexedDiskCache<Integer, DiskTestObject>(cattr); int bytes = 1; ICacheElement<Integer, DiskTestObject>[] elements = DiskTestObjectUtil.createCacheElementsWithTestObjects(numberToInsert, @@ -293,7 +293,7 @@ public abstract class IndexDiskCacheUnit cattr.setOptimizeAtRemoveCount(numberToInsert); cattr.setMaxKeySize(numberToInsert * 2); cattr.setMaxPurgatorySize(numberToInsert); - IndexedDiskCache<Integer, DiskTestObject> disk = new IndexedDiskCache<>(cattr); + IndexedDiskCache<Integer, DiskTestObject> disk = new IndexedDiskCache<Integer, DiskTestObject>(cattr); // we will reuse these int bytes = 1; @@ -345,7 +345,7 @@ public abstract class IndexDiskCacheUnit IndexedDiskCacheAttributes cattr = getCacheAttributes(); cattr.setCacheName("testBytesFreeSize"); cattr.setDiskPath("target/test-sandbox/UnitTest"); - IndexedDiskCache<Integer, DiskTestObject> disk = new IndexedDiskCache<>(cattr); + IndexedDiskCache<Integer, DiskTestObject> disk = new IndexedDiskCache<Integer, DiskTestObject>(cattr); int numberToInsert = 20; int bytes = 24; @@ -399,7 +399,7 @@ public abstract class IndexDiskCacheUnit cattr.setCacheName("testRemove_PartialKey"); cattr.setMaxKeySize(100); cattr.setDiskPath("target/test-sandbox/IndexDiskCacheUnitTest"); - IndexedDiskCache<String, String> disk = new IndexedDiskCache<>(cattr); + IndexedDiskCache<String, String> disk = new IndexedDiskCache<String, String>(cattr); disk.processRemoveAll(); @@ -408,7 +408,7 @@ public abstract class IndexDiskCacheUnit { IElementAttributes eAttr = new ElementAttributes(); eAttr.setIsSpool(true); - ICacheElement<String, String> element = new CacheElement<>("testRemove_PartialKey", i + ":key", "data:" + ICacheElement<String, String> element = new CacheElement<String, String>("testRemove_PartialKey", i + ":key", "data:" + i); element.setElementAttributes(eAttr); disk.processUpdate(element); @@ -444,7 +444,7 @@ public abstract class IndexDiskCacheUnit cattr.setCacheName("testRemove_Group"); cattr.setMaxKeySize(100); cattr.setDiskPath("target/test-sandbox/IndexDiskCacheUnitTest"); - IndexedDiskCache<GroupAttrName<String>, String> disk = new IndexedDiskCache<>(cattr); + IndexedDiskCache<GroupAttrName<String>, String> disk = new IndexedDiskCache<GroupAttrName<String>, String>(cattr); disk.processRemoveAll(); @@ -455,7 +455,7 @@ public abstract class IndexDiskCacheUnit for (int i = 0; i < cnt; i++) { GroupAttrName<String> groupAttrName = getGroupAttrName(cacheName, groupName, i + ":key"); - CacheElement<GroupAttrName<String>, String> element = new CacheElement<>(cacheName, + CacheElement<GroupAttrName<String>, String> element = new CacheElement<GroupAttrName<String>, String>(cacheName, groupAttrName, "data:" + i); IElementAttributes eAttr = new ElementAttributes(); @@ -500,7 +500,7 @@ public abstract class IndexDiskCacheUnit private GroupAttrName<String> getGroupAttrName(String cacheName, String group, String name) { GroupId gid = new GroupId(cacheName, group); - return new GroupAttrName<>(gid, name); + return new GroupAttrName<String>(gid, name); } /** @@ -516,13 +516,13 @@ public abstract class IndexDiskCacheUnit cattr.setCacheName("testUpdate_EventLogging_simple"); cattr.setMaxKeySize(100); cattr.setDiskPath("target/test-sandbox/IndexDiskCacheUnitTestCEL"); - IndexedDiskCache<String, String> diskCache = new IndexedDiskCache<>(cattr); + IndexedDiskCache<String, String> diskCache = new IndexedDiskCache<String, String>(cattr); diskCache.processRemoveAll(); MockCacheEventLogger cacheEventLogger = new MockCacheEventLogger(); diskCache.setCacheEventLogger(cacheEventLogger); - ICacheElement<String, String> item = new CacheElement<>("region", "key", "value"); + ICacheElement<String, String> item = new CacheElement<String, String>("region", "key", "value"); // DO WORK diskCache.update(item); @@ -547,7 +547,7 @@ public abstract class IndexDiskCacheUnit cattr.setCacheName("testGet_EventLogging_simple"); cattr.setMaxKeySize(100); cattr.setDiskPath("target/test-sandbox/IndexDiskCacheUnitTestCEL"); - IndexedDiskCache<String, String> diskCache = new IndexedDiskCache<>(cattr); + IndexedDiskCache<String, String> diskCache = new IndexedDiskCache<String, String>(cattr); diskCache.processRemoveAll(); MockCacheEventLogger cacheEventLogger = new MockCacheEventLogger(); @@ -574,13 +574,13 @@ public abstract class IndexDiskCacheUnit cattr.setCacheName("testGetMultiple_EventLogging_simple"); cattr.setMaxKeySize(100); cattr.setDiskPath("target/test-sandbox/IndexDiskCacheUnitTestCEL"); - IndexedDiskCache<String, String> diskCache = new IndexedDiskCache<>(cattr); + IndexedDiskCache<String, String> diskCache = new IndexedDiskCache<String, String>(cattr); diskCache.processRemoveAll(); MockCacheEventLogger cacheEventLogger = new MockCacheEventLogger(); diskCache.setCacheEventLogger(cacheEventLogger); - Set<String> keys = new HashSet<>(); + Set<String> keys = new HashSet<String>(); keys.add("junk"); // DO WORK @@ -605,7 +605,7 @@ public abstract class IndexDiskCacheUnit cattr.setCacheName("testRemoveAll_EventLogging_simple"); cattr.setMaxKeySize(100); cattr.setDiskPath("target/test-sandbox/IndexDiskCacheUnitTestCEL"); - IndexedDiskCache<String, String> diskCache = new IndexedDiskCache<>(cattr); + IndexedDiskCache<String, String> diskCache = new IndexedDiskCache<String, String>(cattr); diskCache.processRemoveAll(); MockCacheEventLogger cacheEventLogger = new MockCacheEventLogger(); @@ -632,7 +632,7 @@ public abstract class IndexDiskCacheUnit cattr.setCacheName("testRemoveAll_EventLogging_simple"); cattr.setMaxKeySize(100); cattr.setDiskPath("target/test-sandbox/IndexDiskCacheUnitTestCEL"); - IndexedDiskCache<String, String> diskCache = new IndexedDiskCache<>(cattr); + IndexedDiskCache<String, String> diskCache = new IndexedDiskCache<String, String>(cattr); diskCache.processRemoveAll(); MockCacheEventLogger cacheEventLogger = new MockCacheEventLogger(); @@ -662,12 +662,12 @@ public abstract class IndexDiskCacheUnit cattr.setCacheName(cacheName); cattr.setMaxKeySize(100); cattr.setDiskPath("target/test-sandbox/IndexDiskCacheUnitTest"); - IndexedDiskCache<String, String> diskCache = new IndexedDiskCache<>(cattr); + IndexedDiskCache<String, String> diskCache = new IndexedDiskCache<String, String>(cattr); // DO WORK for (int i = 0; i <= items; i++) { - diskCache.update(new CacheElement<>(cacheName, i + ":key", cacheName + " data " + i)); + diskCache.update(new CacheElement<String, String>(cacheName, i + ":key", cacheName + " data " + i)); } Thread.sleep(500); @@ -695,12 +695,12 @@ public abstract class IndexDiskCacheUnit cattr.setCacheName(cacheName); cattr.setMaxKeySize(100); cattr.setDiskPath("target/test-sandbox/IndexDiskCacheUnitTest"); - IndexedDiskCache<String, String> diskCache = new IndexedDiskCache<>(cattr); + IndexedDiskCache<String, String> diskCache = new IndexedDiskCache<String, String>(cattr); // DO WORK for (int i = 0; i <= items; i++) { - diskCache.update(new CacheElement<>(cacheName, i + ":key", cacheName + " data " + i)); + diskCache.update(new CacheElement<String, String>(cacheName, i + ":key", cacheName + " data " + i)); } Map<String, ICacheElement<String, String>> matchingResults = diskCache.getMatching("1.8.+"); @@ -736,10 +736,10 @@ public abstract class IndexDiskCacheUnit cattr.setCacheName(cacheName); cattr.setMaxKeySize(100); cattr.setDiskPath("target/test-sandbox/IndexDiskCacheUnitTest"); - IndexedDiskCache<String, String> diskCache = new IndexedDiskCache<>(cattr); + IndexedDiskCache<String, String> diskCache = new IndexedDiskCache<String, String>(cattr); // DO WORK - diskCache.update(new CacheElement<>(cacheName, "x", string)); + diskCache.update(new CacheElement<String, String>(cacheName, "x", string)); // VERIFY assertNotNull(diskCache.get("x")); @@ -779,10 +779,10 @@ public abstract class IndexDiskCacheUnit cattr.setCacheName(cacheName); cattr.setMaxKeySize(100); cattr.setDiskPath("target/test-sandbox/IndexDiskCacheUnitTest"); - IndexedDiskCache<String, byte[]> diskCache = new IndexedDiskCache<>(cattr); + IndexedDiskCache<String, byte[]> diskCache = new IndexedDiskCache<String, byte[]>(cattr); // DO WORK - diskCache.update(new CacheElement<>(cacheName, "x", bytes)); + diskCache.update(new CacheElement<String, byte[]>(cacheName, "x", bytes)); // VERIFY assertNotNull(diskCache.get("x")); @@ -810,11 +810,11 @@ public abstract class IndexDiskCacheUnit cattr.setCacheName(cacheName); cattr.setMaxKeySize(100); cattr.setDiskPath("target/test-sandbox/IndexDiskCacheUnitTest"); - IndexedDiskCache<String, String> diskCache = new IndexedDiskCache<>(cattr); + IndexedDiskCache<String, String> diskCache = new IndexedDiskCache<String, String>(cattr); String key = "myKey"; String value = "myValue"; - ICacheElement<String, String> ce = new CacheElement<>(cacheName, key, value); + ICacheElement<String, String> ce = new CacheElement<String, String>(cacheName, key, value); // DO WORK diskCache.processUpdate(ce); @@ -840,18 +840,18 @@ public abstract class IndexDiskCacheUnit cattr.setCacheName(cacheName); cattr.setMaxKeySize(100); cattr.setDiskPath("target/test-sandbox/IndexDiskCacheUnitTest"); - IndexedDiskCache<String, String> diskCache = new IndexedDiskCache<>(cattr); + IndexedDiskCache<String, String> diskCache = new IndexedDiskCache<String, String>(cattr); String key = "myKey"; String value = "myValue"; - ICacheElement<String, String> ce1 = new CacheElement<>(cacheName, key, value); + ICacheElement<String, String> ce1 = new CacheElement<String, String>(cacheName, key, value); // DO WORK diskCache.processUpdate(ce1); long fileSize1 = diskCache.getDataFileSize(); // DO WORK - ICacheElement<String, String> ce2 = new CacheElement<>(cacheName, key, value); + ICacheElement<String, String> ce2 = new CacheElement<String, String>(cacheName, key, value); diskCache.processUpdate(ce2); ICacheElement<String, String> result = diskCache.processGet(key); @@ -877,19 +877,19 @@ public abstract class IndexDiskCacheUnit cattr.setCacheName(cacheName); cattr.setMaxKeySize(100); cattr.setDiskPath("target/test-sandbox/IndexDiskCacheUnitTest"); - IndexedDiskCache<String, String> diskCache = new IndexedDiskCache<>(cattr); + IndexedDiskCache<String, String> diskCache = new IndexedDiskCache<String, String>(cattr); String key = "myKey"; String value = "myValue"; String value2 = "myValu"; - ICacheElement<String, String> ce1 = new CacheElement<>(cacheName, key, value); + ICacheElement<String, String> ce1 = new CacheElement<String, String>(cacheName, key, value); // DO WORK diskCache.processUpdate(ce1); long fileSize1 = diskCache.getDataFileSize(); // DO WORK - ICacheElement<String, String> ce2 = new CacheElement<>(cacheName, key, value2); + ICacheElement<String, String> ce2 = new CacheElement<String, String>(cacheName, key, value2); diskCache.processUpdate(ce2); ICacheElement<String, String> result = diskCache.processGet(key); @@ -915,19 +915,19 @@ public abstract class IndexDiskCacheUnit cattr.setCacheName(cacheName); cattr.setMaxKeySize(100); cattr.setDiskPath("target/test-sandbox/IndexDiskCacheUnitTest"); - IndexedDiskCache<String, String> diskCache = new IndexedDiskCache<>(cattr); + IndexedDiskCache<String, String> diskCache = new IndexedDiskCache<String, String>(cattr); String key = "myKey"; String value = "myValue"; String value2 = "myValue2"; - ICacheElement<String, String> ce1 = new CacheElement<>(cacheName, key, value); + ICacheElement<String, String> ce1 = new CacheElement<String, String>(cacheName, key, value); // DO WORK diskCache.processUpdate(ce1); long fileSize1 = diskCache.getDataFileSize(); // DO WORK - ICacheElement<String, String> ce2 = new CacheElement<>(cacheName, key, value2); + ICacheElement<String, String> ce2 = new CacheElement<String, String>(cacheName, key, value2); diskCache.processUpdate(ce2); ICacheElement<String, String> result = diskCache.processGet(key); @@ -965,19 +965,19 @@ public abstract class IndexDiskCacheUnit cattr.setCacheName(cacheName); cattr.setMaxKeySize(100); cattr.setDiskPath("target/test-sandbox/BlockDiskCacheUnitTest"); - IndexedDiskCache<String, String> diskCache = new IndexedDiskCache<>(cattr); + IndexedDiskCache<String, String> diskCache = new IndexedDiskCache<String, String>(cattr); // DO WORK for (int i = 0; i < 50; i++) { - diskCache.update(new CacheElement<>(cacheName, "x" + i, string)); + diskCache.update(new CacheElement<String, String>(cacheName, "x" + i, string)); } // Thread.sleep(1000); // VERIFY diskCache.dispose(); // Thread.sleep(1000); - diskCache = new IndexedDiskCache<>(cattr); + diskCache = new IndexedDiskCache<String, String>(cattr); for (int i = 0; i < 50; i++) {
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheConcurrentUnitTest.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheConcurrentUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheConcurrentUnitTest.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheConcurrentUnitTest.java Wed May 29 12:18:56 2019 @@ -157,7 +157,7 @@ public class IndexedDiskCacheConcurrentU } // Test that getElements returns all the expected values - Set<String> keys = new HashSet<>(); + Set<String> keys = new HashSet<String>(); for ( int i = 0; i <= items; i++ ) { keys.add( i + ":key" ); @@ -218,7 +218,7 @@ public class IndexedDiskCacheConcurrentU } // Test that getElements returns all the expected values - Set<String> keys = new HashSet<>(); + Set<String> keys = new HashSet<String>(); for ( int i = start; i <= end; i++ ) { keys.add( i + ":key" ); Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheKeyStoreUnitTest.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheKeyStoreUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheKeyStoreUnitTest.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheKeyStoreUnitTest.java Wed May 29 12:18:56 2019 @@ -49,7 +49,7 @@ public class IndexedDiskCacheKeyStoreUni cattr.setCacheName( "testStoreKeys" ); cattr.setMaxKeySize( 100 ); cattr.setDiskPath( "target/test-sandbox/KeyStoreUnitTest" ); - IndexedDiskCache<String, String> disk = new IndexedDiskCache<>( cattr ); + IndexedDiskCache<String, String> disk = new IndexedDiskCache<String, String>( cattr ); disk.processRemoveAll(); @@ -58,7 +58,7 @@ public class IndexedDiskCacheKeyStoreUni { IElementAttributes eAttr = new ElementAttributes(); eAttr.setIsSpool( true ); - ICacheElement<String, String> element = new CacheElement<>( cattr.getCacheName(), "key:" + i, "data:" + i ); + ICacheElement<String, String> element = new CacheElement<String, String>( cattr.getCacheName(), "key:" + i, "data:" + i ); element.setElementAttributes( eAttr ); disk.processUpdate( element ); } @@ -103,7 +103,7 @@ public class IndexedDiskCacheKeyStoreUni cattr.setCacheName( "testOptimize" ); cattr.setMaxKeySize( 100 ); cattr.setDiskPath( "target/test-sandbox/KeyStoreUnitTest" ); - IndexedDiskCache<String, String> disk = new IndexedDiskCache<>( cattr ); + IndexedDiskCache<String, String> disk = new IndexedDiskCache<String, String>( cattr ); disk.processRemoveAll(); @@ -112,7 +112,7 @@ public class IndexedDiskCacheKeyStoreUni { IElementAttributes eAttr = new ElementAttributes(); eAttr.setIsSpool( true ); - ICacheElement<String, String> element = new CacheElement<>( cattr.getCacheName(), "key:" + i, "data:" + i ); + ICacheElement<String, String> element = new CacheElement<String, String>( cattr.getCacheName(), "key:" + i, "data:" + i ); element.setElementAttributes( eAttr ); disk.processUpdate( element ); } @@ -121,7 +121,7 @@ public class IndexedDiskCacheKeyStoreUni IElementAttributes eAttr = new ElementAttributes(); eAttr.setIsSpool( true ); - ICacheElement<String, String> elementSetup = new CacheElement<>( cattr.getCacheName(), "key:" + "A", "data:" + "A" ); + ICacheElement<String, String> elementSetup = new CacheElement<String, String>( cattr.getCacheName(), "key:" + "A", "data:" + "A" ); elementSetup.setElementAttributes( eAttr ); disk.processUpdate( elementSetup ); Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheNoMemoryUnitTest.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheNoMemoryUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheNoMemoryUnitTest.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheNoMemoryUnitTest.java Wed May 29 12:18:56 2019 @@ -146,7 +146,7 @@ public class IndexedDiskCacheNoMemoryUni } // Test that getElements returns all the expected values - 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/auxiliary/disk/indexed/IndexedDiskCacheOptimizationUnitTest.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheOptimizationUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheOptimizationUnitTest.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheOptimizationUnitTest.java Wed May 29 12:18:56 2019 @@ -49,7 +49,7 @@ public class IndexedDiskCacheOptimizatio cattr.setMaxKeySize( removeCount * 2 ); cattr.setOptimizeAtRemoveCount( removeCount ); cattr.setDiskPath( "target/test-sandbox/testOptimization" ); - IndexedDiskCache<Integer, DiskTestObject> disk = new IndexedDiskCache<>( cattr ); + IndexedDiskCache<Integer, DiskTestObject> disk = new IndexedDiskCache<Integer, DiskTestObject>( cattr ); disk.removeAll(); Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheSameRegionConcurrentUnitTest.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheSameRegionConcurrentUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheSameRegionConcurrentUnitTest.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheSameRegionConcurrentUnitTest.java Wed May 29 12:18:56 2019 @@ -182,7 +182,7 @@ public class IndexedDiskCacheSameRegionC } // Test that getElements returns all the expected values - Set<String> keys = new HashSet<>(); + Set<String> keys = new HashSet<String>(); for ( int i = start; i <= end; i++ ) { keys.add( i + ":key" ); Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/LRUMapSizeVsCount.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/LRUMapSizeVsCount.java?rev=1860336&r1=1860335&r2=1860336&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/LRUMapSizeVsCount.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/indexed/LRUMapSizeVsCount.java Wed May 29 12:18:56 2019 @@ -114,7 +114,7 @@ public class LRUMapSizeVsCount cattr.setName("junit"); cattr.setCacheName("junit"); cattr.setDiskPath("."); - IndexedDiskCache<String, String> idc = new IndexedDiskCache<>(cattr); + IndexedDiskCache<String, String> idc = new IndexedDiskCache<String, String>(cattr); Map<String, IndexedDiskElementDescriptor> cacheCount = idc.new LRUMapCountLimited( tries ); Map<String, IndexedDiskElementDescriptor> cacheSize = idc.new LRUMapSizeLimited( tries/1024/2 ); Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDataSourceFactoryUnitTest.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDataSourceFactoryUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDataSourceFactoryUnitTest.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDataSourceFactoryUnitTest.java Wed May 29 12:18:56 2019 @@ -154,7 +154,7 @@ public class JDBCDataSourceFactoryUnitTe { context = new InitialContext(true) { - Map<String, Object> bindings = new HashMap<>(); + Map<String, Object> bindings = new HashMap<String, Object>(); @Override public void bind(String name, Object obj) throws NamingException Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheSharedPoolUnitTest.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheSharedPoolUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheSharedPoolUnitTest.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheSharedPoolUnitTest.java Wed May 29 12:18:56 2019 @@ -112,7 +112,7 @@ public class JDBCDiskCacheSharedPoolUnit } // Test that getElements returns all the expected values - 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/auxiliary/disk/jdbc/JDBCDiskCacheUnitTest.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheUnitTest.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheUnitTest.java Wed May 29 12:18:56 2019 @@ -116,7 +116,7 @@ public class JDBCDiskCacheUnitTest } // Test that getElements returns all the expected values - 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/auxiliary/disk/jdbc/hsql/HSQLDiskCacheConcurrentUnitTest.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheConcurrentUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheConcurrentUnitTest.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheConcurrentUnitTest.java Wed May 29 12:18:56 2019 @@ -144,7 +144,7 @@ public class HSQLDiskCacheConcurrentUnit } // Test that getElements returns all the expected values - 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/auxiliary/disk/jdbc/hsql/HSQLDiskCacheUnitTest.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheUnitTest.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheUnitTest.java Wed May 29 12:18:56 2019 @@ -81,7 +81,7 @@ public class HSQLDiskCacheUnitTest } // Test that getElements returns all the expected values - 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/auxiliary/disk/jdbc/mysql/MySQLDiskCacheHsqlBackedUnitTest.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheHsqlBackedUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheHsqlBackedUnitTest.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheHsqlBackedUnitTest.java Wed May 29 12:18:56 2019 @@ -118,7 +118,7 @@ public class MySQLDiskCacheHsqlBackedUni } // Test that getElements returns all the expected values - 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/auxiliary/disk/jdbc/mysql/MySQLDiskCacheUnitTest.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheUnitTest.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheUnitTest.java Wed May 29 12:18:56 2019 @@ -60,7 +60,7 @@ public class MySQLDiskCacheUnitTest TableState tableState = new TableState( tableName ); tableState.setState( TableState.OPTIMIZATION_RUNNING ); - MySQLDiskCache<String, String> cache = new MySQLDiskCache<>( attributes, dsFactory, tableState, + MySQLDiskCache<String, String> cache = new MySQLDiskCache<String, String>( attributes, dsFactory, tableState, CompositeCacheManager.getUnconfiguredInstance() ); // DO WORK Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWaitFacadeUnitTest.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWaitFacadeUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWaitFacadeUnitTest.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWaitFacadeUnitTest.java Wed May 29 12:18:56 2019 @@ -39,10 +39,10 @@ public class LateralCacheNoWaitFacadeUni ILateralCacheAttributes cattr = new LateralCacheAttributes(); cattr.setCacheName( "testCache1" ); - LateralCacheNoWaitFacade<String, String> facade = new LateralCacheNoWaitFacade<>( null, noWaits, cattr ); + LateralCacheNoWaitFacade<String, String> facade = new LateralCacheNoWaitFacade<String, String>( null, noWaits, cattr ); - LateralCache<String, String> cache = new LateralCache<>( cattr ); - LateralCacheNoWait<String, String> noWait = new LateralCacheNoWait<>( cache ); + LateralCache<String, String> cache = new LateralCache<String, String>( cattr ); + LateralCacheNoWait<String, String> noWait = new LateralCacheNoWait<String, String>( cache ); // DO WORK facade.addNoWait( noWait ); @@ -69,11 +69,11 @@ public class LateralCacheNoWaitFacadeUni ILateralCacheAttributes cattr = new LateralCacheAttributes(); cattr.setCacheName( "testCache1" ); - LateralCacheNoWaitFacade<String, String> facade = new LateralCacheNoWaitFacade<>( null, noWaits, cattr ); + LateralCacheNoWaitFacade<String, String> facade = new LateralCacheNoWaitFacade<String, String>( null, noWaits, cattr ); - LateralCache<String, String> cache = new LateralCache<>( cattr ); - LateralCacheNoWait<String, String> noWait = new LateralCacheNoWait<>( cache ); - LateralCacheNoWait<String, String> noWait2 = new LateralCacheNoWait<>( cache ); + LateralCache<String, String> cache = new LateralCache<String, String>( cattr ); + LateralCacheNoWait<String, String> noWait = new LateralCacheNoWait<String, String>( cache ); + LateralCacheNoWait<String, String> noWait2 = new LateralCacheNoWait<String, String>( cache ); // DO WORK facade.addNoWait( noWait ); @@ -104,10 +104,10 @@ public class LateralCacheNoWaitFacadeUni ILateralCacheAttributes cattr = new LateralCacheAttributes(); cattr.setCacheName( "testCache1" ); - LateralCacheNoWaitFacade<String, String> facade = new LateralCacheNoWaitFacade<>( null, noWaits, cattr ); + LateralCacheNoWaitFacade<String, String> facade = new LateralCacheNoWaitFacade<String, String>( null, noWaits, cattr ); - LateralCache<String, String> cache = new LateralCache<>( cattr ); - LateralCacheNoWait<String, String> noWait = new LateralCacheNoWait<>( cache ); + LateralCache<String, String> cache = new LateralCache<String, String>( cattr ); + LateralCacheNoWait<String, String> noWait = new LateralCacheNoWait<String, String>( cache ); // DO WORK facade.addNoWait( noWait ); @@ -129,10 +129,10 @@ public class LateralCacheNoWaitFacadeUni ILateralCacheAttributes cattr = new LateralCacheAttributes(); cattr.setCacheName( "testCache1" ); - LateralCacheNoWaitFacade<String, String> facade = new LateralCacheNoWaitFacade<>( null, noWaits, cattr ); + LateralCacheNoWaitFacade<String, String> facade = new LateralCacheNoWaitFacade<String, String>( null, noWaits, cattr ); - LateralCache<String, String> cache = new LateralCache<>( cattr ); - LateralCacheNoWait<String, String> noWait = new LateralCacheNoWait<>( cache ); + LateralCache<String, String> cache = new LateralCache<String, String>( cattr ); + LateralCacheNoWait<String, String> noWait = new LateralCacheNoWait<String, String>( cache ); // DO WORK facade.removeNoWait( noWait ); Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPConcurrentRandomTestUtil.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPConcurrentRandomTestUtil.java?rev=1860336&r1=1860335&r2=1860336&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPConcurrentRandomTestUtil.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPConcurrentRandomTestUtil.java Wed May 29 12:18:56 2019 @@ -85,7 +85,7 @@ public class LateralTCPConcurrentRandomT // this service will put and remove using the lateral to // the cache instance above // the cache thinks it is different since the listenerid is different - LateralTCPService<String, String> service = new LateralTCPService<>( lattr2 ); + LateralTCPService<String, String> service = new LateralTCPService<String, String>( lattr2 ); service.setListenerId( 123456 ); try @@ -98,7 +98,7 @@ public class LateralTCPConcurrentRandomT String key = "key" + kn; if ( n == 1 ) { - ICacheElement<String, String> element = new CacheElement<>( region, key, region + ":data" + i + ICacheElement<String, String> element = new CacheElement<String, String>( region, key, region + ":data" + i + " junk asdfffffffadfasdfasf " + kn + ":" + n ); service.update( element ); if ( show ) Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListenerUnitTest.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListenerUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListenerUnitTest.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListenerUnitTest.java Wed May 29 12:18:56 2019 @@ -80,7 +80,7 @@ public class LateralTCPDiscoveryListener ILateralCacheAttributes cattr = new LateralCacheAttributes(); cattr.setCacheName( cacheName ); - LateralCacheNoWaitFacade<String, String> facade = new LateralCacheNoWaitFacade<>( null, noWaits, cattr ); + LateralCacheNoWaitFacade<String, String> facade = new LateralCacheNoWaitFacade<String, String>( null, noWaits, cattr ); // DO WORK listener.addNoWaitFacade( cacheName, facade ); @@ -102,11 +102,11 @@ public class LateralTCPDiscoveryListener ILateralCacheAttributes cattr = new LateralCacheAttributes(); cattr.setCacheName( cacheName ); - LateralCacheNoWaitFacade<String, String> facade = new LateralCacheNoWaitFacade<>( null, noWaits, cattr ); + LateralCacheNoWaitFacade<String, String> facade = new LateralCacheNoWaitFacade<String, String>( null, noWaits, cattr ); listener.addNoWaitFacade( cacheName, facade ); - LateralCache<String, String> cache = new LateralCache<>( cattr ); - LateralCacheNoWait<String, String> noWait = new LateralCacheNoWait<>( cache ); + LateralCache<String, String> cache = new LateralCache<String, String>( cattr ); + LateralCacheNoWait<String, String> noWait = new LateralCacheNoWait<String, String>( cache ); // DO WORK boolean result = listener.addNoWait( noWait ); @@ -125,8 +125,8 @@ public class LateralTCPDiscoveryListener ILateralCacheAttributes cattr = new LateralCacheAttributes(); cattr.setCacheName( cacheName ); - LateralCache<String, String> cache = new LateralCache<>( cattr ); - LateralCacheNoWait<String, String> noWait = new LateralCacheNoWait<>( cache ); + LateralCache<String, String> cache = new LateralCache<String, String>( cattr ); + LateralCacheNoWait<String, String> noWait = new LateralCacheNoWait<String, String>( cache ); // DO WORK boolean result = listener.addNoWait( noWait ); @@ -145,8 +145,8 @@ public class LateralTCPDiscoveryListener ILateralCacheAttributes cattr = new LateralCacheAttributes(); cattr.setCacheName( cacheName ); - LateralCache<String, String> cache = new LateralCache<>( cattr ); - LateralCacheNoWait<String, String> noWait = new LateralCacheNoWait<>( cache ); + LateralCache<String, String> cache = new LateralCache<String, String>( cattr ); + LateralCacheNoWait<String, String> noWait = new LateralCacheNoWait<String, String>( cache ); // DO WORK boolean result = listener.removeNoWait( noWait ); @@ -168,11 +168,11 @@ public class LateralTCPDiscoveryListener ILateralCacheAttributes cattr = new LateralCacheAttributes(); cattr.setCacheName( cacheName ); - LateralCacheNoWaitFacade<String, String> facade = new LateralCacheNoWaitFacade<>( null, noWaits, cattr ); + LateralCacheNoWaitFacade<String, String> facade = new LateralCacheNoWaitFacade<String, String>( null, noWaits, cattr ); listener.addNoWaitFacade( cacheName, facade ); - LateralCache<String, String> cache = new LateralCache<>( cattr ); - LateralCacheNoWait<String, String> noWait = new LateralCacheNoWait<>( cache ); + LateralCache<String, String> cache = new LateralCache<String, String>( cattr ); + LateralCacheNoWait<String, String> noWait = new LateralCacheNoWait<String, String>( cache ); // DO WORK boolean result = listener.removeNoWait( noWait ); @@ -194,11 +194,11 @@ public class LateralTCPDiscoveryListener ILateralCacheAttributes cattr = new LateralCacheAttributes(); cattr.setCacheName( cacheName ); - LateralCacheNoWaitFacade<String, String> facade = new LateralCacheNoWaitFacade<>( null, noWaits, cattr ); + LateralCacheNoWaitFacade<String, String> facade = new LateralCacheNoWaitFacade<String, String>( null, noWaits, cattr ); listener.addNoWaitFacade( cacheName, facade ); - LateralCache<String, String> cache = new LateralCache<>( cattr ); - LateralCacheNoWait<String, String> noWait = new LateralCacheNoWait<>( cache ); + LateralCache<String, String> cache = new LateralCache<String, String>( cattr ); + LateralCacheNoWait<String, String> noWait = new LateralCacheNoWait<String, String>( cache ); listener.addNoWait( noWait ); // DO WORK @@ -216,7 +216,7 @@ public class LateralTCPDiscoveryListener // SETUP String cacheName = "testAddDiscoveredService_FacadeInList_NoWaitNot"; - ArrayList<String> cacheNames = new ArrayList<>(); + ArrayList<String> cacheNames = new ArrayList<String>(); cacheNames.add( cacheName ); DiscoveredService service = new DiscoveredService(); @@ -238,7 +238,7 @@ public class LateralTCPDiscoveryListener LateralCacheNoWait<String, String>[] noWaits = new LateralCacheNoWait[0]; ILateralCacheAttributes cattr = new LateralCacheAttributes(); cattr.setCacheName( cacheName ); - LateralCacheNoWaitFacade<String, String> facade = new LateralCacheNoWaitFacade<>( null, noWaits, cattr ); + LateralCacheNoWaitFacade<String, String> facade = new LateralCacheNoWaitFacade<String, String>( null, noWaits, cattr ); listener.addNoWaitFacade( cacheName, facade ); // DO WORK @@ -256,7 +256,7 @@ public class LateralTCPDiscoveryListener // SETUP String cacheName = "testRemoveDiscoveredService_FacadeInList_NoWaitIs"; - ArrayList<String> cacheNames = new ArrayList<>(); + ArrayList<String> cacheNames = new ArrayList<String>(); cacheNames.add( cacheName ); DiscoveredService service = new DiscoveredService(); @@ -278,7 +278,7 @@ public class LateralTCPDiscoveryListener LateralCacheNoWait<String, String>[] noWaits = new LateralCacheNoWait[0]; ILateralCacheAttributes cattr = new LateralCacheAttributes(); cattr.setCacheName( cacheName ); - LateralCacheNoWaitFacade<String, String> facade = new LateralCacheNoWaitFacade<>( null, noWaits, cattr ); + LateralCacheNoWaitFacade<String, String> facade = new LateralCacheNoWaitFacade<String, String>( null, noWaits, cattr ); listener.addNoWaitFacade( cacheName, facade ); listener.addDiscoveredService( service ); Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPFilterRemoveHashCodeUnitTest.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPFilterRemoveHashCodeUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPFilterRemoveHashCodeUnitTest.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPFilterRemoveHashCodeUnitTest.java Wed May 29 12:18:56 2019 @@ -99,7 +99,7 @@ public class LateralTCPFilterRemoveHashC // this service will put and remove using the lateral to // the cache instance above // the cache thinks it is different since the listenerid is different - LateralTCPService<String, Serializable> service = new LateralTCPService<>( lattr2 ); + LateralTCPService<String, Serializable> service = new LateralTCPService<String, Serializable>( lattr2 ); service.setListenerId( 123456 ); String keyToBeRemovedOnPut = "test1"; @@ -122,12 +122,12 @@ public class LateralTCPFilterRemoveHashC // dataToPassHashCodeCompare.hashCode() ); cache.put( keyToBeRemovedOnPut, "this should get removed." ); - ICacheElement<String, Serializable> element1 = new CacheElement<>( region, keyToBeRemovedOnPut, region + ICacheElement<String, Serializable> element1 = new CacheElement<String, Serializable>( region, keyToBeRemovedOnPut, region + ":data-this shouldn't get there" ); service.update( element1 ); cache.put( keyToNotBeRemovedOnPut, dataToPassHashCodeCompare ); - ICacheElement<String, Serializable> element2 = new CacheElement<>( region, keyToNotBeRemovedOnPut, dataToPassHashCodeCompare ); + ICacheElement<String, Serializable> element2 = new CacheElement<String, Serializable>( region, keyToNotBeRemovedOnPut, dataToPassHashCodeCompare ); service.update( element2 ); /* Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPIssueRemoveOnPutUnitTest.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPIssueRemoveOnPutUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPIssueRemoveOnPutUnitTest.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPIssueRemoveOnPutUnitTest.java Wed May 29 12:18:56 2019 @@ -96,12 +96,12 @@ public class LateralTCPIssueRemoveOnPutU // Using the lateral, this service will put to and remove from // the cache instance above. // The cache thinks it is different since the listenerid is different - LateralTCPService<String, String> service = new LateralTCPService<>( lattr2 ); + LateralTCPService<String, String> service = new LateralTCPService<String, String>( lattr2 ); service.setListenerId( 123456 ); String keyToBeRemovedOnPut = "test1_notremoved"; - ICacheElement<String, String> element1 = new CacheElement<>( region, keyToBeRemovedOnPut, region + ICacheElement<String, String> element1 = new CacheElement<String, String>( region, keyToBeRemovedOnPut, region + ":data-this shouldn't get removed, it should get to the cache." ); service.update( element1 ); @@ -143,13 +143,13 @@ public class LateralTCPIssueRemoveOnPutU // Using the lateral, this service will put to and remove from // the cache instance above. // The cache thinks it is different since the listenerid is different - LateralTCPService<String, String> service = new LateralTCPService<>( lattr2 ); + LateralTCPService<String, String> service = new LateralTCPService<String, String>( lattr2 ); service.setListenerId( 123456 ); String keyToBeRemovedOnPut = "test1"; cache.put( keyToBeRemovedOnPut, "this should get removed." ); - ICacheElement<String, String> element1 = new CacheElement<>( region, keyToBeRemovedOnPut, region + ICacheElement<String, String> element1 = new CacheElement<String, String>( region, keyToBeRemovedOnPut, region + ":data-this shouldn't get there" ); service.update( element1 ); @@ -162,7 +162,7 @@ public class LateralTCPIssueRemoveOnPutU int kn = ran.nextInt( range ); String key = "key" + kn; - ICacheElement<String, String> element = new CacheElement<>( region, key, region + ":data" + i + ICacheElement<String, String> element = new CacheElement<String, String>( region, key, region + ":data" + i + " junk asdfffffffadfasdfasf " + kn + ":" + n ); service.update( element ); if ( show ) Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/TestTCPLateralUnitTest.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/TestTCPLateralUnitTest.java?rev=1860336&r1=1860335&r2=1860336&view=diff ============================================================================== --- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/TestTCPLateralUnitTest.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/TestTCPLateralUnitTest.java Wed May 29 12:18:56 2019 @@ -86,8 +86,8 @@ public class TestTCPLateralUnitTest for ( int i = 0; i < numMes; i++ ) { String message = "adsfasasfasfasdasf"; - CacheElement<String, String> ce = new CacheElement<>( "test", "test", message ); - LateralElementDescriptor<String, String> led = new LateralElementDescriptor<>( ce ); + CacheElement<String, String> ce = new CacheElement<String, String>( "test", "test", message ); + LateralElementDescriptor<String, String> led = new LateralElementDescriptor<String, String>( ce ); led.command = LateralCommand.UPDATE; led.requesterId = 1; lur.send( led ); @@ -119,14 +119,14 @@ public class TestTCPLateralUnitTest lattr2.setTransmissionTypeName( "TCP" ); lattr2.setTcpServer( "localhost:1101" ); - LateralTCPService<String, String> service = new LateralTCPService<>( lattr2 ); + LateralTCPService<String, String> service = new LateralTCPService<String, String>( lattr2 ); service.setListenerId( 123456 ); // DO WORK int cnt = 100; for ( int i = 0; i < cnt; i++ ) { - ICacheElement<String, String> element = new CacheElement<>( "test", "key" + i, "value1" ); + ICacheElement<String, String> element = new CacheElement<String, String>( "test", "key" + i, "value1" ); service.update( element ); } @@ -162,16 +162,16 @@ public class TestTCPLateralUnitTest lattr2.setTcpListenerPort( 1104 ); lattr2.setTcpServer( "localhost:1103" ); - LateralTCPService<String, String> service = new LateralTCPService<>( lattr2 ); + LateralTCPService<String, String> service = new LateralTCPService<String, String>( lattr2 ); service.setListenerId( 123456 ); // DO WORK - ICacheElement<String, String> element = new CacheElement<>( "test", "key", "value1" ); + ICacheElement<String, String> element = new CacheElement<String, String>( "test", "key", "value1" ); service.update( element ); SleepUtil.sleepAtLeast( 300 ); - ICacheElement<String, String> element2 = new CacheElement<>( "test", "key", "value2" ); + ICacheElement<String, String> element2 = new CacheElement<String, String>( "test", "key", "value2" ); service.update( element2 ); SleepUtil.sleepAtLeast( 1000 ); @@ -206,17 +206,17 @@ public class TestTCPLateralUnitTest lattr2.setTransmissionTypeName( "TCP" ); lattr2.setTcpServer( "localhost:1105" ); - LateralTCPService<String, String> service = new LateralTCPService<>( lattr2 ); + LateralTCPService<String, String> service = new LateralTCPService<String, String>( lattr2 ); service.setListenerId( 123456 ); // DO WORK String key = "key"; - ICacheElement<String, String> element = new CacheElement<>( "test", key, "value1" ); + ICacheElement<String, String> element = new CacheElement<String, String>( "test", key, "value1" ); service.update( element ); SleepUtil.sleepAtLeast( 300 ); - ICacheElement<String, String> element2 = new CacheElement<>( "test", key, "value2" ); + ICacheElement<String, String> element2 = new CacheElement<String, String>( "test", key, "value2" ); service.update( element2 ); SleepUtil.sleepAtLeast( 1000 ); @@ -248,7 +248,7 @@ public class TestTCPLateralUnitTest LateralTCPListener.getInstance( lattr, cacheMgr ); // add the item to the listeners cache - ICacheElement<String, String> element = new CacheElement<>( "test", "key", "value1" ); + ICacheElement<String, String> element = new CacheElement<String, String>( "test", "key", "value1" ); cache.update( element ); // setup a service to talk to the listener started above. @@ -256,7 +256,7 @@ public class TestTCPLateralUnitTest lattr2.setTcpListenerPort( 1108 ); lattr2.setTcpServer( "localhost:1107" ); - LateralTCPService<String, String> service = new LateralTCPService<>( lattr2 ); + LateralTCPService<String, String> service = new LateralTCPService<String, String>( lattr2 ); service.setListenerId( 123456 ); SleepUtil.sleepAtLeast( 300 ); @@ -290,9 +290,9 @@ public class TestTCPLateralUnitTest LateralTCPListener.getInstance( lattr, cacheMgr ); // add the item to the listeners cache - GroupAttrName<String> groupKey = new GroupAttrName<>(new GroupId("test", "group"), "key"); + GroupAttrName<String> groupKey = new GroupAttrName<String>(new GroupId("test", "group"), "key"); ICacheElement<GroupAttrName<String>, String> element = - new CacheElement<>( "test", groupKey, "value1" ); + new CacheElement<GroupAttrName<String>, String>( "test", groupKey, "value1" ); cache.update( element ); // setup a service to talk to the listener started above. @@ -301,7 +301,7 @@ public class TestTCPLateralUnitTest lattr2.setTcpServer( "localhost:1150" ); LateralTCPService<GroupAttrName<String>, String> service = - new LateralTCPService<>( lattr2 ); + new LateralTCPService<GroupAttrName<String>, String>( lattr2 ); service.setListenerId( 123459 ); SleepUtil.sleepAtLeast( 500 ); @@ -343,7 +343,7 @@ public class TestTCPLateralUnitTest for ( int i = 0; i < numToInsertPrefix1; i++ ) { // add the item to the listeners cache - ICacheElement<String, Integer> element = new CacheElement<>( "test", keyprefix1 + String.valueOf( i ), Integer.valueOf( i ) ); + ICacheElement<String, Integer> element = new CacheElement<String, Integer>( "test", keyprefix1 + String.valueOf( i ), Integer.valueOf( i ) ); cache.update( element ); } @@ -352,7 +352,7 @@ public class TestTCPLateralUnitTest lattr2.setTcpListenerPort( 1108 ); lattr2.setTcpServer( "localhost:1108" ); - LateralTCPService<String, Integer> service = new LateralTCPService<>( lattr2 ); + LateralTCPService<String, Integer> service = new LateralTCPService<String, Integer>( lattr2 ); service.setListenerId( 123456 ); SleepUtil.sleepAtLeast( 300 ); Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/MockRemoteCacheClient.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/MockRemoteCacheClient.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/MockRemoteCacheClient.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/MockRemoteCacheClient.java Wed May 29 12:18:56 2019 @@ -50,20 +50,20 @@ public class MockRemoteCacheClient<K, V> private static final Log log = LogFactory.getLog( MockRemoteCacheClient.class ); /** List of ICacheElement<K, V> objects passed into update. */ - public List<ICacheElement<K, V>> updateList = new LinkedList<>(); + public List<ICacheElement<K, V>> updateList = new LinkedList<ICacheElement<K,V>>(); /** List of key objects passed into remove. */ - public List<K> removeList = new LinkedList<>(); + public List<K> removeList = new LinkedList<K>(); /** status to return. */ public CacheStatus status = CacheStatus.ALIVE; /** Can setup values to return from get. values must be ICacheElement<K, V> */ - public Map<K, ICacheElement<K, V>> getSetupMap = new HashMap<>(); + public Map<K, ICacheElement<K, V>> getSetupMap = new HashMap<K, ICacheElement<K,V>>(); /** Can setup values to return from get. values must be Map<K, ICacheElement<K, V>> */ public Map<Set<K>, Map<K, ICacheElement<K, V>>> getMultipleSetupMap = - new HashMap<>(); + new HashMap<Set<K>, Map<K,ICacheElement<K,V>>>(); /** The last service passed to fixCache */ public ICacheServiceNonLocal<K, V> fixed; @@ -245,7 +245,7 @@ public class MockRemoteCacheClient<K, V> public Map<K, ICacheElement<K, V>> getMatching(String pattern) throws IOException { - 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/auxiliary/remote/MockRemoteCacheListener.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/MockRemoteCacheListener.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/MockRemoteCacheListener.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/MockRemoteCacheListener.java Wed May 29 12:18:56 2019 @@ -45,10 +45,10 @@ public class MockRemoteCacheListener<K, public int putCount; /** List of ICacheElements passed to handlePut. */ - public List<ICacheElement<K, V>> putItems = new LinkedList<>(); + public List<ICacheElement<K, V>> putItems = new LinkedList<ICacheElement<K,V>>(); /** List of Serializable objects passed to handleRemove. */ - public List<K> removedKeys = new LinkedList<>(); + public List<K> removedKeys = new LinkedList<K>(); /** Number of times handleRemote was called. */ public int removeCount; Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/MockRemoteCacheService.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/MockRemoteCacheService.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/MockRemoteCacheService.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/MockRemoteCacheService.java Wed May 29 12:18:56 2019 @@ -49,10 +49,10 @@ public class MockRemoteCacheService<K, V 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 MockRemoteCacheService<K, V @Override public Set<K> getKeySet( String cacheName ) { - return new HashSet<>(); + return new HashSet<K>(); } /** @@ -195,7 +195,7 @@ public class MockRemoteCacheService<K, V 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>>(); } /** @@ -236,6 +236,6 @@ public class MockRemoteCacheService<K, V 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/auxiliary/remote/RemoteCacheClientTester.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheClientTester.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/RemoteCacheClientTester.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheClientTester.java Wed May 29 12:18:56 2019 @@ -158,11 +158,11 @@ public class RemoteCacheClientTester p( "subscribing to the server" ); watch.addCacheListener( "testCache", this ); - ICacheElement<String, String> cb = new CacheElement<>( "testCache", "testKey", "testVal" ); + ICacheElement<String, String> cb = new CacheElement<String, String>( "testCache", "testKey", "testVal" ); for ( int i = 0; i < count; i++ ) { - cb = new CacheElement<>( "testCache", "" + i, "" + i ); + cb = new CacheElement<String, String>( "testCache", "" + i, "" + i ); if ( delete ) { Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheListenerUnitTest.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheListenerUnitTest.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/RemoteCacheListenerUnitTest.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheListenerUnitTest.java Wed May 29 12:18:56 2019 @@ -55,7 +55,7 @@ public class RemoteCacheListenerUnitTest IRemoteCacheAttributes irca = new RemoteCacheAttributes(); irca.setRemoveUponRemotePut( false ); ICompositeCacheManager cacheMgr = new MockCompositeCacheManager(); - RemoteCacheListener<String, String> listener = new RemoteCacheListener<>( irca, cacheMgr, new StandardSerializer() ); + RemoteCacheListener<String, String> listener = new RemoteCacheListener<String, String>( irca, cacheMgr, new StandardSerializer() ); String cacheName = "testName"; String key = "key"; @@ -66,7 +66,7 @@ public class RemoteCacheListenerUnitTest IElementSerializer elementSerializer = new StandardSerializer(); ICacheElementSerialized<String, String> element = - new CacheElementSerialized<>( cacheName, key, elementSerializer + new CacheElementSerialized<String, String>( cacheName, key, elementSerializer .serialize( value ), attr ); // DO WORK @@ -98,7 +98,7 @@ public class RemoteCacheListenerUnitTest IRemoteCacheAttributes irca = new RemoteCacheAttributes(); irca.setRemoveUponRemotePut( true ); ICompositeCacheManager cacheMgr = new MockCompositeCacheManager(); - RemoteCacheListener<String, String> listener = new RemoteCacheListener<>( irca, cacheMgr, new StandardSerializer() ); + RemoteCacheListener<String, String> listener = new RemoteCacheListener<String, String>( irca, cacheMgr, new StandardSerializer() ); String cacheName = "testName"; String key = "key"; @@ -109,7 +109,7 @@ public class RemoteCacheListenerUnitTest IElementSerializer elementSerializer = new StandardSerializer(); ICacheElementSerialized<String, String> element = - new CacheElementSerialized<>( cacheName, key, elementSerializer + new CacheElementSerialized<String, String>( cacheName, key, elementSerializer .serialize( value ), attr ); // DO WORK Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacadeUnitTest.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacadeUnitTest.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/RemoteCacheNoWaitFacadeUnitTest.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacadeUnitTest.java Wed May 29 12:18:56 2019 @@ -38,15 +38,15 @@ public class RemoteCacheNoWaitFacadeUnit public void testAddNoWait_InList() { // SETUP - List<RemoteCacheNoWait<String, String>> noWaits = new ArrayList<>(); + List<RemoteCacheNoWait<String, String>> noWaits = new ArrayList<RemoteCacheNoWait<String,String>>(); IRemoteCacheAttributes cattr = new RemoteCacheAttributes(); cattr.setCacheName( "testCache1" ); - RemoteCache<String, String> client = new RemoteCache<>(cattr, null, null, null); - RemoteCacheNoWait<String, String> noWait = new RemoteCacheNoWait<>( client ); + RemoteCache<String, String> client = new RemoteCache<String, String>(cattr, null, null, null); + RemoteCacheNoWait<String, String> noWait = new RemoteCacheNoWait<String, String>( client ); noWaits.add( noWait ); - RemoteCacheNoWaitFacade<String, String> facade = new RemoteCacheNoWaitFacade<>(noWaits, cattr, null, null, null ); + RemoteCacheNoWaitFacade<String, String> facade = new RemoteCacheNoWaitFacade<String, String>(noWaits, cattr, null, null, null ); // VERIFY assertEquals( "Should have one entry.", 1, facade.noWaits.size() ); Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitUnitTest.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitUnitTest.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/RemoteCacheNoWaitUnitTest.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitUnitTest.java Wed May 29 12:18:56 2019 @@ -48,10 +48,10 @@ public class RemoteCacheNoWaitUnitTest throws Exception { // SETUP - MockRemoteCacheClient<String, String> client = new MockRemoteCacheClient<>(); - RemoteCacheNoWait<String, String> noWait = new RemoteCacheNoWait<>( client ); + MockRemoteCacheClient<String, String> client = new MockRemoteCacheClient<String, String>(); + RemoteCacheNoWait<String, String> noWait = new RemoteCacheNoWait<String, String>( client ); - ICacheElement<String, String> element = new CacheElement<>( "testUpdate", "key", "value" ); + ICacheElement<String, String> element = new CacheElement<String, String>( "testUpdate", "key", "value" ); // DO WORK noWait.update( element ); @@ -72,10 +72,10 @@ public class RemoteCacheNoWaitUnitTest throws Exception { // SETUP - MockRemoteCacheClient<String, String> client = new MockRemoteCacheClient<>(); - RemoteCacheNoWait<String, String> noWait = new RemoteCacheNoWait<>( client ); + MockRemoteCacheClient<String, String> client = new MockRemoteCacheClient<String, String>(); + RemoteCacheNoWait<String, String> noWait = new RemoteCacheNoWait<String, String>( client ); - ICacheElement<String, String> input = new CacheElement<>( "testUpdate", "key", "value" ); + ICacheElement<String, String> input = new CacheElement<String, String>( "testUpdate", "key", "value" ); client.getSetupMap.put( "key", input ); // DO WORK @@ -94,14 +94,14 @@ public class RemoteCacheNoWaitUnitTest throws Exception { // SETUP - MockRemoteCacheClient<String, String> client = new MockRemoteCacheClient<>(); - RemoteCacheNoWait<String, String> noWait = new RemoteCacheNoWait<>( client ); + MockRemoteCacheClient<String, String> client = new MockRemoteCacheClient<String, String>(); + RemoteCacheNoWait<String, String> noWait = new RemoteCacheNoWait<String, String>( client ); - ICacheElement<String, String> inputElement = new CacheElement<>( "testUpdate", "key", "value" ); - Map<String, ICacheElement<String, String>> inputMap = new HashMap<>(); + ICacheElement<String, String> inputElement = new CacheElement<String, String>( "testUpdate", "key", "value" ); + Map<String, ICacheElement<String, String>> inputMap = new HashMap<String, ICacheElement<String,String>>(); inputMap.put( "key", inputElement ); - Set<String> keys = new HashSet<>(); + Set<String> keys = new HashSet<String>(); keys.add( "key" ); client.getMultipleSetupMap.put( keys, inputMap ); @@ -122,8 +122,8 @@ public class RemoteCacheNoWaitUnitTest throws Exception { // SETUP - MockRemoteCacheClient<String, String> client = new MockRemoteCacheClient<>(); - RemoteCacheNoWait<String, String> noWait = new RemoteCacheNoWait<>( client ); + MockRemoteCacheClient<String, String> client = new MockRemoteCacheClient<String, String>(); + RemoteCacheNoWait<String, String> noWait = new RemoteCacheNoWait<String, String>( client ); String input = "MyKey"; @@ -146,9 +146,9 @@ public class RemoteCacheNoWaitUnitTest throws Exception { // SETUP - MockRemoteCacheClient<String, String> client = new MockRemoteCacheClient<>(); + MockRemoteCacheClient<String, String> client = new MockRemoteCacheClient<String, String>(); client.status = CacheStatus.ALIVE; - RemoteCacheNoWait<String, String> noWait = new RemoteCacheNoWait<>( client ); + RemoteCacheNoWait<String, String> noWait = new RemoteCacheNoWait<String, String>( client ); // DO WORK String result = noWait.getStats(); @@ -166,9 +166,9 @@ public class RemoteCacheNoWaitUnitTest throws Exception { // SETUP - MockRemoteCacheClient<String, String> client = new MockRemoteCacheClient<>(); + MockRemoteCacheClient<String, String> client = new MockRemoteCacheClient<String, String>(); client.status = CacheStatus.ERROR; - RemoteCacheNoWait<String, String> noWait = new RemoteCacheNoWait<>( client ); + RemoteCacheNoWait<String, String> noWait = new RemoteCacheNoWait<String, String>( client ); // DO WORK CacheStatus result = noWait.getStatus(); @@ -187,13 +187,13 @@ public class RemoteCacheNoWaitUnitTest throws Exception { // SETUP - MockRemoteCacheClient<String, String> client = new MockRemoteCacheClient<>(); + MockRemoteCacheClient<String, String> client = new MockRemoteCacheClient<String, String>(); client.status = CacheStatus.ALIVE; - RemoteCacheNoWait<String, String> noWait = new RemoteCacheNoWait<>( client ); + RemoteCacheNoWait<String, String> noWait = new RemoteCacheNoWait<String, String>( client ); - MockRemoteCacheService<String, String> service = new MockRemoteCacheService<>(); + MockRemoteCacheService<String, String> service = new MockRemoteCacheService<String, String>(); - ICacheElement<String, String> element = new CacheElement<>( "testUpdate", "key", "value" ); + ICacheElement<String, String> element = new CacheElement<String, String>( "testUpdate", "key", "value" ); // DO WORK noWait.update( element ); Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheUnitTest.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheUnitTest.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/RemoteCacheUnitTest.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheUnitTest.java Wed May 29 12:18:56 2019 @@ -51,8 +51,8 @@ public class RemoteCacheUnitTest { super.setUp(); cattr = new RemoteCacheAttributes(); - service = new MockRemoteCacheService<>(); - listener = new MockRemoteCacheListener<>(); + service = new MockRemoteCacheService<String, String>(); + listener = new MockRemoteCacheListener<String, String>(); monitor = new RemoteCacheMonitor(); } @@ -69,12 +69,12 @@ public class RemoteCacheUnitTest long listenerId = 123; listener.setListenerId( listenerId ); - RemoteCache<String, String> remoteCache = new RemoteCache<>( cattr, service, listener, monitor ); + RemoteCache<String, String> remoteCache = new RemoteCache<String, String>( cattr, service, listener, monitor ); 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" ); remoteCache.update( element ); // VERIFY @@ -96,15 +96,15 @@ public class RemoteCacheUnitTest throws Exception { // SETUP - ZombieCacheServiceNonLocal<String, String> zombie = new ZombieCacheServiceNonLocal<>( 10 ); + ZombieCacheServiceNonLocal<String, String> zombie = new ZombieCacheServiceNonLocal<String, String>( 10 ); // set the zombie - RemoteCache<String, String> remoteCache = new RemoteCache<>( cattr, zombie, listener, monitor ); + RemoteCache<String, String> remoteCache = new RemoteCache<String, String>( cattr, zombie, listener, monitor ); 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" ); remoteCache.update( element ); // set the new service, this should call propagate remoteCache.fixCache( service ); @@ -126,12 +126,12 @@ public class RemoteCacheUnitTest public void testUpdate_simple() throws Exception { - RemoteCache<String, String> remoteCache = new RemoteCache<>( cattr, service, listener, monitor ); + RemoteCache<String, String> remoteCache = new RemoteCache<String, String>( cattr, service, listener, monitor ); MockCacheEventLogger cacheEventLogger = new MockCacheEventLogger(); remoteCache.setCacheEventLogger( cacheEventLogger ); - ICacheElement<String, String> item = new CacheElement<>( "region", "key", "value" ); + ICacheElement<String, String> item = new CacheElement<String, String>( "region", "key", "value" ); // DO WORK remoteCache.update( item ); @@ -149,7 +149,7 @@ public class RemoteCacheUnitTest public void testGet_simple() throws Exception { - RemoteCache<String, String> remoteCache = new RemoteCache<>( cattr, service, listener, monitor ); + RemoteCache<String, String> remoteCache = new RemoteCache<String, String>( cattr, service, listener, monitor ); MockCacheEventLogger cacheEventLogger = new MockCacheEventLogger(); remoteCache.setCacheEventLogger( cacheEventLogger ); @@ -170,13 +170,13 @@ public class RemoteCacheUnitTest public void testGetMultiple_simple() throws Exception { - RemoteCache<String, String> remoteCache = new RemoteCache<>( cattr, service, listener, monitor ); + RemoteCache<String, String> remoteCache = new RemoteCache<String, String>( cattr, service, listener, monitor ); MockCacheEventLogger cacheEventLogger = new MockCacheEventLogger(); remoteCache.setCacheEventLogger( cacheEventLogger ); // DO WORK - remoteCache.getMultiple( new HashSet<>() ); + remoteCache.getMultiple( new HashSet<String>() ); // VERIFY assertEquals( "Start should have been called.", 1, cacheEventLogger.startICacheEventCalls ); @@ -191,7 +191,7 @@ public class RemoteCacheUnitTest public void testRemove_simple() throws Exception { - RemoteCache<String, String> remoteCache = new RemoteCache<>( cattr, service, listener, monitor ); + RemoteCache<String, String> remoteCache = new RemoteCache<String, String>( cattr, service, listener, monitor ); MockCacheEventLogger cacheEventLogger = new MockCacheEventLogger(); remoteCache.setCacheEventLogger( cacheEventLogger ); @@ -212,7 +212,7 @@ public class RemoteCacheUnitTest public void testRemoveAll_simple() throws Exception { - RemoteCache<String, String> remoteCache = new RemoteCache<>( cattr, service, listener, monitor ); + RemoteCache<String, String> remoteCache = new RemoteCache<String, String>( cattr, service, listener, monitor ); MockCacheEventLogger cacheEventLogger = new MockCacheEventLogger(); remoteCache.setCacheEventLogger( cacheEventLogger ); @@ -236,7 +236,7 @@ public class RemoteCacheUnitTest // SETUP String pattern = "adsfasdfasd.?"; - RemoteCache<String, String> remoteCache = new RemoteCache<>( cattr, service, listener, monitor ); + RemoteCache<String, String> remoteCache = new RemoteCache<String, String>( cattr, service, listener, monitor ); MockCacheEventLogger cacheEventLogger = new MockCacheEventLogger(); remoteCache.setCacheEventLogger( cacheEventLogger ); @@ -258,7 +258,7 @@ public class RemoteCacheUnitTest public void testDispose_simple() throws Exception { - RemoteCache<String, String> remoteCache = new RemoteCache<>( cattr, service, listener, monitor ); + RemoteCache<String, String> remoteCache = new RemoteCache<String, String>( cattr, service, listener, monitor ); MockCacheEventLogger cacheEventLogger = new MockCacheEventLogger(); remoteCache.setCacheEventLogger( cacheEventLogger ); @@ -280,7 +280,7 @@ public class RemoteCacheUnitTest throws Exception { // SETUP - RemoteCache<String, String> remoteCache = new RemoteCache<>( cattr, service, null, monitor ); + RemoteCache<String, String> remoteCache = new RemoteCache<String, String>( cattr, service, null, monitor ); MockCacheEventLogger cacheEventLogger = new MockCacheEventLogger(); remoteCache.setCacheEventLogger( cacheEventLogger ); Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/TestRemoteCache.java URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/TestRemoteCache.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/TestRemoteCache.java (original) +++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/TestRemoteCache.java Wed May 29 12:18:56 2019 @@ -120,7 +120,7 @@ public class TestRemoteCache for ( int i = 0; i < numMes; i++ ) { String message = "adsfasasfasfasdasf"; - CacheElement<String, String> ce = new CacheElement<>( "key" + 1, "data" + i, message ); + CacheElement<String, String> ce = new CacheElement<String, String>( "key" + 1, "data" + i, message ); cache.update( ce ); // System.out.println( "put " + ce ); }
