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
b4abccc0
Commit
b4abccc0
authored
Aug 13, 2018
by
Johnny Lim
Committed by
Stephane Nicoll
Aug 15, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
See gh-14049
parent
895d0926
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
8 deletions
+4
-8
LiquibaseEndpointTests.java
...mework/boot/actuate/liquibase/LiquibaseEndpointTests.java
+0
-1
ConfigFileApplicationListener.java
...rk/boot/context/config/ConfigFileApplicationListener.java
+3
-6
MapBinderTests.java
...ramework/boot/context/properties/bind/MapBinderTests.java
+1
-1
No files found.
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/liquibase/LiquibaseEndpointTests.java
View file @
b4abccc0
...
@@ -79,7 +79,6 @@ public class LiquibaseEndpointTests {
...
@@ -79,7 +79,6 @@ public class LiquibaseEndpointTests {
private
boolean
getAutoCommit
(
DataSource
dataSource
)
throws
SQLException
{
private
boolean
getAutoCommit
(
DataSource
dataSource
)
throws
SQLException
{
try
(
Connection
connection
=
dataSource
.
getConnection
())
{
try
(
Connection
connection
=
dataSource
.
getConnection
())
{
System
.
out
.
println
(
connection
);
return
connection
.
getAutoCommit
();
return
connection
.
getAutoCommit
();
}
}
}
}
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
View file @
b4abccc0
...
@@ -685,12 +685,9 @@ public class ConfigFileApplicationListener
...
@@ -685,12 +685,9 @@ public class ConfigFileApplicationListener
* @param processedProfiles the processed profiles
* @param processedProfiles the processed profiles
*/
*/
private
void
resetEnvironmentProfiles
(
List
<
Profile
>
processedProfiles
)
{
private
void
resetEnvironmentProfiles
(
List
<
Profile
>
processedProfiles
)
{
String
[]
names
=
processedProfiles
.
stream
().
filter
((
profile
)
->
{
String
[]
names
=
processedProfiles
.
stream
()
if
(
profile
!=
null
&&
!
profile
.
isDefaultProfile
())
{
.
filter
((
profile
)
->
profile
!=
null
&&
!
profile
.
isDefaultProfile
())
return
true
;
.
map
(
Profile:
:
getName
).
toArray
(
String
[]::
new
);
}
return
false
;
}).
map
(
Profile:
:
getName
).
toArray
(
String
[]::
new
);
this
.
environment
.
setActiveProfiles
(
names
);
this
.
environment
.
setActiveProfiles
(
names
);
}
}
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/MapBinderTests.java
View file @
b4abccc0
...
@@ -616,7 +616,7 @@ public class MapBinderTests {
...
@@ -616,7 +616,7 @@ public class MapBinderTests {
}
}
@Test
@Test
public
void
bindToImmutableMapShouldReturnPopulated
Collection
()
{
public
void
bindToImmutableMapShouldReturnPopulated
Map
()
{
MockConfigurationPropertySource
source
=
new
MockConfigurationPropertySource
();
MockConfigurationPropertySource
source
=
new
MockConfigurationPropertySource
();
source
.
put
(
"foo.values.c"
,
"d"
);
source
.
put
(
"foo.values.c"
,
"d"
);
source
.
put
(
"foo.values.e"
,
"f"
);
source
.
put
(
"foo.values.e"
,
"f"
);
...
...
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