From 8869f769c1e90b0fb81c24f9bc3cddc8efc27b3a Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <andy.wilkinson@broadcom.com>
Date: Fri, 25 Apr 2025 15:48:54 +0100
Subject: [PATCH] Polish "Fix changelog generator missing directly removed
 properties"

See gh-45267
---
 .../changelog/Changelog.java                      | 15 +++++----------
 .../src/test/resources/sample-1.0.json            |  9 +++++++++
 .../src/test/resources/sample-2.0.json            |  2 +-
 .../src/test/resources/sample.adoc                |  2 +-
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata-changelog-generator/src/main/java/org/springframework/boot/configurationmetadata/changelog/Changelog.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata-changelog-generator/src/main/java/org/springframework/boot/configurationmetadata/changelog/Changelog.java
index 61217687e4..1a64246855 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata-changelog-generator/src/main/java/org/springframework/boot/configurationmetadata/changelog/Changelog.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata-changelog-generator/src/main/java/org/springframework/boot/configurationmetadata/changelog/Changelog.java
@@ -21,7 +21,7 @@ import java.util.List;
 
 import org.springframework.boot.configurationmetadata.ConfigurationMetadataProperty;
 import org.springframework.boot.configurationmetadata.ConfigurationMetadataRepository;
-import org.springframework.boot.configurationmetadata.Deprecation;
+import org.springframework.boot.configurationmetadata.Deprecation.Level;
 
 /**
  * A changelog containing differences computed from two repositories of configuration
@@ -50,19 +50,14 @@ record Changelog(String oldVersionNumber, String newVersionNumber, List<Differen
 			String id = oldProperty.getId();
 			seenIds.add(id);
 			ConfigurationMetadataProperty newProperty = newMetadata.getAllProperties().get(id);
-			if (newProperty == null) {
-				differences.add(new Difference(DifferenceType.DELETED, oldProperty, null));
-			}
-			else {
-				Difference difference = Difference.compute(oldProperty, newProperty);
-				if (difference != null) {
-					differences.add(difference);
-				}
+			Difference difference = Difference.compute(oldProperty, newProperty);
+			if (difference != null) {
+				differences.add(difference);
 			}
 		}
 		for (ConfigurationMetadataProperty newProperty : newMetadata.getAllProperties().values()) {
 			if (!seenIds.contains(newProperty.getId())) {
-				if (newProperty.isDeprecated() && newProperty.getDeprecation().getLevel() == Deprecation.Level.ERROR) {
+				if (newProperty.isDeprecated() && newProperty.getDeprecation().getLevel() == Level.ERROR) {
 					differences.add(new Difference(DifferenceType.DELETED, null, newProperty));
 				}
 				else if (!newProperty.isDeprecated()) {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata-changelog-generator/src/test/resources/sample-1.0.json b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata-changelog-generator/src/test/resources/sample-1.0.json
index a0584bc569..f17a92a6e9 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata-changelog-generator/src/test/resources/sample-1.0.json
+++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata-changelog-generator/src/test/resources/sample-1.0.json
@@ -26,6 +26,15 @@
       "deprecation": {
         "level": "warning"
       }
+    },
+    {
+      "name": "test.delete.error",
+      "type": "java.lang.String",
+      "description": "Test delete error.",
+      "defaultValue": "delete",
+      "deprecation": {
+        "level": "error"
+      }
     }
   ]
 }
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata-changelog-generator/src/test/resources/sample-2.0.json b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata-changelog-generator/src/test/resources/sample-2.0.json
index 897c7b6dbc..95a9b8ff50 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata-changelog-generator/src/test/resources/sample-2.0.json
+++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata-changelog-generator/src/test/resources/sample-2.0.json
@@ -40,7 +40,7 @@
       "deprecation": {
         "level": "error",
         "replacement": "test.new.property",
-        "reason": "Removed in Upgrade 10"
+        "reason": "removed in third-party library without deprecation"
       }
     }
   ]
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata-changelog-generator/src/test/resources/sample.adoc b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata-changelog-generator/src/test/resources/sample.adoc
index 21963bffaa..fd4c354ad8 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata-changelog-generator/src/test/resources/sample.adoc
+++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata-changelog-generator/src/test/resources/sample.adoc
@@ -35,5 +35,5 @@ _None_.
 
 | `test.removed.directly`
 | `test.new.property`
-| Removed in Upgrade 10
+| removed in third-party library without deprecation
 |======================