svn commit: r1811416 - /ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/test/UtilCacheTests.java

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1811416 - /ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/test/UtilCacheTests.java

mbrohl
Author: mbrohl
Date: Sat Oct  7 12:28:52 2017
New Revision: 1811416

URL: http://svn.apache.org/viewvc?rev=1811416&view=rev
Log:
Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.base.util.cache.test.
(OFBIZ-9576)

Thanks Dennis Balkir for reporting and providing the patch.

Modified:
    ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/test/UtilCacheTests.java

Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/test/UtilCacheTests.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/test/UtilCacheTests.java?rev=1811416&r1=1811415&r2=1811416&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/test/UtilCacheTests.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/test/UtilCacheTests.java Sat Oct  7 12:28:52 2017
@@ -43,7 +43,7 @@ public class UtilCacheTests extends Gene
     }
 
     protected static final class Removal<V> extends Change<V> {
-        protected final V oldValue;
+        private final V oldValue;
 
         protected Removal(V oldValue) {
             this.oldValue = oldValue;
@@ -65,7 +65,7 @@ public class UtilCacheTests extends Gene
     }
 
     protected static final class Addition<V> extends Change<V> {
-        protected final V newValue;
+        private final V newValue;
 
         protected Addition(V newValue) {
             this.newValue = newValue;
@@ -87,8 +87,8 @@ public class UtilCacheTests extends Gene
     }
 
     protected static final class Update<V> extends Change<V> {
-        protected final V newValue;
-        protected final V oldValue;
+        private final V newValue;
+        private final V oldValue;
 
         protected Update(V newValue, V oldValue) {
             this.newValue = newValue;
@@ -114,12 +114,12 @@ public class UtilCacheTests extends Gene
     }
 
     protected static class Listener<K, V> implements CacheListener<K, V> {
-        protected Map<K, Set<Change<V>>> changeMap = new HashMap<K, Set<Change<V>>>();
+        protected Map<K, Set<Change<V>>> changeMap = new HashMap<>();
 
         private void add(K key, Change<V> change) {
             Set<Change<V>> changeSet = changeMap.get(key);
             if (changeSet == null) {
-                changeSet = new HashSet<Change<V>>();
+                changeSet = new HashSet<>();
                 changeMap.put(key, changeSet);
             }
             for (Change<V> checkChange: changeSet) {
@@ -132,26 +132,34 @@ public class UtilCacheTests extends Gene
         }
 
         public synchronized void noteKeyRemoval(UtilCache<K, V> cache, K key, V oldValue) {
-            add(key, new Removal<V>(oldValue));
+            add(key, new Removal<>(oldValue));
         }
 
         public synchronized void noteKeyAddition(UtilCache<K, V> cache, K key, V newValue) {
-            add(key, new Addition<V>(newValue));
+            add(key, new Addition<>(newValue));
         }
 
         public synchronized void noteKeyUpdate(UtilCache<K, V> cache, K key, V newValue, V oldValue) {
-            add(key, new Update<V>(newValue, oldValue));
+            add(key, new Update<>(newValue, oldValue));
         }
 
         @Override
         public boolean equals(Object o) {
+            if (!(o instanceof Listener)) {
+                return false;
+            }
             Listener<?, ?> other = (Listener<?, ?>) o;
             return changeMap.equals(other.changeMap);
         }
+        
+        @Override
+        public int hashCode() {
+            return super.hashCode();
+        }
     }
 
     private static <K, V> Listener<K, V> createListener(UtilCache<K, V> cache) {
-        Listener<K, V> listener = new Listener<K, V>();
+        Listener<K, V> listener = new Listener<>();
         cache.addListener(listener);
         return listener;
     }
@@ -225,7 +233,7 @@ public class UtilCacheTests extends Gene
         assertTrue("validKey", UtilCache.validKey(cache.getName(), key));
         assertFalse("validKey", UtilCache.validKey(":::" + cache.getName(), key));
         assertEquals("get", value, cache.get(key));
-        assertEquals("keys", new HashSet<K>(UtilMisc.toList(key)), cache.getCacheLineKeys());
+        assertEquals("keys", new HashSet<>(UtilMisc.toList(key)), cache.getCacheLineKeys());
         assertEquals("values", UtilMisc.toList(value), cache.values());
     }
 
@@ -242,7 +250,7 @@ public class UtilCacheTests extends Gene
 
     private static void basicTest(UtilCache<String, String> cache) throws Exception {
         Listener<String, String> gotListener = createListener(cache);
-        Listener<String, String> wantedListener = new Listener<String, String>();
+        Listener<String, String> wantedListener = new Listener<>();
         for (int i = 0; i < 2; i++) {
             assertTrue("UtilCacheTable.keySet", UtilCache.getUtilCacheTableKeySet().contains(cache.getName()));
             assertSame("UtilCache.findCache", cache, UtilCache.findCache(cache.getName()));
@@ -321,7 +329,7 @@ public class UtilCacheTests extends Gene
     public void testPutIfAbsent() throws Exception {
         UtilCache<String, String> cache = createUtilCache(5, 5, 2000, false);
         Listener<String, String> gotListener = createListener(cache);
-        Listener<String, String> wantedListener = new Listener<String, String>();
+        Listener<String, String> wantedListener = new Listener<>();
         wantedListener.noteKeyAddition(cache, "two", "dos");
         assertNull("putIfAbsent", cache.putIfAbsent("two", "dos"));
         assertHasSingleKey(cache, "two", "dos");
@@ -334,7 +342,7 @@ public class UtilCacheTests extends Gene
     public void testPutIfAbsentAndGet() throws Exception {
         UtilCache<String, String> cache = createUtilCache(5, 5, 2000, false);
         Listener<String, String> gotListener = createListener(cache);
-        Listener<String, String> wantedListener = new Listener<String, String>();
+        Listener<String, String> wantedListener = new Listener<>();
         wantedListener.noteKeyAddition(cache, "key", "value");
         wantedListener.noteKeyAddition(cache, "anotherKey", "anotherValue");
         assertNull("no-get", cache.get("key"));
@@ -359,11 +367,8 @@ public class UtilCacheTests extends Gene
         int size = 5;
         long ttl = 2000;
         UtilCache<String, Serializable> cache = createUtilCache(size, size, ttl, false);
-        Map<String, Serializable> map = new HashMap<String, Serializable>();
-        for (int i = 0; i < size; i++) {
-            String s = Integer.toString(i);
-            assertKey(s, cache, s, new String(s), new String(":" + s), i + 1, map);
-        }
+        Map<String, Serializable> map = new HashMap<>();
+        assertKeyLoop(size, cache, map);
         cache.setMaxInMemory(2);
         assertEquals("cache.size", 2, cache.size());
         map.keySet().retainAll(cache.getCacheLineKeys());
@@ -390,11 +395,8 @@ public class UtilCacheTests extends Gene
     }
 
     private void expireTest(UtilCache<String, Serializable> cache, int size, long ttl) throws Exception {
-        Map<String, Serializable> map = new HashMap<String, Serializable>();
-        for (int i = 0; i < size; i++) {
-            String s = Integer.toString(i);
-            assertKey(s, cache, s, new String(s), new String(":" + s), i + 1, map);
-        }
+        Map<String, Serializable> map = new HashMap<>();
+        assertKeyLoop(size, cache, map);
         Thread.sleep(ttl + 500);
         map.clear();
         for (int i = 0; i < size; i++) {
@@ -403,12 +405,16 @@ public class UtilCacheTests extends Gene
         }
         assertEquals("map-keys", map.keySet(), cache.getCacheLineKeys());
         assertEquals("map-values", map.values(), cache.values());
+        assertKeyLoop(size, cache, map);
+        assertEquals("map-keys", map.keySet(), cache.getCacheLineKeys());
+        assertEquals("map-values", map.values(), cache.values());
+    }
+
+    private void assertKeyLoop(int size, UtilCache<String, Serializable> cache, Map<String, Serializable> map) {
         for (int i = 0; i < size; i++) {
             String s = Integer.toString(i);
             assertKey(s, cache, s, new String(s), new String(":" + s), i + 1, map);
         }
-        assertEquals("map-keys", map.keySet(), cache.getCacheLineKeys());
-        assertEquals("map-values", map.values(), cache.values());
     }
 
     public void testExpire() throws Exception {