Commit d0f27296 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '2.0.x'

parents e0d67ae7 df779b4e
......@@ -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();
}
}
......
......@@ -681,12 +681,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);
}
......
......@@ -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");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment