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

Disable Hibernate entity scanning for default JPA setup 

See gh-15565
This commit is contained in:
ayudovin 2018-12-25 16:46:27 +03:00 committed by Stephane Nicoll
parent 33547569db
commit 510a8e2ec1
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateProperties.java
View File

@ -34,6 +34,7 @@ import org.springframework.util.StringUtils;
* Configuration properties for Hibernate. * Configuration properties for Hibernate.
* *
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Artsiom Yudovin
* @since 2.1.0 * @since 2.1.0
* @see JpaProperties * @see JpaProperties
*/ */
@ -95,6 +96,7 @@ public class HibernateProperties {
HibernateSettings settings) { HibernateSettings settings) {
Map<String, Object> result = new HashMap<>(existing); Map<String, Object> result = new HashMap<>(existing);
applyNewIdGeneratorMappings(result); applyNewIdGeneratorMappings(result);
applyArchiveScanner(result);
getNaming().applyNamingStrategies(result); getNaming().applyNamingStrategies(result);
String ddlAuto = determineDdlAuto(existing, settings::getDdlAuto); String ddlAuto = determineDdlAuto(existing, settings::getDdlAuto);
if (StringUtils.hasText(ddlAuto) && !"none".equals(ddlAuto)) { if (StringUtils.hasText(ddlAuto) && !"none".equals(ddlAuto)) {
@ -121,6 +123,13 @@ public class HibernateProperties {
} }
} }
private void applyArchiveScanner(Map<String, Object> result) {
if (!result.containsKey(AvailableSettings.SCANNER)) {
result.put(AvailableSettings.SCANNER,
"org.hibernate.boot.archive.scan.internal.DisabledScanner");
}
}
private String determineDdlAuto(Map<String, String> existing, private String determineDdlAuto(Map<String, String> existing,
Supplier<String> defaultDdlAuto) { Supplier<String> defaultDdlAuto) {
String ddlAuto = existing.get(AvailableSettings.HBM2DDL_AUTO); String ddlAuto = existing.get(AvailableSettings.HBM2DDL_AUTO);

18
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernatePropertiesTests.java
View File

@ -43,6 +43,7 @@ import static org.mockito.Mockito.verify;
* Tests for {@link HibernateProperties}. * Tests for {@link HibernateProperties}.
* *
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Artsiom Yudovin
*/ */
public class HibernatePropertiesTests { public class HibernatePropertiesTests {
@ -123,6 +124,23 @@ public class HibernatePropertiesTests {
"false"))); "false")));
} }
@Test
public void useArchiveScanner() {
this.contextRunner.withPropertyValues(
"spring.jpa.properties.hibernate.archive.scanner:org.hibernate.boot.archive.scan.internal.StandardScanner")
.run(assertHibernateProperties((hibernateProperties) -> assertThat(
hibernateProperties).containsEntry(AvailableSettings.SCANNER,
"org.hibernate.boot.archive.scan.internal.StandardScanner")));
}
@Test
public void defaultArchiveScanner() {
this.contextRunner.run(assertHibernateProperties(
(hibernateProperties) -> assertThat(hibernateProperties).containsEntry(
AvailableSettings.SCANNER,
"org.hibernate.boot.archive.scan.internal.DisabledScanner")));
}
@Test @Test
public void defaultDdlAutoIsNotInvokedIfPropertyIsSet() { public void defaultDdlAutoIsNotInvokedIfPropertyIsSet() {
this.contextRunner.withPropertyValues("spring.jpa.hibernate.ddl-auto=validate") this.contextRunner.withPropertyValues("spring.jpa.hibernate.ddl-auto=validate")