[commons-jcs] branch master updated: JCS-211 - Use Map.forEach()

[tv]

This is an automated email from the ASF dual-hosted git repository.

tv pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jcs.git


The following commit(s) were added to refs/heads/master by this push:
     new 787136f  JCS-211 - Use Map.forEach()
     new f55bb34  Merge pull request #35 from arturobernalg/feature/JCS-211
787136f is described below

commit 787136f153fd7f55055427c54b014eb557240302
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Sun Mar 28 16:48:34 2021 +0200

    JCS-211 - Use Map.forEach()
---
 .../java/org/apache/commons/jcs3/engine/CacheWatchRepairable.java  | 7 ++-----
 .../org/apache/commons/jcs3/engine/memory/AbstractMemoryCache.java | 6 +++---
 .../java/org/apache/commons/jcs3/utils/struct/AbstractLRUMap.java  | 6 ++----
 .../apache/commons/jcs3/jcache/extras/web/InMemoryResponse.java    | 6 +-----
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git 
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/CacheWatchRepairable.java
 
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/CacheWatchRepairable.java
index cde4ca7..3b50a78 100644
--- 
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/CacheWatchRepairable.java
+++ 
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/CacheWatchRepairable.java
@@ -58,9 +58,7 @@ public class CacheWatchRepairable
     public void setCacheWatch( final ICacheObserver cacheWatch )
     {
         this.cacheWatch = cacheWatch;
-        cacheMap.entrySet().forEach(entry -> {
-            final String cacheName = entry.getKey();
-            entry.getValue().forEach(listener -> {
+        cacheMap.forEach((cacheName, value) -> value.forEach(listener -> {
                 try
                 {
                     log.info( "Adding listener to cache watch. ICacheListener 
= "
@@ -72,8 +70,7 @@ public class CacheWatchRepairable
                     log.error( "Problem adding listener. ICacheListener = {0} 
| "
                             + "ICacheObserver = {1}", listener, cacheWatch, ex 
);
                 }
-            });
-        });
+        }));
     }
 
     /**
diff --git 
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/memory/AbstractMemoryCache.java
 
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/memory/AbstractMemoryCache.java
index 7609fd1..31db9d2 100644
--- 
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/memory/AbstractMemoryCache.java
+++ 
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/memory/AbstractMemoryCache.java
@@ -287,9 +287,9 @@ public abstract class AbstractMemoryCache<K, V>
         if (log.isTraceEnabled())
         {
             log.trace("dumpingMap");
-            map.entrySet().forEach(e ->
-                log.trace("dumpMap> key={0}, val={1}", e.getKey(),
-                        e.getValue().getCacheElement().getVal()));
+            map.forEach((key, value) ->
+                log.trace("dumpMap> key={0}, val={1}",key, key,
+                        value.getCacheElement().getVal()));
         }
     }
 
diff --git 
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/utils/struct/AbstractLRUMap.java
 
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/utils/struct/AbstractLRUMap.java
index c744d7e..f5685df 100644
--- 
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/utils/struct/AbstractLRUMap.java
+++ 
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/utils/struct/AbstractLRUMap.java
@@ -172,8 +172,7 @@ public abstract class AbstractLRUMap<K, V>
     {
         if ( source != null )
         {
-            source.entrySet()
-                .forEach(entry -> put(entry.getKey(), entry.getValue()));
+            source.forEach((key, value) -> put(key, value));
         }
     }
 
@@ -379,8 +378,7 @@ public abstract class AbstractLRUMap<K, V>
         if (log.isTraceEnabled())
         {
             log.trace("dumpingMap");
-            map.entrySet().forEach(e ->
-                log.trace("dumpMap> key={0}, val={1}", e.getKey(), 
e.getValue().getPayload()));
+            map.forEach((key, value) -> log.trace("dumpMap> key={0}, val={1}", 
key, value.getPayload()));
         }
     }
 
diff --git 
a/commons-jcs-jcache-extras/src/main/java/org/apache/commons/jcs3/jcache/extras/web/InMemoryResponse.java
 
b/commons-jcs-jcache-extras/src/main/java/org/apache/commons/jcs3/jcache/extras/web/InMemoryResponse.java
index cc11e76..e1b8223 100644
--- 
a/commons-jcs-jcache-extras/src/main/java/org/apache/commons/jcs3/jcache/extras/web/InMemoryResponse.java
+++ 
b/commons-jcs-jcache-extras/src/main/java/org/apache/commons/jcs3/jcache/extras/web/InMemoryResponse.java
@@ -54,11 +54,7 @@ public class InMemoryResponse extends 
HttpServletResponseWrapper implements Seri
 
     private List<Serializable> ensureHeaderExists(final String s)
     {
-        List<Serializable> values = headers.get(s);
-        if (values == null) {
-            values = new LinkedList<>();
-            headers.put(s, values);
-        }
+        List<Serializable> values = headers.computeIfAbsent(s, k -> new 
LinkedList<>());
         return values;
     }