Merge branch '2.2.x' into 2.3.x

Closes gh-23959

Author: philwebb

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/MetadataCollector.java

@@ -111,7 +111,7 @@ private boolean shouldBeMerged(ItemMetadata itemMetadata) {
 	}
 
 	private boolean deletedInCurrentBuild(String sourceType) {
-		return this.processingEnvironment.getElementUtils().getTypeElement(sourceType) == null;
+		return this.processingEnvironment.getElementUtils().getTypeElement(sourceType.replace('$', '.')) == null;
 	}
 
 	private boolean processedInCurrentBuild(String sourceType) {

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/IncrementalBuildMetadataGenerationTests.java

@@ -23,6 +23,7 @@
 import org.springframework.boot.configurationsample.incremental.BarProperties;
 import org.springframework.boot.configurationsample.incremental.FooProperties;
 import org.springframework.boot.configurationsample.incremental.RenamedBarProperties;
+import org.springframework.boot.configurationsample.simple.ClassWithNestedProperties;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -92,4 +93,12 @@ void incrementalBuildTypeRenamed() throws Exception {
 				.has(Metadata.withProperty("bar.counter").withDefaultValue(0).fromSource(RenamedBarProperties.class));
 	}
 
+	@Test
+	void incrementalBuildDoesNotDeleteItems() throws Exception {
+		TestProject project = new TestProject(this.tempDir, ClassWithNestedProperties.class, FooProperties.class);
+		ConfigurationMetadata initialMetadata = project.fullBuild();
+		ConfigurationMetadata updatedMetadata = project.incrementalBuild(FooProperties.class);
+		assertThat(initialMetadata.getItems()).isEqualTo(updatedMetadata.getItems());
+	}
+
 }