Skip to content

Disable Hibernate entity scanning for default JPA setup #15565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Disable Hibernate entity scanning for default JPA setup #15565

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
075906d
adding property for disable entity scanning
ayudovin Dec 25, 2018
46c9a7b
updating by comments
ayudovin Dec 26, 2018
6e326f9
updating by comments
ayudovin Dec 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions ...ure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
* Configuration properties for Hibernate.
*
* @author Stephane Nicoll
* @author Artsiom Yudovin
* @since 2.1.0
* @see JpaProperties
*/
Expand All @@ -56,6 +57,13 @@ public class HibernateProperties {
*/
private Boolean useNewIdGeneratorMappings;

/**
* Archive Scanner. This is actually a shortcut for the "hibernate.archive.scanner"
* property. When not specified will default to
* "org.hibernate.boot.archive.scan.internal.DisabledScanner".
*/
private String archiveScanner = "org.hibernate.boot.archive.scan.internal.DisabledScanner";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the update but that's not what I meant. There shouldn't be any property at all.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

property was removed


public String getDdlAuto() {
return this.ddlAuto;
}
Expand All @@ -72,6 +80,14 @@ public void setUseNewIdGeneratorMappings(Boolean useNewIdGeneratorMappings) {
this.useNewIdGeneratorMappings = useNewIdGeneratorMappings;
}

public String getArchiveScanner() {
return this.archiveScanner;
}

public void setArchiveScanner(String archiveScanner) {
this.archiveScanner = archiveScanner;
}

public Naming getNaming() {
return this.naming;
}
Expand All @@ -95,6 +111,7 @@ private Map<String, Object> getAdditionalProperties(Map<String, String> existing
HibernateSettings settings) {
Map<String, Object> result = new HashMap<>(existing);
applyNewIdGeneratorMappings(result);
applyArchiveScanner(result);
getNaming().applyNamingStrategies(result);
String ddlAuto = determineDdlAuto(existing, settings::getDdlAuto);
if (StringUtils.hasText(ddlAuto) && !"none".equals(ddlAuto)) {
Expand All @@ -121,6 +138,10 @@ else if (!result.containsKey(AvailableSettings.USE_NEW_ID_GENERATOR_MAPPINGS)) {
}
}

private void applyArchiveScanner(Map<String, Object> result) {
result.put(AvailableSettings.SCANNER, this.archiveScanner);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's not checking if a user has set the property

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added checking

}

private String determineDdlAuto(Map<String, String> existing,
Supplier<String> defaultDdlAuto) {
String ddlAuto = existing.get(AvailableSettings.HBM2DDL_AUTO);
Expand Down
18 changes: 18 additions & 0 deletions ...rc/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernatePropertiesTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
* Tests for {@link HibernateProperties}.
*
* @author Stephane Nicoll
* @author Artsiom Yudovin
*/
public class HibernatePropertiesTests {

Expand Down Expand Up @@ -123,6 +124,23 @@ public void useNewIdGeneratorMappingsFalse() {
"false")));
}

@Test
public void useArchiveScanner() {
this.contextRunner.withPropertyValues(
"spring.jpa.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
public void defaultDdlAutoIsNotInvokedIfPropertyIsSet() {
this.contextRunner.withPropertyValues("spring.jpa.hibernate.ddl-auto=validate")
Expand Down