Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Include all deprecated properties in migration report

Browse Source 
This commit expands the migration check to all deprecated properties,
not only the ones that have been effectively removed. This provides more
information upfront, including keys that still work in the current
release but will need to be renamed sooner than later anyway.

Closes gh-21425
This commit is contained in:
Stephane Nicoll 2020-05-13 15:56:06 +02:00
parent 786dae5d9a
commit f43419054d
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,7 +25,6 @@ import java.util.stream.Collectors;
import org.springframework.boot.configurationmetadata.ConfigurationMetadataProperty;
import org.springframework.boot.configurationmetadata.ConfigurationMetadataRepository;
import org.springframework.boot.configurationmetadata.Deprecation;
import org.springframework.boot.context.properties.source.ConfigurationProperty;
import org.springframework.boot.context.properties.source.ConfigurationPropertyName;
import org.springframework.boot.context.properties.source.ConfigurationPropertySource;
@ -62,7 +61,8 @@ class PropertiesMigrationReporter {
*/
PropertiesMigrationReport getReport() {
PropertiesMigrationReport report = new PropertiesMigrationReport();
Map<String, List<PropertyMigration>> properties = getMatchingProperties(deprecatedFilter());
Map<String, List<PropertyMigration>> properties = getMatchingProperties(
ConfigurationMetadataProperty::isDeprecated);
if (properties.isEmpty()) {
return report;
}
@ -129,11 +129,6 @@ class PropertiesMigrationReporter {
return null;
}
private Predicate<ConfigurationMetadataProperty> deprecatedFilter() {
return (property) -> property.getDeprecation() != null
&& property.getDeprecation().getLevel() == Deprecation.Level.ERROR;
}
private Map<String, ConfigurationPropertySource> getPropertySourcesAsMap() {
Map<String, ConfigurationPropertySource> map = new LinkedHashMap<>();
for (ConfigurationPropertySource source : ConfigurationPropertySources.get(this.environment)) {

3
spring-boot-project/spring-boot-properties-migrator/src/test/resources/metadata/type-conversion-metadata.json
View File

@ -20,8 +20,7 @@
"name": "test.cache-seconds",
"type": "java.lang.Integer",
"deprecation": {
"replacement": "test.cache",
"level": "error"
"replacement": "test.cache"
}
},
{