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 8429481 Use for-each. Use final. Remove redundant modifiers.
8429481 is described below
commit 842948113064884f60d7a0cbb1b5d33f67a89c32
Author: Gary Gregory <[email protected]>
AuthorDate: Sat Nov 21 13:22:05 2020 -0500
Use for-each. Use final. Remove redundant modifiers.
---
.../auxiliary/disk/indexed/IndexedDiskCache.java | 13 ++++-------
.../disk/jdbc/mysql/MySQLDiskCacheFactory.java | 5 ++--
.../auxiliary/remote/server/RemoteCacheServer.java | 27 +++++++++-------------
.../commons/jcs3/utils/config/PropertySetter.java | 7 +++---
.../org/apache/commons/jcs3/JCSThrashTest.java | 5 ++--
.../indexed/IndexDiskCacheUnitTestAbstract.java | 20 +++++++---------
.../IndexedDiskCacheOptimizationUnitTest.java | 5 ++--
.../auxiliary/remote/RemoteCacheClientTester.java | 13 +++++------
.../jcs3/jcache/extras/cdi/CacheManagerBean.java | 4 ++--
.../jcs3/jcache/extras/web/InMemoryResponse.java | 2 +-
.../extras/loader/CompositeCacheLoaderTest.java | 4 ++--
.../jcache/openjpa/OpenJPAJCacheDataCache.java | 2 +-
.../org/apache/commons/jcs3/jcache/JCSCache.java | 4 ++--
.../org/apache/commons/jcs3/jcache/NoLoader.java | 2 +-
.../commons/jcs3/jcache/TempStateCacheView.java | 2 +-
.../commons/jcs3/jcache/cdi/CDIJCacheHelper.java | 20 ++++++++--------
.../jcache/cdi/CacheInvocationContextImpl.java | 4 +---
.../jcs3/jcache/cdi/CacheResolverFactoryImpl.java | 4 ++--
.../jcs3/jcache/proxy/ClassLoaderAwareCache.java | 4 ++--
.../org/apache/commons/jcs3/jcache/CacheTest.java | 4 ++--
.../jcs3/jcache/cdi/CDIJCacheHelperTest.java | 2 +-
.../jcache/EnsureCDIIsTestedWhenTCKsRunTest.java | 2 +-
22 files changed, 68 insertions(+), 87 deletions(-)
diff --git
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCache.java
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCache.java
index 1d185b6..28c4eb0 100644
---
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCache.java
+++
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCache.java
@@ -407,9 +407,7 @@ public class IndexedDiskCache<K, V> extends
AbstractDiskCache<K, V>
final ElapsedTimer timer = new ElapsedTimer();
boolean isOk = true;
long expectedNextPos = 0;
- for (int i = 0; i < sortedDescriptors.length; i++)
- {
- final IndexedDiskElementDescriptor ded = sortedDescriptors[i];
+ for (final IndexedDiskElementDescriptor ded : sortedDescriptors) {
if (expectedNextPos > ded.pos)
{
log.error("{0}: Corrupt file: overlapping deds {1}",
logCacheName, ded);
@@ -1227,16 +1225,15 @@ public class IndexedDiskCache<K, V> extends
AbstractDiskCache<K, V>
preFileSize = this.dataFile.length();
// find the first gap in the disk and start defragging.
expectedNextPos = startingPos;
- for (int i = 0; i < defragList.length; i++)
- {
+ for (final IndexedDiskElementDescriptor element : defragList) {
storageLock.writeLock().lock();
try
{
- if (expectedNextPos != defragList[i].pos)
+ if (expectedNextPos != element.pos)
{
- dataFile.move(defragList[i], expectedNextPos);
+ dataFile.move(element, expectedNextPos);
}
- expectedNextPos = defragList[i].pos +
IndexedDisk.HEADER_SIZE_BYTES + defragList[i].len;
+ expectedNextPos = element.pos +
IndexedDisk.HEADER_SIZE_BYTES + element.len;
}
finally
{
diff --git
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/MySQLDiskCacheFactory.java
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/MySQLDiskCacheFactory.java
index 5d072c3..100938f 100644
---
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/MySQLDiskCacheFactory.java
+++
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/MySQLDiskCacheFactory.java
@@ -104,9 +104,8 @@ public class MySQLDiskCacheFactory
final Date[] dates =
ScheduleParser.createDatesForSchedule( attributes.getOptimizationSchedule() );
if ( dates != null )
{
- for ( int i = 0; i < dates.length; i++ )
- {
- this.scheduleOptimization( dates[i], optimizer );
+ for (final Date date : dates) {
+ this.scheduleOptimization( date, optimizer );
}
}
}
diff --git
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServer.java
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServer.java
index 584517a..a098c85 100644
---
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServer.java
+++
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServer.java
@@ -318,9 +318,8 @@ public class RemoteCacheServer<K, V>
{
final ICacheEventQueue<K, V>[] qlist = getEventQList(
cacheDesc, requesterId );
log.debug( "qlist.length = {0}", qlist.length );
- for ( int i = 0; i < qlist.length; i++ )
- {
- qlist[i].addPutEvent( item );
+ for (final ICacheEventQueue<K, V> element : qlist) {
+ element.addPutEvent( item );
}
}
}
@@ -847,9 +846,8 @@ public class RemoteCacheServer<K, V>
{
final ICacheEventQueue<K, V>[] qlist = getEventQList(
cacheDesc, requesterId );
- for ( int i = 0; i < qlist.length; i++ )
- {
- qlist[i].addRemoveEvent( key );
+ for (final ICacheEventQueue<K, V> element : qlist) {
+ element.addRemoveEvent( key );
}
}
}
@@ -1006,9 +1004,8 @@ public class RemoteCacheServer<K, V>
{
final ICacheEventQueue<K, V>[] qlist = getEventQList(
cacheDesc, requesterId );
- for ( int i = 0; i < qlist.length; i++ )
- {
- qlist[i].addDisposeEvent();
+ for (final ICacheEventQueue<K, V> element : qlist) {
+ element.addDisposeEvent();
}
cacheManager.freeCache( cacheName );
}
@@ -1028,9 +1025,8 @@ public class RemoteCacheServer<K, V>
{
final ICacheEventQueue<K, V>[] qlist = getEventQList( cacheDesc, 0
);
- for ( int i = 0; i < qlist.length; i++ )
- {
- qlist[i].addDisposeEvent();
+ for (final ICacheEventQueue<K, V> element : qlist) {
+ element.addDisposeEvent();
}
}
cacheManager.release();
@@ -1109,11 +1105,10 @@ public class RemoteCacheServer<K, V>
// Returns only the qualified.
final ICacheEventQueue<K, V>[] qq = new ICacheEventQueue[count];
count = 0;
- for ( int i = 0; i < list.length; i++ )
- {
- if ( list[i] != null )
+ for (final ICacheEventQueue<K, V> element : list) {
+ if ( element != null )
{
- qq[count++] = list[i];
+ qq[count++] = element;
}
}
return qq;
diff --git
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/utils/config/PropertySetter.java
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/utils/config/PropertySetter.java
index 5549460..1bf07ea 100644
---
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/utils/config/PropertySetter.java
+++
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/utils/config/PropertySetter.java
@@ -287,11 +287,10 @@ public class PropertySetter
introspect();
}
- for ( int i = 0; i < props.length; i++ )
- {
- if ( name.equals( props[i].getName() ) )
+ for (final PropertyDescriptor prop : props) {
+ if ( name.equals( prop.getName() ) )
{
- return props[i];
+ return prop;
}
}
return null;
diff --git
a/commons-jcs-core/src/test/java/org/apache/commons/jcs3/JCSThrashTest.java
b/commons-jcs-core/src/test/java/org/apache/commons/jcs3/JCSThrashTest.java
index 739d83d..8c18b0a 100644
--- a/commons-jcs-core/src/test/java/org/apache/commons/jcs3/JCSThrashTest.java
+++ b/commons-jcs-core/src/test/java/org/apache/commons/jcs3/JCSThrashTest.java
@@ -237,9 +237,8 @@ public class JCSThrashTest
}
// Wait for the threads to finish
- for ( int i = 0; i < threads.length; i++ )
- {
- threads[i].join();
+ for (final Thread thread : threads) {
+ thread.join();
}
// Throw any error that happened
diff --git
a/commons-jcs-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexDiskCacheUnitTestAbstract.java
b/commons-jcs-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexDiskCacheUnitTestAbstract.java
index 1e0f652..05d3def 100644
---
a/commons-jcs-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexDiskCacheUnitTestAbstract.java
+++
b/commons-jcs-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexDiskCacheUnitTestAbstract.java
@@ -214,9 +214,8 @@ public abstract class IndexDiskCacheUnitTestAbstract
extends TestCase
final ICacheElement<Integer, DiskTestObject>[] elements =
DiskTestObjectUtil.createCacheElementsWithTestObjects(numberToInsert,
bytes, cattr.getCacheName());
- for (int i = 0; i < elements.length; i++)
- {
- disk.processUpdate(elements[i]);
+ for (final ICacheElement<Integer, DiskTestObject> element : elements) {
+ disk.processUpdate(element);
}
Thread.yield();
@@ -255,9 +254,8 @@ public abstract class IndexDiskCacheUnitTestAbstract
extends TestCase
final ICacheElement<Integer, DiskTestObject>[] elements =
DiskTestObjectUtil.createCacheElementsWithTestObjects(numberToInsert,
bytes, cattr.getCacheName());
- for (int i = 0; i < elements.length; i++)
- {
- disk.processUpdate(elements[i]);
+ for (final ICacheElement<Integer, DiskTestObject> element : elements) {
+ disk.processUpdate(element);
}
Thread.yield();
@@ -302,9 +300,8 @@ public abstract class IndexDiskCacheUnitTestAbstract
extends TestCase
bytes, cattr.getCacheName());
// Add some to the disk
- for (int i = 0; i < elements.length; i++)
- {
- disk.processUpdate(elements[i]);
+ for (final ICacheElement<Integer, DiskTestObject> element : elements) {
+ disk.processUpdate(element);
}
Thread.yield();
@@ -353,9 +350,8 @@ public abstract class IndexDiskCacheUnitTestAbstract
extends TestCase
final ICacheElement<Integer, DiskTestObject>[] elements =
DiskTestObjectUtil.createCacheElementsWithTestObjects(numberToInsert,
bytes, cattr.getCacheName());
- for (int i = 0; i < elements.length; i++)
- {
- disk.processUpdate(elements[i]);
+ for (final ICacheElement<Integer, DiskTestObject> element : elements) {
+ disk.processUpdate(element);
}
Thread.yield();
diff --git
a/commons-jcs-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheOptimizationUnitTest.java
b/commons-jcs-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheOptimizationUnitTest.java
index 6da2b51..cca4f00 100644
---
a/commons-jcs-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheOptimizationUnitTest.java
+++
b/commons-jcs-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheOptimizationUnitTest.java
@@ -57,9 +57,8 @@ public class IndexedDiskCacheOptimizationUnitTest
final ICacheElement<Integer, DiskTestObject>[] elements =
DiskTestObjectUtil
.createCacheElementsWithTestObjectsOfVariableSizes(
numberToInsert, cattr.getCacheName() );
- for ( int i = 0; i < elements.length; i++ )
- {
- disk.processUpdate( elements[i] );
+ for (final ICacheElement<Integer, DiskTestObject> element : elements) {
+ disk.processUpdate( element );
}
diff --git
a/commons-jcs-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheClientTester.java
b/commons-jcs-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheClientTester.java
index 2ecdda0..1eeaaef 100644
---
a/commons-jcs-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheClientTester.java
+++
b/commons-jcs-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheClientTester.java
@@ -259,26 +259,25 @@ public class RemoteCacheClientTester
boolean write = false;
boolean delete = false;
- for ( int i = 0; i < args.length; i++ )
- {
- if ( args[i].startsWith( "-" ) )
+ for (final String arg : args) {
+ if ( arg.startsWith( "-" ) )
{
if ( !read )
{
- read = args[i].indexOf( "r" ) != -1;
+ read = arg.indexOf( "r" ) != -1;
}
if ( !write )
{
- write = args[i].indexOf( "w" ) != -1;
+ write = arg.indexOf( "w" ) != -1;
}
if ( !delete )
{
- delete = args[i].indexOf( "d" ) != -1;
+ delete = arg.indexOf( "d" ) != -1;
}
}
else
{
- count = Integer.parseInt( args[i] );
+ count = Integer.parseInt( arg );
}
}
new RemoteCacheClientTester( count, write, read, delete );
diff --git
a/commons-jcs-jcache-extras/src/main/java/org/apache/commons/jcs3/jcache/extras/cdi/CacheManagerBean.java
b/commons-jcs-jcache-extras/src/main/java/org/apache/commons/jcs3/jcache/extras/cdi/CacheManagerBean.java
index 50eaa1d..e79d9e3 100644
---
a/commons-jcs-jcache-extras/src/main/java/org/apache/commons/jcs3/jcache/extras/cdi/CacheManagerBean.java
+++
b/commons-jcs-jcache-extras/src/main/java/org/apache/commons/jcs3/jcache/extras/cdi/CacheManagerBean.java
@@ -107,13 +107,13 @@ public class CacheManagerBean implements
Bean<CacheManager>, PassivationCapable
}
@Override
- public CacheManager create(CreationalContext<CacheManager>
cacheManagerCreationalContext)
+ public CacheManager create(final CreationalContext<CacheManager>
cacheManagerCreationalContext)
{
return manager;
}
@Override
- public void destroy(CacheManager cacheManager,
CreationalContext<CacheManager> cacheManagerCreationalContext)
+ public void destroy(final CacheManager cacheManager, final
CreationalContext<CacheManager> cacheManagerCreationalContext)
{
manager.close();
}
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 d1da556..92cc770 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
@@ -180,7 +180,7 @@ public class InMemoryResponse extends
HttpServletResponseWrapper implements Seri
}
@Override
- public void setStatus(int i)
+ public void setStatus(final int i)
{
status = i;
super.setStatus(i);
diff --git
a/commons-jcs-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/loader/CompositeCacheLoaderTest.java
b/commons-jcs-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/loader/CompositeCacheLoaderTest.java
index 37dc98b..4f00381 100644
---
a/commons-jcs-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/loader/CompositeCacheLoaderTest.java
+++
b/commons-jcs-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/loader/CompositeCacheLoaderTest.java
@@ -42,7 +42,7 @@ public class CompositeCacheLoaderTest
private final CacheLoaderAdapter<String, String> loader1 = new
CacheLoaderAdapter<String, String>()
{
@Override
- public String load(String key) throws CacheLoaderException
+ public String load(final String key) throws CacheLoaderException
{
count.incrementAndGet();
return null;
@@ -51,7 +51,7 @@ public class CompositeCacheLoaderTest
private final CacheLoaderAdapter<String, String> loader2 = new
CacheLoaderAdapter<String, String>()
{
@Override
- public String load(String key) throws CacheLoaderException
+ public String load(final String key) throws CacheLoaderException
{
count.incrementAndGet();
return null;
diff --git
a/commons-jcs-jcache-openjpa/src/main/java/org/apache/commons/jcs3/jcache/openjpa/OpenJPAJCacheDataCache.java
b/commons-jcs-jcache-openjpa/src/main/java/org/apache/commons/jcs3/jcache/openjpa/OpenJPAJCacheDataCache.java
index 8025b36..093d444 100644
---
a/commons-jcs-jcache-openjpa/src/main/java/org/apache/commons/jcs3/jcache/openjpa/OpenJPAJCacheDataCache.java
+++
b/commons-jcs-jcache-openjpa/src/main/java/org/apache/commons/jcs3/jcache/openjpa/OpenJPAJCacheDataCache.java
@@ -49,7 +49,7 @@ public class OpenJPAJCacheDataCache extends AbstractDataCache
if (OpenJPAId.class.isInstance(oid))
{
final Class<?> cls = OpenJPAId.class.cast(oid).getType();
- Cache<Object, Object> cache =
manager.getOrCreateCache(OPENJPA_PREFIX, cls.getName());
+ final Cache<Object, Object> cache =
manager.getOrCreateCache(OPENJPA_PREFIX, cls.getName());
if (cache == null)
{
return null;
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 8270fe6..cf10908 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
@@ -474,7 +474,7 @@ public class JCSCache<K, V> implements Cache<K, V>
delegate.remove(cacheKey);
final V value = v != null && v.getVal() != null ? v.getVal() : null;
- boolean remove = v != null;
+ final boolean remove = v != null;
for (final JCSListener<K, V> listener : listeners.values())
{
listener.onRemoved(Arrays.<CacheEntryEvent<? extends K, ? extends
V>> asList(new JCSCacheEntryEvent<>(this,
@@ -625,7 +625,7 @@ public class JCSCache<K, V> implements Cache<K, V>
assertNotClosed();
assertNotNull(key, "key");
assertNotNull(value, "value");
- boolean statisticsEnabled = config.isStatisticsEnabled();
+ final boolean statisticsEnabled = config.isStatisticsEnabled();
if (containsKey(key))
{
if (statisticsEnabled)
diff --git
a/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/NoLoader.java
b/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/NoLoader.java
index e3a1bbe..da0ee3d 100644
---
a/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/NoLoader.java
+++
b/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/NoLoader.java
@@ -33,7 +33,7 @@ public class NoLoader<K, V> implements CacheLoader<K, V>
}
@Override
- public V load(K key) throws CacheLoaderException
+ public V load(final K key) throws CacheLoaderException
{
return null;
}
diff --git
a/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/TempStateCacheView.java
b/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/TempStateCacheView.java
index f3436c3..b4aca4a 100644
---
a/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/TempStateCacheView.java
+++
b/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/TempStateCacheView.java
@@ -273,7 +273,7 @@ public class TempStateCacheView<K, V> implements Cache<K, V>
}
@Override
- public <T> Map<K, EntryProcessorResult<T>> invokeAll(Set<? extends K>
keys, final EntryProcessor<K, V, T> entryProcessor,
+ public <T> Map<K, EntryProcessorResult<T>> invokeAll(final Set<? extends
K> keys, final EntryProcessor<K, V, T> entryProcessor,
final Object... arguments)
{
return cache.invokeAll(keys, entryProcessor, arguments);
diff --git
a/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/cdi/CDIJCacheHelper.java
b/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/cdi/CDIJCacheHelper.java
index 7454c38..14476e0 100644
---
a/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/cdi/CDIJCacheHelper.java
+++
b/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/cdi/CDIJCacheHelper.java
@@ -210,7 +210,7 @@ public class CDIJCacheHelper
private Integer getValueParameter(final List<Set<Annotation>> annotations)
{
- int idx = 0;
+ final int idx = 0;
for (final Set<Annotation> set : annotations)
{
for (final Annotation a : set)
@@ -505,15 +505,15 @@ public class CDIJCacheHelper
private final boolean cacheRemoveAllAfter;
private final CacheRemoveAll cacheRemoveAll;
- public MethodMeta(Class<?>[] parameterTypes, List<Set<Annotation>>
parameterAnnotations, Set<Annotation>
- annotations, Integer[] keysIndices, Integer valueIndex,
Integer[] parameterIndices, String
- cacheResultCacheName, CacheResolverFactory
cacheResultResolverFactory, CacheKeyGenerator
- cacheResultKeyGenerator, CacheResult cacheResult, String
cachePutCacheName, CacheResolverFactory
- cachePutResolverFactory, CacheKeyGenerator
cachePutKeyGenerator, boolean cachePutAfter, CachePut cachePut, String
- cacheRemoveCacheName, CacheResolverFactory
cacheRemoveResolverFactory, CacheKeyGenerator
- cacheRemoveKeyGenerator, boolean cacheRemoveAfter, CacheRemove
cacheRemove, String cacheRemoveAllCacheName,
- CacheResolverFactory cacheRemoveAllResolverFactory,
boolean
- cacheRemoveAllAfter, CacheRemoveAll
cacheRemoveAll)
+ public MethodMeta(final Class<?>[] parameterTypes, final
List<Set<Annotation>> parameterAnnotations, final Set<Annotation>
+ annotations, final Integer[] keysIndices, final Integer
valueIndex, final Integer[] parameterIndices, final String
+ cacheResultCacheName, final CacheResolverFactory
cacheResultResolverFactory, final CacheKeyGenerator
+ cacheResultKeyGenerator, final CacheResult cacheResult, final
String cachePutCacheName, final CacheResolverFactory
+ cachePutResolverFactory, final CacheKeyGenerator
cachePutKeyGenerator, final boolean cachePutAfter, final CachePut cachePut,
final String
+ cacheRemoveCacheName, final CacheResolverFactory
cacheRemoveResolverFactory, final CacheKeyGenerator
+ cacheRemoveKeyGenerator, final boolean cacheRemoveAfter, final
CacheRemove cacheRemove, final String cacheRemoveAllCacheName,
+ final CacheResolverFactory
cacheRemoveAllResolverFactory, final boolean
+ cacheRemoveAllAfter, final CacheRemoveAll
cacheRemoveAll)
{
this.parameterTypes = parameterTypes;
this.parameterAnnotations = parameterAnnotations;
diff --git
a/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/cdi/CacheInvocationContextImpl.java
b/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/cdi/CacheInvocationContextImpl.java
index 4ebcc78..a6aef50 100644
---
a/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/cdi/CacheInvocationContextImpl.java
+++
b/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/cdi/CacheInvocationContextImpl.java
@@ -82,9 +82,7 @@ public class CacheInvocationContextImpl<A extends Annotation>
extends CacheMetho
else
{
int outIdx = 0;
- for (int idx = 0; idx < indexes.length; idx++)
- {
- final int i = indexes[idx];
+ for (final Integer i : indexes) {
parametersAsArray[outIdx] =
newCacheInvocationParameterImpl(parameterTypes[i], args[i],
parameterAnnotations.get(i), i);
outIdx++;
}
diff --git
a/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/cdi/CacheResolverFactoryImpl.java
b/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/cdi/CacheResolverFactoryImpl.java
index 7adae36..02cc439 100644
---
a/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/cdi/CacheResolverFactoryImpl.java
+++
b/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/cdi/CacheResolverFactoryImpl.java
@@ -41,7 +41,7 @@ public class CacheResolverFactoryImpl implements
CacheResolverFactory
}
@Override
- public CacheResolver getCacheResolver(CacheMethodDetails<? extends
Annotation> cacheMethodDetails)
+ public CacheResolver getCacheResolver(final CacheMethodDetails<? extends
Annotation> cacheMethodDetails)
{
return findCacheResolver(cacheMethodDetails.getCacheName());
}
@@ -57,7 +57,7 @@ public class CacheResolverFactoryImpl implements
CacheResolverFactory
return findCacheResolver(exceptionCacheName);
}
- private CacheResolver findCacheResolver(String exceptionCacheName)
+ private CacheResolver findCacheResolver(final String exceptionCacheName)
{
Cache<?, ?> cache = cacheManager.getCache(exceptionCacheName);
if (cache == null)
diff --git
a/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/proxy/ClassLoaderAwareCache.java
b/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/proxy/ClassLoaderAwareCache.java
index 1522c4d..2349886 100644
---
a/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/proxy/ClassLoaderAwareCache.java
+++
b/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/proxy/ClassLoaderAwareCache.java
@@ -99,7 +99,7 @@ public class ClassLoaderAwareCache<K, V> implements Cache<K,
V>
}
@Override
- public void loadAll(final Set<? extends K> keys, boolean
replaceExistingValues, final CompletionListener completionListener)
+ public void loadAll(final Set<? extends K> keys, final boolean
replaceExistingValues, final CompletionListener completionListener)
{
final Thread thread = Thread.currentThread();
final ClassLoader loader = before(thread);
@@ -339,7 +339,7 @@ public class ClassLoaderAwareCache<K, V> implements
Cache<K, V>
}
@Override
- public <T> Map<K, EntryProcessorResult<T>> invokeAll(Set<? extends K>
keys, EntryProcessor<K, V, T> entryProcessor, Object... arguments)
+ public <T> Map<K, EntryProcessorResult<T>> invokeAll(final Set<? extends
K> keys, final EntryProcessor<K, V, T> entryProcessor, final Object...
arguments)
{
final Thread thread = Thread.currentThread();
final ClassLoader loader = before(thread);
diff --git
a/commons-jcs-jcache/src/test/java/org/apache/commons/jcs3/jcache/CacheTest.java
b/commons-jcs-jcache/src/test/java/org/apache/commons/jcs3/jcache/CacheTest.java
index 43ba755..015b1d1 100644
---
a/commons-jcs-jcache/src/test/java/org/apache/commons/jcs3/jcache/CacheTest.java
+++
b/commons-jcs-jcache/src/test/java/org/apache/commons/jcs3/jcache/CacheTest.java
@@ -266,13 +266,13 @@ public class CacheTest
return () -> new CacheLoader<Object, Object>()
{
@Override
- public Object load(Object key) throws CacheLoaderException
+ public Object load(final Object key) throws
CacheLoaderException
{
return "super";
}
@Override
- public Map<Object, Object> loadAll(Iterable<?> keys)
throws CacheLoaderException
+ public Map<Object, Object> loadAll(final Iterable<?> keys)
throws CacheLoaderException
{
return null;
}
diff --git
a/commons-jcs-jcache/src/test/java/org/apache/commons/jcs3/jcache/cdi/CDIJCacheHelperTest.java
b/commons-jcs-jcache/src/test/java/org/apache/commons/jcs3/jcache/cdi/CDIJCacheHelperTest.java
index c53ceea..16c550d 100644
---
a/commons-jcs-jcache/src/test/java/org/apache/commons/jcs3/jcache/cdi/CDIJCacheHelperTest.java
+++
b/commons-jcs-jcache/src/test/java/org/apache/commons/jcs3/jcache/cdi/CDIJCacheHelperTest.java
@@ -64,7 +64,7 @@ public class CDIJCacheHelperTest
{
try {
return MyParent.class.getMethod("foo");
- } catch (NoSuchMethodException e) {
+ } catch (final NoSuchMethodException e) {
fail(e.getMessage());
return null;
}
diff --git
a/commons-jcs-tck-tests/src/test/java/org/apache/commons/jcs3/jcache/EnsureCDIIsTestedWhenTCKsRunTest.java
b/commons-jcs-tck-tests/src/test/java/org/apache/commons/jcs3/jcache/EnsureCDIIsTestedWhenTCKsRunTest.java
index ef1f621..e6063b0 100644
---
a/commons-jcs-tck-tests/src/test/java/org/apache/commons/jcs3/jcache/EnsureCDIIsTestedWhenTCKsRunTest.java
+++
b/commons-jcs-tck-tests/src/test/java/org/apache/commons/jcs3/jcache/EnsureCDIIsTestedWhenTCKsRunTest.java
@@ -39,7 +39,7 @@ public class EnsureCDIIsTestedWhenTCKsRunTest
final Iterator<BeanProvider> iterator =
ServiceLoader.load(BeanProvider.class).iterator();
assertTrue(iterator.hasNext());
assertThat(iterator.next(), instanceOf(OWBBeanProvider.class));
- } catch (java.lang.UnsupportedClassVersionError e) {
+ } catch (final java.lang.UnsupportedClassVersionError e) {
System.err.println("Ignoring checkOWBProvider test failure on " +
System.getProperty("java.version"));
}
}
