Skip to content

Commit b465d9d

Browse files
committed
Remove dead code
1 parent 1b62f66 commit b465d9d

File tree

2 files changed

+0
-28
lines changed

2 files changed

+0
-28
lines changed

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,7 @@
1919
import javax.sql.DataSource;
2020
import javax.sql.XADataSource;
2121

22-
import org.apache.commons.logging.Log;
23-
import org.apache.commons.logging.LogFactory;
24-
2522
import org.springframework.beans.factory.BeanFactoryUtils;
26-
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
27-
import org.springframework.beans.factory.config.BeanDefinition;
28-
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
2923
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
3024
import org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
3125
import org.springframework.boot.autoconfigure.condition.ConditionMessage;
@@ -63,34 +57,13 @@
6357
@Import({ Registrar.class, DataSourcePoolMetadataProvidersConfiguration.class })
6458
public class DataSourceAutoConfiguration {
6559

66-
private static final Log logger = LogFactory
67-
.getLog(DataSourceAutoConfiguration.class);
68-
6960
@Bean
7061
@ConditionalOnMissingBean
7162
public DataSourceInitializer dataSourceInitializer(DataSourceProperties properties,
7263
ApplicationContext applicationContext) {
7364
return new DataSourceInitializer(properties, applicationContext);
7465
}
7566

76-
/**
77-
* Determines if the {@code dataSource} being used by Spring was created from
78-
* {@link EmbeddedDataSourceConfiguration}.
79-
* @param beanFactory the bean factory
80-
* @return true if the data source was auto-configured.
81-
*/
82-
public static boolean containsAutoConfiguredDataSource(
83-
ConfigurableListableBeanFactory beanFactory) {
84-
try {
85-
BeanDefinition beanDefinition = beanFactory.getBeanDefinition("dataSource");
86-
return EmbeddedDataSourceConfiguration.class.getName()
87-
.equals(beanDefinition.getFactoryBeanName());
88-
}
89-
catch (NoSuchBeanDefinitionException ex) {
90-
return false;
91-
}
92-
}
93-
9467
@Configuration
9568
@Conditional(EmbeddedDatabaseCondition.class)
9669
@ConditionalOnMissingBean({ DataSource.class, XADataSource.class })

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
* @author Eddú Meléndez
4646
* @author Stephane Nicoll
4747
* @author Kazuki Shimizu
48-
* @since 1.1.0
4948
* @see DataSourceAutoConfiguration
5049
*/
5150
class DataSourceInitializer implements ApplicationListener<DataSourceInitializedEvent> {

0 commit comments

Comments
 (0)