Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2018-08-20 15:03:24 +02:00
parent f804d5ce4c e03f01564a
commit d9a42a5165
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,7 +124,6 @@ public abstract class JpaBaseConfiguration implements BeanFactoryAware {
EntityManagerFactoryBuilder builder = new EntityManagerFactoryBuilder(
jpaVendorAdapter, this.properties.getProperties(),
persistenceUnitManager.getIfAvailable());
builder.setCallback(getVendorCallback());
for (EntityManagerFactoryBuilderCustomizer customizer : customizers
.getIfAvailable(Collections::emptyList)) {
customizer.customize(builder);
@@ -157,10 +156,6 @@ public abstract class JpaBaseConfiguration implements BeanFactoryAware {
protected void customizeVendorProperties(Map<String, Object> vendorProperties) {
}
protected EntityManagerFactoryBuilder.EntityManagerFactoryBeanCallback getVendorCallback() {
return null;
}
protected String[] getPackagesToScan() {
List<String> packages = EntityScanPackages.get(this.beanFactory)
.getPackageNames();