diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/SbmSupportRewriteConfiguration.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/SpringRewriteCommonsConfiguration.java similarity index 95% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/SbmSupportRewriteConfiguration.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/SpringRewriteCommonsConfiguration.java index 80397f5..903d95f 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/SbmSupportRewriteConfiguration.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/SpringRewriteCommonsConfiguration.java @@ -26,6 +26,6 @@ import org.springframework.rewrite.parsers.RewriteParserConfiguration; */ @AutoConfiguration @Import({ RecipeDiscoveryConfiguration.class, RewriteParserConfiguration.class, ProjectResourceSetConfiguration.class }) -public class SbmSupportRewriteConfiguration { +public class SpringRewriteCommonsConfiguration { } diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/CompareParserRecipeRunTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/CompareParserRecipeRunTest.java index bbe4e0d..526b83f 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/CompareParserRecipeRunTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/CompareParserRecipeRunTest.java @@ -15,7 +15,6 @@ */ package org.springframework.rewrite.parsers; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.openrewrite.ExecutionContext; @@ -29,7 +28,7 @@ import org.openrewrite.marker.Markers; import org.openrewrite.marker.SearchResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.rewrite.boot.autoconfigure.SbmSupportRewriteConfiguration; +import org.springframework.rewrite.boot.autoconfigure.SpringRewriteCommonsConfiguration; import org.springframework.rewrite.parsers.maven.RewriteMavenProjectParser; import org.springframework.rewrite.parsers.maven.SbmTestConfiguration; import org.springframework.rewrite.test.util.ParallelParsingResult; @@ -45,7 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Fabian Krüger */ -@SpringBootTest(classes = { SbmSupportRewriteConfiguration.class, SbmTestConfiguration.class }) +@SpringBootTest(classes = { SpringRewriteCommonsConfiguration.class, SbmTestConfiguration.class }) public class CompareParserRecipeRunTest { @Autowired diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteProjectParserIntegrationTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteProjectParserIntegrationTest.java index 515ce36..0b1f691 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteProjectParserIntegrationTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteProjectParserIntegrationTest.java @@ -23,7 +23,7 @@ import org.junitpioneer.jupiter.Issue; import org.openrewrite.java.tree.J; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.rewrite.boot.autoconfigure.SbmSupportRewriteConfiguration; +import org.springframework.rewrite.boot.autoconfigure.SpringRewriteCommonsConfiguration; import org.springframework.rewrite.parsers.maven.RewriteMavenProjectParser; import org.springframework.rewrite.parsers.maven.SbmTestConfiguration; import org.springframework.rewrite.test.util.ParserParityTestHelper; @@ -38,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat; */ @DisabledOnOs(value = OS.WINDOWS, disabledReason = "The repository URIs of dependencies differ.") @Issue("https://github.com/spring-projects/spring-rewrite-commons/issues/12") -@SpringBootTest(classes = { SbmSupportRewriteConfiguration.class, SbmTestConfiguration.class }) +@SpringBootTest(classes = { SpringRewriteCommonsConfiguration.class, SbmTestConfiguration.class }) public class RewriteProjectParserIntegrationTest { @Autowired diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/RewriteMavenProjectParserIntegrationTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/RewriteMavenProjectParserIntegrationTest.java index 61f4dbd..7beea0e 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/RewriteMavenProjectParserIntegrationTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/RewriteMavenProjectParserIntegrationTest.java @@ -26,7 +26,7 @@ import org.openrewrite.tree.ParsingEventListener; import org.openrewrite.tree.ParsingExecutionContextView; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.rewrite.boot.autoconfigure.SbmSupportRewriteConfiguration; +import org.springframework.rewrite.boot.autoconfigure.SpringRewriteCommonsConfiguration; import org.springframework.rewrite.parsers.RewriteProjectParsingResult; import org.springframework.rewrite.parsers.events.FinishedParsingResourceEvent; @@ -39,7 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Fabian Krüger */ -@SpringBootTest(classes = { SbmSupportRewriteConfiguration.class, SbmTestConfiguration.class }) +@SpringBootTest(classes = { SpringRewriteCommonsConfiguration.class, SbmTestConfiguration.class }) public class RewriteMavenProjectParserIntegrationTest { @Autowired diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParserExecutionHelper.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParserExecutionHelper.java index a6a655e..aa04b36 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParserExecutionHelper.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParserExecutionHelper.java @@ -20,7 +20,7 @@ import org.openrewrite.InMemoryExecutionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.test.context.runner.ApplicationContextRunner; -import org.springframework.rewrite.boot.autoconfigure.SbmSupportRewriteConfiguration; +import org.springframework.rewrite.boot.autoconfigure.SpringRewriteCommonsConfiguration; import org.springframework.rewrite.parsers.SpringRewriteProperties; import org.springframework.rewrite.parsers.RewriteProjectParser; import org.springframework.rewrite.parsers.RewriteProjectParsingResult; @@ -109,7 +109,7 @@ public class ParserExecutionHelper { public RewriteProjectParsingResult parseWithRewriteProjectParser(Path baseDir, SpringRewriteProperties springRewriteProperties) { AtomicReference atomicRef = new AtomicReference<>(); - new ApplicationContextRunner().withUserConfiguration(SbmSupportRewriteConfiguration.class) + new ApplicationContextRunner().withUserConfiguration(SpringRewriteCommonsConfiguration.class) .withBean("spring.rewrite-" + SpringRewriteProperties.class.getName(), SpringRewriteProperties.class, () -> springRewriteProperties) .run(appCtx -> {