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
commit da39af588933a3f460a6251487e341db71631077 Author: Thomas Vandahl <[email protected]> AuthorDate: Sun Feb 1 18:28:42 2026 +0100 Remove unused setters --- .../AbstractAuxiliaryCacheAttributes.java | 2 -- .../jcs4/auxiliary/AuxiliaryCacheAttributes.java | 15 ------------ .../engine/control/CompositeCacheConfigurator.java | 3 +-- .../commons/jcs4/utils/config/OptionConverter.java | 28 +++++++++------------- .../auxiliary/disk/indexed/LRUMapSizeVsCount.java | 1 - 5 files changed, 12 insertions(+), 37 deletions(-) diff --git a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/AbstractAuxiliaryCacheAttributes.java b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/AbstractAuxiliaryCacheAttributes.java index 8d173799..7c5346ce 100644 --- a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/AbstractAuxiliaryCacheAttributes.java +++ b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/AbstractAuxiliaryCacheAttributes.java @@ -116,7 +116,6 @@ public abstract class AbstractAuxiliaryCacheAttributes * * @param s SINGLE or POOLED */ - @Override public void setEventQueuePoolName( final String s ) { eventQueuePoolName = s; @@ -127,7 +126,6 @@ public abstract class AbstractAuxiliaryCacheAttributes * * @param queueType SINGLE or POOLED */ - @Override public void setEventQueueType( final ICacheEventQueue.QueueType queueType ) { this.eventQueueType = queueType; diff --git a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/AuxiliaryCacheAttributes.java b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/AuxiliaryCacheAttributes.java index 145ac0cd..3f48c893 100644 --- a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/AuxiliaryCacheAttributes.java +++ b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/auxiliary/AuxiliaryCacheAttributes.java @@ -69,21 +69,6 @@ public interface AuxiliaryCacheAttributes */ void setCacheName( String s ); - /** - * If you choose a POOLED event queue type, the value of EventQueuePoolName will be used. This - * is ignored if the pool type is SINGLE - * - * @param s SINGLE or POOLED - */ - void setEventQueuePoolName( String s ); - - /** - * SINGLE is the default. If you choose POOLED, the value of EventQueuePoolName will be used - * - * @param s SINGLE or POOLED - */ - void setEventQueueType( ICacheEventQueue.QueueType s ); - /** * Name known by configurator * diff --git a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/control/CompositeCacheConfigurator.java b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/control/CompositeCacheConfigurator.java index d41e2c16..f066dce6 100644 --- a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/control/CompositeCacheConfigurator.java +++ b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/engine/control/CompositeCacheConfigurator.java @@ -162,8 +162,7 @@ public class CompositeCacheConfigurator if ( auxAttr == null ) { // auxFactory was not previously initialized. - final String prefix = AUXILIARY_PREFIX + auxName + ATTRIBUTE_PREFIX; - auxAttr = OptionConverter.instantiateByKey( props, prefix, null ); + auxAttr = OptionConverter.instantiateByKey( props, attrName, null ); if ( auxAttr == null ) { log.error( "Could not instantiate auxAttr named \"{0}\"", attrName ); diff --git a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/utils/config/OptionConverter.java b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/utils/config/OptionConverter.java index 3c80325d..77b1ce29 100644 --- a/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/utils/config/OptionConverter.java +++ b/commons-jcs4-core/src/main/java/org/apache/commons/jcs4/utils/config/OptionConverter.java @@ -183,26 +183,20 @@ public class OptionConverter { try { - final Class<?> classObj = Class.forName( className ); - final Object o = classObj.getDeclaredConstructor().newInstance(); + @SuppressWarnings("unchecked") // CCE catched + final Class<T> classObj = (Class<T>) Class.forName( className ); + return classObj.getDeclaredConstructor().newInstance(); - try - { - @SuppressWarnings("unchecked") // CCE catched - final - T t = (T) o; - return t; - } - catch (final ClassCastException e) - { - log.error( "A \"{0}\" object is not assignable to the " - + "generic variable.", className ); - return defaultValue; - } } - catch (final Exception e ) + catch (final ClassCastException e) + { + log.error( "A \"{0}\" object is not assignable to the " + + "generic variable.", className ); + return defaultValue; + } + catch (final Exception e) { - log.error( "Could not instantiate class [{0}]", className, e ); + log.error("Could not instantiate class [{0}]", className, e); } } return defaultValue; diff --git a/commons-jcs4-core/src/test/java/org/apache/commons/jcs4/auxiliary/disk/indexed/LRUMapSizeVsCount.java b/commons-jcs4-core/src/test/java/org/apache/commons/jcs4/auxiliary/disk/indexed/LRUMapSizeVsCount.java index 974833a8..119f5fd4 100644 --- a/commons-jcs4-core/src/test/java/org/apache/commons/jcs4/auxiliary/disk/indexed/LRUMapSizeVsCount.java +++ b/commons-jcs4-core/src/test/java/org/apache/commons/jcs4/auxiliary/disk/indexed/LRUMapSizeVsCount.java @@ -74,7 +74,6 @@ public class LRUMapSizeVsCount try { final IndexedDiskCacheAttributes cattr = new IndexedDiskCacheAttributes(); - cattr.setName("junit"); cattr.setCacheName("junit"); cattr.setDiskPath("."); final IndexedDiskCache<String, String> idc = new IndexedDiskCache<>(cattr);
