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

Fix merge commit

This commit is contained in:
Stephane Nicoll 2018-08-20 15:04:08 +02:00
parent d9a42a5165
commit c00dbc6c2f
1 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,8 +58,6 @@ public class EntityManagerFactoryBuilder {
private AsyncTaskExecutor bootstrapExecutor;
private EntityManagerFactoryBeanCallback callback;
/**
* Create a new instance passing in the common pieces that will be shared if multiple
* EntityManagerFactory instances are created.
@ -107,15 +105,6 @@ public class EntityManagerFactoryBuilder {
this.bootstrapExecutor = bootstrapExecutor;
}
/**
* 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;
}
/**
* A fluent builder for a LocalContainerEntityManagerFactoryBean.
*/
@ -214,7 +203,6 @@ public class EntityManagerFactoryBuilder {
return this;
}
@SuppressWarnings("deprecation")
public LocalContainerEntityManagerFactoryBean build() {
LocalContainerEntityManagerFactoryBean entityManagerFactoryBean = new LocalContainerEntityManagerFactoryBean();
if (EntityManagerFactoryBuilder.this.persistenceUnitManager != null) {
@ -249,24 +237,9 @@ public class EntityManagerFactoryBuilder {
entityManagerFactoryBean.setBootstrapExecutor(
EntityManagerFactoryBuilder.this.bootstrapExecutor);
}
if (EntityManagerFactoryBuilder.this.callback != null) {
EntityManagerFactoryBuilder.this.callback
.execute(entityManagerFactoryBean);
}
return entityManagerFactoryBean;
}
}
/**
* A callback for new entity manager factory beans created by a Builder.
*/
@FunctionalInterface
@Deprecated
public interface EntityManagerFactoryBeanCallback {
void execute(LocalContainerEntityManagerFactoryBean factory);
}
}