From c046601bc814a91d7ce39d38cbf03953dd891f7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Kr=C3=BCger?= <56278322+fabapp2@users.noreply.github.com> Date: Mon, 22 Apr 2024 18:19:49 +0200 Subject: [PATCH] Replace deprecated Config --- .../springframework/sbm/PrivateArtifactRepositoryTest.java | 4 +--- .../rewrite/test/util/ParserExecutionHelper.java | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/src/test/java/org/springframework/sbm/PrivateArtifactRepositoryTest.java b/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/src/test/java/org/springframework/sbm/PrivateArtifactRepositoryTest.java index 620c17d..96270f9 100644 --- a/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/src/test/java/org/springframework/sbm/PrivateArtifactRepositoryTest.java +++ b/spring-rewrite-commons-functional-tests/private-artifact-repository-tests/src/test/java/org/springframework/sbm/PrivateArtifactRepositoryTest.java @@ -33,7 +33,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.rewrite.RewriteProjectParser; import org.springframework.rewrite.boot.autoconfigure.RewriteLauncherConfiguration; import org.springframework.rewrite.parser.RewriteProjectParsingResult; -import org.springframework.rewrite.parser.maven.SbmTestConfiguration; import org.springframework.util.FileSystemUtils; import org.testcontainers.containers.GenericContainer; import org.testcontainers.junit.jupiter.Container; @@ -87,8 +86,7 @@ import static org.assertj.core.api.Fail.fail; * * @author Fabian Krüger */ -@SpringBootTest(classes = { MavenArtifactCacheTestConfig.class, RewriteLauncherConfiguration.class, - SbmTestConfiguration.class }) +@SpringBootTest(classes = { MavenArtifactCacheTestConfig.class, RewriteLauncherConfiguration.class }) @Testcontainers public class PrivateArtifactRepositoryTest { 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 8d9a0a2..885e10a 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,8 +20,8 @@ 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.SpringRewriteCommonsConfiguration; import org.springframework.rewrite.RewriteProjectParser; +import org.springframework.rewrite.boot.autoconfigure.RewriteLauncherConfiguration; import org.springframework.rewrite.parser.RewriteProjectParsingResult; import org.springframework.rewrite.parser.SpringRewriteProperties; import org.springframework.rewrite.parser.maven.ComparingParserFactory; @@ -109,7 +109,7 @@ public class ParserExecutionHelper { public RewriteProjectParsingResult parseWithRewriteProjectParser(Path baseDir, SpringRewriteProperties springRewriteProperties) { AtomicReference atomicRef = new AtomicReference<>(); - new ApplicationContextRunner().withUserConfiguration(SpringRewriteCommonsConfiguration.class) + new ApplicationContextRunner().withUserConfiguration(RewriteLauncherConfiguration.class) .withBean("spring.rewrite-" + SpringRewriteProperties.class.getName(), SpringRewriteProperties.class, () -> springRewriteProperties) .run(appCtx -> {