Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Phillip Webb
2018-01-26 11:38:04 -08:00
parent 62d9d0fd29
commit b234501af3
38 changed files with 142 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-project/spring-boot-properties-migrator/src/main/java/org/springframework/boot/context/properties/migrator/PropertiesMigrationReporter.java
View File

@@ -70,8 +70,8 @@ class PropertiesMigrationReporter {
return report;
}
properties.forEach((name, candidates) -> {
PropertySource<?> propertySource = mapPropertiesWithReplacement(report,
name, candidates);
PropertySource<?> propertySource = mapPropertiesWithReplacement(report, name,
candidates);
if (propertySource != null) {
this.environment.getPropertySources().addBefore(name, propertySource);
}
@@ -84,8 +84,8 @@ class PropertiesMigrationReporter {
List<PropertyMigration> properties) {
List<PropertyMigration> renamed = new ArrayList<>();
List<PropertyMigration> unsupported = new ArrayList<>();
properties.forEach((property) ->
(isRenamed(property) ? renamed : unsupported).add(property));
properties.forEach((property) -> (isRenamed(property) ? renamed : unsupported)
.add(property));
report.add(name, renamed, unsupported);
if (renamed.isEmpty()) {
return null;
@@ -133,7 +133,7 @@ class PropertiesMigrationReporter {
List<ConfigurationMetadataProperty> candidates = this.allProperties.values()
.stream().filter(filter).collect(Collectors.toList());
getPropertySourcesAsMap().forEach((name, source) -> {
candidates.forEach(metadata -> {
candidates.forEach((metadata) -> {
ConfigurationProperty configurationProperty = source
.getConfigurationProperty(
ConfigurationPropertyName.of(metadata.getId()));