From 940e11c98bff1f8054972c75e63821b5c87ada2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Kr=C3=BCger?= Date: Wed, 13 Dec 2023 16:18:43 +0100 Subject: [PATCH] Rename package sbm to rewrite --- .../boot-3-upgrade-atomic/pom.xml | 6 +- .../com/acme/example/SpringBoot3Upgrade.java | 19 ++--- .../boot-3-upgrade-iterative/pom.xml | 7 +- .../IterativeBoot3UpgradeExample.java | 23 +++--- ...stApplicableRecipesExampleApplication.java | 8 +-- spring-rewrite-commons-examples/pom.xml | 70 +++++++++++++------ .../pom.xml | 1 - .../sbm/PrivateArtifactRepositoryTest.java | 8 +-- spring-rewrite-commons-launcher/README.adoc | 16 ++--- .../autoconfigure/DiscoveryConfiguration.java | 8 +-- .../ParserPropertiesPostProcessor.java | 2 +- .../ProjectResourceSetConfiguration.java | 12 ++-- .../SbmSupportRewriteConfiguration.java | 2 +- .../autoconfigure/ScannerConfiguration.java | 8 +-- .../autoconfigure/ScopeConfiguration.java | 12 ++-- .../parsers/JavaParserBuilder.java | 2 +- .../parsers/MavenProject.java | 6 +- .../parsers/ModuleParser.java | 4 +- .../parsers/ParserContext.java | 4 +- .../parsers/ParserProperties.java | 2 +- .../{sbm => rewrite}/parsers/ProjectId.java | 2 +- .../parsers/ProjectScanner.java | 6 +- .../RecipeValidationErrorException.java | 2 +- .../parsers/RewriteExecutionContext.java | 2 +- .../RewriteExecutionContextErrorHandler.java | 2 +- .../parsers/RewriteParserConfiguration.java | 26 +++---- .../parsers/RewriteProjectParser.java | 23 +++--- .../parsers/RewriteProjectParsingResult.java | 2 +- .../parsers/RewriteResourceParser.java | 4 +- .../parsers/SourceFileParser.java | 4 +- .../parsers/SourceSetParsingResult.java | 2 +- .../parsers/StyleDetector.java | 2 +- .../events/FinishedParsingResourceEvent.java | 2 +- .../events/IntermediateParsingEvent.java | 2 +- .../RewriteParsingEventListenerAdapter.java | 2 +- .../events/StartedParsingProjectEvent.java | 2 +- .../events/StartedParsingResourceEvent.java | 2 +- .../SuccessfullyParsedProjectEvent.java | 2 +- .../parsers/maven/BuildFileParser.java | 4 +- .../parsers/maven/MavenConfigFileParser.java | 2 +- .../parsers/maven/MavenModelReader.java | 4 +- .../parsers/maven/MavenModuleParser.java | 4 +- .../parsers/maven/MavenPasswordDecrypter.java | 3 +- .../parsers/maven/MavenProjectAnalyzer.java | 8 +-- .../maven/MavenProvenanceMarkerFactory.java | 5 +- .../maven/MavenRuntimeInformation.java | 2 +- .../maven/MavenSettingsInitializer.java | 5 +- .../maven/ProvenanceMarkerFactory.java | 6 +- .../maven/RewriteMavenArtifactDownloader.java | 2 +- .../RewriteParserMavenConfiguration.java | 6 +- .../project/RewriteSourceFileWrapper.java | 4 +- .../project/resource/BaseProjectResource.java | 2 +- .../resource/InternalProjectResource.java | 2 +- ...oProjectResourceWrapperFoundException.java | 2 +- .../project/resource/ProjectResource.java | 2 +- .../resource/ProjectResourceSerializer.java | 2 +- .../project/resource/ProjectResourceSet.java | 2 +- .../resource/ProjectResourceSetFactory.java | 4 +- .../resource/ProjectResourceSetHolder.java | 2 +- .../ProjectResourceSetSerializer.java | 2 +- .../resource/ProjectResourceWrapper.java | 2 +- .../RewriteMigrationResultMerger.java | 6 +- .../resource/RewriteSourceFileHolder.java | 2 +- .../resource/SbmApplicationProperties.java | 2 +- .../finder/AbsolutePathResourceFinder.java | 6 +- .../finder/AbsolutePathResourcesFinder.java | 6 +- .../DeletedResourcePathStringFilter.java | 4 +- .../resource/finder/GenericTypeFinder.java | 4 +- .../finder/GenericTypeListFinder.java | 4 +- .../ModifiedResourcePathStringFilter.java | 4 +- ...hPatternMatchingProjectResourceFinder.java | 8 +-- .../finder/ProjectResourceFinder.java | 4 +- .../finder/ResourceFilterException.java | 2 +- .../RewriteSourceFileHolderListFinder.java | 6 +- .../recipes/RewriteRecipeDiscovery.java | 6 +- .../scopes/AbstractBaseScope.java | 2 +- .../scopes/ExecutionScope.java | 4 +- .../scopes/ProjectMetadata.java | 2 +- .../{sbm => rewrite}/scopes/ScanScope.java | 4 +- .../scopes/annotations/ExecutionScope.java | 5 +- .../scopes/annotations/ScanScope.java | 13 ++-- .../openrewrite/GenericOpenRewriteRecipe.java | 2 +- .../{sbm => rewrite}/utils/JavaHelper.java | 2 +- .../utils/LinuxWindowsPathUnifier.java | 2 +- .../utils/OsAgnosticPathMatcher.java | 2 +- .../{sbm => rewrite}/utils/ResourceUtil.java | 2 +- .../main/resources/META-INF/spring.factories | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 10 +-- .../maven/CalculateClasspathTest.java | 10 +-- .../{sbm => rewrite}/ParserTest.java | 2 +- .../parsers/BuildFileParserTest.java | 15 ++-- .../parsers/CompareParserRecipeRunTest.java | 14 ++-- ...ParserEventPublicationIntegrationTest.java | 10 +-- .../parsers/ParserPropertiesTest.java | 4 +- .../RewriteProjectParserIntegrationTest.java | 14 ++-- .../RewriteProjectParserParityTest.java | 14 ++-- .../parsers/RewriteProjectParserTest.java | 14 ++-- .../parsers/RewriteRecipeDiscoveryTest.java | 6 +- .../parsers/Slf4jToMavenLoggerAdapter.java | 2 +- .../parsers/maven/ComparingParserFactory.java | 8 +-- .../maven/MavenConfigFileParserTest.java | 2 +- .../maven/MavenExecutionRequestFactory.java | 2 +- .../maven/MavenExecutionResultException.java | 2 +- .../parsers/maven/MavenExecutor.java | 3 +- .../parsers/maven/MavenExecutorTest.java | 2 +- .../maven/MavenMojoProjectParserFactory.java | 6 +- .../parsers/maven/MavenPlexusContainer.java | 2 +- .../parsers/maven/MavenPomCacheTest.java | 4 +- .../maven/MavenProjectAnalyzerTest.java | 8 +-- .../maven/MavenProjectResolutionTest.java | 2 +- .../maven/MavenSettingsInitializerTest.java | 9 +-- .../maven/ProvenanceMarkerFactoryTest.java | 12 ++-- .../maven/RewriteMavenProjectParser.java | 6 +- ...riteMavenProjectParserIntegrationTest.java | 12 ++-- .../parsers/maven/SbmTestConfiguration.java | 9 ++- .../test/util/DummyResource.java | 2 +- .../util/OpenRewriteDummyRecipeInstaller.java | 2 +- .../test/util/ParallelParsingResult.java | 4 +- .../test/util/ParserExecutionHelper.java | 17 +++-- .../test/util/ParserParityTestHelper.java | 7 +- .../test/util/TestProjectHelper.java | 4 +- 121 files changed, 373 insertions(+), 359 deletions(-) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/boot/autoconfigure/DiscoveryConfiguration.java (83%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/boot/autoconfigure/ParserPropertiesPostProcessor.java (97%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/boot/autoconfigure/ProjectResourceSetConfiguration.java (80%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/boot/autoconfigure/SbmSupportRewriteConfiguration.java (94%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/boot/autoconfigure/ScannerConfiguration.java (82%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/boot/autoconfigure/ScopeConfiguration.java (86%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/JavaParserBuilder.java (98%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/MavenProject.java (97%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/ModuleParser.java (99%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/ParserContext.java (96%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/ParserProperties.java (98%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/ProjectId.java (96%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/ProjectScanner.java (96%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/RecipeValidationErrorException.java (94%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/RewriteExecutionContext.java (98%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/RewriteExecutionContextErrorHandler.java (97%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/RewriteParserConfiguration.java (85%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/RewriteProjectParser.java (89%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/RewriteProjectParsingResult.java (95%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/RewriteResourceParser.java (99%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/SourceFileParser.java (94%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/SourceSetParsingResult.java (95%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/StyleDetector.java (98%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/events/FinishedParsingResourceEvent.java (94%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/events/IntermediateParsingEvent.java (93%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/events/RewriteParsingEventListenerAdapter.java (97%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/events/StartedParsingProjectEvent.java (93%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/events/StartedParsingResourceEvent.java (93%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/events/SuccessfullyParsedProjectEvent.java (93%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/maven/BuildFileParser.java (98%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/maven/MavenConfigFileParser.java (99%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/maven/MavenModelReader.java (92%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/maven/MavenModuleParser.java (98%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/maven/MavenPasswordDecrypter.java (96%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/maven/MavenProjectAnalyzer.java (98%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/maven/MavenProvenanceMarkerFactory.java (97%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/maven/MavenRuntimeInformation.java (93%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/maven/MavenSettingsInitializer.java (95%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/maven/ProvenanceMarkerFactory.java (90%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/maven/RewriteMavenArtifactDownloader.java (96%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/parsers/maven/RewriteParserMavenConfiguration.java (92%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/project/RewriteSourceFileWrapper.java (92%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/project/resource/BaseProjectResource.java (95%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/project/resource/InternalProjectResource.java (93%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/project/resource/NoProjectResourceWrapperFoundException.java (93%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/project/resource/ProjectResource.java (94%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/project/resource/ProjectResourceSerializer.java (97%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/project/resource/ProjectResourceSet.java (98%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/project/resource/ProjectResourceSetFactory.java (92%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/project/resource/ProjectResourceSetHolder.java (96%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/project/resource/ProjectResourceSetSerializer.java (94%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/project/resource/ProjectResourceWrapper.java (94%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/project/resource/RewriteMigrationResultMerger.java (93%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/project/resource/RewriteSourceFileHolder.java (98%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/project/resource/SbmApplicationProperties.java (97%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/project/resource/finder/AbsolutePathResourceFinder.java (87%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/project/resource/finder/AbsolutePathResourcesFinder.java (91%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/project/resource/finder/DeletedResourcePathStringFilter.java (88%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/project/resource/finder/GenericTypeFinder.java (91%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/project/resource/finder/GenericTypeListFinder.java (89%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/project/resource/finder/ModifiedResourcePathStringFilter.java (89%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/project/resource/finder/PathPatternMatchingProjectResourceFinder.java (88%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/project/resource/finder/ProjectResourceFinder.java (84%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/project/resource/finder/ResourceFilterException.java (92%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/project/resource/finder/RewriteSourceFileHolderListFinder.java (87%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/recipes/RewriteRecipeDiscovery.java (97%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/scopes/AbstractBaseScope.java (98%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/scopes/ExecutionScope.java (87%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/scopes/ProjectMetadata.java (94%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/scopes/ScanScope.java (87%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/scopes/annotations/ExecutionScope.java (88%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/scopes/annotations/ScanScope.java (72%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/support/openrewrite/GenericOpenRewriteRecipe.java (96%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/utils/JavaHelper.java (95%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/utils/LinuxWindowsPathUnifier.java (96%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/utils/OsAgnosticPathMatcher.java (98%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/{sbm => rewrite}/utils/ResourceUtil.java (98%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/ParserTest.java (98%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/parsers/BuildFileParserTest.java (94%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/parsers/CompareParserRecipeRunTest.java (88%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/parsers/ParserEventPublicationIntegrationTest.java (92%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/parsers/ParserPropertiesTest.java (95%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/parsers/RewriteProjectParserIntegrationTest.java (86%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/parsers/RewriteProjectParserParityTest.java (94%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/parsers/RewriteProjectParserTest.java (91%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/parsers/RewriteRecipeDiscoveryTest.java (98%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/parsers/Slf4jToMavenLoggerAdapter.java (98%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/parsers/maven/ComparingParserFactory.java (89%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/parsers/maven/MavenConfigFileParserTest.java (97%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/parsers/maven/MavenExecutionRequestFactory.java (99%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/parsers/maven/MavenExecutionResultException.java (96%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/parsers/maven/MavenExecutor.java (98%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/parsers/maven/MavenExecutorTest.java (96%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/parsers/maven/MavenMojoProjectParserFactory.java (94%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/parsers/maven/MavenPlexusContainer.java (98%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/parsers/maven/MavenPomCacheTest.java (97%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/parsers/maven/MavenProjectAnalyzerTest.java (99%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/parsers/maven/MavenProjectResolutionTest.java (99%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/parsers/maven/MavenSettingsInitializerTest.java (91%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/parsers/maven/ProvenanceMarkerFactoryTest.java (97%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/parsers/maven/RewriteMavenProjectParser.java (97%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/parsers/maven/RewriteMavenProjectParserIntegrationTest.java (83%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/parsers/maven/SbmTestConfiguration.java (89%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/test/util/DummyResource.java (97%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/test/util/OpenRewriteDummyRecipeInstaller.java (96%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/test/util/ParallelParsingResult.java (87%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/test/util/ParserExecutionHelper.java (86%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/test/util/ParserParityTestHelper.java (98%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/{sbm => rewrite}/test/util/TestProjectHelper.java (96%) diff --git a/spring-rewrite-commons-examples/boot-3-upgrade-atomic/pom.xml b/spring-rewrite-commons-examples/boot-3-upgrade-atomic/pom.xml index d8fbbe4d0..4e63d5160 100644 --- a/spring-rewrite-commons-examples/boot-3-upgrade-atomic/pom.xml +++ b/spring-rewrite-commons-examples/boot-3-upgrade-atomic/pom.xml @@ -54,14 +54,12 @@ spring-boot-starter - org.springframework.experimental - sbm-support-rewrite - 0.1.0-SNAPSHOT + org.springframework.rewrite + spring-rewrite-commons-launcher org.openrewrite.recipe rewrite-spring - 5.0.10 diff --git a/spring-rewrite-commons-examples/boot-3-upgrade-atomic/src/main/java/com/acme/example/SpringBoot3Upgrade.java b/spring-rewrite-commons-examples/boot-3-upgrade-atomic/src/main/java/com/acme/example/SpringBoot3Upgrade.java index 15b05b9d1..d79da4266 100644 --- a/spring-rewrite-commons-examples/boot-3-upgrade-atomic/src/main/java/com/acme/example/SpringBoot3Upgrade.java +++ b/spring-rewrite-commons-examples/boot-3-upgrade-atomic/src/main/java/com/acme/example/SpringBoot3Upgrade.java @@ -15,20 +15,23 @@ */ package com.acme.example; -import org.openrewrite.*; +import org.openrewrite.ExecutionContext; +import org.openrewrite.Recipe; +import org.openrewrite.SourceFile; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.event.EventListener; import org.springframework.core.io.Resource; -import org.springframework.sbm.parsers.ProjectScanner; -import org.springframework.sbm.parsers.RewriteProjectParser; -import org.springframework.sbm.parsers.RewriteProjectParsingResult; -import org.springframework.sbm.parsers.events.StartedParsingResourceEvent; -import org.springframework.sbm.project.RewriteSourceFileWrapper; -import org.springframework.sbm.project.resource.*; -import org.springframework.sbm.recipes.RewriteRecipeDiscovery; +import org.springframework.rewrite.parsers.ProjectScanner; +import org.springframework.rewrite.parsers.RewriteProjectParser; +import org.springframework.rewrite.parsers.RewriteProjectParsingResult; +import org.springframework.rewrite.parsers.events.StartedParsingResourceEvent; +import org.springframework.rewrite.project.resource.ProjectResourceSet; +import org.springframework.rewrite.project.resource.ProjectResourceSetFactory; +import org.springframework.rewrite.project.resource.ProjectResourceSetSerializer; +import org.springframework.rewrite.recipes.RewriteRecipeDiscovery; import java.nio.file.Path; import java.util.List; diff --git a/spring-rewrite-commons-examples/boot-3-upgrade-iterative/pom.xml b/spring-rewrite-commons-examples/boot-3-upgrade-iterative/pom.xml index 65a3b84d4..c1378ce17 100644 --- a/spring-rewrite-commons-examples/boot-3-upgrade-iterative/pom.xml +++ b/spring-rewrite-commons-examples/boot-3-upgrade-iterative/pom.xml @@ -5,10 +5,11 @@ org.springframework.rewrite - spring-rewrite-commons + spring-rewrite-commons-examples 0.1.0-SNAPSHOT ../pom.xml + com.example boot-3-upgrade-iterative 0.0.1-SNAPSHOT @@ -24,8 +25,8 @@ - org.springframework.experimental - sbm-support-rewrite + org.springframework.rewrite + spring-rewrite-commons-launcher 0.1.0-SNAPSHOT diff --git a/spring-rewrite-commons-examples/boot-3-upgrade-iterative/src/main/java/com/example/bootupgrade/IterativeBoot3UpgradeExample.java b/spring-rewrite-commons-examples/boot-3-upgrade-iterative/src/main/java/com/example/bootupgrade/IterativeBoot3UpgradeExample.java index 5ef73dd84..e06a7030c 100644 --- a/spring-rewrite-commons-examples/boot-3-upgrade-iterative/src/main/java/com/example/bootupgrade/IterativeBoot3UpgradeExample.java +++ b/spring-rewrite-commons-examples/boot-3-upgrade-iterative/src/main/java/com/example/bootupgrade/IterativeBoot3UpgradeExample.java @@ -33,7 +33,7 @@ import org.openrewrite.shaded.jgit.api.errors.GitAPIException; import org.openrewrite.shaded.jgit.lib.Ref; import org.openrewrite.shaded.jgit.revwalk.RevCommit; -import org.openrewrite.shaded.jgit.transport.*; +import org.openrewrite.shaded.jgit.transport.UsernamePasswordCredentialsProvider; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; @@ -41,14 +41,14 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.event.EventListener; import org.springframework.core.io.Resource; -import org.springframework.sbm.parsers.ProjectScanner; -import org.springframework.sbm.parsers.RewriteProjectParser; -import org.springframework.sbm.parsers.RewriteProjectParsingResult; -import org.springframework.sbm.parsers.events.StartedParsingResourceEvent; -import org.springframework.sbm.project.resource.ProjectResourceSet; -import org.springframework.sbm.project.resource.ProjectResourceSetFactory; -import org.springframework.sbm.project.resource.ProjectResourceSetSerializer; -import org.springframework.sbm.recipes.RewriteRecipeDiscovery; +import org.springframework.rewrite.parsers.ProjectScanner; +import org.springframework.rewrite.parsers.RewriteProjectParser; +import org.springframework.rewrite.parsers.RewriteProjectParsingResult; +import org.springframework.rewrite.parsers.events.StartedParsingResourceEvent; +import org.springframework.rewrite.project.resource.ProjectResourceSet; +import org.springframework.rewrite.project.resource.ProjectResourceSetFactory; +import org.springframework.rewrite.project.resource.ProjectResourceSetSerializer; +import org.springframework.rewrite.recipes.RewriteRecipeDiscovery; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.util.FileSystemUtils; @@ -57,7 +57,10 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; /** * @author Fabian Krüger diff --git a/spring-rewrite-commons-examples/list-applicable-recipes-example/src/main/java/org/example/app/ListApplicableRecipesExampleApplication.java b/spring-rewrite-commons-examples/list-applicable-recipes-example/src/main/java/org/example/app/ListApplicableRecipesExampleApplication.java index 5f4970f8f..6e2f00eda 100644 --- a/spring-rewrite-commons-examples/list-applicable-recipes-example/src/main/java/org/example/app/ListApplicableRecipesExampleApplication.java +++ b/spring-rewrite-commons-examples/list-applicable-recipes-example/src/main/java/org/example/app/ListApplicableRecipesExampleApplication.java @@ -26,10 +26,10 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.core.io.Resource; -import org.springframework.sbm.parsers.ProjectScanner; -import org.springframework.sbm.parsers.RewriteProjectParser; -import org.springframework.sbm.parsers.RewriteProjectParsingResult; -import org.springframework.sbm.recipes.RewriteRecipeDiscovery; +import org.springframework.rewrite.parsers.ProjectScanner; +import org.springframework.rewrite.parsers.RewriteProjectParser; +import org.springframework.rewrite.parsers.RewriteProjectParsingResult; +import org.springframework.rewrite.recipes.RewriteRecipeDiscovery; import java.nio.file.Path; import java.util.Arrays; diff --git a/spring-rewrite-commons-examples/pom.xml b/spring-rewrite-commons-examples/pom.xml index b785b53d5..414c0efed 100644 --- a/spring-rewrite-commons-examples/pom.xml +++ b/spring-rewrite-commons-examples/pom.xml @@ -1,27 +1,57 @@ - 4.0.0 - - org.springframework.rewrite - spring-rewrite-commons - 0.1.0-SNAPSHOT - ../pom.xml - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.springframework.rewrite + spring-rewrite-commons + 0.1.0-SNAPSHOT + ../pom.xml + - spring-rewrite-commons-examples - pom + spring-rewrite-commons-examples + pom - Spring Rewrite Commons Examples - Examples using Spring Rewrite Commons + Spring Rewrite Commons Examples + Examples using Spring Rewrite Commons - - boot-3-upgrade-atomic - boot-3-upgrade-iterative - list-applicable-recipes-example - + + boot-3-upgrade-atomic + boot-3-upgrade-iterative + list-applicable-recipes-example + - - 17 - + + 17 + + + + + + org.springframework.rewrite + spring-rewrite-commons-launcher + 0.1.0-SNAPSHOT + + + org.openrewrite.recipe + rewrite-spring + 5.0.10 + + + + + + + org.springframework.boot + spring-boot-starter + + + org.springframework.rewrite + spring-rewrite-commons-launcher + + + org.openrewrite.recipe + rewrite-spring + + diff --git a/spring-rewrite-commons-functional-tests/pom.xml b/spring-rewrite-commons-functional-tests/pom.xml index 2ee9e47e3..a865484f3 100644 --- a/spring-rewrite-commons-functional-tests/pom.xml +++ b/spring-rewrite-commons-functional-tests/pom.xml @@ -27,7 +27,6 @@ 3.1.3 - 5.3.2 2.3.1 5.3.2 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 f7491cede..3f93369cd 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 @@ -30,10 +30,10 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.sbm.boot.autoconfigure.SbmSupportRewriteConfiguration; -import org.springframework.sbm.parsers.RewriteProjectParser; -import org.springframework.sbm.parsers.RewriteProjectParsingResult; -import org.springframework.sbm.parsers.maven.SbmTestConfiguration; +import org.springframework.rewrite.boot.autoconfigure.SbmSupportRewriteConfiguration; +import org.springframework.rewrite.parsers.RewriteProjectParser; +import org.springframework.rewrite.parsers.RewriteProjectParsingResult; +import org.springframework.rewrite.parsers.maven.SbmTestConfiguration; import org.springframework.util.FileSystemUtils; import org.testcontainers.containers.GenericContainer; import org.testcontainers.junit.jupiter.Container; diff --git a/spring-rewrite-commons-launcher/README.adoc b/spring-rewrite-commons-launcher/README.adoc index 6cfa2e83e..489263887 100644 --- a/spring-rewrite-commons-launcher/README.adoc +++ b/spring-rewrite-commons-launcher/README.adoc @@ -83,7 +83,7 @@ public MavenPomCache mavenPomCache() { Example code showing how to apply OpenRewrite's UpgradeSpringBoot_3_1 recipe -[source, java] +[source,java] ..... package com.example; @@ -92,13 +92,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.sbm.parsers.ProjectScanner; -import org.springframework.sbm.parsers.RewriteProjectParser; -import org.springframework.sbm.parsers.RewriteProjectParsingResult; -import org.springframework.sbm.project.resource.ProjectResourceSet; -import org.springframework.sbm.project.resource.ProjectResourceSetFactory; -import org.springframework.sbm.project.resource.ProjectResourceSetSerializer; -import org.springframework.sbm.recipes.RewriteRecipeDiscovery; +import org.springframework.rewrite.parsers.ProjectScanner; +import org.springframework.rewrite.parsers.RewriteProjectParser; +import org.springframework.rewrite.parsers.RewriteProjectParsingResult; +import org.springframework.rewrite.project.resource.ProjectResourceSet; +import org.springframework.rewrite.project.resource.ProjectResourceSetFactory; +import org.springframework.rewrite.project.resource.ProjectResourceSetSerializer; +import org.springframework.rewrite.recipes.RewriteRecipeDiscovery; import java.nio.file.Path; import java.util.List; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/boot/autoconfigure/DiscoveryConfiguration.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/DiscoveryConfiguration.java similarity index 83% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/boot/autoconfigure/DiscoveryConfiguration.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/DiscoveryConfiguration.java index 8a1248788..415574bc2 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/boot/autoconfigure/DiscoveryConfiguration.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/DiscoveryConfiguration.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.boot.autoconfigure; +package org.springframework.rewrite.boot.autoconfigure; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; -import org.springframework.sbm.parsers.ParserProperties; -import org.springframework.sbm.parsers.RewriteParserConfiguration; -import org.springframework.sbm.recipes.RewriteRecipeDiscovery; +import org.springframework.rewrite.parsers.ParserProperties; +import org.springframework.rewrite.parsers.RewriteParserConfiguration; +import org.springframework.rewrite.recipes.RewriteRecipeDiscovery; /** * @author Fabian Krüger diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/boot/autoconfigure/ParserPropertiesPostProcessor.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/ParserPropertiesPostProcessor.java similarity index 97% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/boot/autoconfigure/ParserPropertiesPostProcessor.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/ParserPropertiesPostProcessor.java index 23fb4adf7..ed1c7070f 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/boot/autoconfigure/ParserPropertiesPostProcessor.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/ParserPropertiesPostProcessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.boot.autoconfigure; +package org.springframework.rewrite.boot.autoconfigure; import org.springframework.boot.SpringApplication; import org.springframework.boot.env.EnvironmentPostProcessor; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/boot/autoconfigure/ProjectResourceSetConfiguration.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/ProjectResourceSetConfiguration.java similarity index 80% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/boot/autoconfigure/ProjectResourceSetConfiguration.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/ProjectResourceSetConfiguration.java index d69a6a14a..f68108722 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/boot/autoconfigure/ProjectResourceSetConfiguration.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/ProjectResourceSetConfiguration.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.boot.autoconfigure; +package org.springframework.rewrite.boot.autoconfigure; import org.openrewrite.ExecutionContext; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; -import org.springframework.sbm.project.RewriteSourceFileWrapper; -import org.springframework.sbm.project.resource.ProjectResourceSerializer; -import org.springframework.sbm.project.resource.ProjectResourceSetFactory; -import org.springframework.sbm.project.resource.ProjectResourceSetSerializer; -import org.springframework.sbm.project.resource.RewriteMigrationResultMerger; +import org.springframework.rewrite.project.RewriteSourceFileWrapper; +import org.springframework.rewrite.project.resource.ProjectResourceSerializer; +import org.springframework.rewrite.project.resource.ProjectResourceSetFactory; +import org.springframework.rewrite.project.resource.ProjectResourceSetSerializer; +import org.springframework.rewrite.project.resource.RewriteMigrationResultMerger; /** * @author Fabian Krüger diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/boot/autoconfigure/SbmSupportRewriteConfiguration.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/SbmSupportRewriteConfiguration.java similarity index 94% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/boot/autoconfigure/SbmSupportRewriteConfiguration.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/SbmSupportRewriteConfiguration.java index 272b5fe44..8857ac2ed 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/boot/autoconfigure/SbmSupportRewriteConfiguration.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/SbmSupportRewriteConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.boot.autoconfigure; +package org.springframework.rewrite.boot.autoconfigure; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Import; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/boot/autoconfigure/ScannerConfiguration.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/ScannerConfiguration.java similarity index 82% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/boot/autoconfigure/ScannerConfiguration.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/ScannerConfiguration.java index 52b5dbc48..3bbc403fa 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/boot/autoconfigure/ScannerConfiguration.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/ScannerConfiguration.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.boot.autoconfigure; +package org.springframework.rewrite.boot.autoconfigure; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; import org.springframework.core.io.ResourceLoader; -import org.springframework.sbm.parsers.ParserProperties; -import org.springframework.sbm.parsers.ProjectScanner; -import org.springframework.sbm.parsers.RewriteParserConfiguration; +import org.springframework.rewrite.parsers.ParserProperties; +import org.springframework.rewrite.parsers.ProjectScanner; +import org.springframework.rewrite.parsers.RewriteParserConfiguration; /** * @author Fabian Krüger diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/boot/autoconfigure/ScopeConfiguration.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/ScopeConfiguration.java similarity index 86% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/boot/autoconfigure/ScopeConfiguration.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/ScopeConfiguration.java index 3614e21ff..fbfe995eb 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/boot/autoconfigure/ScopeConfiguration.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/ScopeConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.boot.autoconfigure; +package org.springframework.rewrite.boot.autoconfigure; import org.openrewrite.ExecutionContext; import org.openrewrite.InMemoryExecutionContext; @@ -22,9 +22,9 @@ import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; -import org.springframework.sbm.scopes.ExecutionScope; -import org.springframework.sbm.scopes.ProjectMetadata; -import org.springframework.sbm.scopes.ScanScope; +import org.springframework.rewrite.scopes.ExecutionScope; +import org.springframework.rewrite.scopes.ProjectMetadata; +import org.springframework.rewrite.scopes.ScanScope; import java.util.function.Supplier; @@ -57,7 +57,7 @@ public static BeanFactoryPostProcessor beanFactoryPostProcessor(ExecutionScope e } @Bean - @org.springframework.sbm.scopes.annotations.ScanScope + @org.springframework.rewrite.scopes.annotations.ScanScope ProjectMetadata projectMetadata() { return new ProjectMetadata(); } @@ -71,7 +71,7 @@ Supplier executionContextSupplier() { } @Bean - @org.springframework.sbm.scopes.annotations.ScanScope + @org.springframework.rewrite.scopes.annotations.ScanScope ExecutionContext executionContext(ProjectMetadata projectMetadata, Supplier executionContextSupplier, MavenPomCache mavenPomCache) { ExecutionContext executionContext = executionContextSupplier.get(); diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/JavaParserBuilder.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/JavaParserBuilder.java similarity index 98% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/JavaParserBuilder.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/JavaParserBuilder.java index e2463a362..9d7135417 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/JavaParserBuilder.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/JavaParserBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers; +package org.springframework.rewrite.parsers; import lombok.Getter; import lombok.Setter; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/MavenProject.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/MavenProject.java similarity index 97% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/MavenProject.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/MavenProject.java index 5fac465a6..d278214a6 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/MavenProject.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/MavenProject.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers; +package org.springframework.rewrite.parsers; import lombok.Getter; import lombok.Setter; @@ -26,8 +26,8 @@ import org.openrewrite.maven.utilities.MavenArtifactDownloader; import org.openrewrite.xml.tree.Xml; import org.springframework.core.io.Resource; -import org.springframework.sbm.parsers.maven.MavenRuntimeInformation; -import org.springframework.sbm.utils.ResourceUtil; +import org.springframework.rewrite.parsers.maven.MavenRuntimeInformation; +import org.springframework.rewrite.utils.ResourceUtil; import java.io.File; import java.nio.file.Path; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/ModuleParser.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ModuleParser.java similarity index 99% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/ModuleParser.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ModuleParser.java index 676ea441f..54b443dfb 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/ModuleParser.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ModuleParser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers; +package org.springframework.rewrite.parsers; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; @@ -32,7 +32,7 @@ import org.openrewrite.marker.Markers; import org.openrewrite.xml.tree.Xml; import org.springframework.core.io.Resource; -import org.springframework.sbm.utils.ResourceUtil; +import org.springframework.rewrite.utils.ResourceUtil; import java.io.InputStream; import java.nio.file.Files; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/ParserContext.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ParserContext.java similarity index 96% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/ParserContext.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ParserContext.java index 64bfa95a9..8b77c6684 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/ParserContext.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ParserContext.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers; +package org.springframework.rewrite.parsers; import lombok.Getter; import lombok.RequiredArgsConstructor; import org.openrewrite.xml.tree.Xml; import org.springframework.core.io.Resource; -import org.springframework.sbm.utils.ResourceUtil; +import org.springframework.rewrite.utils.ResourceUtil; import java.nio.file.Path; import java.util.List; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/ParserProperties.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ParserProperties.java similarity index 98% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/ParserProperties.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ParserProperties.java index fb22d9382..4d184127f 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/ParserProperties.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ParserProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers; +package org.springframework.rewrite.parsers; import lombok.Getter; import lombok.Setter; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/ProjectId.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ProjectId.java similarity index 96% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/ProjectId.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ProjectId.java index 2b423041e..3f1cde12a 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/ProjectId.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ProjectId.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers; +package org.springframework.rewrite.parsers; import java.util.Objects; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/ProjectScanner.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ProjectScanner.java similarity index 96% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/ProjectScanner.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ProjectScanner.java index 526a3a1ad..19edd515d 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/ProjectScanner.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ProjectScanner.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers; +package org.springframework.rewrite.parsers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -21,8 +21,8 @@ import org.springframework.core.io.Resource; import org.springframework.core.io.ResourceLoader; import org.springframework.core.io.support.ResourcePatternUtils; -import org.springframework.sbm.utils.LinuxWindowsPathUnifier; -import org.springframework.sbm.utils.ResourceUtil; +import org.springframework.rewrite.utils.LinuxWindowsPathUnifier; +import org.springframework.rewrite.utils.ResourceUtil; import java.io.IOException; import java.nio.file.Path; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/RecipeValidationErrorException.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RecipeValidationErrorException.java similarity index 94% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/RecipeValidationErrorException.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RecipeValidationErrorException.java index 1b1db2555..3b0002c1f 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/RecipeValidationErrorException.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RecipeValidationErrorException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers; +package org.springframework.rewrite.parsers; /** * Thrown when recipe validation failed during discovery. diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/RewriteExecutionContext.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteExecutionContext.java similarity index 98% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/RewriteExecutionContext.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteExecutionContext.java index b322ce3b5..a8ff165b8 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/RewriteExecutionContext.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteExecutionContext.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers; +package org.springframework.rewrite.parsers; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/RewriteExecutionContextErrorHandler.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteExecutionContextErrorHandler.java similarity index 97% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/RewriteExecutionContextErrorHandler.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteExecutionContextErrorHandler.java index e91871772..2106f036a 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/RewriteExecutionContextErrorHandler.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteExecutionContextErrorHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers; +package org.springframework.rewrite.parsers; import lombok.Getter; import lombok.Setter; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/RewriteParserConfiguration.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteParserConfiguration.java similarity index 85% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/RewriteParserConfiguration.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteParserConfiguration.java index 77026794c..59b7992f7 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/RewriteParserConfiguration.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteParserConfiguration.java @@ -13,14 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers; +package org.springframework.rewrite.parsers; import lombok.extern.slf4j.Slf4j; import org.openrewrite.ExecutionContext; import org.openrewrite.maven.cache.*; import org.openrewrite.maven.utilities.MavenArtifactDownloader; import org.openrewrite.tree.ParsingEventListener; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -28,12 +27,12 @@ import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; -import org.springframework.sbm.boot.autoconfigure.ParserPropertiesPostProcessor; -import org.springframework.sbm.boot.autoconfigure.ScopeConfiguration; -import org.springframework.sbm.parsers.events.RewriteParsingEventListenerAdapter; -import org.springframework.sbm.parsers.maven.*; -import org.springframework.sbm.project.resource.SbmApplicationProperties; -import org.springframework.sbm.scopes.ScanScope; +import org.springframework.rewrite.boot.autoconfigure.ParserPropertiesPostProcessor; +import org.springframework.rewrite.boot.autoconfigure.ScopeConfiguration; +import org.springframework.rewrite.parsers.events.RewriteParsingEventListenerAdapter; +import org.springframework.rewrite.parsers.maven.*; +import org.springframework.rewrite.project.resource.SbmApplicationProperties; +import org.springframework.rewrite.scopes.annotations.ScanScope; import java.io.PrintWriter; import java.io.StringWriter; @@ -48,7 +47,8 @@ @Slf4j @AutoConfiguration(after = { ScopeConfiguration.class }) @EnableConfigurationProperties({ ParserProperties.class, SbmApplicationProperties.class }) -@Import({ ScanScope.class, ScopeConfiguration.class, RewriteParserMavenConfiguration.class }) +@Import({ org.springframework.rewrite.scopes.ScanScope.class, ScopeConfiguration.class, + RewriteParserMavenConfiguration.class }) public class RewriteParserConfiguration { @Bean @@ -57,7 +57,7 @@ ProvenanceMarkerFactory provenanceMarkerFactory(MavenProvenanceMarkerFactory mav } @Bean - @org.springframework.sbm.scopes.annotations.ScanScope + @ScanScope JavaParserBuilder javaParserBuilder() { return new JavaParserBuilder(); } @@ -120,9 +120,9 @@ MavenProjectAnalyzer mavenProjectAnalyzer(MavenArtifactDownloader artifactDownlo RewriteProjectParser rewriteProjectParser(ProvenanceMarkerFactory provenanceMarkerFactory, BuildFileParser buildFileParser, SourceFileParser sourceFileParser, StyleDetector styleDetector, ParserProperties parserProperties, ParsingEventListener parsingEventListener, - ApplicationEventPublisher eventPublisher, ScanScope scanScope, ConfigurableListableBeanFactory beanFactory, - ProjectScanner projectScanner, ExecutionContext executionContext, - MavenProjectAnalyzer mavenProjectAnalyzer) { + ApplicationEventPublisher eventPublisher, org.springframework.rewrite.scopes.ScanScope scanScope, + ConfigurableListableBeanFactory beanFactory, ProjectScanner projectScanner, + ExecutionContext executionContext, MavenProjectAnalyzer mavenProjectAnalyzer) { return new RewriteProjectParser(provenanceMarkerFactory, buildFileParser, sourceFileParser, styleDetector, parserProperties, parsingEventListener, eventPublisher, scanScope, beanFactory, projectScanner, executionContext, mavenProjectAnalyzer); diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/RewriteProjectParser.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteProjectParser.java similarity index 89% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/RewriteProjectParser.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteProjectParser.java index f75aa99f4..27f6e4fea 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/RewriteProjectParser.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteProjectParser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers; +package org.springframework.rewrite.parsers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -21,8 +21,6 @@ import org.openrewrite.ExecutionContext; import org.openrewrite.SourceFile; import org.openrewrite.marker.Marker; -import org.openrewrite.maven.MavenExecutionContextView; -import org.openrewrite.maven.MavenSettings; import org.openrewrite.style.NamedStyles; import org.openrewrite.tree.ParsingEventListener; import org.openrewrite.tree.ParsingExecutionContextView; @@ -30,15 +28,14 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.context.ApplicationEventPublisher; import org.springframework.core.io.Resource; -import org.springframework.sbm.parsers.events.StartedParsingProjectEvent; -import org.springframework.sbm.parsers.events.SuccessfullyParsedProjectEvent; -import org.springframework.sbm.parsers.maven.BuildFileParser; -import org.springframework.sbm.parsers.maven.MavenProjectAnalyzer; -import org.springframework.sbm.parsers.maven.ProvenanceMarkerFactory; -import org.springframework.sbm.scopes.ScanScope; - -import java.net.URI; -import java.nio.charset.Charset; +import org.springframework.rewrite.parsers.events.StartedParsingProjectEvent; +import org.springframework.rewrite.parsers.events.SuccessfullyParsedProjectEvent; +import org.springframework.rewrite.parsers.maven.BuildFileParser; +import org.springframework.rewrite.parsers.maven.MavenProjectAnalyzer; +import org.springframework.rewrite.parsers.maven.ProvenanceMarkerFactory; +import org.springframework.rewrite.recipes.RewriteRecipeDiscovery; +import org.springframework.rewrite.scopes.ScanScope; + import java.nio.file.Path; import java.util.ArrayList; import java.util.List; @@ -63,7 +60,7 @@ * * * @author Fabian Krüger - * @see org.springframework.sbm.recipes.RewriteRecipeDiscovery + * @see RewriteRecipeDiscovery * @see LST */ diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/RewriteProjectParsingResult.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteProjectParsingResult.java similarity index 95% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/RewriteProjectParsingResult.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteProjectParsingResult.java index 4c5350949..7862b905d 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/RewriteProjectParsingResult.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteProjectParsingResult.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers; +package org.springframework.rewrite.parsers; import org.openrewrite.ExecutionContext; import org.openrewrite.SourceFile; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/RewriteResourceParser.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteResourceParser.java similarity index 99% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/RewriteResourceParser.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteResourceParser.java index a2cef8044..bd1997639 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/RewriteResourceParser.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteResourceParser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers; +package org.springframework.rewrite.parsers; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; @@ -31,7 +31,7 @@ import org.openrewrite.yaml.YamlParser; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.Resource; -import org.springframework.sbm.utils.ResourceUtil; +import org.springframework.rewrite.utils.ResourceUtil; import java.nio.file.Path; import java.nio.file.PathMatcher; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/SourceFileParser.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/SourceFileParser.java similarity index 94% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/SourceFileParser.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/SourceFileParser.java index c8c585d8d..8877b01ed 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/SourceFileParser.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/SourceFileParser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers; +package org.springframework.rewrite.parsers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -23,7 +23,7 @@ import org.openrewrite.style.NamedStyles; import org.openrewrite.xml.tree.Xml; import org.springframework.core.io.Resource; -import org.springframework.sbm.parsers.maven.MavenModuleParser; +import org.springframework.rewrite.parsers.maven.MavenModuleParser; import java.nio.file.Path; import java.util.*; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/SourceSetParsingResult.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/SourceSetParsingResult.java similarity index 95% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/SourceSetParsingResult.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/SourceSetParsingResult.java index cba9db43b..512cd7b4d 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/SourceSetParsingResult.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/SourceSetParsingResult.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers; +package org.springframework.rewrite.parsers; import org.openrewrite.SourceFile; import org.openrewrite.java.tree.JavaType; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/StyleDetector.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/StyleDetector.java similarity index 98% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/StyleDetector.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/StyleDetector.java index 5c4b4c187..6fd7e22ec 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/StyleDetector.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/StyleDetector.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers; +package org.springframework.rewrite.parsers; import org.openrewrite.SourceFile; import org.openrewrite.Tree; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/events/FinishedParsingResourceEvent.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/FinishedParsingResourceEvent.java similarity index 94% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/events/FinishedParsingResourceEvent.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/FinishedParsingResourceEvent.java index a13b9f1ac..04ca5b0a7 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/events/FinishedParsingResourceEvent.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/FinishedParsingResourceEvent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.events; +package org.springframework.rewrite.parsers.events; import org.openrewrite.Parser; import org.openrewrite.SourceFile; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/events/IntermediateParsingEvent.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/IntermediateParsingEvent.java similarity index 93% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/events/IntermediateParsingEvent.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/IntermediateParsingEvent.java index 8a2b036b5..34df104eb 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/events/IntermediateParsingEvent.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/IntermediateParsingEvent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.sbm.parsers.events; +package org.springframework.rewrite.parsers.events; /** * @author Fabian Krüger diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/events/RewriteParsingEventListenerAdapter.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/RewriteParsingEventListenerAdapter.java similarity index 97% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/events/RewriteParsingEventListenerAdapter.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/RewriteParsingEventListenerAdapter.java index 3e9c5f62b..c69b6d414 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/events/RewriteParsingEventListenerAdapter.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/RewriteParsingEventListenerAdapter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.events; +package org.springframework.rewrite.parsers.events; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/events/StartedParsingProjectEvent.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/StartedParsingProjectEvent.java similarity index 93% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/events/StartedParsingProjectEvent.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/StartedParsingProjectEvent.java index d91d2fe77..b879e963a 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/events/StartedParsingProjectEvent.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/StartedParsingProjectEvent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.events; +package org.springframework.rewrite.parsers.events; import org.springframework.core.io.Resource; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/events/StartedParsingResourceEvent.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/StartedParsingResourceEvent.java similarity index 93% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/events/StartedParsingResourceEvent.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/StartedParsingResourceEvent.java index 4db025769..ddc698324 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/events/StartedParsingResourceEvent.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/StartedParsingResourceEvent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.events; +package org.springframework.rewrite.parsers.events; import org.openrewrite.Parser; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/events/SuccessfullyParsedProjectEvent.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/SuccessfullyParsedProjectEvent.java similarity index 93% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/events/SuccessfullyParsedProjectEvent.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/SuccessfullyParsedProjectEvent.java index 3866603be..b9692cb82 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/events/SuccessfullyParsedProjectEvent.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/SuccessfullyParsedProjectEvent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.events; +package org.springframework.rewrite.parsers.events; import org.openrewrite.SourceFile; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/BuildFileParser.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/BuildFileParser.java similarity index 98% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/BuildFileParser.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/BuildFileParser.java index 2dfbded68..526063196 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/BuildFileParser.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/BuildFileParser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.maven; +package org.springframework.rewrite.parsers.maven; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -24,7 +24,7 @@ import org.openrewrite.maven.MavenParser; import org.openrewrite.xml.tree.Xml; import org.springframework.core.io.Resource; -import org.springframework.sbm.utils.ResourceUtil; +import org.springframework.rewrite.utils.ResourceUtil; import org.springframework.util.Assert; import java.nio.file.Path; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/MavenConfigFileParser.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenConfigFileParser.java similarity index 99% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/MavenConfigFileParser.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenConfigFileParser.java index 4ef1ed4d9..8f8c0b3e3 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/MavenConfigFileParser.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenConfigFileParser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.maven; +package org.springframework.rewrite.parsers.maven; import org.apache.commons.cli.*; import org.apache.maven.cli.CleanArgument; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/MavenModelReader.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenModelReader.java similarity index 92% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/MavenModelReader.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenModelReader.java index 8acc93c89..6b2f430a5 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/MavenModelReader.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenModelReader.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.maven; +package org.springframework.rewrite.parsers.maven; import org.apache.maven.model.Model; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import org.springframework.core.io.Resource; -import org.springframework.sbm.utils.ResourceUtil; +import org.springframework.rewrite.utils.ResourceUtil; import java.io.IOException; import java.nio.file.Path; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/MavenModuleParser.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenModuleParser.java similarity index 98% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/MavenModuleParser.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenModuleParser.java index 0a41bb7b1..d3e9634eb 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/MavenModuleParser.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenModuleParser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.maven; +package org.springframework.rewrite.parsers.maven; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -26,7 +26,7 @@ import org.openrewrite.tree.ParsingExecutionContextView; import org.openrewrite.xml.tree.Xml; import org.springframework.core.io.Resource; -import org.springframework.sbm.parsers.*; +import org.springframework.rewrite.parsers.*; import java.nio.charset.Charset; import java.nio.file.Path; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/MavenPasswordDecrypter.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenPasswordDecrypter.java similarity index 96% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/MavenPasswordDecrypter.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenPasswordDecrypter.java index 8a5b15c38..c8e56b521 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/MavenPasswordDecrypter.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenPasswordDecrypter.java @@ -13,9 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.maven; +package org.springframework.rewrite.parsers.maven; -import lombok.RequiredArgsConstructor; import org.openrewrite.maven.MavenSettings; import org.sonatype.plexus.components.cipher.DefaultPlexusCipher; import org.sonatype.plexus.components.cipher.PlexusCipherException; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/MavenProjectAnalyzer.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenProjectAnalyzer.java similarity index 98% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/MavenProjectAnalyzer.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenProjectAnalyzer.java index c213da604..0921d6327 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/MavenProjectAnalyzer.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenProjectAnalyzer.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.maven; +package org.springframework.rewrite.parsers.maven; import org.apache.maven.model.*; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import org.openrewrite.maven.utilities.MavenArtifactDownloader; import org.springframework.core.io.Resource; -import org.springframework.sbm.parsers.MavenProject; -import org.springframework.sbm.parsers.ParserContext; -import org.springframework.sbm.utils.ResourceUtil; +import org.springframework.rewrite.parsers.MavenProject; +import org.springframework.rewrite.parsers.ParserContext; +import org.springframework.rewrite.utils.ResourceUtil; import java.io.File; import java.io.IOException; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/MavenProvenanceMarkerFactory.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenProvenanceMarkerFactory.java similarity index 97% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/MavenProvenanceMarkerFactory.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenProvenanceMarkerFactory.java index a60e8c0ec..1690083da 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/MavenProvenanceMarkerFactory.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenProvenanceMarkerFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.maven; +package org.springframework.rewrite.parsers.maven; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -29,12 +29,11 @@ import org.openrewrite.marker.Marker; import org.openrewrite.marker.OperatingSystemProvenance; import org.openrewrite.marker.ci.BuildEnvironment; -import org.springframework.sbm.parsers.MavenProject; +import org.springframework.rewrite.parsers.MavenProject; import java.nio.file.Path; import java.util.List; import java.util.Objects; -import java.util.stream.Collectors; import java.util.stream.Stream; /** diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/MavenRuntimeInformation.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenRuntimeInformation.java similarity index 93% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/MavenRuntimeInformation.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenRuntimeInformation.java index 3e203eb0c..26b8f476e 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/MavenRuntimeInformation.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenRuntimeInformation.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.maven; +package org.springframework.rewrite.parsers.maven; /** * @author Fabian Krüger diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/MavenSettingsInitializer.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenSettingsInitializer.java similarity index 95% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/MavenSettingsInitializer.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenSettingsInitializer.java index ce19ee300..39ee67c7a 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/MavenSettingsInitializer.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenSettingsInitializer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.maven; +package org.springframework.rewrite.parsers.maven; import lombok.RequiredArgsConstructor; import org.openrewrite.ExecutionContext; @@ -22,8 +22,7 @@ import org.openrewrite.maven.MavenSettings; import org.openrewrite.maven.internal.RawRepositories; import org.openrewrite.maven.tree.MavenRepository; -import org.openrewrite.maven.tree.ProfileActivation; -import org.springframework.sbm.scopes.ProjectMetadata; +import org.springframework.rewrite.scopes.ProjectMetadata; import org.springframework.stereotype.Component; import java.nio.file.Files; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/ProvenanceMarkerFactory.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/ProvenanceMarkerFactory.java similarity index 90% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/ProvenanceMarkerFactory.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/ProvenanceMarkerFactory.java index f21ed9d97..e8c3c17ce 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/ProvenanceMarkerFactory.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/ProvenanceMarkerFactory.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.maven; +package org.springframework.rewrite.parsers.maven; import lombok.RequiredArgsConstructor; import org.openrewrite.marker.Marker; import org.springframework.core.io.Resource; -import org.springframework.sbm.parsers.ParserContext; -import org.springframework.sbm.utils.ResourceUtil; +import org.springframework.rewrite.parsers.ParserContext; +import org.springframework.rewrite.utils.ResourceUtil; import java.nio.file.Path; import java.util.HashMap; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/RewriteMavenArtifactDownloader.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/RewriteMavenArtifactDownloader.java similarity index 96% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/RewriteMavenArtifactDownloader.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/RewriteMavenArtifactDownloader.java index 1a3c510c7..8c2e42e0a 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/RewriteMavenArtifactDownloader.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/RewriteMavenArtifactDownloader.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.maven; +package org.springframework.rewrite.parsers.maven; import lombok.extern.slf4j.Slf4j; import org.openrewrite.internal.lang.Nullable; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/RewriteParserMavenConfiguration.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/RewriteParserMavenConfiguration.java similarity index 92% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/RewriteParserMavenConfiguration.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/RewriteParserMavenConfiguration.java index 44c4c6de7..aa8763fcd 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/parsers/maven/RewriteParserMavenConfiguration.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/RewriteParserMavenConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.maven; +package org.springframework.rewrite.parsers.maven; import org.openrewrite.ExecutionContext; import org.openrewrite.maven.cache.LocalMavenArtifactCache; @@ -22,8 +22,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; -import org.springframework.sbm.boot.autoconfigure.ScopeConfiguration; -import org.springframework.sbm.scopes.ProjectMetadata; +import org.springframework.rewrite.boot.autoconfigure.ScopeConfiguration; +import org.springframework.rewrite.scopes.ProjectMetadata; import java.nio.file.Paths; import java.util.function.Consumer; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/RewriteSourceFileWrapper.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/RewriteSourceFileWrapper.java similarity index 92% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/RewriteSourceFileWrapper.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/RewriteSourceFileWrapper.java index 895244ff3..5de3c4ae7 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/RewriteSourceFileWrapper.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/RewriteSourceFileWrapper.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.project; +package org.springframework.rewrite.project; import org.openrewrite.SourceFile; -import org.springframework.sbm.project.resource.RewriteSourceFileHolder; +import org.springframework.rewrite.project.resource.RewriteSourceFileHolder; import java.nio.file.Path; import java.util.List; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/BaseProjectResource.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/BaseProjectResource.java similarity index 95% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/BaseProjectResource.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/BaseProjectResource.java index 761d44449..9192ef78a 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/BaseProjectResource.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/BaseProjectResource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.project.resource; +package org.springframework.rewrite.project.resource; public abstract class BaseProjectResource implements InternalProjectResource { diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/InternalProjectResource.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/InternalProjectResource.java similarity index 93% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/InternalProjectResource.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/InternalProjectResource.java index 585f59987..0d861bc36 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/InternalProjectResource.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/InternalProjectResource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.project.resource; +package org.springframework.rewrite.project.resource; public interface InternalProjectResource extends ProjectResource { diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/NoProjectResourceWrapperFoundException.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/NoProjectResourceWrapperFoundException.java similarity index 93% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/NoProjectResourceWrapperFoundException.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/NoProjectResourceWrapperFoundException.java index 7c00392f7..4e8d27bf2 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/NoProjectResourceWrapperFoundException.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/NoProjectResourceWrapperFoundException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.project.resource; +package org.springframework.rewrite.project.resource; public class NoProjectResourceWrapperFoundException extends RuntimeException { diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/ProjectResource.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/ProjectResource.java similarity index 94% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/ProjectResource.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/ProjectResource.java index 9c32f6dd2..90890b25e 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/ProjectResource.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/ProjectResource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.project.resource; +package org.springframework.rewrite.project.resource; import java.nio.file.Path; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/ProjectResourceSerializer.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/ProjectResourceSerializer.java similarity index 97% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/ProjectResourceSerializer.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/ProjectResourceSerializer.java index 6227395d0..797267fbb 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/ProjectResourceSerializer.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/ProjectResourceSerializer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.project.resource; +package org.springframework.rewrite.project.resource; import java.io.BufferedWriter; import java.io.IOException; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/ProjectResourceSet.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/ProjectResourceSet.java similarity index 98% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/ProjectResourceSet.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/ProjectResourceSet.java index a8ccf011c..46ebaf675 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/ProjectResourceSet.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/ProjectResourceSet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.project.resource; +package org.springframework.rewrite.project.resource; import org.openrewrite.ExecutionContext; import org.openrewrite.Recipe; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/ProjectResourceSetFactory.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/ProjectResourceSetFactory.java similarity index 92% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/ProjectResourceSetFactory.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/ProjectResourceSetFactory.java index 75c30c0ec..66e8b4323 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/ProjectResourceSetFactory.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/ProjectResourceSetFactory.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.project.resource; +package org.springframework.rewrite.project.resource; import lombok.RequiredArgsConstructor; import org.openrewrite.ExecutionContext; import org.openrewrite.SourceFile; -import org.springframework.sbm.project.RewriteSourceFileWrapper; +import org.springframework.rewrite.project.RewriteSourceFileWrapper; import java.nio.file.Path; import java.util.List; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/ProjectResourceSetHolder.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/ProjectResourceSetHolder.java similarity index 96% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/ProjectResourceSetHolder.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/ProjectResourceSetHolder.java index b79b09775..8e2074d45 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/ProjectResourceSetHolder.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/ProjectResourceSetHolder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.project.resource; +package org.springframework.rewrite.project.resource; import lombok.RequiredArgsConstructor; import org.openrewrite.ExecutionContext; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/ProjectResourceSetSerializer.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/ProjectResourceSetSerializer.java similarity index 94% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/ProjectResourceSetSerializer.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/ProjectResourceSetSerializer.java index 460c6b110..f12948689 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/ProjectResourceSetSerializer.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/ProjectResourceSetSerializer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.project.resource; +package org.springframework.rewrite.project.resource; import lombok.RequiredArgsConstructor; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/ProjectResourceWrapper.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/ProjectResourceWrapper.java similarity index 94% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/ProjectResourceWrapper.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/ProjectResourceWrapper.java index 3ece5cea6..662639f32 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/ProjectResourceWrapper.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/ProjectResourceWrapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.project.resource; +package org.springframework.rewrite.project.resource; import org.openrewrite.SourceFile; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/RewriteMigrationResultMerger.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/RewriteMigrationResultMerger.java similarity index 93% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/RewriteMigrationResultMerger.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/RewriteMigrationResultMerger.java index 94ec50177..2fa73568b 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/RewriteMigrationResultMerger.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/RewriteMigrationResultMerger.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.project.resource; +package org.springframework.rewrite.project.resource; import lombok.RequiredArgsConstructor; import org.openrewrite.Result; import org.openrewrite.SourceFile; -import org.springframework.sbm.project.RewriteSourceFileWrapper; -import org.springframework.sbm.project.resource.finder.AbsolutePathResourceFinder; +import org.springframework.rewrite.project.RewriteSourceFileWrapper; +import org.springframework.rewrite.project.resource.finder.AbsolutePathResourceFinder; import java.nio.file.Path; import java.util.List; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/RewriteSourceFileHolder.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/RewriteSourceFileHolder.java similarity index 98% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/RewriteSourceFileHolder.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/RewriteSourceFileHolder.java index c4b03e441..9e597f207 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/RewriteSourceFileHolder.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/RewriteSourceFileHolder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.project.resource; +package org.springframework.rewrite.project.resource; import lombok.Getter; import org.openrewrite.SourceFile; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/SbmApplicationProperties.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/SbmApplicationProperties.java similarity index 97% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/SbmApplicationProperties.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/SbmApplicationProperties.java index aa21293c5..28fa1f3af 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/SbmApplicationProperties.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/SbmApplicationProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.project.resource; +package org.springframework.rewrite.project.resource; import lombok.Getter; import lombok.Setter; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/finder/AbsolutePathResourceFinder.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/AbsolutePathResourceFinder.java similarity index 87% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/finder/AbsolutePathResourceFinder.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/AbsolutePathResourceFinder.java index 01073b471..e9f765f11 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/finder/AbsolutePathResourceFinder.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/AbsolutePathResourceFinder.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.project.resource.finder; +package org.springframework.rewrite.project.resource.finder; import lombok.RequiredArgsConstructor; import org.openrewrite.SourceFile; -import org.springframework.sbm.project.resource.ProjectResourceSet; -import org.springframework.sbm.project.resource.RewriteSourceFileHolder; +import org.springframework.rewrite.project.resource.ProjectResourceSet; +import org.springframework.rewrite.project.resource.RewriteSourceFileHolder; import java.nio.file.Path; import java.util.Optional; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/finder/AbsolutePathResourcesFinder.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/AbsolutePathResourcesFinder.java similarity index 91% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/finder/AbsolutePathResourcesFinder.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/AbsolutePathResourcesFinder.java index df032fa03..6868f65b7 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/finder/AbsolutePathResourcesFinder.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/AbsolutePathResourcesFinder.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.project.resource.finder; +package org.springframework.rewrite.project.resource.finder; import org.openrewrite.SourceFile; -import org.springframework.sbm.project.resource.ProjectResourceSet; -import org.springframework.sbm.project.resource.RewriteSourceFileHolder; +import org.springframework.rewrite.project.resource.ProjectResourceSet; +import org.springframework.rewrite.project.resource.RewriteSourceFileHolder; import java.nio.file.Path; import java.util.Arrays; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/finder/DeletedResourcePathStringFilter.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/DeletedResourcePathStringFilter.java similarity index 88% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/finder/DeletedResourcePathStringFilter.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/DeletedResourcePathStringFilter.java index cd8dcfed4..87c916486 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/finder/DeletedResourcePathStringFilter.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/DeletedResourcePathStringFilter.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.project.resource.finder; +package org.springframework.rewrite.project.resource.finder; -import org.springframework.sbm.project.resource.ProjectResourceSet; +import org.springframework.rewrite.project.resource.ProjectResourceSet; import java.util.List; import java.util.stream.Collectors; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/finder/GenericTypeFinder.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/GenericTypeFinder.java similarity index 91% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/finder/GenericTypeFinder.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/GenericTypeFinder.java index c76cc7c10..4385160be 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/finder/GenericTypeFinder.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/GenericTypeFinder.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.project.resource.finder; +package org.springframework.rewrite.project.resource.finder; import lombok.Getter; -import org.springframework.sbm.project.resource.ProjectResourceSet; +import org.springframework.rewrite.project.resource.ProjectResourceSet; import java.util.List; import java.util.Optional; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/finder/GenericTypeListFinder.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/GenericTypeListFinder.java similarity index 89% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/finder/GenericTypeListFinder.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/GenericTypeListFinder.java index aa036e2c8..24a008ecf 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/finder/GenericTypeListFinder.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/GenericTypeListFinder.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.project.resource.finder; +package org.springframework.rewrite.project.resource.finder; import lombok.Getter; -import org.springframework.sbm.project.resource.ProjectResourceSet; +import org.springframework.rewrite.project.resource.ProjectResourceSet; import java.util.List; import java.util.stream.Collectors; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/finder/ModifiedResourcePathStringFilter.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/ModifiedResourcePathStringFilter.java similarity index 89% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/finder/ModifiedResourcePathStringFilter.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/ModifiedResourcePathStringFilter.java index 0ea5f8b6e..dac702e04 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/finder/ModifiedResourcePathStringFilter.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/ModifiedResourcePathStringFilter.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.project.resource.finder; +package org.springframework.rewrite.project.resource.finder; -import org.springframework.sbm.project.resource.ProjectResourceSet; +import org.springframework.rewrite.project.resource.ProjectResourceSet; import java.util.List; import java.util.stream.Collectors; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/finder/PathPatternMatchingProjectResourceFinder.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/PathPatternMatchingProjectResourceFinder.java similarity index 88% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/finder/PathPatternMatchingProjectResourceFinder.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/PathPatternMatchingProjectResourceFinder.java index bab3024bb..0c666bf86 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/finder/PathPatternMatchingProjectResourceFinder.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/PathPatternMatchingProjectResourceFinder.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.project.resource.finder; +package org.springframework.rewrite.project.resource.finder; -import org.springframework.sbm.project.resource.ProjectResource; -import org.springframework.sbm.project.resource.ProjectResourceSet; -import org.springframework.sbm.utils.OsAgnosticPathMatcher; +import org.springframework.rewrite.project.resource.ProjectResource; +import org.springframework.rewrite.project.resource.ProjectResourceSet; +import org.springframework.rewrite.utils.OsAgnosticPathMatcher; import org.springframework.util.PathMatcher; import java.util.Arrays; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/finder/ProjectResourceFinder.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/ProjectResourceFinder.java similarity index 84% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/finder/ProjectResourceFinder.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/ProjectResourceFinder.java index 11aa0f405..6dbd9ea1a 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/finder/ProjectResourceFinder.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/ProjectResourceFinder.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.project.resource.finder; +package org.springframework.rewrite.project.resource.finder; -import org.springframework.sbm.project.resource.ProjectResourceSet; +import org.springframework.rewrite.project.resource.ProjectResourceSet; public interface ProjectResourceFinder { diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/finder/ResourceFilterException.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/ResourceFilterException.java similarity index 92% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/finder/ResourceFilterException.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/ResourceFilterException.java index 737a374fe..7413c72a0 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/finder/ResourceFilterException.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/ResourceFilterException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.project.resource.finder; +package org.springframework.rewrite.project.resource.finder; public class ResourceFilterException extends RuntimeException { diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/finder/RewriteSourceFileHolderListFinder.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/RewriteSourceFileHolderListFinder.java similarity index 87% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/finder/RewriteSourceFileHolderListFinder.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/RewriteSourceFileHolderListFinder.java index 26b94c3af..5c9708dbd 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/project/resource/finder/RewriteSourceFileHolderListFinder.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/RewriteSourceFileHolderListFinder.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.project.resource.finder; +package org.springframework.rewrite.project.resource.finder; import lombok.RequiredArgsConstructor; import org.openrewrite.SourceFile; -import org.springframework.sbm.project.resource.ProjectResourceSet; -import org.springframework.sbm.project.resource.RewriteSourceFileHolder; +import org.springframework.rewrite.project.resource.ProjectResourceSet; +import org.springframework.rewrite.project.resource.RewriteSourceFileHolder; import java.util.List; import java.util.stream.Collectors; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/recipes/RewriteRecipeDiscovery.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/recipes/RewriteRecipeDiscovery.java similarity index 97% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/recipes/RewriteRecipeDiscovery.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/recipes/RewriteRecipeDiscovery.java index 60f12a926..73de4d366 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/recipes/RewriteRecipeDiscovery.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/recipes/RewriteRecipeDiscovery.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.recipes; +package org.springframework.rewrite.recipes; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -23,8 +23,8 @@ import org.openrewrite.config.Environment; import org.openrewrite.config.RecipeDescriptor; import org.openrewrite.config.ResourceLoader; -import org.springframework.sbm.parsers.ParserProperties; -import org.springframework.sbm.parsers.RecipeValidationErrorException; +import org.springframework.rewrite.parsers.ParserProperties; +import org.springframework.rewrite.parsers.RecipeValidationErrorException; import java.util.ArrayList; import java.util.Collection; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/scopes/AbstractBaseScope.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/scopes/AbstractBaseScope.java similarity index 98% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/scopes/AbstractBaseScope.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/scopes/AbstractBaseScope.java index e4ccc3e5c..8a78530c8 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/scopes/AbstractBaseScope.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/scopes/AbstractBaseScope.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.scopes; +package org.springframework.rewrite.scopes; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.ObjectFactory; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/scopes/ExecutionScope.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/scopes/ExecutionScope.java similarity index 87% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/scopes/ExecutionScope.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/scopes/ExecutionScope.java index c4d95e3ef..0ea9ff71e 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/scopes/ExecutionScope.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/scopes/ExecutionScope.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.scopes; +package org.springframework.rewrite.scopes; /** * Scope implementation for beans marked with - * {@link org.springframework.sbm.scopes.annotations.ExecutionScope}. + * {@link org.springframework.rewrite.scopes.annotations.ExecutionScope}. * * @author Fabian Krüger */ diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/scopes/ProjectMetadata.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/scopes/ProjectMetadata.java similarity index 94% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/scopes/ProjectMetadata.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/scopes/ProjectMetadata.java index b42ef888b..aded2e278 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/scopes/ProjectMetadata.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/scopes/ProjectMetadata.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.scopes; +package org.springframework.rewrite.scopes; import lombok.Getter; import lombok.Setter; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/scopes/ScanScope.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/scopes/ScanScope.java similarity index 87% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/scopes/ScanScope.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/scopes/ScanScope.java index eb9884ecb..ff1c7d6f2 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/scopes/ScanScope.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/scopes/ScanScope.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.scopes; +package org.springframework.rewrite.scopes; /** * Scope implementation for beans marked with - * {@link org.springframework.sbm.scopes.annotations.ScanScope}. + * {@link org.springframework.rewrite.scopes.annotations.ScanScope}. * * @author Fabian Krüger */ diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/scopes/annotations/ExecutionScope.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/scopes/annotations/ExecutionScope.java similarity index 88% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/scopes/annotations/ExecutionScope.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/scopes/annotations/ExecutionScope.java index 5b286979e..8c56bd640 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/scopes/annotations/ExecutionScope.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/scopes/annotations/ExecutionScope.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.scopes.annotations; +package org.springframework.rewrite.scopes.annotations; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Scope; @@ -36,7 +36,8 @@ @Qualifier @Target({ ElementType.TYPE, ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) -@Scope(scopeName = org.springframework.sbm.scopes.ExecutionScope.SCOPE_NAME, proxyMode = ScopedProxyMode.TARGET_CLASS) +@Scope(scopeName = org.springframework.rewrite.scopes.ExecutionScope.SCOPE_NAME, + proxyMode = ScopedProxyMode.TARGET_CLASS) public @interface ExecutionScope { } diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/scopes/annotations/ScanScope.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/scopes/annotations/ScanScope.java similarity index 72% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/scopes/annotations/ScanScope.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/scopes/annotations/ScanScope.java index b08787497..8360348f3 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/scopes/annotations/ScanScope.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/scopes/annotations/ScanScope.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.scopes.annotations; +package org.springframework.rewrite.scopes.annotations; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Scope; @@ -26,11 +26,10 @@ /** * - * ## scanScope Beans annotated with - * {@link org.springframework.sbm.scopes.annotations.ScanScope} will be created on first - * access during scan/parse and added to the scanScope. Subsequent usages will receive - * instances from the scanScope until the scope ends and all scoped beans get removed from - * the scope. + * ## scanScope Beans annotated with {@link ScanScope} will be created on first access + * during scan/parse and added to the scanScope. Subsequent usages will receive instances + * from the scanScope until the scope ends and all scoped beans get removed from the + * scope. * * The `scanScope` starts with - parsing a given application * @@ -41,7 +40,7 @@ @Qualifier @Target({ ElementType.TYPE, ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) -@Scope(scopeName = org.springframework.sbm.scopes.ScanScope.SCOPE_NAME, proxyMode = ScopedProxyMode.TARGET_CLASS) +@Scope(scopeName = org.springframework.rewrite.scopes.ScanScope.SCOPE_NAME, proxyMode = ScopedProxyMode.TARGET_CLASS) public @interface ScanScope { } diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/support/openrewrite/GenericOpenRewriteRecipe.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/support/openrewrite/GenericOpenRewriteRecipe.java similarity index 96% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/support/openrewrite/GenericOpenRewriteRecipe.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/support/openrewrite/GenericOpenRewriteRecipe.java index a25b37cb0..8232a98b3 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/support/openrewrite/GenericOpenRewriteRecipe.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/support/openrewrite/GenericOpenRewriteRecipe.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.support.openrewrite; +package org.springframework.rewrite.support.openrewrite; import org.openrewrite.ExecutionContext; import org.openrewrite.Recipe; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/utils/JavaHelper.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/utils/JavaHelper.java similarity index 95% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/utils/JavaHelper.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/utils/JavaHelper.java index 9777ae6be..1a22c3db2 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/utils/JavaHelper.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/utils/JavaHelper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.utils; +package org.springframework.rewrite.utils; /** * @author Fabian Krüger diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/utils/LinuxWindowsPathUnifier.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/utils/LinuxWindowsPathUnifier.java similarity index 96% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/utils/LinuxWindowsPathUnifier.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/utils/LinuxWindowsPathUnifier.java index 0cdb17180..81e3c41e5 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/utils/LinuxWindowsPathUnifier.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/utils/LinuxWindowsPathUnifier.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.utils; +package org.springframework.rewrite.utils; import org.springframework.util.StringUtils; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/utils/OsAgnosticPathMatcher.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/utils/OsAgnosticPathMatcher.java similarity index 98% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/utils/OsAgnosticPathMatcher.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/utils/OsAgnosticPathMatcher.java index 36eab6a4c..4b8e6740e 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/utils/OsAgnosticPathMatcher.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/utils/OsAgnosticPathMatcher.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.utils; +package org.springframework.rewrite.utils; import org.springframework.util.AntPathMatcher; import org.springframework.util.PathMatcher; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/utils/ResourceUtil.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/utils/ResourceUtil.java similarity index 98% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/utils/ResourceUtil.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/utils/ResourceUtil.java index 3a4a02e38..98a948db5 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/sbm/utils/ResourceUtil.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/utils/ResourceUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.utils; +package org.springframework.rewrite.utils; import org.springframework.core.io.Resource; diff --git a/spring-rewrite-commons-launcher/src/main/resources/META-INF/spring.factories b/spring-rewrite-commons-launcher/src/main/resources/META-INF/spring.factories index a7ae65973..12164d7d5 100644 --- a/spring-rewrite-commons-launcher/src/main/resources/META-INF/spring.factories +++ b/spring-rewrite-commons-launcher/src/main/resources/META-INF/spring.factories @@ -1 +1 @@ -org.springframework.boot.env.EnvironmentPostProcessor=org.springframework.sbm.boot.autoconfigure.ParserPropertiesPostProcessor \ No newline at end of file +org.springframework.boot.env.EnvironmentPostProcessor=org.springframework.rewrite.boot.autoconfigure.ParserPropertiesPostProcessor \ No newline at end of file diff --git a/spring-rewrite-commons-launcher/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-rewrite-commons-launcher/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 419c73db3..3496f1b98 100644 --- a/spring-rewrite-commons-launcher/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/spring-rewrite-commons-launcher/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,5 +1,5 @@ -org.springframework.sbm.boot.autoconfigure.ScopeConfiguration -org.springframework.sbm.parsers.RewriteParserConfiguration -org.springframework.sbm.boot.autoconfigure.ScannerConfiguration -org.springframework.sbm.boot.autoconfigure.DiscoveryConfiguration -org.springframework.sbm.boot.autoconfigure.ProjectResourceSetConfiguration \ No newline at end of file +org.springframework.rewrite.boot.autoconfigure.ScopeConfiguration +org.springframework.rewrite.parsers.RewriteParserConfiguration +org.springframework.rewrite.boot.autoconfigure.ScannerConfiguration +org.springframework.rewrite.boot.autoconfigure.DiscoveryConfiguration +org.springframework.rewrite.boot.autoconfigure.ProjectResourceSetConfiguration \ No newline at end of file diff --git a/spring-rewrite-commons-launcher/src/test/java/org/openrewrite/maven/CalculateClasspathTest.java b/spring-rewrite-commons-launcher/src/test/java/org/openrewrite/maven/CalculateClasspathTest.java index 9acc8b84f..3c069a2c5 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/openrewrite/maven/CalculateClasspathTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/openrewrite/maven/CalculateClasspathTest.java @@ -26,11 +26,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.core.io.Resource; -import org.springframework.sbm.boot.autoconfigure.ScannerConfiguration; -import org.springframework.sbm.parsers.RewriteProjectParser; -import org.springframework.sbm.parsers.RewriteProjectParsingResult; -import org.springframework.sbm.test.util.DummyResource; -import org.springframework.sbm.test.util.TestProjectHelper; +import org.springframework.rewrite.boot.autoconfigure.ScannerConfiguration; +import org.springframework.rewrite.parsers.RewriteProjectParser; +import org.springframework.rewrite.parsers.RewriteProjectParsingResult; +import org.springframework.rewrite.test.util.DummyResource; +import org.springframework.rewrite.test.util.TestProjectHelper; import java.nio.file.Path; import java.util.List; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/ParserTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/ParserTest.java similarity index 98% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/ParserTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/ParserTest.java index 08818e4a2..d03a57809 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/ParserTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/ParserTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm; +package org.springframework.rewrite; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/BuildFileParserTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/BuildFileParserTest.java similarity index 94% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/BuildFileParserTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/BuildFileParserTest.java index 71d7bfe62..4200a6ba6 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/BuildFileParserTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/BuildFileParserTest.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers; +package org.springframework.rewrite.parsers; +import org.assertj.core.api.Assertions; import org.intellij.lang.annotations.Language; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -26,11 +27,11 @@ import org.openrewrite.marker.Marker; import org.openrewrite.xml.tree.Xml; import org.springframework.core.io.Resource; -import org.springframework.sbm.parsers.maven.BuildFileParser; -import org.springframework.sbm.parsers.maven.MavenSettingsInitializer; -import org.springframework.sbm.scopes.ProjectMetadata; -import org.springframework.sbm.test.util.DummyResource; -import org.springframework.sbm.utils.ResourceUtil; +import org.springframework.rewrite.parsers.maven.BuildFileParser; +import org.springframework.rewrite.parsers.maven.MavenSettingsInitializer; +import org.springframework.rewrite.scopes.ProjectMetadata; +import org.springframework.rewrite.test.util.DummyResource; +import org.springframework.rewrite.utils.ResourceUtil; import java.nio.file.Path; import java.util.List; @@ -129,7 +130,7 @@ void filterAndSortBuildFiles_shouldReturnSortedListOfFilteredBuildFiles() { assertThat(resourceList).hasSize(3); Path resolve = Path.of(".").resolve("pom.xml").toAbsolutePath().normalize(); - assertThat(ResourceUtil.getPath(resourceList.get(0))).isEqualTo(resolve); + Assertions.assertThat(ResourceUtil.getPath(resourceList.get(0))).isEqualTo(resolve); Path resolve2 = Path.of("module1/pom.xml").toAbsolutePath().normalize(); assertThat(ResourceUtil.getPath(resourceList.get(1))).isEqualTo(resolve2); diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/CompareParserRecipeRunTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/CompareParserRecipeRunTest.java similarity index 88% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/CompareParserRecipeRunTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/CompareParserRecipeRunTest.java index 2cfd55e61..3d845a8ba 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/CompareParserRecipeRunTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/CompareParserRecipeRunTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers; +package org.springframework.rewrite.parsers; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -28,12 +28,12 @@ import org.openrewrite.marker.SearchResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.sbm.boot.autoconfigure.SbmSupportRewriteConfiguration; -import org.springframework.sbm.parsers.maven.RewriteMavenProjectParser; -import org.springframework.sbm.parsers.maven.SbmTestConfiguration; -import org.springframework.sbm.test.util.ParallelParsingResult; -import org.springframework.sbm.test.util.ParserExecutionHelper; -import org.springframework.sbm.test.util.TestProjectHelper; +import org.springframework.rewrite.boot.autoconfigure.SbmSupportRewriteConfiguration; +import org.springframework.rewrite.parsers.maven.RewriteMavenProjectParser; +import org.springframework.rewrite.parsers.maven.SbmTestConfiguration; +import org.springframework.rewrite.test.util.ParallelParsingResult; +import org.springframework.rewrite.test.util.ParserExecutionHelper; +import org.springframework.rewrite.test.util.TestProjectHelper; import java.nio.file.Path; import java.util.UUID; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/ParserEventPublicationIntegrationTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/ParserEventPublicationIntegrationTest.java similarity index 92% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/ParserEventPublicationIntegrationTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/ParserEventPublicationIntegrationTest.java index da3772b3a..f0343475e 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/ParserEventPublicationIntegrationTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/ParserEventPublicationIntegrationTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers; +package org.springframework.rewrite.parsers; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -23,10 +23,10 @@ import org.springframework.boot.test.context.TestConfiguration; import org.springframework.context.event.EventListener; import org.springframework.core.io.Resource; -import org.springframework.sbm.boot.autoconfigure.ScannerConfiguration; -import org.springframework.sbm.parsers.events.FinishedParsingResourceEvent; -import org.springframework.sbm.parsers.events.StartedParsingProjectEvent; -import org.springframework.sbm.parsers.events.SuccessfullyParsedProjectEvent; +import org.springframework.rewrite.boot.autoconfigure.ScannerConfiguration; +import org.springframework.rewrite.parsers.events.FinishedParsingResourceEvent; +import org.springframework.rewrite.parsers.events.StartedParsingProjectEvent; +import org.springframework.rewrite.parsers.events.SuccessfullyParsedProjectEvent; import java.nio.file.Path; import java.util.ArrayList; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/ParserPropertiesTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/ParserPropertiesTest.java similarity index 95% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/ParserPropertiesTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/ParserPropertiesTest.java index b08c8eb4d..065cec106 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/ParserPropertiesTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/ParserPropertiesTest.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers; +package org.springframework.rewrite.parsers; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.sbm.boot.autoconfigure.ScannerConfiguration; +import org.springframework.rewrite.boot.autoconfigure.ScannerConfiguration; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/RewriteProjectParserIntegrationTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteProjectParserIntegrationTest.java similarity index 86% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/RewriteProjectParserIntegrationTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteProjectParserIntegrationTest.java index 83fccc04a..27bd40ce5 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/RewriteProjectParserIntegrationTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteProjectParserIntegrationTest.java @@ -13,22 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers; +package org.springframework.rewrite.parsers; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.openrewrite.java.tree.J; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.core.io.Resource; -import org.springframework.sbm.boot.autoconfigure.SbmSupportRewriteConfiguration; -import org.springframework.sbm.parsers.maven.RewriteMavenProjectParser; -import org.springframework.sbm.parsers.maven.SbmTestConfiguration; -import org.springframework.sbm.test.util.ParserParityTestHelper; -import org.springframework.sbm.test.util.TestProjectHelper; +import org.springframework.rewrite.boot.autoconfigure.SbmSupportRewriteConfiguration; +import org.springframework.rewrite.parsers.maven.RewriteMavenProjectParser; +import org.springframework.rewrite.parsers.maven.SbmTestConfiguration; +import org.springframework.rewrite.test.util.ParserParityTestHelper; +import org.springframework.rewrite.test.util.TestProjectHelper; import java.nio.file.Path; -import java.util.List; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/RewriteProjectParserParityTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteProjectParserParityTest.java similarity index 94% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/RewriteProjectParserParityTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteProjectParserParityTest.java index 843c75d56..02b78760e 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/RewriteProjectParserParityTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteProjectParserParityTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers; +package org.springframework.rewrite.parsers; import org.intellij.lang.annotations.Language; import org.jetbrains.annotations.NotNull; @@ -29,11 +29,11 @@ import org.openrewrite.shaded.jgit.api.errors.GitAPIException; import org.openrewrite.tree.ParsingEventListener; import org.openrewrite.tree.ParsingExecutionContextView; -import org.springframework.sbm.parsers.maven.ComparingParserFactory; -import org.springframework.sbm.parsers.maven.RewriteMavenProjectParser; -import org.springframework.sbm.test.util.DummyResource; -import org.springframework.sbm.test.util.ParserParityTestHelper; -import org.springframework.sbm.test.util.TestProjectHelper; +import org.springframework.rewrite.parsers.maven.ComparingParserFactory; +import org.springframework.rewrite.parsers.maven.RewriteMavenProjectParser; +import org.springframework.rewrite.test.util.DummyResource; +import org.springframework.rewrite.test.util.ParserParityTestHelper; +import org.springframework.rewrite.test.util.TestProjectHelper; import java.nio.file.Path; import java.time.Instant; @@ -46,7 +46,7 @@ import java.util.Set; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Fail.fail; +import static org.assertj.core.api.AssertionsForClassTypes.fail; /** * Test parity between OpenRewrite parser logic and RewriteProjectParser. diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/RewriteProjectParserTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteProjectParserTest.java similarity index 91% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/RewriteProjectParserTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteProjectParserTest.java index 88fab2e66..061031c71 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/RewriteProjectParserTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteProjectParserTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers; +package org.springframework.rewrite.parsers; import org.intellij.lang.annotations.Language; import org.junit.jupiter.api.DisplayName; @@ -25,18 +25,16 @@ import org.openrewrite.SourceFile; import org.openrewrite.tree.ParsingEventListener; import org.openrewrite.tree.ParsingExecutionContextView; -import org.sonatype.plexus.components.cipher.DefaultPlexusCipher; import org.sonatype.plexus.components.cipher.PlexusCipherException; -import org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.context.ApplicationEventPublisher; import org.springframework.core.io.DefaultResourceLoader; import org.springframework.core.io.Resource; -import org.springframework.sbm.parsers.maven.*; -import org.springframework.sbm.scopes.ProjectMetadata; -import org.springframework.sbm.scopes.ScanScope; -import org.springframework.sbm.test.util.DummyResource; -import org.springframework.sbm.utils.ResourceUtil; +import org.springframework.rewrite.parsers.maven.*; +import org.springframework.rewrite.scopes.ProjectMetadata; +import org.springframework.rewrite.scopes.ScanScope; +import org.springframework.rewrite.test.util.DummyResource; +import org.springframework.rewrite.utils.ResourceUtil; import java.nio.file.Path; import java.util.ArrayList; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/RewriteRecipeDiscoveryTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteRecipeDiscoveryTest.java similarity index 98% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/RewriteRecipeDiscoveryTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteRecipeDiscoveryTest.java index d0eab4e22..7e60a70c6 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/RewriteRecipeDiscoveryTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteRecipeDiscoveryTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers; +package org.springframework.rewrite.parsers; import com.example.recipes.DummyRecipe; import io.example.recipes.AnotherDummyRecipe; @@ -26,8 +26,8 @@ import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; import org.openrewrite.Recipe; import org.openrewrite.config.*; -import org.springframework.sbm.recipes.RewriteRecipeDiscovery; -import org.springframework.sbm.test.util.OpenRewriteDummyRecipeInstaller; +import org.springframework.rewrite.recipes.RewriteRecipeDiscovery; +import org.springframework.rewrite.test.util.OpenRewriteDummyRecipeInstaller; import java.nio.file.Path; import java.util.*; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/Slf4jToMavenLoggerAdapter.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/Slf4jToMavenLoggerAdapter.java similarity index 98% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/Slf4jToMavenLoggerAdapter.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/Slf4jToMavenLoggerAdapter.java index 41a8c7c8c..885c9904d 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/Slf4jToMavenLoggerAdapter.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/Slf4jToMavenLoggerAdapter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers; +package org.springframework.rewrite.parsers; import org.apache.maven.plugin.logging.Log; import org.slf4j.Logger; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/ComparingParserFactory.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/ComparingParserFactory.java similarity index 89% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/ComparingParserFactory.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/ComparingParserFactory.java index 11bb5a7dd..e063e9124 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/ComparingParserFactory.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/ComparingParserFactory.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.maven; +package org.springframework.rewrite.parsers.maven; import org.jetbrains.annotations.NotNull; import org.openrewrite.InMemoryExecutionContext; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.context.ApplicationEventPublisher; -import org.springframework.sbm.parsers.ParserProperties; -import org.springframework.sbm.parsers.events.RewriteParsingEventListenerAdapter; -import org.springframework.sbm.scopes.ScanScope; +import org.springframework.rewrite.parsers.ParserProperties; +import org.springframework.rewrite.parsers.events.RewriteParsingEventListenerAdapter; +import org.springframework.rewrite.scopes.ScanScope; import static org.mockito.Mockito.mock; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenConfigFileParserTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenConfigFileParserTest.java similarity index 97% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenConfigFileParserTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenConfigFileParserTest.java index 8deee7a9b..101aa1286 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenConfigFileParserTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenConfigFileParserTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.maven; +package org.springframework.rewrite.parsers.maven; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenExecutionRequestFactory.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenExecutionRequestFactory.java similarity index 99% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenExecutionRequestFactory.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenExecutionRequestFactory.java index e6755c888..7ba8da1de 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenExecutionRequestFactory.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenExecutionRequestFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.maven; +package org.springframework.rewrite.parsers.maven; import lombok.RequiredArgsConstructor; import org.apache.maven.artifact.repository.ArtifactRepository; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenExecutionResultException.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenExecutionResultException.java similarity index 96% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenExecutionResultException.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenExecutionResultException.java index ab61519fe..f072644cc 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenExecutionResultException.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenExecutionResultException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.maven; +package org.springframework.rewrite.parsers.maven; import lombok.Getter; import org.apache.commons.lang3.exception.ExceptionUtils; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenExecutor.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenExecutor.java similarity index 98% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenExecutor.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenExecutor.java index e6f1c3ad4..a4b8644b7 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenExecutor.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenExecutor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.maven; +package org.springframework.rewrite.parsers.maven; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -24,7 +24,6 @@ import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import java.nio.file.Path; -import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenExecutorTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenExecutorTest.java similarity index 96% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenExecutorTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenExecutorTest.java index 64f466bfa..68333a50d 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenExecutorTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenExecutorTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.maven; +package org.springframework.rewrite.parsers.maven; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenMojoProjectParserFactory.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenMojoProjectParserFactory.java similarity index 94% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenMojoProjectParserFactory.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenMojoProjectParserFactory.java index 3b2e63d93..6ae1c6517 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenMojoProjectParserFactory.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenMojoProjectParserFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.maven; +package org.springframework.rewrite.parsers.maven; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -25,8 +25,8 @@ import org.codehaus.plexus.PlexusContainer; import org.jetbrains.annotations.NotNull; import org.openrewrite.maven.MavenMojoProjectParser; -import org.springframework.sbm.parsers.ParserProperties; -import org.springframework.sbm.parsers.Slf4jToMavenLoggerAdapter; +import org.springframework.rewrite.parsers.ParserProperties; +import org.springframework.rewrite.parsers.Slf4jToMavenLoggerAdapter; import java.nio.file.Path; import java.util.Collection; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenPlexusContainer.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenPlexusContainer.java similarity index 98% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenPlexusContainer.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenPlexusContainer.java index 80ee072e0..236b619e2 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenPlexusContainer.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenPlexusContainer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.maven; +package org.springframework.rewrite.parsers.maven; import org.codehaus.plexus.*; import org.codehaus.plexus.classworlds.ClassWorld; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenPomCacheTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenPomCacheTest.java similarity index 97% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenPomCacheTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenPomCacheTest.java index 553784787..1ec717e79 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenPomCacheTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenPomCacheTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.maven; +package org.springframework.rewrite.parsers.maven; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -30,7 +30,7 @@ import org.springframework.boot.test.context.TestConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; -import org.springframework.sbm.boot.autoconfigure.ScannerConfiguration; +import org.springframework.rewrite.boot.autoconfigure.ScannerConfiguration; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.util.ReflectionTestUtils; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenProjectAnalyzerTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenProjectAnalyzerTest.java similarity index 99% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenProjectAnalyzerTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenProjectAnalyzerTest.java index b2ef96d3b..a228bc307 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenProjectAnalyzerTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenProjectAnalyzerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.sbm.parsers.maven; +package org.springframework.rewrite.parsers.maven; import org.apache.maven.execution.MavenSession; import org.intellij.lang.annotations.Language; @@ -26,9 +26,9 @@ import org.mockito.Mockito; import org.openrewrite.maven.utilities.MavenArtifactDownloader; import org.springframework.core.io.Resource; -import org.springframework.sbm.parsers.MavenProject; -import org.springframework.sbm.test.util.DummyResource; -import org.springframework.sbm.utils.ResourceUtil; +import org.springframework.rewrite.parsers.MavenProject; +import org.springframework.rewrite.test.util.DummyResource; +import org.springframework.rewrite.utils.ResourceUtil; import java.io.IOException; import java.nio.file.Files; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenProjectResolutionTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenProjectResolutionTest.java similarity index 99% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenProjectResolutionTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenProjectResolutionTest.java index 6c94050d9..3bc9afb11 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenProjectResolutionTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenProjectResolutionTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.maven; +package org.springframework.rewrite.parsers.maven; import org.apache.maven.artifact.DependencyResolutionRequiredException; import org.apache.maven.project.MavenProject; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenSettingsInitializerTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenSettingsInitializerTest.java similarity index 91% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenSettingsInitializerTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenSettingsInitializerTest.java index 303b66acc..1567899a4 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/MavenSettingsInitializerTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenSettingsInitializerTest.java @@ -13,20 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.maven; +package org.springframework.rewrite.parsers.maven; import org.junit.jupiter.api.Test; import org.junitpioneer.jupiter.SetSystemProperty; import org.openrewrite.maven.MavenExecutionContextView; import org.openrewrite.maven.MavenSettings; import org.openrewrite.maven.tree.MavenRepository; -import org.sonatype.plexus.components.cipher.DefaultPlexusCipher; import org.sonatype.plexus.components.cipher.PlexusCipherException; -import org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher; -import org.springframework.sbm.parsers.RewriteExecutionContext; -import org.springframework.sbm.scopes.ProjectMetadata; +import org.springframework.rewrite.parsers.RewriteExecutionContext; +import org.springframework.rewrite.scopes.ProjectMetadata; -import java.net.URI; import java.net.URISyntaxException; import java.nio.file.Path; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/ProvenanceMarkerFactoryTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/ProvenanceMarkerFactoryTest.java similarity index 97% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/ProvenanceMarkerFactoryTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/ProvenanceMarkerFactoryTest.java index 5be0ba170..68b231bbf 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/ProvenanceMarkerFactoryTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/ProvenanceMarkerFactoryTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.maven; +package org.springframework.rewrite.parsers.maven; import org.apache.maven.plugin.logging.Log; import org.apache.maven.rtinfo.RuntimeInformation; @@ -35,11 +35,11 @@ import org.openrewrite.shaded.jgit.lib.Repository; import org.openrewrite.shaded.jgit.storage.file.FileRepositoryBuilder; import org.springframework.core.io.Resource; -import org.springframework.sbm.parsers.MavenProject; -import org.springframework.sbm.parsers.ParserContext; -import org.springframework.sbm.parsers.ParserProperties; -import org.springframework.sbm.test.util.DummyResource; -import org.springframework.sbm.utils.ResourceUtil; +import org.springframework.rewrite.parsers.MavenProject; +import org.springframework.rewrite.parsers.ParserContext; +import org.springframework.rewrite.parsers.ParserProperties; +import org.springframework.rewrite.test.util.DummyResource; +import org.springframework.rewrite.utils.ResourceUtil; import java.io.IOException; import java.lang.reflect.Method; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/RewriteMavenProjectParser.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/RewriteMavenProjectParser.java similarity index 97% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/RewriteMavenProjectParser.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/RewriteMavenProjectParser.java index 578d7d944..5f07b7b16 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/RewriteMavenProjectParser.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/RewriteMavenProjectParser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.maven; +package org.springframework.rewrite.parsers.maven; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -35,8 +35,8 @@ import org.openrewrite.xml.tree.Xml; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.core.io.Resource; -import org.springframework.sbm.parsers.RewriteProjectParsingResult; -import org.springframework.sbm.scopes.ScanScope; +import org.springframework.rewrite.parsers.RewriteProjectParsingResult; +import org.springframework.rewrite.scopes.ScanScope; import java.nio.file.Path; import java.util.HashMap; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/RewriteMavenProjectParserIntegrationTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/RewriteMavenProjectParserIntegrationTest.java similarity index 83% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/RewriteMavenProjectParserIntegrationTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/RewriteMavenProjectParserIntegrationTest.java index 752fffff5..61f4dbd14 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/RewriteMavenProjectParserIntegrationTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/RewriteMavenProjectParserIntegrationTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.maven; +package org.springframework.rewrite.parsers.maven; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -26,13 +26,9 @@ import org.openrewrite.tree.ParsingExecutionContextView; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.TestConfiguration; -import org.springframework.context.event.EventListener; -import org.springframework.sbm.boot.autoconfigure.SbmSupportRewriteConfiguration; -import org.springframework.sbm.parsers.RewriteProjectParser; -import org.springframework.sbm.parsers.RewriteProjectParsingResult; -import org.springframework.sbm.parsers.events.FinishedParsingResourceEvent; -import org.springframework.sbm.parsers.events.RewriteParsingEventListenerAdapter; +import org.springframework.rewrite.boot.autoconfigure.SbmSupportRewriteConfiguration; +import org.springframework.rewrite.parsers.RewriteProjectParsingResult; +import org.springframework.rewrite.parsers.events.FinishedParsingResourceEvent; import java.nio.file.Path; import java.util.ArrayList; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/SbmTestConfiguration.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/SbmTestConfiguration.java similarity index 89% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/SbmTestConfiguration.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/SbmTestConfiguration.java index 53f84b3ef..97e004d6a 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/parsers/maven/SbmTestConfiguration.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/SbmTestConfiguration.java @@ -13,20 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.parsers.maven; +package org.springframework.rewrite.parsers.maven; import lombok.extern.slf4j.Slf4j; import org.openrewrite.ExecutionContext; -import org.openrewrite.maven.utilities.MavenArtifactDownloader; import org.openrewrite.tree.ParsingEventListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; -import org.springframework.sbm.parsers.ParserProperties; -import org.springframework.sbm.parsers.RewriteParserConfiguration; -import org.springframework.sbm.scopes.ScanScope; +import org.springframework.rewrite.parsers.ParserProperties; +import org.springframework.rewrite.parsers.RewriteParserConfiguration; +import org.springframework.rewrite.scopes.ScanScope; /** * @author Fabian Krüger diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/test/util/DummyResource.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/DummyResource.java similarity index 97% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/test/util/DummyResource.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/DummyResource.java index 35b89535e..616890bc3 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/test/util/DummyResource.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/DummyResource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.test.util; +package org.springframework.rewrite.test.util; import org.springframework.core.io.Resource; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/test/util/OpenRewriteDummyRecipeInstaller.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/OpenRewriteDummyRecipeInstaller.java similarity index 96% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/test/util/OpenRewriteDummyRecipeInstaller.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/OpenRewriteDummyRecipeInstaller.java index a5ff6b951..f5a02c499 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/test/util/OpenRewriteDummyRecipeInstaller.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/OpenRewriteDummyRecipeInstaller.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.test.util; +package org.springframework.rewrite.test.util; import org.apache.maven.shared.invoker.*; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/test/util/ParallelParsingResult.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParallelParsingResult.java similarity index 87% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/test/util/ParallelParsingResult.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParallelParsingResult.java index 5bf6f545c..89d15714a 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/test/util/ParallelParsingResult.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParallelParsingResult.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.test.util; +package org.springframework.rewrite.test.util; -import org.springframework.sbm.parsers.RewriteProjectParsingResult; +import org.springframework.rewrite.parsers.RewriteProjectParsingResult; /** * @author Fabian Krüger diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/test/util/ParserExecutionHelper.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParserExecutionHelper.java similarity index 86% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/test/util/ParserExecutionHelper.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParserExecutionHelper.java index 09cb31ce0..45e6537b0 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/test/util/ParserExecutionHelper.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParserExecutionHelper.java @@ -13,23 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.test.util; +package org.springframework.rewrite.test.util; import org.openrewrite.ExecutionContext; import org.openrewrite.InMemoryExecutionContext; import org.springframework.boot.test.context.runner.ApplicationContextRunner; -import org.springframework.sbm.boot.autoconfigure.SbmSupportRewriteConfiguration; -import org.springframework.sbm.parsers.ParserProperties; -import org.springframework.sbm.parsers.RewriteProjectParser; -import org.springframework.sbm.parsers.RewriteProjectParsingResult; -import org.springframework.sbm.parsers.maven.ComparingParserFactory; -import org.springframework.sbm.parsers.maven.RewriteMavenProjectParser; +import org.springframework.rewrite.boot.autoconfigure.SbmSupportRewriteConfiguration; +import org.springframework.rewrite.parsers.ParserProperties; +import org.springframework.rewrite.parsers.RewriteProjectParser; +import org.springframework.rewrite.parsers.RewriteProjectParsingResult; +import org.springframework.rewrite.parsers.maven.ComparingParserFactory; +import org.springframework.rewrite.parsers.maven.RewriteMavenProjectParser; import java.nio.file.Path; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; /** @@ -99,7 +98,7 @@ public RewriteProjectParsingResult parseWithComparingParser(Path baseDir, Parser public RewriteProjectParsingResult parseWithRewriteProjectParser(Path baseDir, ParserProperties parserProperties) { AtomicReference atomicRef = new AtomicReference<>(); new ApplicationContextRunner().withUserConfiguration(SbmSupportRewriteConfiguration.class) - .withBean("parser-org.springframework.sbm.parsers.ParserProperties", ParserProperties.class, + .withBean("parser-org.springframework.parsers.rewrite.ParserProperties", ParserProperties.class, () -> parserProperties) .run(appCtx -> { RewriteProjectParser sut = appCtx.getBean(RewriteProjectParser.class); diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/test/util/ParserParityTestHelper.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParserParityTestHelper.java similarity index 98% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/test/util/ParserParityTestHelper.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParserParityTestHelper.java index d161b016b..d2242291c 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/test/util/ParserParityTestHelper.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParserParityTestHelper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.test.util; +package org.springframework.rewrite.test.util; import lombok.RequiredArgsConstructor; import org.assertj.core.api.SoftAssertions; @@ -24,13 +24,12 @@ import org.openrewrite.java.tree.JavaType; import org.openrewrite.marker.Marker; import org.openrewrite.marker.Markers; -import org.openrewrite.maven.MavenSettings; import org.openrewrite.maven.tree.MavenResolutionResult; import org.openrewrite.maven.tree.ResolvedDependency; import org.openrewrite.maven.tree.Scope; import org.openrewrite.style.Style; -import org.springframework.sbm.parsers.ParserProperties; -import org.springframework.sbm.parsers.RewriteProjectParsingResult; +import org.springframework.rewrite.parsers.ParserProperties; +import org.springframework.rewrite.parsers.RewriteProjectParsingResult; import java.net.URI; import java.net.URISyntaxException; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/test/util/TestProjectHelper.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/TestProjectHelper.java similarity index 96% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/test/util/TestProjectHelper.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/TestProjectHelper.java index 4af3f7208..9d2d65b7b 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/sbm/test/util/TestProjectHelper.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/TestProjectHelper.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.sbm.test.util; +package org.springframework.rewrite.test.util; import org.apache.commons.io.FileUtils; import org.openrewrite.shaded.jgit.api.Git; import org.openrewrite.shaded.jgit.api.errors.GitAPIException; import org.springframework.core.io.Resource; -import org.springframework.sbm.utils.ResourceUtil; +import org.springframework.rewrite.utils.ResourceUtil; import java.io.File; import java.io.IOException;