root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Add missing EntityManagerFactory hints for SharedEntityManagerCreator 

Closes gh-30523
This commit is contained in:
Sébastien Deleuze 2023-05-23 11:13:57 +02:00
parent e92c9c5619
commit 424daede2f
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerRuntimeHints.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2022 the original author or authors. * Copyright 2002-2023 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -16,14 +16,17 @@
package org.springframework.orm.jpa; package org.springframework.orm.jpa;
import java.util.Collections;
import org.springframework.aot.hint.ExecutableMode;
import org.springframework.aot.hint.RuntimeHints; import org.springframework.aot.hint.RuntimeHints;
import org.springframework.aot.hint.RuntimeHintsRegistrar; import org.springframework.aot.hint.RuntimeHintsRegistrar;
import org.springframework.aot.hint.TypeReference; import org.springframework.aot.hint.TypeReference;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
/** /**
* {@link RuntimeHintsRegistrar} implementation that makes sure JDK proxy hints related to * {@link RuntimeHintsRegistrar} implementation that makes sure that hints related to
* {@link AbstractEntityManagerFactoryBean} are registered. * {@link AbstractEntityManagerFactoryBean} and {@link SharedEntityManagerCreator} are registered.
* *
* @author Sebastien Deleuze * @author Sebastien Deleuze
* @since 6.0 * @since 6.0
@ -32,6 +35,8 @@ class EntityManagerRuntimeHints implements RuntimeHintsRegistrar {
private static final String HIBERNATE_SESSION_FACTORY_CLASS_NAME = "org.hibernate.SessionFactory"; private static final String HIBERNATE_SESSION_FACTORY_CLASS_NAME = "org.hibernate.SessionFactory";
private static final String ENTITY_MANAGER_FACTORY_CLASS_NAME = "jakarta.persistence.EntityManagerFactory";
@Override @Override
public void registerHints(RuntimeHints hints, ClassLoader classLoader) { public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
if (ClassUtils.isPresent(HIBERNATE_SESSION_FACTORY_CLASS_NAME, classLoader)) { if (ClassUtils.isPresent(HIBERNATE_SESSION_FACTORY_CLASS_NAME, classLoader)) {
@ -40,5 +45,13 @@ class EntityManagerRuntimeHints implements RuntimeHintsRegistrar {
hints.proxies().registerJdkProxy(TypeReference.of("org.hibernate.Session"), hints.proxies().registerJdkProxy(TypeReference.of("org.hibernate.Session"),
TypeReference.of(EntityManagerProxy.class)); TypeReference.of(EntityManagerProxy.class));
} }
if (ClassUtils.isPresent(ENTITY_MANAGER_FACTORY_CLASS_NAME, classLoader)) {
hints.reflection().registerType(TypeReference.of(ENTITY_MANAGER_FACTORY_CLASS_NAME), builder -> {
builder.onReachableType(SharedEntityManagerCreator.class).withMethod("getCriteriaBuilder",
Collections.emptyList(), ExecutableMode.INVOKE);
builder.onReachableType(SharedEntityManagerCreator.class).withMethod("getMetamodel",
Collections.emptyList(), ExecutableMode.INVOKE);
});
}
} }
} }

9
spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerRuntimeHintsTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2022 the original author or authors. * Copyright 2002-2023 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -16,6 +16,7 @@
package org.springframework.orm.jpa; package org.springframework.orm.jpa;
import jakarta.persistence.EntityManagerFactory;
import org.hibernate.Session; import org.hibernate.Session;
import org.hibernate.SessionFactory; import org.hibernate.SessionFactory;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
@ -56,4 +57,10 @@ class EntityManagerRuntimeHintsTests {
assertThat(RuntimeHintsPredicates.proxies().forInterfaces(Session.class, EntityManagerProxy.class)) assertThat(RuntimeHintsPredicates.proxies().forInterfaces(Session.class, EntityManagerProxy.class))
.accepts(this.hints); .accepts(this.hints);
} }
@Test
void entityManagerFactoryHasReflectionHints() {
assertThat(RuntimeHintsPredicates.reflection().onMethod(EntityManagerFactory.class, "getCriteriaBuilder")).accepts(this.hints);
assertThat(RuntimeHintsPredicates.reflection().onMethod(EntityManagerFactory.class, "getMetamodel")).accepts(this.hints);
}
} }