mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-15 01:07:30 +08:00
Handle invalid names gracefully in properties migrator
Closes gh-32729
This commit is contained in:
parent
97e6626b34
commit
7c65c3e260
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2020 the original author or authors.
|
||||
* Copyright 2012-2022 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.
|
||||
@ -99,8 +99,10 @@ class PropertiesMigrationReporter {
|
||||
List<ConfigurationMetadataProperty> candidates = this.allProperties.values().stream().filter(filter)
|
||||
.collect(Collectors.toList());
|
||||
getPropertySourcesAsMap().forEach((name, source) -> candidates.forEach((metadata) -> {
|
||||
ConfigurationProperty configurationProperty = source
|
||||
.getConfigurationProperty(ConfigurationPropertyName.of(metadata.getId()));
|
||||
ConfigurationPropertyName metadataName = ConfigurationPropertyName.isValid(metadata.getId())
|
||||
? ConfigurationPropertyName.of(metadata.getId())
|
||||
: ConfigurationPropertyName.adapt(metadata.getId(), '.');
|
||||
ConfigurationProperty configurationProperty = source.getConfigurationProperty(metadataName);
|
||||
if (configurationProperty != null) {
|
||||
result.add(name,
|
||||
new PropertyMigration(configurationProperty, metadata, determineReplacementMetadata(metadata)));
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2019 the original author or authors.
|
||||
* Copyright 2012-2022 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.
|
||||
@ -18,6 +18,7 @@ package org.springframework.boot.context.properties.migrator;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@ -144,6 +145,15 @@ class PropertiesMigrationReporterTests {
|
||||
assertThat(report).doesNotContain("null");
|
||||
}
|
||||
|
||||
@Test
|
||||
void invalidNameHandledGracefully() {
|
||||
this.environment.getPropertySources()
|
||||
.addFirst(new MapPropertySource("first", Collections.singletonMap("invalid.property-name", "value")));
|
||||
String report = createWarningReport(loadRepository("metadata/sample-metadata-invalid-name.json"));
|
||||
assertThat(report).isNotNull();
|
||||
assertThat(report).contains("Key: invalid.PropertyName").contains("Replacement: valid.property-name");
|
||||
}
|
||||
|
||||
private List<String> mapToNames(PropertySources sources) {
|
||||
List<String> names = new ArrayList<>();
|
||||
for (PropertySource<?> source : sources) {
|
||||
|
@ -0,0 +1,16 @@
|
||||
{
|
||||
"properties": [
|
||||
{
|
||||
"name": "invalid.PropertyName",
|
||||
"type": "java.lang.String",
|
||||
"deprecation": {
|
||||
"replacement": "valid.property-name",
|
||||
"level": "error"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "valid.property-name",
|
||||
"type": "java.lang.String"
|
||||
}
|
||||
]
|
||||
}
|
Loading…
Reference in New Issue
Block a user