spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.0.x' into 4.1.x

Browse Source 
Closes gh-51658
This commit is contained in:
Stéphane Nicoll
2026-09-10 16:39:50 +02:00
parent 2fbc10fbaf a7d90d3532
commit e55f120d8a
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configuration-metadata/spring-boot-configuration-metadata-changelog-generator/src/main/java/org/springframework/boot/configurationmetadata/changelog/Changelog.java
+8 -7
View File
@@ -18,6 +18,7 @@ package org.springframework.boot.configurationmetadata.changelog;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.springframework.boot.configurationmetadata.ConfigurationMetadataProperty;
import org.springframework.boot.configurationmetadata.ConfigurationMetadataRepository;
@@ -34,6 +35,7 @@ import org.springframework.boot.configurationmetadata.Deprecation.Level;
* @author Andy Wilkinson
* @author Phillip Webb
* @author Yoobin Yoon
* @author Junggi Kim
*/
record Changelog(String oldVersionNumber, String newVersionNumber, List<Difference> differences) {
@@ -44,19 +46,18 @@ record Changelog(String oldVersionNumber, String newVersionNumber, List<Differen
static List<Difference> computeDifferences(ConfigurationMetadataRepository oldMetadata,
ConfigurationMetadataRepository newMetadata) {
List<String> seenIds = new ArrayList<>();
Map<String, ConfigurationMetadataProperty> oldProperties = oldMetadata.getAllProperties();
Map<String, ConfigurationMetadataProperty> newProperties = newMetadata.getAllProperties();
List<Difference> differences = new ArrayList<>();
for (ConfigurationMetadataProperty oldProperty : oldMetadata.getAllProperties().values()) {
String id = oldProperty.getId();
seenIds.add(id);
ConfigurationMetadataProperty newProperty = newMetadata.getAllProperties().get(id);
for (ConfigurationMetadataProperty oldProperty : oldProperties.values()) {
ConfigurationMetadataProperty newProperty = newProperties.get(oldProperty.getId());
Difference difference = Difference.compute(oldProperty, newProperty);
if (difference != null) {
differences.add(difference);
}
}
for (ConfigurationMetadataProperty newProperty : newMetadata.getAllProperties().values()) {
if (!seenIds.contains(newProperty.getId())) {
for (ConfigurationMetadataProperty newProperty : newProperties.values()) {
if (!oldProperties.containsKey(newProperty.getId())) {
if (!newProperty.isDeprecated()) {
differences.add(new Difference(DifferenceType.ADDED, null, newProperty));
}