Temporarily add hints needed for Hibernate 7.2

See gh-48518

Co-Authored-By: Christoph Strobl <christoph.strobl@broadcom.com>

module/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/autoconfigure/HibernateJpaConfiguration.java

@@ -22,6 +22,7 @@ import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
@@ -29,13 +30,17 @@ import javax.sql.DataSource;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.hibernate.annotations.EmbeddedTable;
 import org.hibernate.boot.model.naming.ImplicitNamingStrategy;
 import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
 import org.hibernate.boot.model.naming.PhysicalNamingStrategySnakeCaseImpl;
+import org.hibernate.boot.models.annotations.internal.EmbeddedTableAnnotation;
 import org.hibernate.cfg.ManagedBeanSettings;
+import org.hibernate.event.spi.PreFlushEventListener;
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.aot.hint.MemberCategory;
+import org.springframework.aot.hint.ReflectionHints;
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
 import org.springframework.aot.hint.TypeHint;
@@ -47,6 +52,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandi
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.hibernate.SpringImplicitNamingStrategy;
 import org.springframework.boot.hibernate.SpringJtaPlatform;
+import org.springframework.boot.hibernate.autoconfigure.HibernateJpaConfiguration.Hibernate72RuntimeHints;
 import org.springframework.boot.hibernate.autoconfigure.HibernateJpaConfiguration.HibernateRuntimeHints;
 import org.springframework.boot.jdbc.SchemaManagementProvider;
 import org.springframework.boot.jdbc.metadata.CompositeDataSourcePoolMetadataProvider;
@@ -77,7 +83,7 @@ import org.springframework.util.ClassUtils;
 @Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties(HibernateProperties.class)
 @ConditionalOnSingleCandidate(DataSource.class)
-@ImportRuntimeHints(HibernateRuntimeHints.class)
+@ImportRuntimeHints({ HibernateRuntimeHints.class, Hibernate72RuntimeHints.class })
 class HibernateJpaConfiguration extends JpaBaseConfiguration {
 
 	private static final Log logger = LogFactory.getLog(HibernateJpaConfiguration.class);
@@ -276,4 +282,67 @@ class HibernateJpaConfiguration extends JpaBaseConfiguration {
 
 	}
 
+	static class Hibernate72RuntimeHints implements RuntimeHintsRegistrar {
+
+		@Override
+		public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
+			registerLoggerHints(hints.reflection());
+			registerEventHints(hints.reflection());
+			registerAnnotationHints(hints.reflection());
+		}
+
+		private void registerLoggerHints(ReflectionHints reflection) {
+			reflection.registerTypes(Set.of(TypeReference.of("org.hibernate.action.internal.ActionLogging_$logger"),
+					TypeReference.of("org.hibernate.boot.BootLogging_$logger"),
+					TypeReference.of("org.hibernate.boot.beanvalidation.BeanValidationLogger_$logger"),
+					TypeReference
+						.of("org.hibernate.bytecode.enhance.spi.interceptor.BytecodeInterceptorLogging_$logger"),
+					TypeReference.of("org.hibernate.collection.internal.CollectionLogger_$logger"),
+					TypeReference.of("org.hibernate.context.internal.CurrentSessionLogging_$logger"),
+					TypeReference.of("org.hibernate.engine.internal.NaturalIdLogging_$logger"),
+					TypeReference.of("org.hibernate.engine.internal.PersistenceContextLogging_$logger"),
+					TypeReference.of("org.hibernate.engine.internal.SessionMetricsLogger_$logger"),
+					TypeReference.of("org.hibernate.engine.jdbc.JdbcLogging_$logger"),
+					TypeReference.of("org.hibernate.engine.jdbc.batch.JdbcBatchLogging_$logger"),
+					TypeReference
+						.of("org.hibernate.engine.jdbc.connections.internal.ConnectionProviderLogging_$logger"),
+					TypeReference.of("org.hibernate.engine.jdbc.env.internal.LobCreationLogging_$logger"),
+					TypeReference.of("org.hibernate.engine.jdbc.spi.SQLExceptionLogging_$logger"),
+					TypeReference.of("org.hibernate.event.internal.EntityCopyLogging_$logger"),
+					TypeReference.of("org.hibernate.event.internal.EventListenerLogging_$logger"),
+					TypeReference.of("org.hibernate.id.UUIDLogger_$logger"),
+					TypeReference.of("org.hibernate.id.enhanced.OptimizerLogger_$logger"),
+					TypeReference.of("org.hibernate.internal.SessionFactoryLogging_$logger"),
+					TypeReference.of("org.hibernate.internal.SessionLogging_$logger"),
+					TypeReference.of("org.hibernate.internal.log.StatisticsLogger_$logger"),
+					TypeReference.of("org.hibernate.jpa.internal.JpaLogger_$logger"),
+					TypeReference.of("org.hibernate.loader.ast.internal.MultiKeyLoadLogging_$logger"),
+					TypeReference.of("org.hibernate.metamodel.mapping.MappingModelCreationLogging_$logger"),
+					TypeReference.of("org.hibernate.query.QueryLogging_$logger"),
+					TypeReference.of("org.hibernate.query.hql.HqlLogging_$logger"),
+					TypeReference.of("org.hibernate.resource.jdbc.internal.LogicalConnectionLogging_$logger"),
+					TypeReference.of("org.hibernate.resource.transaction.backend.jta.internal.JtaLogging_$logger"),
+					TypeReference.of("org.hibernate.resource.transaction.internal.SynchronizationLogging_$logger"),
+					TypeReference.of("org.hibernate.service.internal.ServiceLogger_$logger"),
+					TypeReference.of("org.hibernate.sql.model.ModelMutationLogging_$logger"),
+					TypeReference.of("org.hibernate.sql.results.graph.embeddable.EmbeddableLoadingLogger_$logger")),
+					(hint) -> hint.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS,
+							MemberCategory.INVOKE_PUBLIC_METHODS));
+		}
+
+		private void registerEventHints(ReflectionHints reflection) {
+			reflection.registerType(PreFlushEventListener.class, MemberCategory.INVOKE_DECLARED_CONSTRUCTORS,
+					MemberCategory.INVOKE_PUBLIC_METHODS);
+			reflection.registerType(PreFlushEventListener[].class, MemberCategory.INVOKE_DECLARED_CONSTRUCTORS,
+					MemberCategory.INVOKE_PUBLIC_METHODS);
+		}
+
+		private void registerAnnotationHints(ReflectionHints reflection) {
+			reflection.registerType(EmbeddedTable.class, MemberCategory.INVOKE_PUBLIC_METHODS);
+			reflection.registerType(EmbeddedTableAnnotation.class, MemberCategory.INVOKE_DECLARED_CONSTRUCTORS,
+					MemberCategory.INVOKE_PUBLIC_METHODS);
+		}
+
+	}
+
 }

