This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch danielsun/shorten-FlexibleEvictableCache in repository https://gitbox.apache.org/repos/asf/groovy.git
commit a325bcf10717e45fed5f3ce455807cb1f5365696 Author: Daniel Sun <[email protected]> AuthorDate: Sat Aug 16 14:48:10 2025 +0900 Shorten `FlexibleEvictableCache` class name --- src/main/java/groovy/lang/GroovyClassLoader.java | 6 +++--- src/main/java/org/codehaus/groovy/runtime/memoize/CommonCache.java | 2 +- .../org/codehaus/groovy/runtime/memoize/ConcurrentCommonCache.java | 2 +- .../memoize/{FlexibleEvictableCache.java => FlexibleCache.java} | 2 +- .../org/codehaus/groovy/runtime/memoize/StampedCommonCache.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/groovy/lang/GroovyClassLoader.java b/src/main/java/groovy/lang/GroovyClassLoader.java index 8fa0f5fc80..219c0a476d 100644 --- a/src/main/java/groovy/lang/GroovyClassLoader.java +++ b/src/main/java/groovy/lang/GroovyClassLoader.java @@ -37,7 +37,7 @@ import org.codehaus.groovy.runtime.IOGroovyMethods; import org.codehaus.groovy.runtime.InvokerHelper; import org.codehaus.groovy.runtime.memoize.ConcurrentCommonCache; import org.codehaus.groovy.runtime.memoize.EvictableCache; -import org.codehaus.groovy.runtime.memoize.FlexibleEvictableCache; +import org.codehaus.groovy.runtime.memoize.FlexibleCache; import org.codehaus.groovy.runtime.memoize.UnlimitedConcurrentCache; import org.codehaus.groovy.util.URLStreams; import org.objectweb.asm.ClassVisitor; @@ -100,7 +100,7 @@ public class GroovyClassLoader extends URLClassLoader { /** * This cache contains mappings of file name to class. It is used to bypass compilation. */ - protected final FlexibleEvictableCache<String, Class> sourceCache; + protected final FlexibleCache<String, Class> sourceCache; private final CompilerConfiguration config; private final String sourceEncoding; @@ -158,7 +158,7 @@ public class GroovyClassLoader extends URLClassLoader { * @param useConfigurationClasspath determines if the configurations classpath should be added * @param sourceCache the source cache to use */ - public GroovyClassLoader(final ClassLoader parent, final CompilerConfiguration config, final boolean useConfigurationClasspath, FlexibleEvictableCache<String, Class> sourceCache) { + public GroovyClassLoader(final ClassLoader parent, final CompilerConfiguration config, final boolean useConfigurationClasspath, FlexibleCache<String, Class> sourceCache) { super(EMPTY_URL_ARRAY, parent); this.config = (config != null ? config : CompilerConfiguration.DEFAULT); this.sourceCache = sourceCache; diff --git a/src/main/java/org/codehaus/groovy/runtime/memoize/CommonCache.java b/src/main/java/org/codehaus/groovy/runtime/memoize/CommonCache.java index 89a4166250..4c6103eda2 100644 --- a/src/main/java/org/codehaus/groovy/runtime/memoize/CommonCache.java +++ b/src/main/java/org/codehaus/groovy/runtime/memoize/CommonCache.java @@ -38,7 +38,7 @@ import java.util.Set; * @param <V> type of the values * @since 2.5.0 */ -public class CommonCache<K, V> implements FlexibleEvictableCache<K, V>, ValueConvertable<V, Object>, Serializable { +public class CommonCache<K, V> implements FlexibleCache<K, V>, ValueConvertable<V, Object>, Serializable { private static final long serialVersionUID = 934699400232698324L; /** * The default load factor diff --git a/src/main/java/org/codehaus/groovy/runtime/memoize/ConcurrentCommonCache.java b/src/main/java/org/codehaus/groovy/runtime/memoize/ConcurrentCommonCache.java index ed27993ed4..c951d8b48d 100644 --- a/src/main/java/org/codehaus/groovy/runtime/memoize/ConcurrentCommonCache.java +++ b/src/main/java/org/codehaus/groovy/runtime/memoize/ConcurrentCommonCache.java @@ -33,7 +33,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; * @since 2.5.0 */ @ThreadSafe -public class ConcurrentCommonCache<K, V> implements FlexibleEvictableCache<K, V>, ValueConvertable<V, Object>, Serializable { +public class ConcurrentCommonCache<K, V> implements FlexibleCache<K, V>, ValueConvertable<V, Object>, Serializable { private static final long serialVersionUID = -7352338549333024936L; private final ReentrantReadWriteLock rwl = new ReentrantReadWriteLock(); diff --git a/src/main/java/org/codehaus/groovy/runtime/memoize/FlexibleEvictableCache.java b/src/main/java/org/codehaus/groovy/runtime/memoize/FlexibleCache.java similarity index 93% rename from src/main/java/org/codehaus/groovy/runtime/memoize/FlexibleEvictableCache.java rename to src/main/java/org/codehaus/groovy/runtime/memoize/FlexibleCache.java index 4137d89bba..87eaf55755 100644 --- a/src/main/java/org/codehaus/groovy/runtime/memoize/FlexibleEvictableCache.java +++ b/src/main/java/org/codehaus/groovy/runtime/memoize/FlexibleCache.java @@ -23,6 +23,6 @@ package org.codehaus.groovy.runtime.memoize; * * @since 5.0.0 */ -public interface FlexibleEvictableCache<K, V> extends EvictableCache<K, V> { +public interface FlexibleCache<K, V> extends EvictableCache<K, V> { V getAndPut(K key, ValueProvider<? super K, ? extends V> valueProvider, boolean shouldCache); } diff --git a/src/main/java/org/codehaus/groovy/runtime/memoize/StampedCommonCache.java b/src/main/java/org/codehaus/groovy/runtime/memoize/StampedCommonCache.java index cd989b55b7..2bde08afa7 100644 --- a/src/main/java/org/codehaus/groovy/runtime/memoize/StampedCommonCache.java +++ b/src/main/java/org/codehaus/groovy/runtime/memoize/StampedCommonCache.java @@ -37,7 +37,7 @@ import java.util.concurrent.locks.StampedLock; * @since 3.0.0 */ @ThreadSafe -public class StampedCommonCache<K, V> implements FlexibleEvictableCache<K, V>, ValueConvertable<V, Object>, Serializable { +public class StampedCommonCache<K, V> implements FlexibleCache<K, V>, ValueConvertable<V, Object>, Serializable { private static final long serialVersionUID = 6760742552334555146L; private final StampedLock sl = new StampedLock();
