From 914f4af010a2f8938a5135dda4e4029c2d4d4f3d Mon Sep 17 00:00:00 2001 From: arefbehboudi Date: Tue, 29 Oct 2024 10:14:18 +0100 Subject: [PATCH] Cleanup code. Closes #3592 --- .../data/jpa/mapping/JpaMetamodelMappingContext.java | 1 - .../data/jpa/mapping/JpaPersistentEntityImpl.java | 1 - .../org/springframework/data/jpa/provider/JpaClassUtils.java | 2 +- .../data/jpa/provider/PersistenceProvider.java | 2 +- .../jpa/repository/query/QueryParameterSetterFactory.java | 4 ++-- .../data/jpa/util/JpaMetamodelCacheCleanup.java | 2 +- .../data/jpa/provider/PersistenceProviderUnitTests.java | 5 ++++- 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContext.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContext.java index 6335aec76..ee663c687 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContext.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContext.java @@ -54,7 +54,6 @@ public class JpaMetamodelMappingContext */ public JpaMetamodelMappingContext(Set models) { - Assert.notNull(models, "JPA metamodel must not be null"); Assert.notEmpty(models, "JPA metamodel must not be empty"); this.models = new Metamodels(models); diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentEntityImpl.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentEntityImpl.java index cd6c1a00f..fa8eebd38 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentEntityImpl.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentEntityImpl.java @@ -58,7 +58,6 @@ class JpaPersistentEntityImpl extends BasicPersistentEntity ALL = List.of(HIBERNATE, ECLIPSELINK, GENERIC_JPA); - static ConcurrentReferenceHashMap, PersistenceProvider> CACHE = new ConcurrentReferenceHashMap<>(); + private static final ConcurrentReferenceHashMap, PersistenceProvider> CACHE = new ConcurrentReferenceHashMap<>(); private final Iterable entityManagerClassNames; private final Iterable metamodelClassNames; diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryParameterSetterFactory.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryParameterSetterFactory.java index 294ec89c8..38247f92d 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryParameterSetterFactory.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryParameterSetterFactory.java @@ -184,7 +184,7 @@ abstract class QueryParameterSetterFactory { @Override public QueryParameterSetter create(ParameterBinding binding, DeclaredQuery declaredQuery) { - if (!(binding.getOrigin()instanceof ParameterBinding.Expression e)) { + if (!(binding.getOrigin() instanceof ParameterBinding.Expression e)) { return null; } @@ -234,7 +234,7 @@ abstract class QueryParameterSetterFactory { Assert.notNull(binding, "Binding must not be null"); JpaParameter parameter; - if (!(binding.getOrigin()instanceof MethodInvocationArgument mia)) { + if (!(binding.getOrigin() instanceof MethodInvocationArgument mia)) { return QueryParameterSetter.NOOP; } diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/util/JpaMetamodelCacheCleanup.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/util/JpaMetamodelCacheCleanup.java index ed83f5d18..df17d56ad 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/util/JpaMetamodelCacheCleanup.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/util/JpaMetamodelCacheCleanup.java @@ -30,7 +30,7 @@ import org.springframework.context.ApplicationContext; class JpaMetamodelCacheCleanup implements DisposableBean { @Override - public void destroy() throws Exception { + public void destroy() { JpaMetamodel.clear(); } } diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/provider/PersistenceProviderUnitTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/provider/PersistenceProviderUnitTests.java index 2e4ce22ca..bcb9582bc 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/provider/PersistenceProviderUnitTests.java +++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/provider/PersistenceProviderUnitTests.java @@ -22,6 +22,7 @@ import static org.springframework.data.jpa.provider.PersistenceProvider.Constant import jakarta.persistence.EntityManager; import java.util.Arrays; +import java.util.Map; import org.assertj.core.api.Assumptions; import org.hibernate.Version; @@ -32,6 +33,7 @@ import org.mockito.Mockito; import org.springframework.asm.ClassWriter; import org.springframework.asm.Opcodes; import org.springframework.instrument.classloading.ShadowingClassLoader; +import org.springframework.test.util.ReflectionTestUtils; import org.springframework.util.ClassUtils; /** @@ -48,7 +50,8 @@ class PersistenceProviderUnitTests { @BeforeEach void setup() { - PersistenceProvider.CACHE.clear(); + Map cache = (Map) ReflectionTestUtils.getField(PersistenceProvider.class, "CACHE"); + cache.clear(); this.shadowingClassLoader = new ShadowingClassLoader(getClass().getClassLoader()); }