root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Revert "Sort the contents of generated imports files" 

This reverts commit 95e62b7ff8.
This commit is contained in:
Scott Frederick 2022-09-21 11:48:37 -05:00
parent 910e9c9fcc
commit 1f53eb7df9
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,6 @@ import java.io.OutputStreamWriter;
import java.io.Writer;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
@ -75,7 +74,6 @@ abstract class AbstractImportsAnnotationProcessor extends AbstractProcessor {
Filer filer = this.processingEnv.getFiler();
FileObject file = filer.createResource(StandardLocation.CLASS_OUTPUT, "", getImportsFilePath());
try (Writer writer = new OutputStreamWriter(file.openOutputStream(), StandardCharsets.UTF_8)) {
Collections.sort(this.qualifiedClassNames);
for (String className : this.qualifiedClassNames) {
writer.append(className);
writer.append(System.lineSeparator());

4
spring-boot-project/spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/AutoConfigurationImportsAnnotationProcessorTests.java
View File

@ -50,8 +50,8 @@ class AutoConfigurationImportsAnnotationProcessorTests {
@Test
void annotatedClasses() throws Exception {
List<String> classes = compile(TestAutoConfigurationOnlyConfiguration.class,
TestAutoConfigurationConfiguration.class);
List<String> classes = compile(TestAutoConfigurationConfiguration.class,
TestAutoConfigurationOnlyConfiguration.class);
assertThat(classes).hasSize(2);
assertThat(classes).containsExactly(
"org.springframework.boot.autoconfigureprocessor.TestAutoConfigurationConfiguration",

4
spring-boot-project/spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/ManagementContextConfigurationImportsAnnotationProcessorTests.java
View File

@ -50,8 +50,8 @@ class ManagementContextConfigurationImportsAnnotationProcessorTests {
@Test
void annotatedClasses() throws Exception {
List<String> classes = compile(TestManagementContextConfigurationTwo.class,
TestManagementContextConfigurationOne.class);
List<String> classes = compile(TestManagementContextConfigurationOne.class,
TestManagementContextConfigurationTwo.class);
assertThat(classes).hasSize(2);
assertThat(classes).containsExactly(
"org.springframework.boot.autoconfigureprocessor.TestManagementContextConfigurationOne",