module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/HibernateJpaAutoConfigurationTests.java

@@ -71,6 +71,7 @@ import org.springframework.boot.flyway.autoconfigure.FlywayAutoConfiguration;
 import org.springframework.boot.hibernate.SpringImplicitNamingStrategy;
 import org.springframework.boot.hibernate.SpringJtaPlatform;
 import org.springframework.boot.hibernate.autoconfigure.HibernateJpaAutoConfigurationTests.JpaUsingApplicationListenerConfiguration.EventCapturingApplicationListener;
+import org.springframework.boot.hibernate.autoconfigure.HibernateJpaConfiguration.Hibernate72RuntimeHints;
 import org.springframework.boot.hibernate.autoconfigure.HibernateJpaConfiguration.HibernateRuntimeHints;
 import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
@@ -876,6 +877,24 @@ class HibernateJpaAutoConfigurationTests {
 		}
 	}
 
+	@Test
+	void registersHintsForHibernate72() {
+		RuntimeHints hints = new RuntimeHints();
+		new Hibernate72RuntimeHints().registerHints(hints, getClass().getClassLoader());
+		assertThat(RuntimeHintsPredicates.reflection()
+			.onType(TypeReference.of("org.hibernate.action.internal.ActionLogging_$logger"))
+			.withMemberCategories(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.INVOKE_PUBLIC_METHODS))
+			.accepts(hints);
+		assertThat(RuntimeHintsPredicates.reflection()
+			.onType(TypeReference.of("org.hibernate.event.spi.PreFlushEventListener"))
+			.withMemberCategories(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.INVOKE_PUBLIC_METHODS))
+			.accepts(hints);
+		assertThat(RuntimeHintsPredicates.reflection()
+			.onType(TypeReference.of("org.hibernate.boot.models.annotations.internal.EmbeddedTableAnnotation"))
+			.withMemberCategories(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.INVOKE_PUBLIC_METHODS))
+			.accepts(hints);
+	}
+
 	@Test
 	@Disabled("gh-40177")
 	void whenSpringJpaGenerateDdlIsNotSetThenTableIsNotCreated() {