From daa197ef20943eed37085ebbf34fba185505a690 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Mon, 24 Oct 2022 10:24:07 +0200 Subject: [PATCH 1/2] Prepare issue branch. --- pom.xml | 2 +- spring-data-envers/pom.xml | 4 ++-- spring-data-jpa-distribution/pom.xml | 2 +- spring-data-jpa/pom.xml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 48bec13dc6..bab98e41cd 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-jpa-parent - 3.0.0-SNAPSHOT + 3.0.0-GH-2681-SNAPSHOT pom Spring Data JPA Parent diff --git a/spring-data-envers/pom.xml b/spring-data-envers/pom.xml index 540834bb60..9aeb613bec 100755 --- a/spring-data-envers/pom.xml +++ b/spring-data-envers/pom.xml @@ -5,12 +5,12 @@ org.springframework.data spring-data-envers - 3.0.0-SNAPSHOT + 3.0.0-GH-2681-SNAPSHOT org.springframework.data spring-data-jpa-parent - 3.0.0-SNAPSHOT + 3.0.0-GH-2681-SNAPSHOT ../pom.xml diff --git a/spring-data-jpa-distribution/pom.xml b/spring-data-jpa-distribution/pom.xml index bba8571672..74c07fab17 100644 --- a/spring-data-jpa-distribution/pom.xml +++ b/spring-data-jpa-distribution/pom.xml @@ -14,7 +14,7 @@ org.springframework.data spring-data-jpa-parent - 3.0.0-SNAPSHOT + 3.0.0-GH-2681-SNAPSHOT ../pom.xml diff --git a/spring-data-jpa/pom.xml b/spring-data-jpa/pom.xml index 3ad9c39a2a..2c084063dc 100644 --- a/spring-data-jpa/pom.xml +++ b/spring-data-jpa/pom.xml @@ -6,7 +6,7 @@ org.springframework.data spring-data-jpa - 3.0.0-SNAPSHOT + 3.0.0-GH-2681-SNAPSHOT Spring Data JPA Spring Data module for JPA repositories. @@ -15,7 +15,7 @@ org.springframework.data spring-data-jpa-parent - 3.0.0-SNAPSHOT + 3.0.0-GH-2681-SNAPSHOT ../pom.xml From a2d82bceb37490bb7c228887b42efe545abd9061 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Mon, 24 Oct 2022 10:25:54 +0200 Subject: [PATCH 2/2] Add missing reflection hint for NamedEntityGraph when EntityGraph is present. Closes: #2681 See also: spring-projects/spring-aot-smoke-tests#135 --- .../data/jpa/repository/aot/JpaRuntimeHints.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/aot/JpaRuntimeHints.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/aot/JpaRuntimeHints.java index 65bb6e357e..8141aa4791 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/aot/JpaRuntimeHints.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/aot/JpaRuntimeHints.java @@ -15,6 +15,8 @@ */ package org.springframework.data.jpa.repository.aot; +import jakarta.persistence.NamedEntityGraph; + import java.util.Arrays; import org.springframework.aot.hint.MemberCategory; @@ -23,6 +25,7 @@ import org.springframework.aot.hint.TypeReference; import org.springframework.data.jpa.domain.support.AuditingBeanFactoryPostProcessor; import org.springframework.data.jpa.domain.support.AuditingEntityListener; +import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.support.QuerydslJpaPredicateExecutor; import org.springframework.data.jpa.repository.support.SimpleJpaRepository; @@ -72,5 +75,8 @@ public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) hint -> hint.withMembers(MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_PUBLIC_METHODS) .onReachableType(QuerydslPredicateExecutor.class)); } + + hints.reflection().registerType(NamedEntityGraph.class, + hint -> hint.onReachableType(EntityGraph.class).withMembers(MemberCategory.INVOKE_PUBLIC_METHODS)); } }