Skip to content

Commit dbf6d3d

Browse files
committed
Don't detect persistenceUnitRootLocation
Update JpaBaseConfiguration so that the persistenceUnitRootLocation is no longer detected. The update to gh-7003 means that we can now rely on the standard detection mechanism. Fixes gh-6983 See gh-6635
1 parent 60355e0 commit dbf6d3d

File tree

1 file changed

+1
-22
lines changed

1 file changed

+1
-22
lines changed

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,12 @@
1616

1717
package org.springframework.boot.autoconfigure.orm.jpa;
1818

19-
import java.net.URL;
2019
import java.util.List;
2120
import java.util.Map;
2221

2322
import javax.persistence.EntityManagerFactory;
2423
import javax.sql.DataSource;
2524

26-
import org.apache.commons.logging.Log;
27-
import org.apache.commons.logging.LogFactory;
28-
2925
import org.springframework.beans.BeansException;
3026
import org.springframework.beans.factory.BeanFactory;
3127
import org.springframework.beans.factory.BeanFactoryAware;
@@ -53,7 +49,6 @@
5349
import org.springframework.orm.jpa.vendor.AbstractJpaVendorAdapter;
5450
import org.springframework.transaction.PlatformTransactionManager;
5551
import org.springframework.transaction.jta.JtaTransactionManager;
56-
import org.springframework.util.ResourceUtils;
5752
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
5853
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
5954

@@ -69,8 +64,6 @@
6964
@Import(DataSourceInitializedPublisher.Registrar.class)
7065
public abstract class JpaBaseConfiguration implements BeanFactoryAware {
7166

72-
private static final Log logger = LogFactory.getLog(JpaBaseConfiguration.class);
73-
7467
private final DataSource dataSource;
7568

7669
private final JpaProperties properties;
@@ -110,8 +103,7 @@ public EntityManagerFactoryBuilder entityManagerFactoryBuilder(
110103
ObjectProvider<PersistenceUnitManager> persistenceUnitManagerProvider) {
111104
EntityManagerFactoryBuilder builder = new EntityManagerFactoryBuilder(
112105
jpaVendorAdapter, this.properties.getProperties(),
113-
persistenceUnitManagerProvider.getIfAvailable(),
114-
determinePersistenceUnitRootLocation());
106+
persistenceUnitManagerProvider.getIfAvailable());
115107
builder.setCallback(getVendorCallback());
116108
return builder;
117109
}
@@ -190,19 +182,6 @@ public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
190182
this.beanFactory = (ConfigurableListableBeanFactory) beanFactory;
191183
}
192184

193-
private URL determinePersistenceUnitRootLocation() {
194-
Class<?> source = getClass();
195-
try {
196-
URL url = source.getProtectionDomain().getCodeSource().getLocation();
197-
return ResourceUtils.extractJarFileURL(url);
198-
}
199-
catch (Exception ex) {
200-
logger.info("Could not determine persistence " + "unit root location from "
201-
+ source + " : " + ex);
202-
}
203-
return null;
204-
}
205-
206185
@Configuration
207186
@ConditionalOnWebApplication
208187
@ConditionalOnClass(WebMvcConfigurerAdapter.class)

0 commit comments

Comments
 (0)