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

Merge pull request #15565 from ayudovin 

* pr/15565:
  Polish "Disable Hibernate entity scanning for default JPA setup"
  Disable Hibernate entity scanning for default JPA setup
This commit is contained in:
Stephane Nicoll 2018-12-31 16:52:25 +01:00
parent 33547569db d0811b48df
commit 6ee8cde5b0
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy; import org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy;
import org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy; import org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@ -40,6 +41,8 @@ import org.springframework.util.StringUtils;
@ConfigurationProperties("spring.jpa.hibernate") @ConfigurationProperties("spring.jpa.hibernate")
public class HibernateProperties { public class HibernateProperties {
private static final String DISABLED_SCANNER_CLASS = "org.hibernate.boot.archive.scan.internal.DisabledScanner";
private final Naming naming = new Naming(); private final Naming naming = new Naming();
/** /**
@ -95,6 +98,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);
applyScanner(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 +125,13 @@ public class HibernateProperties {
} }
} }
private void applyScanner(Map<String, Object> result) {
if (!result.containsKey(AvailableSettings.SCANNER)
&& ClassUtils.isPresent(DISABLED_SCANNER_CLASS, null)) {
result.put(AvailableSettings.SCANNER, DISABLED_SCANNER_CLASS);
}
}
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 scannerUsesDisabledScannerByDefault() {
this.contextRunner.run(assertHibernateProperties(
(hibernateProperties) -> assertThat(hibernateProperties).containsEntry(
AvailableSettings.SCANNER,
"org.hibernate.boot.archive.scan.internal.DisabledScanner")));
}
@Test
public void scannerCanBeCustomized() {
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 @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")