Cleanup code.

Closes #3592

spring-data-envers/src/main/java/org/springframework/data/envers/repository/support/EnversRevisionRepositoryImpl.java

@@ -172,7 +172,7 @@ public class EnversRevisionRepositoryImpl<T, ID, N extends Number & Comparable<N
 
 		AuditQuery baseQuery = createBaseQuery(id);
 
-		List<AuditOrder> orderMapped = (pageable.getSort()instanceof RevisionSort revisionSort)
+		List<AuditOrder> orderMapped = (pageable.getSort() instanceof RevisionSort revisionSort)
 				? List.of(mapRevisionSort(revisionSort))
 				: mapPropertySort(pageable.getSort());
 

spring-data-jpa/src/main/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContext.java

@@ -54,7 +54,6 @@ public class JpaMetamodelMappingContext
 	 */
 	public JpaMetamodelMappingContext(Set<Metamodel> models) {
 
-		Assert.notNull(models, "JPA metamodel must not be null");
 		Assert.notEmpty(models, "JPA metamodel must not be empty");
 
 		this.models = new Metamodels(models);

spring-data-jpa/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentEntityImpl.java

@@ -58,7 +58,6 @@ class JpaPersistentEntityImpl<T> extends BasicPersistentEntity<T, JpaPersistentP
 
 		super(information, null);
 
-		Assert.notNull(proxyIdAccessor, "ProxyIdAccessor must not be null");
 		this.proxyIdAccessor = proxyIdAccessor;
 		this.metamodel = metamodel;
 	}

spring-data-jpa/src/main/java/org/springframework/data/jpa/provider/JpaClassUtils.java

@@ -47,7 +47,7 @@ abstract class JpaClassUtils {
 	 */
 	public static boolean isEntityManagerOfType(EntityManager em, String type) {
 
-		EntityManager entityManagerToUse = em.getDelegate()instanceof EntityManager delegate //
+		EntityManager entityManagerToUse = em.getDelegate() instanceof EntityManager delegate //
 				? delegate //
 				: em;
 

spring-data-jpa/src/main/java/org/springframework/data/jpa/provider/PersistenceProvider.java

@@ -200,7 +200,7 @@ public enum PersistenceProvider implements QueryExtractor, ProxyIdAccessor, Quer
 
 	private static final Collection<PersistenceProvider> ALL = List.of(HIBERNATE, ECLIPSELINK, GENERIC_JPA);
 
-	static ConcurrentReferenceHashMap<Class<?>, PersistenceProvider> CACHE = new ConcurrentReferenceHashMap<>();
+	private static final ConcurrentReferenceHashMap<Class<?>, PersistenceProvider> CACHE = new ConcurrentReferenceHashMap<>();
 	private final Iterable<String> entityManagerClassNames;
 	private final Iterable<String> metamodelClassNames;
 

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JSqlParserQueryEnhancer.java

@@ -120,7 +120,7 @@ public class JSqlParserQueryEnhancer implements QueryEnhancer {
 
 		Select selectStatement = parseSelectStatement(queryString);
 
-		if (selectStatement.getSelectBody()instanceof SetOperationList setOperationList) {
+		if (selectStatement.getSelectBody() instanceof SetOperationList setOperationList) {
 			return applySortingToSetOperationList(setOperationList, sort);
 		} else if (!(selectStatement.getSelectBody() instanceof PlainSelect)) {
 			return queryString;
@@ -221,7 +221,7 @@ public class JSqlParserQueryEnhancer implements QueryEnhancer {
 		}
 
 		Select selectStatement = (Select) statement;
-		if (selectStatement.getSelectBody()instanceof PlainSelect selectBody) {
+		if (selectStatement.getSelectBody() instanceof PlainSelect selectBody) {
 			return getJoinAliases(selectBody);
 		}
 
@@ -319,7 +319,7 @@ public class JSqlParserQueryEnhancer implements QueryEnhancer {
 			 * ValuesStatement has no alias
 			 * SetOperation can have multiple alias for each operation item
 			 */
-			if (!(selectStatement.getSelectBody()instanceof PlainSelect selectBody)) {
+			if (!(selectStatement.getSelectBody() instanceof PlainSelect selectBody)) {
 				return null;
 			}
 
@@ -374,7 +374,7 @@ public class JSqlParserQueryEnhancer implements QueryEnhancer {
 		/*
 		  We only support count queries for {@link PlainSelect}.
 		 */
-		if (!(selectStatement.getSelectBody()instanceof PlainSelect selectBody)) {
+		if (!(selectStatement.getSelectBody() instanceof PlainSelect selectBody)) {
 			return this.query.getQueryString();
 		}
 
@@ -441,7 +441,7 @@ public class JSqlParserQueryEnhancer implements QueryEnhancer {
 
 		SelectBody selectBody = selectStatement.getSelectBody();
 
-		if (selectStatement.getSelectBody()instanceof SetOperationList setOperationList) {
+		if (selectStatement.getSelectBody() instanceof SetOperationList setOperationList) {
 
 			// using the first one since for setoperations the projection has to be the same
 			selectBody = setOperationList.getSelects().get(0);

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryParameterSetterFactory.java

@@ -186,7 +186,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;
 			}
 
@@ -239,7 +239,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;
 			}
 

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();
 	}
 }

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());
 	}