Adapt to changed AOT packages in Spring Data Commons.

Closes #2661

Author: mp911de

spring-data-jpa/src/main/java/org/springframework/data/jpa/aot/JpaRuntimeHints.java renamed to spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/aot/JpaRuntimeHints.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jpa.aot;
+package org.springframework.data.jpa.repository.aot;
 
 import java.util.Arrays;
 
@@ -29,10 +29,12 @@
 import org.springframework.util.ClassUtils;
 
 /**
+ * Runtime hints for JPA AOT processing.
+ *
  * @author Christoph Strobl
  * @since 3.0
  */
-public class JpaRuntimeHints implements RuntimeHintsRegistrar {
+class JpaRuntimeHints implements RuntimeHintsRegistrar {
 
 	@Override
 	public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
@@ -49,9 +51,10 @@ public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader)
 							.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS));
 
 			hints.reflection().registerTypes(Arrays.asList( //
-							TypeReference.of(AuditingBeanFactoryPostProcessor.class), //
-							TypeReference.of(AuditingEntityListener.class)),
-					hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS));
+					TypeReference.of(AuditingBeanFactoryPostProcessor.class), //
+					TypeReference.of(AuditingEntityListener.class)),
+					hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS,
+							MemberCategory.INVOKE_DECLARED_METHODS));
 		}
 
 		hints.reflection().registerType(TypeReference.of(SimpleJpaRepository.class),

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtension.java

@@ -46,13 +46,13 @@
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
-import org.springframework.data.aot.AotRepositoryContext;
-import org.springframework.data.aot.RepositoryRegistrationAotProcessor;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.support.DefaultJpaContext;
 import org.springframework.data.jpa.repository.support.EntityManagerBeanDefinitionRegistrarPostProcessor;
 import org.springframework.data.jpa.repository.support.JpaEvaluationContextExtension;
 import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean;
+import org.springframework.data.repository.aot.AotRepositoryContext;
+import org.springframework.data.repository.aot.RepositoryRegistrationAotProcessor;
 import org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource;
 import org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport;
 import org.springframework.data.repository.config.RepositoryConfigurationSource;

spring-data-jpa/src/main/resources/META-INF/spring/aot.factories

@@ -1,2 +1,2 @@
 org.springframework.aot.hint.RuntimeHintsRegistrar=\
-	org.springframework.data.jpa.aot.JpaRuntimeHints
+	org.springframework.data.jpa.repository.aot.JpaRuntimeHints

spring-data-jpa/src/test/java/org/springframework/data/jpa/aot/JpaRuntimeHintsUnitTests.java renamed to spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/aot/JpaRuntimeHintsUnitTests.java

@@ -13,19 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jpa.aot;
+package org.springframework.data.jpa.repository.aot;
 
 import static org.assertj.core.api.AssertionsForClassTypes.*;
-import static org.springframework.aot.hint.predicate.RuntimeHintsPredicates.reflection;
+import static org.springframework.aot.hint.predicate.RuntimeHintsPredicates.*;
 
 import org.junit.jupiter.api.Test;
+
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.beans.factory.aspectj.AnnotationBeanConfigurerAspect;
 import org.springframework.data.jpa.domain.support.AuditingBeanFactoryPostProcessor;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 import org.springframework.data.jpa.util.HidingClassLoader;
 
 /**
+ * Unit tests for {@link JpaRuntimeHints}.
+ *
  * @author Christoph Strobl
  */
 class JpaRuntimeHintsUnitTests {

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryRegistrationAotProcessorUnitTests.java

@@ -31,7 +31,7 @@
 import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.core.annotation.MergedAnnotation;
-import org.springframework.data.aot.AotRepositoryContext;
+import org.springframework.data.repository.aot.AotRepositoryContext;
 import org.springframework.data.repository.core.RepositoryInformation;
 import org.springframework.javapoet.ClassName;