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

Merge branch '2.0.x'

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
Show Stats 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();

3
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/orm/jpa/EntityManagerFactoryBuilder.java
View File

@ -111,6 +111,7 @@ public class EntityManagerFactoryBuilder {
* An optional callback for new entity manager factory beans.
* @param callback the entity manager factory bean callback
*/
@Deprecated
public void setCallback(EntityManagerFactoryBeanCallback callback) {
this.callback = callback;
}
@ -213,6 +214,7 @@ public class EntityManagerFactoryBuilder {
return this;
}
@SuppressWarnings("deprecation")
public LocalContainerEntityManagerFactoryBean build() {
LocalContainerEntityManagerFactoryBean entityManagerFactoryBean = new LocalContainerEntityManagerFactoryBean();
if (EntityManagerFactoryBuilder.this.persistenceUnitManager != null) {
@ -260,6 +262,7 @@ public class EntityManagerFactoryBuilder {
* A callback for new entity manager factory beans created by a Builder.
*/
@FunctionalInterface
@Deprecated
public interface EntityManagerFactoryBeanCallback {
void execute(LocalContainerEntityManagerFactoryBean factory);