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
ec731442
Commit
ec731442
authored
Nov 28, 2016
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix warnings
parent
5ed00b35
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
1 deletion
+17
-1
pom.xml
spring-boot-autoconfigure/pom.xml
+0
-1
DataSourceAutoConfiguration.java
.../boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
+1
-0
DataSourceConfiguration.java
...work/boot/autoconfigure/jdbc/DataSourceConfiguration.java
+16
-0
No files found.
spring-boot-autoconfigure/pom.xml
View file @
ec731442
...
@@ -613,7 +613,6 @@
...
@@ -613,7 +613,6 @@
<dependency>
<dependency>
<groupId>
org.springframework.kafka
</groupId>
<groupId>
org.springframework.kafka
</groupId>
<artifactId>
spring-kafka-test
</artifactId>
<artifactId>
spring-kafka-test
</artifactId>
<version>
${spring-kafka.version}
</version>
<scope>
test
</scope>
<scope>
test
</scope>
<exclusions>
<exclusions>
<exclusion>
<exclusion>
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
View file @
ec731442
...
@@ -103,6 +103,7 @@ public class DataSourceAutoConfiguration {
...
@@ -103,6 +103,7 @@ public class DataSourceAutoConfiguration {
@Import
({
DataSourceConfiguration
.
Tomcat
.
class
,
DataSourceConfiguration
.
Hikari
.
class
,
@Import
({
DataSourceConfiguration
.
Tomcat
.
class
,
DataSourceConfiguration
.
Hikari
.
class
,
DataSourceConfiguration
.
Dbcp
.
class
,
DataSourceConfiguration
.
Dbcp2
.
class
,
DataSourceConfiguration
.
Dbcp
.
class
,
DataSourceConfiguration
.
Dbcp2
.
class
,
DataSourceConfiguration
.
Generic
.
class
})
DataSourceConfiguration
.
Generic
.
class
})
@SuppressWarnings
(
"deprecation"
)
protected
static
class
PooledDataSourceConfiguration
{
protected
static
class
PooledDataSourceConfiguration
{
}
}
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java
View file @
ec731442
...
@@ -42,6 +42,9 @@ abstract class DataSourceConfiguration {
...
@@ -42,6 +42,9 @@ abstract class DataSourceConfiguration {
return
(
T
)
properties
.
initializeDataSourceBuilder
().
type
(
type
).
build
();
return
(
T
)
properties
.
initializeDataSourceBuilder
().
type
(
type
).
build
();
}
}
/**
* Tomcat Pool DataSource configuration.
*/
@ConditionalOnClass
(
org
.
apache
.
tomcat
.
jdbc
.
pool
.
DataSource
.
class
)
@ConditionalOnClass
(
org
.
apache
.
tomcat
.
jdbc
.
pool
.
DataSource
.
class
)
@ConditionalOnProperty
(
name
=
"spring.datasource.type"
,
havingValue
=
"org.apache.tomcat.jdbc.pool.DataSource"
,
matchIfMissing
=
true
)
@ConditionalOnProperty
(
name
=
"spring.datasource.type"
,
havingValue
=
"org.apache.tomcat.jdbc.pool.DataSource"
,
matchIfMissing
=
true
)
static
class
Tomcat
extends
DataSourceConfiguration
{
static
class
Tomcat
extends
DataSourceConfiguration
{
...
@@ -64,6 +67,9 @@ abstract class DataSourceConfiguration {
...
@@ -64,6 +67,9 @@ abstract class DataSourceConfiguration {
}
}
/**
* Hikari DataSource configuration.
*/
@ConditionalOnClass
(
HikariDataSource
.
class
)
@ConditionalOnClass
(
HikariDataSource
.
class
)
@ConditionalOnProperty
(
name
=
"spring.datasource.type"
,
havingValue
=
"com.zaxxer.hikari.HikariDataSource"
,
matchIfMissing
=
true
)
@ConditionalOnProperty
(
name
=
"spring.datasource.type"
,
havingValue
=
"com.zaxxer.hikari.HikariDataSource"
,
matchIfMissing
=
true
)
static
class
Hikari
extends
DataSourceConfiguration
{
static
class
Hikari
extends
DataSourceConfiguration
{
...
@@ -75,6 +81,10 @@ abstract class DataSourceConfiguration {
...
@@ -75,6 +81,10 @@ abstract class DataSourceConfiguration {
}
}
}
}
/**
* DBCP DataSource configuration.
* @deprecated as of Spring Boot 1.5 in favor of DBCP2
*/
@ConditionalOnClass
(
org
.
apache
.
commons
.
dbcp
.
BasicDataSource
.
class
)
@ConditionalOnClass
(
org
.
apache
.
commons
.
dbcp
.
BasicDataSource
.
class
)
@ConditionalOnProperty
(
name
=
"spring.datasource.type"
,
havingValue
=
"org.apache.commons.dbcp.BasicDataSource"
,
matchIfMissing
=
true
)
@ConditionalOnProperty
(
name
=
"spring.datasource.type"
,
havingValue
=
"org.apache.commons.dbcp.BasicDataSource"
,
matchIfMissing
=
true
)
@Deprecated
@Deprecated
...
@@ -97,6 +107,9 @@ abstract class DataSourceConfiguration {
...
@@ -97,6 +107,9 @@ abstract class DataSourceConfiguration {
}
}
}
}
/**
* DBCP DataSource configuration.
*/
@ConditionalOnClass
(
org
.
apache
.
commons
.
dbcp2
.
BasicDataSource
.
class
)
@ConditionalOnClass
(
org
.
apache
.
commons
.
dbcp2
.
BasicDataSource
.
class
)
@ConditionalOnProperty
(
name
=
"spring.datasource.type"
,
havingValue
=
"org.apache.commons.dbcp2.BasicDataSource"
,
matchIfMissing
=
true
)
@ConditionalOnProperty
(
name
=
"spring.datasource.type"
,
havingValue
=
"org.apache.commons.dbcp2.BasicDataSource"
,
matchIfMissing
=
true
)
static
class
Dbcp2
extends
DataSourceConfiguration
{
static
class
Dbcp2
extends
DataSourceConfiguration
{
...
@@ -110,6 +123,9 @@ abstract class DataSourceConfiguration {
...
@@ -110,6 +123,9 @@ abstract class DataSourceConfiguration {
}
}
}
}
/**
* Generic DataSource configuration.
*/
@ConditionalOnMissingBean
(
DataSource
.
class
)
@ConditionalOnMissingBean
(
DataSource
.
class
)
@ConditionalOnProperty
(
name
=
"spring.datasource.type"
)
@ConditionalOnProperty
(
name
=
"spring.datasource.type"
)
static
class
Generic
{
static
class
Generic
{
...
...
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