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
ed6f11d6
Commit
ed6f11d6
authored
Jun 10, 2016
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
parent
ec4c8bf5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
5 deletions
+2
-5
DataSourceBuilder.java
...gframework/boot/autoconfigure/jdbc/DataSourceBuilder.java
+2
-4
AbstractDevToolsDataSourceAutoConfigurationTests.java
...ure/AbstractDevToolsDataSourceAutoConfigurationTests.java
+0
-1
No files found.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBuilder.java
View file @
ed6f11d6
...
...
@@ -83,10 +83,8 @@ public class DataSourceBuilder {
private
void
bind
(
DataSource
result
)
{
MutablePropertyValues
properties
=
new
MutablePropertyValues
(
this
.
properties
);
new
RelaxedDataBinder
(
result
)
.
withAlias
(
"url"
,
"jdbcUrl"
)
.
withAlias
(
"username"
,
"user"
)
.
bind
(
properties
);
new
RelaxedDataBinder
(
result
).
withAlias
(
"url"
,
"jdbcUrl"
)
.
withAlias
(
"username"
,
"user"
).
bind
(
properties
);
}
public
DataSourceBuilder
type
(
Class
<?
extends
DataSource
>
type
)
{
...
...
spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/AbstractDevToolsDataSourceAutoConfigurationTests.java
View file @
ed6f11d6
...
...
@@ -76,7 +76,6 @@ public class AbstractDevToolsDataSourceAutoConfigurationTests {
@Test
public
void
emptyFactoryMethodMetadataIgnored
()
{
AnnotationConfigApplicationContext
context
=
new
AnnotationConfigApplicationContext
();
DataSource
dataSource
=
mock
(
DataSource
.
class
);
AnnotatedGenericBeanDefinition
beanDefinition
=
new
AnnotatedGenericBeanDefinition
(
dataSource
.
getClass
());
...
...
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