Polishing.

Provide load-factor to sets with well-known sizing, move annotation auditing metadata cache to DefaultAuditableBeanWrapperFactory to avoid strong static references.

See #3067
Original pull request: #3073
This commit is contained in:
Mark Paluch
2024-06-13 13:54:34 +02:00
parent b21b2e8934
commit 0e9dc7aec4
13 changed files with 54 additions and 58 deletions

View File

@@ -21,9 +21,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import org.springframework.data.annotation.CreatedBy; import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.CreatedDate;
@@ -53,8 +51,6 @@ final class AnnotationAuditingMetadata {
private static final AnnotationFieldFilter LAST_MODIFIED_DATE_FILTER = new AnnotationFieldFilter( private static final AnnotationFieldFilter LAST_MODIFIED_DATE_FILTER = new AnnotationFieldFilter(
LastModifiedDate.class); LastModifiedDate.class);
private static final Map<Class<?>, AnnotationAuditingMetadata> metadataCache = new ConcurrentHashMap<>();
static final List<String> SUPPORTED_DATE_TYPES; static final List<String> SUPPORTED_DATE_TYPES;
static { static {
@@ -126,7 +122,7 @@ final class AnnotationAuditingMetadata {
* @param type the type to inspect, must not be {@literal null}. * @param type the type to inspect, must not be {@literal null}.
*/ */
public static AnnotationAuditingMetadata getMetadata(Class<?> type) { public static AnnotationAuditingMetadata getMetadata(Class<?> type) {
return metadataCache.computeIfAbsent(type, AnnotationAuditingMetadata::new); return new AnnotationAuditingMetadata(type);
} }
/** /**

View File

@@ -19,7 +19,9 @@ import java.lang.reflect.Field;
import java.time.Instant; import java.time.Instant;
import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAccessor;
import java.util.Date; import java.util.Date;
import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Stream; import java.util.stream.Stream;
import org.springframework.core.ResolvableType; import org.springframework.core.ResolvableType;
@@ -44,6 +46,7 @@ import org.springframework.util.Assert;
class DefaultAuditableBeanWrapperFactory implements AuditableBeanWrapperFactory { class DefaultAuditableBeanWrapperFactory implements AuditableBeanWrapperFactory {
private final ConversionService conversionService; private final ConversionService conversionService;
private final Map<Class<?>, AnnotationAuditingMetadata> metadataCache;
public DefaultAuditableBeanWrapperFactory() { public DefaultAuditableBeanWrapperFactory() {
@@ -52,6 +55,7 @@ class DefaultAuditableBeanWrapperFactory implements AuditableBeanWrapperFactory
Jsr310Converters.getConvertersToRegister().forEach(conversionService::addConverter); Jsr310Converters.getConvertersToRegister().forEach(conversionService::addConverter);
this.conversionService = conversionService; this.conversionService = conversionService;
this.metadataCache = new ConcurrentHashMap<>();
} }
ConversionService getConversionService() { ConversionService getConversionService() {
@@ -77,10 +81,11 @@ class DefaultAuditableBeanWrapperFactory implements AuditableBeanWrapperFactory
(Auditable<Object, ?, TemporalAccessor>) it); (Auditable<Object, ?, TemporalAccessor>) it);
} }
AnnotationAuditingMetadata metadata = AnnotationAuditingMetadata.getMetadata(it.getClass()); AnnotationAuditingMetadata metadata = metadataCache.computeIfAbsent(it.getClass(),
AnnotationAuditingMetadata::getMetadata);
if (metadata.isAuditable()) { if (metadata.isAuditable()) {
return new ReflectionAuditingBeanWrapper<T>(conversionService, it); return new ReflectionAuditingBeanWrapper<>(conversionService, it);
} }
return null; return null;

View File

@@ -47,7 +47,7 @@ public enum DistanceFormatter implements Converter<String, Distance>, Formatter<
static { static {
Map<String, Metric> metrics = new LinkedHashMap<>(Metrics.values().length); Map<String, Metric> metrics = new LinkedHashMap<>(Metrics.values().length, 1.0f);
for (Metric metric : Metrics.values()) { for (Metric metric : Metrics.values()) {
metrics.put(metric.getAbbreviation(), metric); metrics.put(metric.getAbbreviation(), metric);

View File

@@ -115,7 +115,7 @@ public class BasicPersistentEntity<T, P extends PersistentProperty<P>> implement
this.creator = InstanceCreatorMetadataDiscoverer.discover(this); this.creator = InstanceCreatorMetadataDiscoverer.discover(this);
this.associations = comparator == null ? new HashSet<>() : new TreeSet<>(new AssociationComparator<>(comparator)); this.associations = comparator == null ? new HashSet<>() : new TreeSet<>(new AssociationComparator<>(comparator));
this.propertyCache = new HashMap<>(16, 1f); this.propertyCache = new HashMap<>(16, 1.0f);
this.annotationCache = new ConcurrentHashMap<>(16); this.annotationCache = new ConcurrentHashMap<>(16);
this.propertyAnnotationCache = CollectionUtils this.propertyAnnotationCache = CollectionUtils
.toMultiValueMap(new ConcurrentHashMap<>(16)); .toMultiValueMap(new ConcurrentHashMap<>(16));

View File

@@ -108,7 +108,7 @@ class SpelEvaluatingMethodInterceptor implements MethodInterceptor {
ExpressionParser parser, Class<?> targetInterface) { ExpressionParser parser, Class<?> targetInterface) {
Method[] methods = targetInterface.getMethods(); Method[] methods = targetInterface.getMethods();
Map<Integer, Expression> expressions = new HashMap<>(methods.length); Map<Integer, Expression> expressions = new HashMap<>(methods.length, 1.0f);
for (Method method : methods) { for (Method method : methods) {

View File

@@ -93,7 +93,7 @@ class QueryExecutorMethodInterceptor implements MethodInterceptor {
QueryLookupStrategy lookupStrategy, ProjectionFactory projectionFactory) { QueryLookupStrategy lookupStrategy, ProjectionFactory projectionFactory) {
List<Method> queryMethods = repositoryInformation.getQueryMethods().toList(); List<Method> queryMethods = repositoryInformation.getQueryMethods().toList();
Map<Method, RepositoryQuery> result = new HashMap<>(queryMethods.size()); Map<Method, RepositoryQuery> result = new HashMap<>(queryMethods.size(), 1.0f);
for (Method method : queryMethods) { for (Method method : queryMethods) {

View File

@@ -23,13 +23,13 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation; import org.aopalliance.intercept.MethodInvocation;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.aop.framework.ProxyFactory; import org.springframework.aop.framework.ProxyFactory;
import org.springframework.aop.interceptor.ExposeInvocationInterceptor; import org.springframework.aop.interceptor.ExposeInvocationInterceptor;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
@@ -108,7 +108,7 @@ public abstract class RepositoryFactorySupport implements BeanClassLoaderAware,
@SuppressWarnings("null") @SuppressWarnings("null")
public RepositoryFactorySupport() { public RepositoryFactorySupport() {
this.repositoryInformationCache = new ConcurrentHashMap<>(16); this.repositoryInformationCache = new HashMap<>(16);
this.postProcessors = new ArrayList<>(); this.postProcessors = new ArrayList<>();
this.repositoryBaseClass = Optional.empty(); this.repositoryBaseClass = Optional.empty();
@@ -364,8 +364,7 @@ public abstract class RepositoryFactorySupport implements BeanClassLoaderAware,
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger logger
.debug(LogMessage.format("Finished creation of repository instance for %s.", .debug(LogMessage.format("Finished creation of repository instance for %s.", repositoryInterface.getName()));
repositoryInterface.getName()));
} }
return repository; return repository;
@@ -440,12 +439,15 @@ public abstract class RepositoryFactorySupport implements BeanClassLoaderAware,
RepositoryInformationCacheKey cacheKey = new RepositoryInformationCacheKey(metadata, composition); RepositoryInformationCacheKey cacheKey = new RepositoryInformationCacheKey(metadata, composition);
return repositoryInformationCache.computeIfAbsent(cacheKey, key -> { synchronized (repositoryInformationCache) {
Class<?> baseClass = repositoryBaseClass.orElse(getRepositoryBaseClass(metadata)); return repositoryInformationCache.computeIfAbsent(cacheKey, key -> {
return new DefaultRepositoryInformation(metadata, baseClass, composition); Class<?> baseClass = repositoryBaseClass.orElse(getRepositoryBaseClass(metadata));
});
return new DefaultRepositoryInformation(metadata, baseClass, composition);
});
}
} }
protected List<QueryMethod> getQueryMethods() { protected List<QueryMethod> getQueryMethods() {
@@ -725,7 +727,7 @@ public abstract class RepositoryFactorySupport implements BeanClassLoaderAware,
*/ */
static class RepositoryValidator { static class RepositoryValidator {
static Map<Class<?>, String> WELL_KNOWN_EXECUTORS = new HashMap<>(4, 1f); static Map<Class<?>, String> WELL_KNOWN_EXECUTORS = new HashMap<>(4, 1.0f);
static { static {
@@ -786,11 +788,9 @@ public abstract class RepositoryFactorySupport implements BeanClassLoaderAware,
} }
if (!containsFragmentImplementation(composition, executorInterface)) { if (!containsFragmentImplementation(composition, executorInterface)) {
throw new UnsupportedFragmentException( throw new UnsupportedFragmentException(String.format("Repository %s implements %s but %s does not support %s",
String.format("Repository %s implements %s but %s does not support %s", ClassUtils.getQualifiedName(repositoryInterface), ClassUtils.getQualifiedName(executorInterface),
ClassUtils.getQualifiedName(repositoryInterface), ClassUtils.getQualifiedName(executorInterface), ClassUtils.getShortName(source), entry.getValue()), repositoryInterface, executorInterface);
ClassUtils.getShortName(source), entry.getValue()),
repositoryInterface, executorInterface);
} }
} }
} }

View File

@@ -100,7 +100,7 @@ public class ExtensionAwareQueryMethodEvaluationContextProvider implements Query
*/ */
static Map<String, Object> collectVariables(Parameters<?, ?> parameters, Object[] arguments) { static Map<String, Object> collectVariables(Parameters<?, ?> parameters, Object[] arguments) {
Map<String, Object> variables = new HashMap<>(parameters.getNumberOfParameters()); Map<String, Object> variables = new HashMap<>(parameters.getNumberOfParameters(), 1.0f);
parameters.stream()// parameters.stream()//
.filter(Parameter::isSpecialParameter)// .filter(Parameter::isSpecialParameter)//

View File

@@ -63,7 +63,7 @@ import org.springframework.util.concurrent.ListenableFuture;
* <li>{@code javaslang.collection.Seq}, {@code javaslang.collection.Map}, {@code javaslang.collection.Set} - as of * <li>{@code javaslang.collection.Seq}, {@code javaslang.collection.Map}, {@code javaslang.collection.Set} - as of
* 1.13</li> * 1.13</li>
* <li>{@code io.vavr.collection.Seq}, {@code io.vavr.collection.Map}, {@code io.vavr.collection.Set} - as of 2.0</li> * <li>{@code io.vavr.collection.Seq}, {@code io.vavr.collection.Map}, {@code io.vavr.collection.Set} - as of 2.0</li>
* <li>Reactive wrappers supported by {@link ReactiveWrappers} - as of 2.0</li> * <li>Reactive wrappers supported by {@link org.springframework.data.util.ReactiveWrappers} - as of 2.0</li>
* </ul> * </ul>
* *
* @author Oliver Gierke * @author Oliver Gierke
@@ -79,11 +79,11 @@ public abstract class QueryExecutionConverters {
private static final boolean VAVR_PRESENT = ClassUtils.isPresent("io.vavr.control.Try", private static final boolean VAVR_PRESENT = ClassUtils.isPresent("io.vavr.control.Try",
QueryExecutionConverters.class.getClassLoader()); QueryExecutionConverters.class.getClassLoader());
private static final Set<WrapperType> WRAPPER_TYPES = new HashSet<>(10, 1f); private static final Set<WrapperType> WRAPPER_TYPES = new HashSet<>(10, 1.0f);
private static final Set<WrapperType> UNWRAPPER_TYPES = new HashSet<WrapperType>(10, 1f); private static final Set<WrapperType> UNWRAPPER_TYPES = new HashSet<WrapperType>(10, 1.0f);
private static final Set<Function<Object, Object>> UNWRAPPERS = new HashSet<>(); private static final Set<Function<Object, Object>> UNWRAPPERS = new HashSet<>();
private static final Set<Class<?>> ALLOWED_PAGEABLE_TYPES = new HashSet<>(); private static final Set<Class<?>> ALLOWED_PAGEABLE_TYPES = new HashSet<>();
private static final Map<Class<?>, ExecutionAdapter> EXECUTION_ADAPTER = new HashMap<>(3, 1f); private static final Map<Class<?>, ExecutionAdapter> EXECUTION_ADAPTER = new HashMap<>(3, 1.0f);
private static final Map<Class<?>, Boolean> supportsCache = new ConcurrentReferenceHashMap<>(); private static final Map<Class<?>, Boolean> supportsCache = new ConcurrentReferenceHashMap<>();
private static final TypeInformation<Void> VOID_INFORMATION = TypeInformation.of(Void.class); private static final TypeInformation<Void> VOID_INFORMATION = TypeInformation.of(Void.class);

View File

@@ -23,7 +23,6 @@ import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Stream; import java.util.stream.Stream;
import org.springframework.core.convert.TypeDescriptor; import org.springframework.core.convert.TypeDescriptor;
@@ -33,6 +32,7 @@ import org.springframework.core.convert.converter.GenericConverter;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
import org.springframework.util.ConcurrentReferenceHashMap;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import com.google.common.base.Optional; import com.google.common.base.Optional;
@@ -67,7 +67,7 @@ public abstract class NullableWrapperConverters {
private static final Set<WrapperType> WRAPPER_TYPES = new HashSet<WrapperType>(); private static final Set<WrapperType> WRAPPER_TYPES = new HashSet<WrapperType>();
private static final Set<WrapperType> UNWRAPPER_TYPES = new HashSet<WrapperType>(); private static final Set<WrapperType> UNWRAPPER_TYPES = new HashSet<WrapperType>();
private static final Set<Converter<Object, Object>> UNWRAPPERS = new HashSet<Converter<Object, Object>>(); private static final Set<Converter<Object, Object>> UNWRAPPERS = new HashSet<Converter<Object, Object>>();
private static final Map<Class<?>, Boolean> supportsCache = new ConcurrentHashMap<>(); private static final Map<Class<?>, Boolean> supportsCache = new ConcurrentReferenceHashMap<>();
static { static {

View File

@@ -41,11 +41,16 @@ public interface Optionals {
* @param optionals must not be {@literal null}. * @param optionals must not be {@literal null}.
* @return * @return
*/ */
public static boolean isAnyPresent(Optional<?>... optionals) { static boolean isAnyPresent(Optional<?>... optionals) {
Assert.notNull(optionals, "Optionals must not be null"); Assert.notNull(optionals, "Optionals must not be null");
return Arrays.stream(optionals).anyMatch(Optional::isPresent); for (Optional<?> optional : optionals) {
if (optional.isPresent()) {
return true;
}
}
return false;
} }
/** /**
@@ -55,7 +60,7 @@ public interface Optionals {
* @return * @return
*/ */
@SafeVarargs @SafeVarargs
public static <T> Stream<T> toStream(Optional<? extends T>... optionals) { static <T> Stream<T> toStream(Optional<? extends T>... optionals) {
Assert.notNull(optionals, "Optional must not be null"); Assert.notNull(optionals, "Optional must not be null");
@@ -69,7 +74,7 @@ public interface Optionals {
* @param function must not be {@literal null}. * @param function must not be {@literal null}.
* @return * @return
*/ */
public static <S, T> Optional<T> firstNonEmpty(Iterable<S> source, Function<S, Optional<T>> function) { static <S, T> Optional<T> firstNonEmpty(Iterable<S> source, Function<S, Optional<T>> function) {
Assert.notNull(source, "Source must not be null"); Assert.notNull(source, "Source must not be null");
Assert.notNull(function, "Function must not be null"); Assert.notNull(function, "Function must not be null");
@@ -87,7 +92,7 @@ public interface Optionals {
* @param function must not be {@literal null}. * @param function must not be {@literal null}.
* @return * @return
*/ */
public static <S, T> T firstNonEmpty(Iterable<S> source, Function<S, T> function, T defaultValue) { static <S, T> T firstNonEmpty(Iterable<S> source, Function<S, T> function, T defaultValue) {
Assert.notNull(source, "Source must not be null"); Assert.notNull(source, "Source must not be null");
Assert.notNull(function, "Function must not be null"); Assert.notNull(function, "Function must not be null");
@@ -105,7 +110,7 @@ public interface Optionals {
* @return * @return
*/ */
@SafeVarargs @SafeVarargs
public static <T> Optional<T> firstNonEmpty(Supplier<Optional<T>>... suppliers) { static <T> Optional<T> firstNonEmpty(Supplier<Optional<T>>... suppliers) {
Assert.notNull(suppliers, "Suppliers must not be null"); Assert.notNull(suppliers, "Suppliers must not be null");
@@ -118,7 +123,7 @@ public interface Optionals {
* @param suppliers must not be {@literal null}. * @param suppliers must not be {@literal null}.
* @return * @return
*/ */
public static <T> Optional<T> firstNonEmpty(Iterable<Supplier<Optional<T>>> suppliers) { static <T> Optional<T> firstNonEmpty(Iterable<Supplier<Optional<T>>> suppliers) {
Assert.notNull(suppliers, "Suppliers must not be null"); Assert.notNull(suppliers, "Suppliers must not be null");
@@ -135,7 +140,7 @@ public interface Optionals {
* @param iterator must not be {@literal null}. * @param iterator must not be {@literal null}.
* @return * @return
*/ */
public static <T> Optional<T> next(Iterator<T> iterator) { static <T> Optional<T> next(Iterator<T> iterator) {
Assert.notNull(iterator, "Iterator must not be null"); Assert.notNull(iterator, "Iterator must not be null");
@@ -150,7 +155,7 @@ public interface Optionals {
* @param right * @param right
* @return * @return
*/ */
public static <T, S> Optional<Pair<T, S>> withBoth(Optional<T> left, Optional<S> right) { static <T, S> Optional<Pair<T, S>> withBoth(Optional<T> left, Optional<S> right) {
return left.flatMap(l -> right.map(r -> Pair.of(l, r))); return left.flatMap(l -> right.map(r -> Pair.of(l, r)));
} }
@@ -161,7 +166,7 @@ public interface Optionals {
* @param right must not be {@literal null}. * @param right must not be {@literal null}.
* @param consumer must not be {@literal null}. * @param consumer must not be {@literal null}.
*/ */
public static <T, S> void ifAllPresent(Optional<T> left, Optional<S> right, BiConsumer<T, S> consumer) { static <T, S> void ifAllPresent(Optional<T> left, Optional<S> right, BiConsumer<T, S> consumer) {
Assert.notNull(left, "Optional must not be null"); Assert.notNull(left, "Optional must not be null");
Assert.notNull(right, "Optional must not be null"); Assert.notNull(right, "Optional must not be null");
@@ -181,7 +186,7 @@ public interface Optionals {
* @param function must not be {@literal null}. * @param function must not be {@literal null}.
* @return * @return
*/ */
public static <T, S, R> Optional<R> mapIfAllPresent(Optional<T> left, Optional<S> right, static <T, S, R> Optional<R> mapIfAllPresent(Optional<T> left, Optional<S> right,
BiFunction<T, S, R> function) { BiFunction<T, S, R> function) {
Assert.notNull(left, "Optional must not be null"); Assert.notNull(left, "Optional must not be null");
@@ -198,7 +203,7 @@ public interface Optionals {
* @param consumer must not be {@literal null}. * @param consumer must not be {@literal null}.
* @param runnable must not be {@literal null}. * @param runnable must not be {@literal null}.
*/ */
public static <T> void ifPresentOrElse(Optional<T> optional, Consumer<? super T> consumer, Runnable runnable) { static <T> void ifPresentOrElse(Optional<T> optional, Consumer<? super T> consumer, Runnable runnable) {
Assert.notNull(optional, "Optional must not be null"); Assert.notNull(optional, "Optional must not be null");
Assert.notNull(consumer, "Consumer must not be null"); Assert.notNull(consumer, "Consumer must not be null");

View File

@@ -49,16 +49,6 @@ class AnnotationAuditingMetadataUnitTests {
assertThat(metadata.getLastModifiedDateField()).hasValue(lastModifiedDateField); assertThat(metadata.getLastModifiedDateField()).hasValue(lastModifiedDateField);
} }
@Test
void checkCaching() {
var firstCall = AnnotationAuditingMetadata.getMetadata(AnnotatedUser.class);
assertThat(firstCall).isNotNull();
var secondCall = AnnotationAuditingMetadata.getMetadata(AnnotatedUser.class);
assertThat(firstCall).isEqualTo(secondCall);
}
@Test @Test
void checkIsAuditable() { void checkIsAuditable() {

View File

@@ -68,10 +68,10 @@ public class ClassGeneratingPropertyAccessorFactoryDatatypeTests {
parameters.addAll(create(types, "primitiveBooleanArray", new boolean[] { true, false })); parameters.addAll(create(types, "primitiveBooleanArray", new boolean[] { true, false }));
parameters.addAll(create(types, "boxedBoolean", Boolean.valueOf(true))); parameters.addAll(create(types, "boxedBoolean", Boolean.valueOf(true)));
parameters.addAll(create(types, "boxedBooleanArray", new Boolean[] { Boolean.valueOf(true) })); parameters.addAll(create(types, "boxedBooleanArray", new Boolean[] { Boolean.valueOf(true) }));
parameters.addAll(create(types, "primitiveFloat", Float.valueOf(1f))); parameters.addAll(create(types, "primitiveFloat", Float.valueOf(1.0f)));
parameters.addAll(create(types, "primitiveFloatArray", new float[] { 1f, 2f })); parameters.addAll(create(types, "primitiveFloatArray", new float[] { 1.0f, 2f }));
parameters.addAll(create(types, "boxedFloat", Float.valueOf(1f))); parameters.addAll(create(types, "boxedFloat", Float.valueOf(1.0f)));
parameters.addAll(create(types, "boxedFloatArray", new Float[] { Float.valueOf(1f) })); parameters.addAll(create(types, "boxedFloatArray", new Float[] { Float.valueOf(1.0f) }));
parameters.addAll(create(types, "primitiveDouble", Double.valueOf(1d))); parameters.addAll(create(types, "primitiveDouble", Double.valueOf(1d)));
parameters.addAll(create(types, "primitiveDoubleArray", new double[] { 1d, 2d })); parameters.addAll(create(types, "primitiveDoubleArray", new double[] { 1d, 2d }));
parameters.addAll(create(types, "boxedDouble", Double.valueOf(1d))); parameters.addAll(create(types, "boxedDouble", Double.valueOf(1d)));