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
21f2b95a
Commit
21f2b95a
authored
Oct 20, 2020
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #23762 from izeye
* pr/23762: Polish assertions Polish Closes gh-23762
parents
0aa0cba3
72eaf93d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
DataSourcePropertiesTests.java
...rk/boot/autoconfigure/jdbc/DataSourcePropertiesTests.java
+2
-2
EmbeddedDatabaseConnection.java
...springframework/boot/jdbc/EmbeddedDatabaseConnection.java
+3
-2
No files found.
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourcePropertiesTests.java
View file @
21f2b95a
...
@@ -103,7 +103,7 @@ class DataSourcePropertiesTests {
...
@@ -103,7 +103,7 @@ class DataSourcePropertiesTests {
DataSourceProperties
properties
=
new
DataSourceProperties
();
DataSourceProperties
properties
=
new
DataSourceProperties
();
properties
.
setUsername
(
""
);
properties
.
setUsername
(
""
);
properties
.
afterPropertiesSet
();
properties
.
afterPropertiesSet
();
assertThat
(
properties
.
getUsername
());
assertThat
(
properties
.
getUsername
())
.
isEqualTo
(
""
)
;
assertThat
(
properties
.
determineUsername
()).
isEqualTo
(
"sa"
);
assertThat
(
properties
.
determineUsername
()).
isEqualTo
(
"sa"
);
}
}
...
@@ -112,7 +112,7 @@ class DataSourcePropertiesTests {
...
@@ -112,7 +112,7 @@ class DataSourcePropertiesTests {
DataSourceProperties
properties
=
new
DataSourceProperties
();
DataSourceProperties
properties
=
new
DataSourceProperties
();
properties
.
setUsername
(
null
);
properties
.
setUsername
(
null
);
properties
.
afterPropertiesSet
();
properties
.
afterPropertiesSet
();
assertThat
(
properties
.
getUsername
());
assertThat
(
properties
.
getUsername
())
.
isNull
()
;
assertThat
(
properties
.
determineUsername
()).
isEqualTo
(
"sa"
);
assertThat
(
properties
.
determineUsername
()).
isEqualTo
(
"sa"
);
}
}
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/EmbeddedDatabaseConnection.java
View file @
21f2b95a
...
@@ -140,7 +140,7 @@ public enum EmbeddedDatabaseConnection {
...
@@ -140,7 +140,7 @@ public enum EmbeddedDatabaseConnection {
* database type.
* database type.
* @param driverClass the driver class
* @param driverClass the driver class
* @return true if the driver class is one of the embedded types
* @return true if the driver class is one of the embedded types
* @deprecated since 2.
3.5
in favor of {@link #isEmbedded(String, String)}
* @deprecated since 2.
4.0
in favor of {@link #isEmbedded(String, String)}
*/
*/
@Deprecated
@Deprecated
public
static
boolean
isEmbedded
(
String
driverClass
)
{
public
static
boolean
isEmbedded
(
String
driverClass
)
{
...
@@ -151,8 +151,9 @@ public enum EmbeddedDatabaseConnection {
...
@@ -151,8 +151,9 @@ public enum EmbeddedDatabaseConnection {
* Convenience method to determine if a given driver class name and url represent an
* Convenience method to determine if a given driver class name and url represent an
* embedded database type.
* embedded database type.
* @param driverClass the driver class
* @param driverClass the driver class
* @param url the jdbc url (can be {@code null
)}
* @param url the jdbc url (can be {@code null
})
* @return true if the driver class and url refer to an embedded database
* @return true if the driver class and url refer to an embedded database
* @since 2.4.0
*/
*/
public
static
boolean
isEmbedded
(
String
driverClass
,
String
url
)
{
public
static
boolean
isEmbedded
(
String
driverClass
,
String
url
)
{
if
(
driverClass
==
null
)
{
if
(
driverClass
==
null
)
{
...
...
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