From ab6b90cfce909246cb84056c9360593deebf78fa Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 13 Jun 2024 14:24:59 +0200 Subject: [PATCH] Polishing. Simplify code, refine constructor visibility. See #3322 --- .../PersistenceProviderUnitTests.java | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) 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 4aed6106f..2e4ce22ca 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 @@ -19,16 +19,16 @@ import static org.assertj.core.api.Assertions.*; import static org.springframework.data.jpa.provider.PersistenceProvider.*; import static org.springframework.data.jpa.provider.PersistenceProvider.Constants.*; -import java.util.ArrayList; -import java.util.List; - import jakarta.persistence.EntityManager; +import java.util.Arrays; + import org.assertj.core.api.Assumptions; import org.hibernate.Version; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; + import org.springframework.asm.ClassWriter; import org.springframework.asm.Opcodes; import org.springframework.instrument.classloading.ShadowingClassLoader; @@ -111,12 +111,12 @@ class PersistenceProviderUnitTests { static class InterfaceGenerator implements Opcodes { - static Class generate(final String interfaceName, ClassLoader parentClassLoader, - final Class... interfaces) throws ClassNotFoundException { + static Class generate(final String interfaceName, ClassLoader parentClassLoader, final Class... interfaces) + throws ClassNotFoundException { class CustomClassLoader extends ClassLoader { - CustomClassLoader(ClassLoader parent) { + private CustomClassLoader(ClassLoader parent) { super(parent); } @@ -151,12 +151,10 @@ class PersistenceProviderUnitTests { private static String[] toResourcePaths(Class... interfacesToImplement) { - List interfaceResourcePaths = new ArrayList<>(interfacesToImplement.length); - for (Class targetInterface : interfacesToImplement) { - interfaceResourcePaths.add(ClassUtils.convertClassNameToResourcePath(targetInterface.getName())); - } - - return interfaceResourcePaths.toArray(new String[0]); + return Arrays.stream(interfacesToImplement) // + .map(Class::getName) // + .map(ClassUtils::convertClassNameToResourcePath) // + .toArray(String[]::new); } } }