From cb8443e2996a24eecbcff49db9104a478dd73d4a Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 9 Jun 2020 08:54:45 -0700 Subject: [PATCH] DATACMNS-1755 - Rename uppercase 'CACHE' static finals. Rename static final `CACHE` members to use the lowercase form. Although the caches are static final, they are not constant values. Original pull request: #448. --- .../data/auditing/AnnotationAuditingMetadata.java | 4 ++-- .../data/convert/SimpleTypeInformationMapper.java | 4 ++-- .../org/springframework/data/mapping/PropertyPath.java | 4 ++-- .../springframework/data/mapping/model/BeanWrapper.java | 4 ++-- .../EventPublishingRepositoryProxyPostProcessor.java | 6 +++--- ...xtensionAwareQueryMethodEvaluationContextProvider.java | 4 ++-- .../data/repository/query/ReturnedType.java | 4 ++-- .../data/repository/util/QueryExecutionConverters.java | 8 ++++---- .../springframework/data/util/ClassTypeInformation.java | 6 +++--- .../org/springframework/data/util/ParameterTypes.java | 4 ++-- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/main/java/org/springframework/data/auditing/AnnotationAuditingMetadata.java b/src/main/java/org/springframework/data/auditing/AnnotationAuditingMetadata.java index a6576ad7e..7612c4907 100644 --- a/src/main/java/org/springframework/data/auditing/AnnotationAuditingMetadata.java +++ b/src/main/java/org/springframework/data/auditing/AnnotationAuditingMetadata.java @@ -52,7 +52,7 @@ final class AnnotationAuditingMetadata { private static final AnnotationFieldFilter LAST_MODIFIED_DATE_FILTER = new AnnotationFieldFilter( LastModifiedDate.class); - private static final Map, AnnotationAuditingMetadata> METADATA_CACHE = new ConcurrentHashMap<>(); + private static final Map, AnnotationAuditingMetadata> metadataCache = new ConcurrentHashMap<>(); public static final boolean IS_JDK_8 = org.springframework.util.ClassUtils.isPresent("java.time.Clock", AnnotationAuditingMetadata.class.getClassLoader()); @@ -125,7 +125,7 @@ final class AnnotationAuditingMetadata { * @param type the type to inspect, must not be {@literal null}. */ public static AnnotationAuditingMetadata getMetadata(Class type) { - return METADATA_CACHE.computeIfAbsent(type, AnnotationAuditingMetadata::new); + return metadataCache.computeIfAbsent(type, AnnotationAuditingMetadata::new); } /** diff --git a/src/main/java/org/springframework/data/convert/SimpleTypeInformationMapper.java b/src/main/java/org/springframework/data/convert/SimpleTypeInformationMapper.java index 88d8e217a..973e409f0 100644 --- a/src/main/java/org/springframework/data/convert/SimpleTypeInformationMapper.java +++ b/src/main/java/org/springframework/data/convert/SimpleTypeInformationMapper.java @@ -35,7 +35,7 @@ import org.springframework.util.ClassUtils; */ public class SimpleTypeInformationMapper implements TypeInformationMapper { - private final Map>> CACHE = new ConcurrentHashMap<>(); + private final Map>> cache = new ConcurrentHashMap<>(); /** * Returns the {@link TypeInformation} that shall be used when the given {@link String} value is found as type hint. @@ -53,7 +53,7 @@ public class SimpleTypeInformationMapper implements TypeInformationMapper { String stringAlias = alias.mapTyped(String.class); if (stringAlias != null) { - return CACHE.computeIfAbsent(stringAlias, SimpleTypeInformationMapper::loadClass).orElse(null); + return cache.computeIfAbsent(stringAlias, SimpleTypeInformationMapper::loadClass).orElse(null); } return null; diff --git a/src/main/java/org/springframework/data/mapping/PropertyPath.java b/src/main/java/org/springframework/data/mapping/PropertyPath.java index 5359e0c39..76b64294b 100644 --- a/src/main/java/org/springframework/data/mapping/PropertyPath.java +++ b/src/main/java/org/springframework/data/mapping/PropertyPath.java @@ -50,7 +50,7 @@ public class PropertyPath implements Streamable { private static final String ALL_UPPERCASE = "[A-Z0-9._$]+"; private static final Pattern SPLITTER = Pattern.compile("(?:[%s]?([%s]*?[^%s]+))".replaceAll("%s", DELIMITERS)); private static final Pattern SPLITTER_FOR_QUOTED = Pattern.compile("(?:[%s]?([%s]*?[^%s]+))".replaceAll("%s", "\\.")); - private static final Map CACHE = new ConcurrentReferenceHashMap<>(); + private static final Map cache = new ConcurrentReferenceHashMap<>(); private final TypeInformation owningType; private final String name; @@ -345,7 +345,7 @@ public class PropertyPath implements Streamable { Assert.hasText(source, "Source must not be null or empty!"); Assert.notNull(type, "TypeInformation must not be null or empty!"); - return CACHE.computeIfAbsent(Key.of(type, source), it -> { + return cache.computeIfAbsent(Key.of(type, source), it -> { List iteratorSource = new ArrayList<>(); diff --git a/src/main/java/org/springframework/data/mapping/model/BeanWrapper.java b/src/main/java/org/springframework/data/mapping/model/BeanWrapper.java index 0731c2e66..72ca8dfbe 100644 --- a/src/main/java/org/springframework/data/mapping/model/BeanWrapper.java +++ b/src/main/java/org/springframework/data/mapping/model/BeanWrapper.java @@ -165,7 +165,7 @@ class BeanWrapper implements PersistentPropertyAccessor { */ static class KotlinCopyUtil { - private static final Map, KCallable> COPY_METHOD_CACHE = new ConcurrentReferenceHashMap<>(); + private static final Map, KCallable> copyMethodCache = new ConcurrentReferenceHashMap<>(); /** * Set a single property by calling {@code copy(…)} on a Kotlin data class. Copying creates a new instance that @@ -176,7 +176,7 @@ class BeanWrapper implements PersistentPropertyAccessor { static Object setProperty(PersistentProperty property, T bean, @Nullable Object value) { Class type = property.getOwner().getType(); - KCallable copy = COPY_METHOD_CACHE.computeIfAbsent(type, it -> getCopyMethod(it, property)); + KCallable copy = copyMethodCache.computeIfAbsent(type, it -> getCopyMethod(it, property)); if (copy == null) { throw new UnsupportedOperationException(String.format( diff --git a/src/main/java/org/springframework/data/repository/core/support/EventPublishingRepositoryProxyPostProcessor.java b/src/main/java/org/springframework/data/repository/core/support/EventPublishingRepositoryProxyPostProcessor.java index a92bf9f52..dc9d0a3cd 100644 --- a/src/main/java/org/springframework/data/repository/core/support/EventPublishingRepositoryProxyPostProcessor.java +++ b/src/main/java/org/springframework/data/repository/core/support/EventPublishingRepositoryProxyPostProcessor.java @@ -126,7 +126,7 @@ public class EventPublishingRepositoryProxyPostProcessor implements RepositoryPr */ static class EventPublishingMethod { - private static Map, EventPublishingMethod> CACHE = new ConcurrentReferenceHashMap<>(); + private static Map, EventPublishingMethod> cache = new ConcurrentReferenceHashMap<>(); private static @SuppressWarnings("null") EventPublishingMethod NONE = new EventPublishingMethod(null, null); private final Method publishingMethod; @@ -150,7 +150,7 @@ public class EventPublishingRepositoryProxyPostProcessor implements RepositoryPr Assert.notNull(type, "Type must not be null!"); - EventPublishingMethod eventPublishingMethod = CACHE.get(type); + EventPublishingMethod eventPublishingMethod = cache.get(type); if (eventPublishingMethod != null) { return eventPublishingMethod.orNull(); @@ -159,7 +159,7 @@ public class EventPublishingRepositoryProxyPostProcessor implements RepositoryPr EventPublishingMethod result = from(getDetector(type, DomainEvents.class), () -> getDetector(type, AfterDomainEventPublication.class)); - CACHE.put(type, result); + cache.put(type, result); return result.orNull(); } diff --git a/src/main/java/org/springframework/data/repository/query/ExtensionAwareQueryMethodEvaluationContextProvider.java b/src/main/java/org/springframework/data/repository/query/ExtensionAwareQueryMethodEvaluationContextProvider.java index dceb137e3..e2b47cd6b 100644 --- a/src/main/java/org/springframework/data/repository/query/ExtensionAwareQueryMethodEvaluationContextProvider.java +++ b/src/main/java/org/springframework/data/repository/query/ExtensionAwareQueryMethodEvaluationContextProvider.java @@ -142,7 +142,7 @@ public class ExtensionAwareQueryMethodEvaluationContextProvider implements Query */ static class DelegatingMethodInterceptor implements MethodInterceptor { - private static final Map METHOD_CACHE = new ConcurrentReferenceHashMap(); + private static final Map methodCache = new ConcurrentReferenceHashMap(); private final Object target; private final Map> directMappings = new HashMap<>(); @@ -175,7 +175,7 @@ public class ExtensionAwareQueryMethodEvaluationContextProvider implements Query } Method method = invocation.getMethod(); - Method targetMethod = METHOD_CACHE.computeIfAbsent(method, + Method targetMethod = methodCache.computeIfAbsent(method, it -> Optional.ofNullable(findTargetMethod(it)).orElse(it)); Object result = method.equals(targetMethod) ? invocation.proceed() diff --git a/src/main/java/org/springframework/data/repository/query/ReturnedType.java b/src/main/java/org/springframework/data/repository/query/ReturnedType.java index e89c5df74..384527456 100644 --- a/src/main/java/org/springframework/data/repository/query/ReturnedType.java +++ b/src/main/java/org/springframework/data/repository/query/ReturnedType.java @@ -46,7 +46,7 @@ import org.springframework.util.ObjectUtils; */ public abstract class ReturnedType { - private static final Map CACHE = new ConcurrentReferenceHashMap<>(32); + private static final Map cache = new ConcurrentReferenceHashMap<>(32); private final Class domainType; @@ -68,7 +68,7 @@ public abstract class ReturnedType { Assert.notNull(domainType, "Domain type must not be null!"); Assert.notNull(factory, "ProjectionFactory must not be null!"); - return CACHE.computeIfAbsent(CacheKey.of(returnedType, domainType, factory.hashCode()), key -> { + return cache.computeIfAbsent(CacheKey.of(returnedType, domainType, factory.hashCode()), key -> { return returnedType.isInterface() ? new ReturnedInterface(factory.getProjectionInformation(returnedType), domainType) diff --git a/src/main/java/org/springframework/data/repository/util/QueryExecutionConverters.java b/src/main/java/org/springframework/data/repository/util/QueryExecutionConverters.java index a25a04182..8fc7dbe6c 100644 --- a/src/main/java/org/springframework/data/repository/util/QueryExecutionConverters.java +++ b/src/main/java/org/springframework/data/repository/util/QueryExecutionConverters.java @@ -97,7 +97,7 @@ public abstract class QueryExecutionConverters { private static final Set> UNWRAPPERS = new HashSet>(); private static final Set> ALLOWED_PAGEABLE_TYPES = new HashSet>(); private static final Map, ExecutionAdapter> EXECUTION_ADAPTER = new HashMap<>(); - private static final Map, Boolean> SUPPORTS_CACHE = new ConcurrentReferenceHashMap<>(); + private static final Map, Boolean> supportsCache = new ConcurrentReferenceHashMap<>(); static { @@ -160,7 +160,7 @@ public abstract class QueryExecutionConverters { Assert.notNull(type, "Type must not be null!"); - return SUPPORTS_CACHE.computeIfAbsent(type, key -> { + return supportsCache.computeIfAbsent(type, key -> { for (WrapperType candidate : WRAPPER_TYPES) { if (candidate.getType().isAssignableFrom(key)) { @@ -683,7 +683,7 @@ public abstract class QueryExecutionConverters { private static final TypeDescriptor STREAMABLE = TypeDescriptor.valueOf(Streamable.class); - private final Map TARGET_TYPE_CACHE = new ConcurrentHashMap<>(); + private final Map targetTypeCache = new ConcurrentHashMap<>(); private final ConversionService conversionService = DefaultConversionService.getSharedInstance(); public IterableToStreamableConverter() {} @@ -717,7 +717,7 @@ public abstract class QueryExecutionConverters { return true; } - return TARGET_TYPE_CACHE.computeIfAbsent(targetType, it -> { + return targetTypeCache.computeIfAbsent(targetType, it -> { return conversionService.canConvert(STREAMABLE, targetType); }); } diff --git a/src/main/java/org/springframework/data/util/ClassTypeInformation.java b/src/main/java/org/springframework/data/util/ClassTypeInformation.java index c95ac0bf9..ac74feda8 100644 --- a/src/main/java/org/springframework/data/util/ClassTypeInformation.java +++ b/src/main/java/org/springframework/data/util/ClassTypeInformation.java @@ -48,11 +48,11 @@ public class ClassTypeInformation extends TypeDiscoverer { public static final ClassTypeInformation MAP = new ClassTypeInformation(Map.class); public static final ClassTypeInformation OBJECT = new ClassTypeInformation(Object.class); - private static final Map, ClassTypeInformation> CACHE = new ConcurrentReferenceHashMap<>(64, + private static final Map, ClassTypeInformation> cache = new ConcurrentReferenceHashMap<>(64, ReferenceType.WEAK); static { - Arrays.asList(COLLECTION, LIST, SET, MAP, OBJECT).forEach(it -> CACHE.put(it.getType(), it)); + Arrays.asList(COLLECTION, LIST, SET, MAP, OBJECT).forEach(it -> cache.put(it.getType(), it)); } private final Class type; @@ -68,7 +68,7 @@ public class ClassTypeInformation extends TypeDiscoverer { Assert.notNull(type, "Type must not be null!"); - return (ClassTypeInformation) CACHE.computeIfAbsent(type, ClassTypeInformation::new); + return (ClassTypeInformation) cache.computeIfAbsent(type, ClassTypeInformation::new); } /** diff --git a/src/main/java/org/springframework/data/util/ParameterTypes.java b/src/main/java/org/springframework/data/util/ParameterTypes.java index 97ed95881..175650209 100644 --- a/src/main/java/org/springframework/data/util/ParameterTypes.java +++ b/src/main/java/org/springframework/data/util/ParameterTypes.java @@ -44,7 +44,7 @@ import org.springframework.util.TypeUtils; public class ParameterTypes { private static final TypeDescriptor OBJECT_DESCRIPTOR = TypeDescriptor.valueOf(Object.class); - private static final ConcurrentMap, ParameterTypes> CACHE = new ConcurrentReferenceHashMap<>(); + private static final ConcurrentMap, ParameterTypes> cache = new ConcurrentReferenceHashMap<>(); private final List types; private final Lazy> alternatives; @@ -75,7 +75,7 @@ public class ParameterTypes { Assert.notNull(types, "Types must not be null!"); - return CACHE.computeIfAbsent(types, ParameterTypes::new); + return cache.computeIfAbsent(types, ParameterTypes::new); } /**