Revert "Generate ManagementContextConfiguration.imports file from annotations"

This reverts commit 6b3b0dd.

Author: scottfrederick

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports

@@ -0,0 +1,10 @@
+org.springframework.boot.actuate.autoconfigure.endpoint.web.ServletEndpointManagementContextConfiguration
+org.springframework.boot.actuate.autoconfigure.endpoint.web.jersey.JerseyWebEndpointManagementContextConfiguration
+org.springframework.boot.actuate.autoconfigure.endpoint.web.reactive.WebFluxEndpointManagementContextConfiguration
+org.springframework.boot.actuate.autoconfigure.endpoint.web.servlet.WebMvcEndpointManagementContextConfiguration
+org.springframework.boot.actuate.autoconfigure.security.servlet.SecurityRequestMatchersManagementContextConfiguration
+org.springframework.boot.actuate.autoconfigure.web.jersey.JerseySameManagementContextConfiguration
+org.springframework.boot.actuate.autoconfigure.web.jersey.JerseyChildManagementContextConfiguration
+org.springframework.boot.actuate.autoconfigure.web.reactive.ReactiveManagementChildContextConfiguration
+org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementChildContextConfiguration
+org.springframework.boot.actuate.autoconfigure.web.servlet.WebMvcEndpointChildContextConfiguration

spring-boot-project/spring-boot-tools/spring-boot-autoconfigure-processor/src/main/java/org/springframework/boot/autoconfigureprocessor/AbstractImportsAnnotationProcessor.java

@@ -16,7 +16,23 @@
 
 package org.springframework.boot.autoconfigureprocessor;
 
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import javax.annotation.processing.AbstractProcessor;
+import javax.annotation.processing.Filer;
+import javax.annotation.processing.RoundEnvironment;
 import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
+import javax.tools.FileObject;
+import javax.tools.StandardLocation;
 
 /**
  * Annotation processor to generate a
@@ -27,11 +43,47 @@
  * @since 3.0.0
  */
 @SupportedAnnotationTypes({ "org.springframework.boot.autoconfigure.AutoConfiguration" })
-public class AutoConfigurationImportsAnnotationProcessor extends AbstractImportsAnnotationProcessor {
+public class AutoConfigurationImportsAnnotationProcessor extends AbstractProcessor {
+
+	static final String IMPORTS_FILE_PATH = "META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports";
+
+	private final List<String> qualifiedClassNames = new ArrayList<>();
+
+	@Override
+	public SourceVersion getSupportedSourceVersion() {
+		return SourceVersion.latestSupported();
+	}
 
 	@Override
-	protected String getImportsFilePath() {
-		return "META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports";
+	public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+		for (TypeElement annotation : annotations) {
+			Set<? extends Element> elements = roundEnv.getElementsAnnotatedWith(annotation);
+			for (Element element : elements) {
+				this.qualifiedClassNames.add(element.asType().toString());
+			}
+		}
+		if (roundEnv.processingOver()) {
+			try {
+				writeImportsFile();
+			}
+			catch (IOException ex) {
+				throw new IllegalStateException("Failed to write auto-configuration imports file", ex);
+			}
+		}
+		return false;
+	}
+
+	private void writeImportsFile() throws IOException {
+		if (!this.qualifiedClassNames.isEmpty()) {
+			Filer filer = this.processingEnv.getFiler();
+			FileObject file = filer.createResource(StandardLocation.CLASS_OUTPUT, "", IMPORTS_FILE_PATH);
+			try (Writer writer = new OutputStreamWriter(file.openOutputStream(), StandardCharsets.UTF_8)) {
+				for (String className : this.qualifiedClassNames) {
+					writer.append(className);
+					writer.append(System.lineSeparator());
+				}
+			}
+		}
 	}
 
 }

spring-boot-project/spring-boot-tools/spring-boot-autoconfigure-processor/src/main/java/org/springframework/boot/autoconfigureprocessor/AutoConfigurationImportsAnnotationProcessor.java

@@ -1,3 +1,2 @@
 org.springframework.boot.autoconfigureprocessor.AutoConfigureAnnotationProcessor,aggregating
-org.springframework.boot.autoconfigureprocessor.AutoConfigurationImportsAnnotationProcessor,aggregating
-org.springframework.boot.autoconfigureprocessor.ManagementContextConfigurationImportsAnnotationProcessor,aggregating
+org.springframework.boot.autoconfigureprocessor.AutoConfigurationImportsAnnotationProcessor,aggregating

spring-boot-project/spring-boot-tools/spring-boot-autoconfigure-processor/src/main/java/org/springframework/boot/autoconfigureprocessor/ManagementContextConfigurationImportsAnnotationProcessor.java

@@ -1,3 +1,2 @@
 org.springframework.boot.autoconfigureprocessor.AutoConfigureAnnotationProcessor
 org.springframework.boot.autoconfigureprocessor.AutoConfigurationImportsAnnotationProcessor
-org.springframework.boot.autoconfigureprocessor.ManagementContextConfigurationImportsAnnotationProcessor

spring-boot-project/spring-boot-tools/spring-boot-autoconfigure-processor/src/main/resources/META-INF/gradle/incremental.annotation.processors

@@ -32,7 +32,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link AutoConfigurationImportsAnnotationProcessor}.
+ * Tests for {@link TestAutoConfigurationImportsAnnotationProcessor}.
  *
  * @author Scott Frederick
  */
@@ -67,16 +67,20 @@ void notAnnotatedClasses() throws Exception {
 	private List<String> compile(Class<?>... types) throws IOException {
 		TestAutoConfigurationImportsAnnotationProcessor processor = new TestAutoConfigurationImportsAnnotationProcessor();
 		this.compiler.getTask(types).call(processor);
-		return getWrittenImports(processor.getImportsFilePath());
+		return getWrittenImports();
 	}
 
-	private List<String> getWrittenImports(String importsFilePath) throws IOException {
-		File file = new File(this.tempDir, importsFilePath);
+	private List<String> getWrittenImports() throws IOException {
+		File file = getWrittenFile();
 		if (!file.exists()) {
 			return null;
 		}
 		BufferedReader reader = new BufferedReader(new FileReader(file));
 		return reader.lines().collect(Collectors.toList());
 	}
 
+	private File getWrittenFile() {
+		return new File(this.tempDir, AutoConfigurationImportsAnnotationProcessor.IMPORTS_FILE_PATH);
+	}
+
 }