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 bad74ed JCS-217 Minor improvements:
new dc754c3 Merge pull request #58 from arturobernalg/featture/JCS-217
bad74ed is described below
commit bad74ede7be185b71202a7971e9a7d1001da3f9a
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Sun Apr 11 14:06:01 2021 +0200
JCS-217 Minor improvements:
* Unused import
* Make void method
* Add final var
* Remove unnecessary condition
* Simplify conditions
---
.../commons/jcs3/auxiliary/lateral/LateralCacheNoWaitFacade.java | 2 +-
.../jcs3/auxiliary/lateral/socket/tcp/LateralTCPCacheFactory.java | 4 +---
.../commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPSender.java | 2 +-
.../java/org/apache/commons/jcs3/auxiliary/remote/RemoteLocation.java | 2 +-
.../org/apache/commons/jcs3/engine/ZombieCacheServiceNonLocal.java | 4 ++--
.../java/org/apache/commons/jcs3/engine/control/CompositeCache.java | 2 +-
.../apache/commons/jcs3/engine/control/event/ElementEventQueue.java | 4 ++--
.../org/apache/commons/jcs3/engine/control/group/GroupAttrName.java | 2 +-
.../java/org/apache/commons/jcs3/engine/control/group/GroupId.java | 2 +-
.../java/org/apache/commons/jcs3/utils/struct/AbstractLRUMap.java | 2 +-
.../main/java/org/apache/commons/jcs3/jcache/ExpiryAwareCache.java | 1 -
.../src/main/java/org/apache/commons/jcs3/jcache/JCSCache.java | 1 -
12 files changed, 12 insertions(+), 16 deletions(-)
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 db19179..591ba2c 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
@@ -79,7 +79,7 @@ public class LateralCacheNoWaitFacade<K, V>
private final ILateralCacheAttributes lateralCacheAttributes;
/** Disposed state of this facade */
- private AtomicBoolean disposed = new AtomicBoolean(false);
+ private final AtomicBoolean disposed = new AtomicBoolean(false);
/**
* Constructs with the given lateral cache, and fires events to any
listeners.
diff --git
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPCacheFactory.java
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPCacheFactory.java
index aeb0a05..baf7025 100644
---
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPCacheFactory.java
+++
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPCacheFactory.java
@@ -367,9 +367,8 @@ public class LateralTCPCacheFactory
* @param cacheMgr a reference to the global cache manager
* @param cacheEventLogger Reference to the cache event logger for
auxiliary cache creation
* @param elementSerializer Reference to the cache element serializer for
auxiliary cache
- * @return null if none is created.
*/
- private synchronized <K, V> UDPDiscoveryService createDiscoveryService(
+ private synchronized <K, V> void createDiscoveryService(
final ITCPLateralCacheAttributes lac,
final LateralCacheNoWaitFacade<K, V> lcnwf,
final ICompositeCacheManager cacheMgr,
@@ -399,6 +398,5 @@ public class LateralTCPCacheFactory
log.info( "Registered TCP lateral cache [{0}] with
UDPDiscoveryService.",
lac::getCacheName);
}
- return discovery;
}
}
diff --git
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPSender.java
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPSender.java
index 0aa73e2..8fdb6d1 100644
---
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPSender.java
+++
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPSender.java
@@ -50,7 +50,7 @@ public class LateralTCPSender
private final int socketSoTimeOut;
/** The serializer. */
- private IElementSerializer serializer;
+ private final IElementSerializer serializer;
/** The client connection with the server. */
private AsynchronousSocketChannel client;
diff --git
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteLocation.java
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteLocation.java
index 4eca121..7e6f9f7 100644
---
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteLocation.java
+++
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteLocation.java
@@ -81,7 +81,7 @@ public final class RemoteLocation
{
return true;
}
- if ( obj == null || !( obj instanceof RemoteLocation ) )
+ if (!(obj instanceof RemoteLocation))
{
return false;
}
diff --git
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/ZombieCacheServiceNonLocal.java
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/ZombieCacheServiceNonLocal.java
index 7cb5dde..6f6c098 100644
---
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/ZombieCacheServiceNonLocal.java
+++
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/ZombieCacheServiceNonLocal.java
@@ -262,7 +262,7 @@ public class ZombieCacheServiceNonLocal<K, V>
extends ZombieEvent
{
/** The element to put */
- ICacheElement<K, V> element;
+ final ICacheElement<K, V> element;
/**
* Set the element
@@ -283,7 +283,7 @@ public class ZombieCacheServiceNonLocal<K, V>
extends ZombieEvent
{
/** The key to remove */
- K key;
+ final K key;
/**
* Set the element
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 84e7218..c77e0d8 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
@@ -1185,7 +1185,7 @@ public class CompositeCache<K, V>
public void dispose(final boolean fromRemote)
{
// If already disposed, return immediately
- if (alive.compareAndSet(true, false) == false)
+ if (!alive.compareAndSet(true, false))
{
return;
}
diff --git
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/event/ElementEventQueue.java
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/event/ElementEventQueue.java
index 332e994..3cb957b 100644
---
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/event/ElementEventQueue.java
+++
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/event/ElementEventQueue.java
@@ -44,10 +44,10 @@ public class ElementEventQueue
private static final Log log = LogManager.getLog( ElementEventQueue.class
);
/** shutdown or not */
- private AtomicBoolean destroyed = new AtomicBoolean(false);
+ private final AtomicBoolean destroyed = new AtomicBoolean(false);
/** The worker thread pool. */
- private ExecutorService queueProcessor;
+ private final ExecutorService queueProcessor;
/**
* Constructor for the ElementEventQueue object
diff --git
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/group/GroupAttrName.java
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/group/GroupAttrName.java
index dd150a2..4e12b9a 100644
---
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/group/GroupAttrName.java
+++
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/group/GroupAttrName.java
@@ -61,7 +61,7 @@ public class GroupAttrName<T>
@Override
public boolean equals( final Object obj )
{
- if ( obj == null || !( obj instanceof GroupAttrName ) )
+ if (!(obj instanceof GroupAttrName))
{
return false;
}
diff --git
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/group/GroupId.java
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/group/GroupId.java
index fa4bee4..1b4f4bd 100644
---
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/group/GroupId.java
+++
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/engine/control/group/GroupId.java
@@ -66,7 +66,7 @@ public class GroupId
@Override
public boolean equals( final Object obj )
{
- if ( obj == null || !( obj instanceof GroupId ) )
+ if (!(obj instanceof GroupId))
{
return false;
}
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 5d9b369..66828f8 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
@@ -427,7 +427,7 @@ public abstract class AbstractLRUMap<K, V>
log.trace( "verifycache: checking linked list by value " );
for (LRUElementDescriptor<K, V> li3 = list.getFirst(); li3 != null;
li3 = (LRUElementDescriptor<K, V>) li3.next )
{
- if ( map.containsValue( li3 ) == false )
+ if (!map.containsValue(li3))
{
log.error( "verifycache: map does not contain value : {0}",
li3 );
dumpMap();
diff --git
a/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/ExpiryAwareCache.java
b/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/ExpiryAwareCache.java
index db6f4d4..9bb02ca 100644
---
a/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/ExpiryAwareCache.java
+++
b/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/ExpiryAwareCache.java
@@ -18,7 +18,6 @@
*/
package org.apache.commons.jcs3.jcache;
-import java.util.Arrays;
import java.util.Collections;
import java.util.Map;
diff --git
a/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/JCSCache.java
b/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/JCSCache.java
index d1fc79b..c6b5c7c 100644
---
a/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/JCSCache.java
+++
b/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/JCSCache.java
@@ -23,7 +23,6 @@ import static
org.apache.commons.jcs3.jcache.serialization.Serializations.copy;
import java.io.Closeable;
import java.io.IOException;
-import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
