You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2020/10/25 20:33:02 UTC
[commons-jcs] branch master updated: Better lambdas.
This is an automated email from the ASF dual-hosted git repository.
ggregory 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 9c9c4e2 Better lambdas.
9c9c4e2 is described below
commit 9c9c4e26505f22b8205a33d82ca8e07dff2cb4cc
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Oct 25 16:32:57 2020 -0400
Better lambdas.
---
.../main/java/org/apache/commons/jcs3/access/CacheAccess.java | 3 ++-
.../main/java/org/apache/commons/jcs3/admin/JCSAdminBean.java | 2 +-
.../apache/commons/jcs3/auxiliary/AbstractAuxiliaryCache.java | 2 +-
.../commons/jcs3/auxiliary/disk/block/BlockDiskCache.java | 5 +++--
.../jcs3/auxiliary/disk/jdbc/JDBCDiskCacheFactory.java | 2 +-
.../jcs3/auxiliary/disk/jdbc/mysql/MySQLTableOptimizer.java | 2 +-
.../commons/jcs3/auxiliary/lateral/LateralCacheNoWait.java | 5 +++--
.../jcs3/auxiliary/lateral/LateralCacheNoWaitFacade.java | 11 ++++++-----
.../commons/jcs3/auxiliary/remote/RemoteCacheManager.java | 4 +---
.../org/apache/commons/jcs3/auxiliary/remote/RemoteUtils.java | 2 +-
.../org/apache/commons/jcs3/engine/CacheWatchRepairable.java | 4 +---
.../apache/commons/jcs3/engine/control/CompositeCache.java | 5 +++--
.../engine/memory/AbstractDoubleLinkedListMemoryCache.java | 2 +-
.../commons/jcs3/engine/memory/AbstractMemoryCache.java | 2 +-
.../commons/jcs3/engine/memory/lru/LHMLRUMemoryCache.java | 2 +-
.../jcs3/engine/memory/soft/SoftReferenceMemoryCache.java | 2 +-
.../java/org/apache/commons/jcs3/log/MessageFormatter.java | 2 +-
.../commons/jcs3/utils/discovery/UDPDiscoveryReceiver.java | 2 +-
.../org/apache/commons/jcs3/utils/struct/AbstractLRUMap.java | 4 ++--
19 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/access/CacheAccess.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/access/CacheAccess.java
index 7bf290c..0964216 100644
--- a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/access/CacheAccess.java
+++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/access/CacheAccess.java
@@ -22,6 +22,7 @@ package org.apache.commons.jcs3.access;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.function.Supplier;
import java.util.stream.Collectors;
@@ -121,7 +122,7 @@ public class CacheAccess<K, V>
.stream()
.filter(entry -> entry.getValue() != null)
.collect(Collectors.toMap(
- entry -> entry.getKey(),
+ Entry::getKey,
entry -> entry.getValue().getVal()));
}
diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/admin/JCSAdminBean.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/admin/JCSAdminBean.java
index d1468a7..e53dd69 100644
--- a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/admin/JCSAdminBean.java
+++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/admin/JCSAdminBean.java
@@ -96,7 +96,7 @@ public class JCSAdminBean implements JCSJMXBean
// Convert all keys to string, store in a sorted map
TreeMap<String, ?> keys = new TreeMap<>(cache.getMemoryCache().getKeySet()
.stream()
- .collect(Collectors.toMap(k -> k.toString(), k -> k)));
+ .collect(Collectors.toMap(Object::toString, k -> k)));
LinkedList<CacheElementInfo> records = new LinkedList<>();
diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/AbstractAuxiliaryCache.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/AbstractAuxiliaryCache.java
index 8a1ed09..bfb231b 100644
--- a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/AbstractAuxiliaryCache.java
+++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/AbstractAuxiliaryCache.java
@@ -71,7 +71,7 @@ public abstract class AbstractAuxiliaryCache<K, V>
})
.filter(element -> element != null)
.collect(Collectors.toMap(
- element -> element.getKey(),
+ ICacheElement::getKey,
element -> element));
}
diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCache.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCache.java
index 54e6919..2a421d3 100644
--- a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCache.java
+++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCache.java
@@ -26,6 +26,7 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
@@ -269,8 +270,8 @@ public class BlockDiskCache<K, V>
key -> processGet( key ))).entrySet().stream()
.filter(entry -> entry.getValue() != null)
.collect(Collectors.toMap(
- entry -> entry.getKey(),
- entry -> entry.getValue()));
+ Entry::getKey,
+ Entry::getValue));
return elements;
}
diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCacheFactory.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCacheFactory.java
index 99ab390..1a70699 100644
--- a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCacheFactory.java
+++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCacheFactory.java
@@ -150,7 +150,7 @@ public class JDBCDiskCacheFactory
*/
protected TableState getTableState(String tableName)
{
- return tableStates.computeIfAbsent(tableName, key -> new TableState(key));
+ return tableStates.computeIfAbsent(tableName, TableState::new);
}
/**
diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/MySQLTableOptimizer.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/MySQLTableOptimizer.java
index 352f6ba..ffd2cde 100644
--- a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/MySQLTableOptimizer.java
+++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/MySQLTableOptimizer.java
@@ -187,7 +187,7 @@ public class MySQLTableOptimizer
tableState.setState( TableState.FREE );
log.info( "Optimization of table [{0}] took {1} ms.",
- () -> this.getTableName(), () -> timer.getElapsedTime() );
+ this::getTableName, () -> timer.getElapsedTime() );
}
return success;
diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCacheNoWait.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCacheNoWait.java
index b85616b..e2fff84 100644
--- a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCacheNoWait.java
+++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCacheNoWait.java
@@ -25,6 +25,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.stream.Collectors;
@@ -173,8 +174,8 @@ public class LateralCacheNoWait<K, V>
key -> get(key))).entrySet().stream()
.filter(entry -> entry.getValue() != null)
.collect(Collectors.toMap(
- entry -> entry.getKey(),
- entry -> entry.getValue()));
+ Entry::getKey,
+ Entry::getValue));
return elements;
}
diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCacheNoWaitFacade.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCacheNoWaitFacade.java
index 18e4c22..7649718 100644
--- a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCacheNoWaitFacade.java
+++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCacheNoWaitFacade.java
@@ -26,6 +26,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
@@ -232,8 +233,8 @@ public class LateralCacheNoWaitFacade<K, V>
key -> get(key))).entrySet().stream()
.filter(entry -> entry.getValue() != null)
.collect(Collectors.toMap(
- entry -> entry.getKey(),
- entry -> entry.getValue()));
+ Entry::getKey,
+ Entry::getValue));
return elements;
}
@@ -301,7 +302,7 @@ public class LateralCacheNoWaitFacade<K, V>
@Override
public void removeAll()
{
- Arrays.stream(noWaits).forEach(nw -> nw.removeAll());
+ Arrays.stream(noWaits).forEach(LateralCacheNoWait::removeAll);
}
/** Adds a dispose request to the lateral cache. */
@@ -316,7 +317,7 @@ public class LateralCacheNoWaitFacade<K, V>
listener = null;
}
- Arrays.stream(noWaits).forEach(nw -> nw.dispose());
+ Arrays.stream(noWaits).forEach(LateralCacheNoWait::dispose);
}
finally
{
@@ -376,7 +377,7 @@ public class LateralCacheNoWaitFacade<K, V>
}
List<CacheStatus> statii = Arrays.stream(noWaits)
- .map(nw -> nw.getStatus())
+ .map(LateralCacheNoWait::getStatus)
.collect(Collectors.toList());
// It's alive if ANY of its nowaits is alive
diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheManager.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheManager.java
index 84119e2..ccd9dd5 100644
--- a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheManager.java
+++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheManager.java
@@ -229,9 +229,7 @@ public class RemoteCacheManager
public <K, V> RemoteCacheNoWait<K, V> getCache( IRemoteCacheAttributes cattr )
{
RemoteCacheNoWait<K, V> remoteCacheNoWait =
- (RemoteCacheNoWait<K, V>) caches.computeIfAbsent(cattr.getCacheName(), key -> {
- return newRemoteCacheNoWait(cattr);
- });
+ (RemoteCacheNoWait<K, V>) caches.computeIfAbsent(cattr.getCacheName(), key -> newRemoteCacheNoWait(cattr));
// might want to do some listener sanity checking here.
return remoteCacheNoWait;
diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteUtils.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteUtils.java
index 427992d..e05ec03 100644
--- a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteUtils.java
+++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteUtils.java
@@ -222,7 +222,7 @@ public class RemoteUtils
if (factoryInUse != null && !factoryInUse.getClass().getName().startsWith("org.apache.commons.jcs3"))
{
log.info("Could not create new custom socket factory. {0} Factory in use = {1}",
- () -> e.getMessage(), () -> RMISocketFactory.getSocketFactory());
+ () -> e.getMessage(), RMISocketFactory::getSocketFactory);
}
}
}
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 342479b..bc41de7 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
@@ -91,9 +91,7 @@ public class CacheWatchRepairable
{
// Record the added cache listener locally, regardless of whether the
// remote add-listener operation succeeds or fails.
- Set<ICacheListener<?, ?>> listenerSet = cacheMap.computeIfAbsent(cacheName, key -> {
- return new CopyOnWriteArraySet<>();
- });
+ Set<ICacheListener<?, ?>> listenerSet = cacheMap.computeIfAbsent(cacheName, key -> new CopyOnWriteArraySet<>());
listenerSet.add( obj );
diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCache.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCache.java
index e1de16c..8dd1e26 100644
--- a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCache.java
+++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCache.java
@@ -24,6 +24,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
@@ -788,8 +789,8 @@ public class CompositeCache<K, V>
getMatchingFromMemory(pattern).entrySet().stream(),
getMatchingFromAuxiliaryCaches(pattern, localOnly).entrySet().stream())
.collect(Collectors.toMap(
- entry -> entry.getKey(),
- entry -> entry.getValue(),
+ Entry::getKey,
+ Entry::getValue,
// Prefer memory entries
(mem, aux) -> mem));
}
diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/memory/AbstractDoubleLinkedListMemoryCache.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/memory/AbstractDoubleLinkedListMemoryCache.java
index 55479c5..85a846c 100644
--- a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/memory/AbstractDoubleLinkedListMemoryCache.java
+++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/memory/AbstractDoubleLinkedListMemoryCache.java
@@ -62,7 +62,7 @@ public abstract class AbstractDoubleLinkedListMemoryCache<K, V> extends Abstract
{
super.initialize(hub);
list = new DoubleLinkedList<>();
- log.info("initialized MemoryCache for {0}", () -> getCacheName());
+ log.info("initialized MemoryCache for {0}", this::getCacheName);
}
/**
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 dec6227..c9f1d59 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
@@ -131,7 +131,7 @@ public abstract class AbstractMemoryCache<K, V>
})
.filter(element -> element != null)
.collect(Collectors.toMap(
- element -> element.getKey(),
+ ICacheElement::getKey,
element -> element));
}
diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/memory/lru/LHMLRUMemoryCache.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/memory/lru/LHMLRUMemoryCache.java
index 8d9fa7b..cfccb25 100644
--- a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/memory/lru/LHMLRUMemoryCache.java
+++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/memory/lru/LHMLRUMemoryCache.java
@@ -49,7 +49,7 @@ public class LHMLRUMemoryCache<K, V>
public void initialize( CompositeCache<K, V> hub )
{
super.initialize( hub );
- log.info( "initialized LHMLRUMemoryCache for {0}", () -> getCacheName() );
+ log.info( "initialized LHMLRUMemoryCache for {0}", this::getCacheName );
}
/**
diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/memory/soft/SoftReferenceMemoryCache.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/memory/soft/SoftReferenceMemoryCache.java
index 9776ac2..d89537b 100644
--- a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/memory/soft/SoftReferenceMemoryCache.java
+++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/memory/soft/SoftReferenceMemoryCache.java
@@ -76,7 +76,7 @@ public class SoftReferenceMemoryCache<K, V> extends AbstractMemoryCache<K, V>
super.initialize( hub );
strongReferences = new LinkedBlockingQueue<>();
log.info( "initialized Soft Reference Memory Cache for {0}",
- () -> getCacheName() );
+ this::getCacheName );
}
/**
diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/log/MessageFormatter.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/log/MessageFormatter.java
index fbabfa9..1a50f74 100644
--- a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/log/MessageFormatter.java
+++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/log/MessageFormatter.java
@@ -65,7 +65,7 @@ public class MessageFormatter
{
this.messagePattern = messagePattern;
this.parameters = Arrays.stream(paramSuppliers)
- .map(s -> s.get())
+ .map(Supplier::get)
.toArray();
final int length = parameters == null ? 0 : parameters.length;
diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryReceiver.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryReceiver.java
index 361b90a..0684d8c 100644
--- a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryReceiver.java
+++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryReceiver.java
@@ -208,7 +208,7 @@ public class UDPDiscoveryReceiver
cnt.incrementAndGet();
- log.debug( "{0} messages received.", () -> getCnt() );
+ log.debug( "{0} messages received.", this::getCnt );
UDPDiscoveryMessage message = null;
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 7cfb139..82a1c7f 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
@@ -160,7 +160,7 @@ public abstract class AbstractLRUMap<K, V>
public Collection<V> values()
{
return map.values().stream()
- .map(value -> value.getPayload())
+ .map(LRUElementDescriptor::getPayload)
.collect(Collectors.toList());
}
@@ -536,7 +536,7 @@ public abstract class AbstractLRUMap<K, V>
public Set<K> keySet()
{
return map.values().stream()
- .map(value -> value.getKey())
+ .map(LRUElementDescriptor::getKey)
.collect(Collectors.toSet());
}
}