Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
b465d9d8
Commit
b465d9d8
authored
Jun 26, 2017
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove dead code
parent
1b62f664
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
28 deletions
+0
-28
DataSourceAutoConfiguration.java
.../boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
+0
-27
DataSourceInitializer.java
...mework/boot/autoconfigure/jdbc/DataSourceInitializer.java
+0
-1
No files found.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
View file @
b465d9d8
...
@@ -19,13 +19,7 @@ package org.springframework.boot.autoconfigure.jdbc;
...
@@ -19,13 +19,7 @@ package org.springframework.boot.autoconfigure.jdbc;
import
javax.sql.DataSource
;
import
javax.sql.DataSource
;
import
javax.sql.XADataSource
;
import
javax.sql.XADataSource
;
import
org.apache.commons.logging.Log
;
import
org.apache.commons.logging.LogFactory
;
import
org.springframework.beans.factory.BeanFactoryUtils
;
import
org.springframework.beans.factory.BeanFactoryUtils
;
import
org.springframework.beans.factory.NoSuchBeanDefinitionException
;
import
org.springframework.beans.factory.config.BeanDefinition
;
import
org.springframework.beans.factory.config.ConfigurableListableBeanFactory
;
import
org.springframework.boot.autoconfigure.EnableAutoConfiguration
;
import
org.springframework.boot.autoconfigure.EnableAutoConfiguration
;
import
org.springframework.boot.autoconfigure.condition.AnyNestedCondition
;
import
org.springframework.boot.autoconfigure.condition.AnyNestedCondition
;
import
org.springframework.boot.autoconfigure.condition.ConditionMessage
;
import
org.springframework.boot.autoconfigure.condition.ConditionMessage
;
...
@@ -63,9 +57,6 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
...
@@ -63,9 +57,6 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
@Import
({
Registrar
.
class
,
DataSourcePoolMetadataProvidersConfiguration
.
class
})
@Import
({
Registrar
.
class
,
DataSourcePoolMetadataProvidersConfiguration
.
class
})
public
class
DataSourceAutoConfiguration
{
public
class
DataSourceAutoConfiguration
{
private
static
final
Log
logger
=
LogFactory
.
getLog
(
DataSourceAutoConfiguration
.
class
);
@Bean
@Bean
@ConditionalOnMissingBean
@ConditionalOnMissingBean
public
DataSourceInitializer
dataSourceInitializer
(
DataSourceProperties
properties
,
public
DataSourceInitializer
dataSourceInitializer
(
DataSourceProperties
properties
,
...
@@ -73,24 +64,6 @@ public class DataSourceAutoConfiguration {
...
@@ -73,24 +64,6 @@ public class DataSourceAutoConfiguration {
return
new
DataSourceInitializer
(
properties
,
applicationContext
);
return
new
DataSourceInitializer
(
properties
,
applicationContext
);
}
}
/**
* Determines if the {@code dataSource} being used by Spring was created from
* {@link EmbeddedDataSourceConfiguration}.
* @param beanFactory the bean factory
* @return true if the data source was auto-configured.
*/
public
static
boolean
containsAutoConfiguredDataSource
(
ConfigurableListableBeanFactory
beanFactory
)
{
try
{
BeanDefinition
beanDefinition
=
beanFactory
.
getBeanDefinition
(
"dataSource"
);
return
EmbeddedDataSourceConfiguration
.
class
.
getName
()
.
equals
(
beanDefinition
.
getFactoryBeanName
());
}
catch
(
NoSuchBeanDefinitionException
ex
)
{
return
false
;
}
}
@Configuration
@Configuration
@Conditional
(
EmbeddedDatabaseCondition
.
class
)
@Conditional
(
EmbeddedDatabaseCondition
.
class
)
@ConditionalOnMissingBean
({
DataSource
.
class
,
XADataSource
.
class
})
@ConditionalOnMissingBean
({
DataSource
.
class
,
XADataSource
.
class
})
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java
View file @
b465d9d8
...
@@ -45,7 +45,6 @@ import org.springframework.util.StringUtils;
...
@@ -45,7 +45,6 @@ import org.springframework.util.StringUtils;
* @author Eddú Meléndez
* @author Eddú Meléndez
* @author Stephane Nicoll
* @author Stephane Nicoll
* @author Kazuki Shimizu
* @author Kazuki Shimizu
* @since 1.1.0
* @see DataSourceAutoConfiguration
* @see DataSourceAutoConfiguration
*/
*/
class
DataSourceInitializer
implements
ApplicationListener
<
DataSourceInitializedEvent
>
{
class
DataSourceInitializer
implements
ApplicationListener
<
DataSourceInitializedEvent
>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment