root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14049 from izeye:polish-20180813 

* pr/14049:
  Polish
This commit is contained in:
Stephane Nicoll 2018-08-15 10:43:18 +03:00
parent 895d092640 b4abccc07c
commit df779b4eeb
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/liquibase/LiquibaseEndpointTests.java
View File

@ -79,7 +79,6 @@ public class LiquibaseEndpointTests {
private boolean getAutoCommit(DataSource dataSource) throws SQLException {
try (Connection connection = dataSource.getConnection()) {
System.out.println(connection);
return connection.getAutoCommit();
}
}

9
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
View File

@ -685,12 +685,9 @@ public class ConfigFileApplicationListener
* @param processedProfiles the processed profiles
*/
private void resetEnvironmentProfiles(List<Profile> processedProfiles) {
String[] names = processedProfiles.stream().filter((profile) -> {
if (profile != null && !profile.isDefaultProfile()) {
return true;
}
return false;
}).map(Profile::getName).toArray(String[]::new);
String[] names = processedProfiles.stream()
.filter((profile) -> profile != null && !profile.isDefaultProfile())
.map(Profile::getName).toArray(String[]::new);
this.environment.setActiveProfiles(names);
}

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/MapBinderTests.java
View File

@ -616,7 +616,7 @@ public class MapBinderTests {
}
@Test
public void bindToImmutableMapShouldReturnPopulatedCollection() {
public void bindToImmutableMapShouldReturnPopulatedMap() {
MockConfigurationPropertySource source = new MockConfigurationPropertySource();
source.put("foo.values.c", "d");
source.put("foo.values.e", "f");