From 861eabc7002b44ddc7f0b0cdbc3003dd814ec818 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Kr=C3=BCger?= <56278322+fabapp2@users.noreply.github.com> Date: Fri, 26 Jan 2024 13:20:40 +0000 Subject: [PATCH] Refactoring * Fix package name * Move classes to the application root package * Change class names * Polish --- README.adoc | 13 ++++++------- .../partials/example-application-code.adoc | 13 ++++++------- .../com/acme/example/SpringBoot3Upgrade.java | 12 ++++++------ .../IterativeBoot3UpgradeExample.java | 16 ++++++++-------- ...stApplicableRecipesExampleApplication.java | 8 ++++---- .../rewrite/MavenTypeResolutionTests.java | 10 +++++----- .../sbm/PrivateArtifactRepositoryTest.java | 13 +++++++------ spring-rewrite-commons-launcher/README.adoc | 14 +++++++------- spring-rewrite-commons-launcher/pom.xml | 2 +- .../{parsers => }/RewriteProjectParser.java | 19 ++++++++++--------- .../{recipes => }/RewriteRecipeDiscovery.java | 6 +++--- .../RewriteRecipeLauncher.java | 12 +++++------- .../ProjectResourceSetConfiguration.java | 3 +-- .../RecipeDiscoveryConfiguration.java | 6 +++--- .../RewriteLauncherConfiguration.java | 12 ++++++------ .../SpringRewriteCommonsConfiguration.java | 2 +- .../JavaParserBuilder.java | 2 +- .../ModuleParsingResult.java | 3 ++- .../{parsers => parser}/ParserContext.java | 3 ++- .../{parsers => parser}/ProjectId.java | 2 +- .../{parsers => parser}/ProjectScanner.java | 2 +- .../RecipeValidationErrorException.java | 2 +- .../RewriteExecutionContext.java | 2 +- .../RewriteExecutionContextErrorHandler.java | 2 +- .../RewriteParserConfiguration.java | 9 +++++---- .../RewriteProjectParsingResult.java | 2 +- .../RewriteResourceParser.java | 2 +- .../{parsers => parser}/SourceFileParser.java | 5 +++-- .../SourceSetParsingResult.java | 2 +- .../SpringRewriteProperties.java | 2 +- .../{parsers => parser}/StyleDetector.java | 4 ++-- .../events/FinishedParsingResourceEvent.java | 2 +- .../events/IntermediateParsingEvent.java | 2 +- .../RewriteParsingEventListenerAdapter.java | 2 +- .../events/StartedParsingProjectEvent.java | 2 +- .../events/StartedParsingResourceEvent.java | 2 +- .../SuccessfullyParsedProjectEvent.java | 2 +- .../maven/ClasspathDependencies.java | 2 +- .../maven/MavenBuildFileFilter.java | 2 +- .../maven/MavenBuildFileParser.java} | 8 ++++---- .../maven/MavenConfigFileParser.java | 2 +- .../maven/MavenModelReader.java | 2 +- .../maven/MavenModuleParser.java | 5 ++--- .../maven/MavenPasswordDecrypter.java | 2 +- .../maven}/MavenProject.java | 9 ++++++--- .../maven/MavenProjectAnalyzer.java | 7 ++++--- .../maven/MavenProjectFactory.java | 3 +-- .../maven/MavenProjectGraph.java | 5 ++--- .../maven/MavenProjectSorter.java | 4 +--- .../maven/MavenProvenanceMarkerFactory.java | 3 +-- .../maven/MavenRuntimeInformation.java | 2 +- .../maven/MavenSettingsInitializer.java | 2 +- .../maven/ProvenanceMarkerFactory.java | 5 ++--- .../maven/RewriteMavenArtifactDownloader.java | 2 +- .../RewriteParserMavenConfiguration.java | 6 +++--- .../GenericOpenRewriteRecipe.java | 2 +- .../resource/BaseProjectResource.java | 2 +- .../resource/InternalProjectResource.java | 2 +- .../resource/ProjectResource.java | 2 +- .../resource/ProjectResourceSerializer.java | 2 +- .../resource/ProjectResourceSet.java | 2 +- .../resource/ProjectResourceSetFactory.java | 3 +-- .../ProjectResourceSetSerializer.java | 2 +- .../RewriteMigrationResultMerger.java | 5 ++--- .../resource/RewriteSourceFileHolder.java | 2 +- .../RewriteSourceFileWrapper.java | 3 +-- .../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 | 6 +++--- .../finder/ProjectResourceFinder.java | 4 ++-- .../finder/ResourceFilterException.java | 2 +- .../rewrite/scopes/AbstractBaseScope.java | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../maven/CalculateClasspathTest.java | 6 +++--- .../CompareParserRecipeRunTest.java | 7 ++++--- .../MavenBuildFileParserTest.java} | 12 ++++++------ ...ParserEventPublicationIntegrationTest.java | 9 +++++---- .../RewriteProjectParserIntegrationTest.java | 7 ++++--- .../RewriteProjectParserParityTest.java | 6 +++--- .../RewriteProjectParserTest.java | 7 ++++--- .../RewriteRecipeDiscoveryTest.java | 4 ++-- .../RewriteResourceParserTest.java | 2 +- .../Slf4jToMavenLoggerAdapter.java | 2 +- .../SpringRewritePropertiesTest.java | 3 +-- .../maven/ComparingParserFactory.java | 6 +++--- .../maven/MavenConfigFileParserTest.java | 2 +- .../maven/MavenExecutionRequestFactory.java | 2 +- .../maven/MavenExecutionResultException.java | 2 +- .../maven/MavenExecutor.java | 2 +- .../maven/MavenExecutorTest.java | 2 +- .../maven/MavenMojoProjectParserFactory.java | 7 +++---- .../maven/MavenPlexusContainer.java | 2 +- .../maven/MavenPomCacheTest.java | 4 ++-- .../maven/MavenProjectGraphTest.java | 5 ++--- .../maven/MavenProjectResolutionTest.java | 2 +- .../maven/MavenProjectSorterTest.java | 3 +-- .../maven/MavenSettingsInitializerTest.java | 4 ++-- .../maven/ProvenanceMarkerFactoryTest.java | 7 +++---- .../maven/RewriteMavenProjectParser.java | 6 ++---- ...riteMavenProjectParserIntegrationTest.java | 6 +++--- .../maven/SbmTestConfiguration.java | 6 +++--- .../test/util/ParallelParsingResult.java | 2 +- .../test/util/ParserExecutionHelper.java | 10 +++++----- .../test/util/ParserParityTestHelper.java | 8 ++++---- 108 files changed, 252 insertions(+), 260 deletions(-) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => }/RewriteProjectParser.java (91%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{recipes => }/RewriteRecipeDiscovery.java (97%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{execution => }/RewriteRecipeLauncher.java (89%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/JavaParserBuilder.java (98%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/ModuleParsingResult.java (92%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/ParserContext.java (96%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/ProjectId.java (96%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/ProjectScanner.java (99%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/RecipeValidationErrorException.java (94%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/RewriteExecutionContext.java (98%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/RewriteExecutionContextErrorHandler.java (97%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/RewriteParserConfiguration.java (94%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/RewriteProjectParsingResult.java (95%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/RewriteResourceParser.java (99%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/SourceFileParser.java (94%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/SourceSetParsingResult.java (95%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/SpringRewriteProperties.java (99%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/StyleDetector.java (95%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/events/FinishedParsingResourceEvent.java (94%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/events/IntermediateParsingEvent.java (94%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/events/RewriteParsingEventListenerAdapter.java (97%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/events/StartedParsingProjectEvent.java (94%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/events/StartedParsingResourceEvent.java (93%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/events/SuccessfullyParsedProjectEvent.java (94%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/maven/ClasspathDependencies.java (96%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/maven/MavenBuildFileFilter.java (95%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers/maven/BuildFileParser.java => parser/maven/MavenBuildFileParser.java} (96%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/maven/MavenConfigFileParser.java (99%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/maven/MavenModelReader.java (96%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/maven/MavenModuleParser.java (99%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/maven/MavenPasswordDecrypter.java (98%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser/maven}/MavenProject.java (98%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/maven/MavenProjectAnalyzer.java (95%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/maven/MavenProjectFactory.java (93%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/maven/MavenProjectGraph.java (96%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/maven/MavenProjectSorter.java (96%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/maven/MavenProvenanceMarkerFactory.java (97%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/maven/MavenRuntimeInformation.java (93%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/maven/MavenSettingsInitializer.java (98%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/maven/ProvenanceMarkerFactory.java (90%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/maven/RewriteMavenArtifactDownloader.java (96%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{parsers => parser}/maven/RewriteParserMavenConfiguration.java (92%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{support/openrewrite => recipes}/GenericOpenRewriteRecipe.java (96%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{project => }/resource/BaseProjectResource.java (95%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{project => }/resource/InternalProjectResource.java (93%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{project => }/resource/ProjectResource.java (94%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{project => }/resource/ProjectResourceSerializer.java (97%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{project => }/resource/ProjectResourceSet.java (98%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{project => }/resource/ProjectResourceSetFactory.java (93%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{project => }/resource/ProjectResourceSetSerializer.java (95%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{project => }/resource/RewriteMigrationResultMerger.java (93%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{project => }/resource/RewriteSourceFileHolder.java (98%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{project => resource}/RewriteSourceFileWrapper.java (92%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{project => }/resource/finder/AbsolutePathResourceFinder.java (87%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{project => }/resource/finder/AbsolutePathResourcesFinder.java (91%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{project => }/resource/finder/DeletedResourcePathStringFilter.java (88%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{project => }/resource/finder/GenericTypeFinder.java (91%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{project => }/resource/finder/GenericTypeListFinder.java (89%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{project => }/resource/finder/ModifiedResourcePathStringFilter.java (89%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{project => }/resource/finder/PathPatternMatchingProjectResourceFinder.java (91%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{project => }/resource/finder/ProjectResourceFinder.java (84%) rename spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/{project => }/resource/finder/ResourceFilterException.java (92%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/{parsers => parser}/CompareParserRecipeRunTest.java (94%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/{parsers/BuildFileParserTest.java => parser/MavenBuildFileParserTest.java} (96%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/{parsers => parser}/ParserEventPublicationIntegrationTest.java (92%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/{parsers => parser}/RewriteProjectParserIntegrationTest.java (93%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/{parsers => parser}/RewriteProjectParserParityTest.java (97%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/{parsers => parser}/RewriteProjectParserTest.java (95%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/{parsers => parser}/RewriteRecipeDiscoveryTest.java (98%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/{parsers => parser}/RewriteResourceParserTest.java (98%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/{parsers => parser}/Slf4jToMavenLoggerAdapter.java (98%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/{parsers => parser}/SpringRewritePropertiesTest.java (97%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/{parsers => parser}/maven/ComparingParserFactory.java (91%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/{parsers => parser}/maven/MavenConfigFileParserTest.java (97%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/{parsers => parser}/maven/MavenExecutionRequestFactory.java (99%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/{parsers => parser}/maven/MavenExecutionResultException.java (96%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/{parsers => parser}/maven/MavenExecutor.java (98%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/{parsers => parser}/maven/MavenExecutorTest.java (96%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/{parsers => parser}/maven/MavenMojoProjectParserFactory.java (93%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/{parsers => parser}/maven/MavenPlexusContainer.java (98%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/{parsers => parser}/maven/MavenPomCacheTest.java (97%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/{parsers => parser}/maven/MavenProjectGraphTest.java (98%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/{parsers => parser}/maven/MavenProjectResolutionTest.java (99%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/{parsers => parser}/maven/MavenProjectSorterTest.java (99%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/{parsers => parser}/maven/MavenSettingsInitializerTest.java (96%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/{parsers => parser}/maven/ProvenanceMarkerFactoryTest.java (98%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/{parsers => parser}/maven/RewriteMavenProjectParser.java (97%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/{parsers => parser}/maven/RewriteMavenProjectParserIntegrationTest.java (93%) rename spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/{parsers => parser}/maven/SbmTestConfiguration.java (93%) diff --git a/README.adoc b/README.adoc index c1c698d..77d4bb7 100644 --- a/README.adoc +++ b/README.adoc @@ -40,16 +40,15 @@ package com.acme.example; import org.openrewrite.Recipe; import org.openrewrite.SourceFile; import org.springframework.beans.factory.annotation.Autowired; -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 org.springframework.rewrite.RewriteProjectParser; +import org.springframework.rewrite.parser.RewriteProjectParsingResult; +import org.springframework.rewrite.resource.ProjectResourceSet; +import org.springframework.rewrite.resource.ProjectResourceSetFactory; +import org.springframework.rewrite.resource.ProjectResourceSetSerializer; +import org.springframework.rewrite.RewriteRecipeDiscovery; import org.springframework.stereotype.Component; import java.nio.file.Path; -import java.util.List; @Component public class MyMigrationApplication { diff --git a/spring-rewrite-commons-docs/src/main/antora/modules/ROOT/pages/partials/example-application-code.adoc b/spring-rewrite-commons-docs/src/main/antora/modules/ROOT/pages/partials/example-application-code.adoc index 71780dd..53bd163 100644 --- a/spring-rewrite-commons-docs/src/main/antora/modules/ROOT/pages/partials/example-application-code.adoc +++ b/spring-rewrite-commons-docs/src/main/antora/modules/ROOT/pages/partials/example-application-code.adoc @@ -5,16 +5,15 @@ package com.acme.example; import org.openrewrite.Recipe; import org.openrewrite.SourceFile; import org.springframework.beans.factory.annotation.Autowired; -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 org.springframework.rewrite.RewriteProjectParser; +import org.springframework.rewrite.parser.RewriteProjectParsingResult; +import org.springframework.rewrite.resource.ProjectResourceSet; +import org.springframework.rewrite.resource.ProjectResourceSetFactory; +import org.springframework.rewrite.resource.ProjectResourceSetSerializer; +import org.springframework.rewrite.RewriteRecipeDiscovery; import org.springframework.stereotype.Component; import java.nio.file.Path; -import java.util.List; @Component public class MyMigrationApplication { diff --git a/spring-rewrite-commons-examples/boot-3-upgrade-atomic-example/src/main/java/com/acme/example/SpringBoot3Upgrade.java b/spring-rewrite-commons-examples/boot-3-upgrade-atomic-example/src/main/java/com/acme/example/SpringBoot3Upgrade.java index f7ea9eb..0ec5aa8 100644 --- a/spring-rewrite-commons-examples/boot-3-upgrade-atomic-example/src/main/java/com/acme/example/SpringBoot3Upgrade.java +++ b/spring-rewrite-commons-examples/boot-3-upgrade-atomic-example/src/main/java/com/acme/example/SpringBoot3Upgrade.java @@ -20,12 +20,12 @@ import org.openrewrite.SourceFile; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -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 org.springframework.rewrite.RewriteProjectParser; +import org.springframework.rewrite.parser.RewriteProjectParsingResult; +import org.springframework.rewrite.resource.ProjectResourceSet; +import org.springframework.rewrite.resource.ProjectResourceSetFactory; +import org.springframework.rewrite.resource.ProjectResourceSetSerializer; +import org.springframework.rewrite.RewriteRecipeDiscovery; import java.nio.file.Path; import java.util.List; diff --git a/spring-rewrite-commons-examples/boot-3-upgrade-iterative-example/src/main/java/com/example/bootupgrade/IterativeBoot3UpgradeExample.java b/spring-rewrite-commons-examples/boot-3-upgrade-iterative-example/src/main/java/com/example/bootupgrade/IterativeBoot3UpgradeExample.java index fa8cc7a..0091e1a 100644 --- a/spring-rewrite-commons-examples/boot-3-upgrade-iterative-example/src/main/java/com/example/bootupgrade/IterativeBoot3UpgradeExample.java +++ b/spring-rewrite-commons-examples/boot-3-upgrade-iterative-example/src/main/java/com/example/bootupgrade/IterativeBoot3UpgradeExample.java @@ -34,8 +34,6 @@ 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.UsernamePasswordCredentialsProvider; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; @@ -43,12 +41,14 @@ 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.rewrite.parsers.*; -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.rewrite.parser.ProjectScanner; +import org.springframework.rewrite.RewriteProjectParser; +import org.springframework.rewrite.parser.RewriteProjectParsingResult; +import org.springframework.rewrite.parser.events.StartedParsingResourceEvent; +import org.springframework.rewrite.resource.ProjectResourceSet; +import org.springframework.rewrite.resource.ProjectResourceSetFactory; +import org.springframework.rewrite.resource.ProjectResourceSetSerializer; +import org.springframework.rewrite.RewriteRecipeDiscovery; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.util.FileSystemUtils; 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 6e2f00e..87fda94 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.ApplicationRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.core.io.Resource; -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 org.springframework.rewrite.parser.ProjectScanner; +import org.springframework.rewrite.RewriteProjectParser; +import org.springframework.rewrite.parser.RewriteProjectParsingResult; +import org.springframework.rewrite.RewriteRecipeDiscovery; import java.nio.file.Path; import java.util.Arrays; diff --git a/spring-rewrite-commons-functional-tests/dependency-resolution-tests/src/test/java/org/springframework/rewrite/MavenTypeResolutionTests.java b/spring-rewrite-commons-functional-tests/dependency-resolution-tests/src/test/java/org/springframework/rewrite/MavenTypeResolutionTests.java index 9b8567c..76f39c6 100644 --- a/spring-rewrite-commons-functional-tests/dependency-resolution-tests/src/test/java/org/springframework/rewrite/MavenTypeResolutionTests.java +++ b/spring-rewrite-commons-functional-tests/dependency-resolution-tests/src/test/java/org/springframework/rewrite/MavenTypeResolutionTests.java @@ -30,11 +30,11 @@ import org.openrewrite.java.marker.JavaSourceSet; import org.openrewrite.java.tree.J; import org.openrewrite.java.tree.JavaType; import org.openrewrite.java.tree.Statement; -import org.springframework.rewrite.parsers.RewriteExecutionContext; -import org.springframework.rewrite.parsers.RewriteProjectParsingResult; -import org.springframework.rewrite.parsers.SpringRewriteProperties; -import org.springframework.rewrite.parsers.maven.ClasspathDependencies; -import org.springframework.rewrite.support.openrewrite.GenericOpenRewriteRecipe; +import org.springframework.rewrite.parser.RewriteExecutionContext; +import org.springframework.rewrite.parser.RewriteProjectParsingResult; +import org.springframework.rewrite.parser.SpringRewriteProperties; +import org.springframework.rewrite.parser.maven.ClasspathDependencies; +import org.springframework.rewrite.recipes.GenericOpenRewriteRecipe; import org.springframework.rewrite.test.util.ParserExecutionHelper; import org.springframework.rewrite.test.util.TestProjectHelper; 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 d58cdb1..620c17d 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.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.rewrite.boot.autoconfigure.SpringRewriteCommonsConfiguration; -import org.springframework.rewrite.parsers.RewriteProjectParser; -import org.springframework.rewrite.parsers.RewriteProjectParsingResult; -import org.springframework.rewrite.parsers.maven.SbmTestConfiguration; +import org.springframework.rewrite.RewriteProjectParser; +import org.springframework.rewrite.boot.autoconfigure.RewriteLauncherConfiguration; +import org.springframework.rewrite.parser.RewriteProjectParsingResult; +import org.springframework.rewrite.parser.maven.SbmTestConfiguration; import org.springframework.util.FileSystemUtils; import org.testcontainers.containers.GenericContainer; import org.testcontainers.junit.jupiter.Container; @@ -41,7 +41,8 @@ import org.testcontainers.junit.jupiter.Testcontainers; import org.testcontainers.utility.DockerImageName; import org.testcontainers.utility.MountableFile; -import java.io.*; +import java.io.File; +import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -86,7 +87,7 @@ import static org.assertj.core.api.Fail.fail; * * @author Fabian Krüger */ -@SpringBootTest(classes = { MavenArtifactCacheTestConfig.class, SpringRewriteCommonsConfiguration.class, +@SpringBootTest(classes = { MavenArtifactCacheTestConfig.class, RewriteLauncherConfiguration.class, SbmTestConfiguration.class }) @Testcontainers public class PrivateArtifactRepositoryTest { diff --git a/spring-rewrite-commons-launcher/README.adoc b/spring-rewrite-commons-launcher/README.adoc index 4892638..f4e6b50 100644 --- a/spring-rewrite-commons-launcher/README.adoc +++ b/spring-rewrite-commons-launcher/README.adoc @@ -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.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 org.springframework.rewrite.parser.ProjectScanner; +import org.springframework.rewrite.RewriteProjectParser; +import org.springframework.rewrite.parser.RewriteProjectParsingResult; +import org.springframework.rewrite.resource.ProjectResourceSet; +import org.springframework.rewrite.resource.ProjectResourceSetFactory; +import org.springframework.rewrite.resource.ProjectResourceSetSerializer; +import org.springframework.rewrite.RewriteRecipeDiscovery; import java.nio.file.Path; import java.util.List; diff --git a/spring-rewrite-commons-launcher/pom.xml b/spring-rewrite-commons-launcher/pom.xml index a695662..654ab74 100644 --- a/spring-rewrite-commons-launcher/pom.xml +++ b/spring-rewrite-commons-launcher/pom.xml @@ -186,7 +186,7 @@ test - **/parsers/maven/**,**/test/util/** + **/parser/maven/**,**/test/util/** diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteProjectParser.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/RewriteProjectParser.java similarity index 91% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteProjectParser.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/RewriteProjectParser.java index 80628e8..677d476 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteProjectParser.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/RewriteProjectParser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers; +package org.springframework.rewrite; import org.jetbrains.annotations.NotNull; import org.openrewrite.ExecutionContext; @@ -28,12 +28,13 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.context.ApplicationEventPublisher; import org.springframework.core.io.Resource; -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.parser.*; +import org.springframework.rewrite.parser.events.StartedParsingProjectEvent; +import org.springframework.rewrite.parser.events.SuccessfullyParsedProjectEvent; +import org.springframework.rewrite.parser.maven.MavenBuildFileParser; +import org.springframework.rewrite.parser.maven.MavenProject; +import org.springframework.rewrite.parser.maven.MavenProjectAnalyzer; +import org.springframework.rewrite.parser.maven.ProvenanceMarkerFactory; import org.springframework.rewrite.scopes.ScanScope; import org.springframework.util.StringUtils; @@ -71,7 +72,7 @@ public class RewriteProjectParser { private final ProvenanceMarkerFactory provenanceMarkerFactory; - private final BuildFileParser buildFileParser; + private final MavenBuildFileParser buildFileParser; private final SourceFileParser sourceFileParser; @@ -93,7 +94,7 @@ public class RewriteProjectParser { private final MavenProjectAnalyzer mavenProjectAnalyzer; - public RewriteProjectParser(ProvenanceMarkerFactory provenanceMarkerFactory, BuildFileParser buildFileParser, + public RewriteProjectParser(ProvenanceMarkerFactory provenanceMarkerFactory, MavenBuildFileParser buildFileParser, SourceFileParser sourceFileParser, StyleDetector styleDetector, SpringRewriteProperties springRewriteProperties, ParsingEventListener parsingEventListener, ApplicationEventPublisher eventPublisher, ScanScope scanScope, ConfigurableListableBeanFactory beanFactory, diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/recipes/RewriteRecipeDiscovery.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/RewriteRecipeDiscovery.java similarity index 97% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/recipes/RewriteRecipeDiscovery.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/RewriteRecipeDiscovery.java index 716fa09..cbca181 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/recipes/RewriteRecipeDiscovery.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/RewriteRecipeDiscovery.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.recipes; +package org.springframework.rewrite; import org.jetbrains.annotations.NotNull; import org.openrewrite.Recipe; @@ -24,8 +24,8 @@ import org.openrewrite.config.RecipeDescriptor; import org.openrewrite.config.ResourceLoader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.rewrite.parsers.SpringRewriteProperties; -import org.springframework.rewrite.parsers.RecipeValidationErrorException; +import org.springframework.rewrite.parser.RecipeValidationErrorException; +import org.springframework.rewrite.parser.SpringRewriteProperties; import java.util.*; import java.util.function.Predicate; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/execution/RewriteRecipeLauncher.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/RewriteRecipeLauncher.java similarity index 89% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/execution/RewriteRecipeLauncher.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/RewriteRecipeLauncher.java index 233e090..df83939 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/execution/RewriteRecipeLauncher.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/RewriteRecipeLauncher.java @@ -13,18 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.execution; +package org.springframework.rewrite; import org.jetbrains.annotations.NotNull; import org.openrewrite.Recipe; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -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 org.springframework.rewrite.parser.RewriteProjectParsingResult; +import org.springframework.rewrite.resource.ProjectResourceSet; +import org.springframework.rewrite.resource.ProjectResourceSetFactory; +import org.springframework.rewrite.resource.ProjectResourceSetSerializer; import org.springframework.util.StopWatch; import java.nio.file.Path; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/ProjectResourceSetConfiguration.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/ProjectResourceSetConfiguration.java index a976ee1..c56daf4 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/ProjectResourceSetConfiguration.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/ProjectResourceSetConfiguration.java @@ -18,8 +18,7 @@ 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.rewrite.project.RewriteSourceFileWrapper; -import org.springframework.rewrite.project.resource.*; +import org.springframework.rewrite.resource.*; /** * Configuration for {@link ProjectResourceSet} related beans. diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/RecipeDiscoveryConfiguration.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/RecipeDiscoveryConfiguration.java index 9067dd8..f02e4ee 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/RecipeDiscoveryConfiguration.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/RecipeDiscoveryConfiguration.java @@ -19,9 +19,9 @@ 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.rewrite.parsers.SpringRewriteProperties; -import org.springframework.rewrite.parsers.RewriteParserConfiguration; -import org.springframework.rewrite.recipes.RewriteRecipeDiscovery; +import org.springframework.rewrite.parser.RewriteParserConfiguration; +import org.springframework.rewrite.parser.SpringRewriteProperties; +import org.springframework.rewrite.RewriteRecipeDiscovery; /** * Configuration for {@link RewriteRecipeDiscovery}. diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/RewriteLauncherConfiguration.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/RewriteLauncherConfiguration.java index 6314bef..b584930 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/RewriteLauncherConfiguration.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/RewriteLauncherConfiguration.java @@ -18,11 +18,11 @@ 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.rewrite.execution.RewriteRecipeLauncher; -import org.springframework.rewrite.parsers.RewriteProjectParser; -import org.springframework.rewrite.project.resource.ProjectResourceSetFactory; -import org.springframework.rewrite.project.resource.ProjectResourceSetSerializer; -import org.springframework.rewrite.recipes.RewriteRecipeDiscovery; +import org.springframework.rewrite.RewriteRecipeLauncher; +import org.springframework.rewrite.RewriteProjectParser; +import org.springframework.rewrite.resource.ProjectResourceSetFactory; +import org.springframework.rewrite.resource.ProjectResourceSetSerializer; +import org.springframework.rewrite.RewriteRecipeDiscovery; /** * @author Fabian Krüger @@ -32,7 +32,7 @@ import org.springframework.rewrite.recipes.RewriteRecipeDiscovery; public class RewriteLauncherConfiguration { @Bean - RewriteRecipeLauncher rewriteRecipeLaucnher(RewriteProjectParser parser, RewriteRecipeDiscovery dicovery, + RewriteRecipeLauncher rewriteRecipeLauncher(RewriteProjectParser parser, RewriteRecipeDiscovery dicovery, ProjectResourceSetFactory resourceSetFactory, ProjectResourceSetSerializer deserializer) { return new RewriteRecipeLauncher(parser, dicovery, resourceSetFactory, deserializer); } diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/SpringRewriteCommonsConfiguration.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/SpringRewriteCommonsConfiguration.java index 3fceb82..670ea64 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/SpringRewriteCommonsConfiguration.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/SpringRewriteCommonsConfiguration.java @@ -17,7 +17,7 @@ package org.springframework.rewrite.boot.autoconfigure; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Import; -import org.springframework.rewrite.parsers.RewriteParserConfiguration; +import org.springframework.rewrite.parser.RewriteParserConfiguration; /** * Configuration for all components. diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/JavaParserBuilder.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/JavaParserBuilder.java similarity index 98% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/JavaParserBuilder.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/JavaParserBuilder.java index 0d5bb71..a0abbea 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/JavaParserBuilder.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/JavaParserBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers; +package org.springframework.rewrite.parser; import org.openrewrite.ExecutionContext; import org.openrewrite.java.JavaParser; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ModuleParsingResult.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/ModuleParsingResult.java similarity index 92% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ModuleParsingResult.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/ModuleParsingResult.java index fb616e8..eeb23bc 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ModuleParsingResult.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/ModuleParsingResult.java @@ -13,9 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers; +package org.springframework.rewrite.parser; import org.openrewrite.SourceFile; +import org.springframework.rewrite.parser.maven.MavenProject; import java.util.ArrayList; import java.util.List; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ParserContext.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/ParserContext.java similarity index 96% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ParserContext.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/ParserContext.java index db92798..ad5544c 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ParserContext.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/ParserContext.java @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers; +package org.springframework.rewrite.parser; import org.openrewrite.xml.tree.Xml; import org.springframework.core.io.Resource; +import org.springframework.rewrite.parser.maven.MavenProject; import org.springframework.rewrite.utils.ResourceUtil; import java.nio.file.Path; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ProjectId.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/ProjectId.java similarity index 96% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ProjectId.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/ProjectId.java index 3f1cde1..cd954b0 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ProjectId.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/ProjectId.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers; +package org.springframework.rewrite.parser; import java.util.Objects; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ProjectScanner.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/ProjectScanner.java similarity index 99% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ProjectScanner.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/ProjectScanner.java index 2ca74d2..72622b2 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ProjectScanner.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/ProjectScanner.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers; +package org.springframework.rewrite.parser; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RecipeValidationErrorException.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/RecipeValidationErrorException.java similarity index 94% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RecipeValidationErrorException.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/RecipeValidationErrorException.java index 3b0002c..e2edef9 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RecipeValidationErrorException.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/RecipeValidationErrorException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers; +package org.springframework.rewrite.parser; /** * Thrown when recipe validation failed during discovery. diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteExecutionContext.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/RewriteExecutionContext.java similarity index 98% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteExecutionContext.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/RewriteExecutionContext.java index 09fe43b..4cbe7f0 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteExecutionContext.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/RewriteExecutionContext.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers; +package org.springframework.rewrite.parser; import org.openrewrite.ExecutionContext; import org.openrewrite.InMemoryExecutionContext; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteExecutionContextErrorHandler.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/RewriteExecutionContextErrorHandler.java similarity index 97% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteExecutionContextErrorHandler.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/RewriteExecutionContextErrorHandler.java index 29c5c9e..1eca5e0 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteExecutionContextErrorHandler.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/RewriteExecutionContextErrorHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers; +package org.springframework.rewrite.parser; import org.openrewrite.java.JavaParsingException; import org.openrewrite.maven.MavenDownloadingException; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteParserConfiguration.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/RewriteParserConfiguration.java similarity index 94% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteParserConfiguration.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/RewriteParserConfiguration.java index c3ca9e6..ba15cf3 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteParserConfiguration.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/RewriteParserConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers; +package org.springframework.rewrite.parser; import org.openrewrite.ExecutionContext; import org.openrewrite.maven.cache.CompositeMavenPomCache; @@ -32,10 +32,11 @@ import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; import org.springframework.core.io.ResourceLoader; +import org.springframework.rewrite.RewriteProjectParser; import org.springframework.rewrite.boot.autoconfigure.ProjectResourceSetConfiguration; import org.springframework.rewrite.boot.autoconfigure.ScopeConfiguration; -import org.springframework.rewrite.parsers.events.RewriteParsingEventListenerAdapter; -import org.springframework.rewrite.parsers.maven.*; +import org.springframework.rewrite.parser.events.RewriteParsingEventListenerAdapter; +import org.springframework.rewrite.parser.maven.*; import org.springframework.rewrite.scopes.annotations.ScanScope; import java.io.PrintWriter; @@ -110,7 +111,7 @@ public class RewriteParserConfiguration { @Bean RewriteProjectParser rewriteProjectParser(ProvenanceMarkerFactory provenanceMarkerFactory, - BuildFileParser buildFileParser, SourceFileParser sourceFileParser, StyleDetector styleDetector, + MavenBuildFileParser buildFileParser, SourceFileParser sourceFileParser, StyleDetector styleDetector, SpringRewriteProperties springRewriteProperties, ParsingEventListener parsingEventListener, ApplicationEventPublisher eventPublisher, org.springframework.rewrite.scopes.ScanScope scanScope, ConfigurableListableBeanFactory beanFactory, ProjectScanner projectScanner, diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteProjectParsingResult.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/RewriteProjectParsingResult.java similarity index 95% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteProjectParsingResult.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/RewriteProjectParsingResult.java index 7862b90..e3224fb 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteProjectParsingResult.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/RewriteProjectParsingResult.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers; +package org.springframework.rewrite.parser; import org.openrewrite.ExecutionContext; import org.openrewrite.SourceFile; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteResourceParser.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/RewriteResourceParser.java similarity index 99% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteResourceParser.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/RewriteResourceParser.java index 1effaee..ec93a95 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteResourceParser.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/RewriteResourceParser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers; +package org.springframework.rewrite.parser; import org.jetbrains.annotations.NotNull; import org.openrewrite.ExecutionContext; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/SourceFileParser.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/SourceFileParser.java similarity index 94% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/SourceFileParser.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/SourceFileParser.java index 7f4a835..9470ecf 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/SourceFileParser.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/SourceFileParser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers; +package org.springframework.rewrite.parser; import org.openrewrite.ExecutionContext; import org.openrewrite.SourceFile; @@ -23,7 +23,8 @@ import org.openrewrite.xml.tree.Xml; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.io.Resource; -import org.springframework.rewrite.parsers.maven.MavenModuleParser; +import org.springframework.rewrite.parser.maven.MavenModuleParser; +import org.springframework.rewrite.parser.maven.MavenProject; import java.nio.file.Path; import java.util.*; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/SourceSetParsingResult.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/SourceSetParsingResult.java similarity index 95% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/SourceSetParsingResult.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/SourceSetParsingResult.java index 138e72a..2200eb7 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/SourceSetParsingResult.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/SourceSetParsingResult.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers; +package org.springframework.rewrite.parser; import org.openrewrite.SourceFile; import org.openrewrite.java.internal.JavaTypeCache; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/SpringRewriteProperties.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/SpringRewriteProperties.java similarity index 99% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/SpringRewriteProperties.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/SpringRewriteProperties.java index 9effefd..72900a9 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/SpringRewriteProperties.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/SpringRewriteProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers; +package org.springframework.rewrite.parser; import org.openrewrite.java.JavaParser; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/StyleDetector.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/StyleDetector.java similarity index 95% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/StyleDetector.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/StyleDetector.java index 6fd7e22..c31a958 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/StyleDetector.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/StyleDetector.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers; +package org.springframework.rewrite.parser; import org.openrewrite.SourceFile; import org.openrewrite.Tree; @@ -36,7 +36,7 @@ import java.util.stream.Stream; public class StyleDetector { - List sourcesWithAutoDetectedStyles(Stream sourceFiles) { + public List sourcesWithAutoDetectedStyles(Stream sourceFiles) { org.openrewrite.java.style.Autodetect.Detector javaDetector = org.openrewrite.java.style.Autodetect.detector(); org.openrewrite.xml.style.Autodetect.Detector xmlDetector = org.openrewrite.xml.style.Autodetect.detector(); List sourceFileList = sourceFiles.peek(javaDetector::sample).peek(xmlDetector::sample).toList(); diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/FinishedParsingResourceEvent.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/events/FinishedParsingResourceEvent.java similarity index 94% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/FinishedParsingResourceEvent.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/events/FinishedParsingResourceEvent.java index ef68591..a33f513 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/FinishedParsingResourceEvent.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/events/FinishedParsingResourceEvent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers.events; +package org.springframework.rewrite.parser.events; import org.openrewrite.Parser; import org.openrewrite.SourceFile; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/IntermediateParsingEvent.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/events/IntermediateParsingEvent.java similarity index 94% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/IntermediateParsingEvent.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/events/IntermediateParsingEvent.java index b9080a5..b7e5c13 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/IntermediateParsingEvent.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/events/IntermediateParsingEvent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.rewrite.parsers.events; +package org.springframework.rewrite.parser.events; import org.openrewrite.tree.ParsingEventListener; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/RewriteParsingEventListenerAdapter.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/events/RewriteParsingEventListenerAdapter.java similarity index 97% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/RewriteParsingEventListenerAdapter.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/events/RewriteParsingEventListenerAdapter.java index d248b0f..67b67eb 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/RewriteParsingEventListenerAdapter.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/events/RewriteParsingEventListenerAdapter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers.events; +package org.springframework.rewrite.parser.events; import org.openrewrite.Parser; import org.openrewrite.SourceFile; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/StartedParsingProjectEvent.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/events/StartedParsingProjectEvent.java similarity index 94% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/StartedParsingProjectEvent.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/events/StartedParsingProjectEvent.java index 83f97c6..1040e67 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/StartedParsingProjectEvent.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/events/StartedParsingProjectEvent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers.events; +package org.springframework.rewrite.parser.events; import org.springframework.core.io.Resource; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/StartedParsingResourceEvent.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/events/StartedParsingResourceEvent.java similarity index 93% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/StartedParsingResourceEvent.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/events/StartedParsingResourceEvent.java index 03157b2..9e5725c 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/StartedParsingResourceEvent.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/events/StartedParsingResourceEvent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers.events; +package org.springframework.rewrite.parser.events; import org.openrewrite.Parser; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/SuccessfullyParsedProjectEvent.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/events/SuccessfullyParsedProjectEvent.java similarity index 94% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/SuccessfullyParsedProjectEvent.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/events/SuccessfullyParsedProjectEvent.java index e0d7edc..96c095c 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/SuccessfullyParsedProjectEvent.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/events/SuccessfullyParsedProjectEvent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers.events; +package org.springframework.rewrite.parser.events; import org.openrewrite.SourceFile; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/ClasspathDependencies.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/ClasspathDependencies.java similarity index 96% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/ClasspathDependencies.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/ClasspathDependencies.java index b0a1fee..788c1f8 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/ClasspathDependencies.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/ClasspathDependencies.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers.maven; +package org.springframework.rewrite.parser.maven; import org.openrewrite.marker.Marker; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenBuildFileFilter.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenBuildFileFilter.java similarity index 95% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenBuildFileFilter.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenBuildFileFilter.java index fcb7c86..5aea23a 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenBuildFileFilter.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenBuildFileFilter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers.maven; +package org.springframework.rewrite.parser.maven; import org.jetbrains.annotations.NotNull; import org.springframework.core.io.Resource; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/BuildFileParser.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenBuildFileParser.java similarity index 96% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/BuildFileParser.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenBuildFileParser.java index 5eefa5c..3d670da 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/BuildFileParser.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenBuildFileParser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers.maven; +package org.springframework.rewrite.parser.maven; import org.jetbrains.annotations.NotNull; import org.openrewrite.ExecutionContext; @@ -43,13 +43,13 @@ import static java.util.Collections.emptyList; * * @author Fabian Krüger */ -public class BuildFileParser { +public class MavenBuildFileParser { - private static final Logger LOGGER = LoggerFactory.getLogger(BuildFileParser.class); + private static final Logger LOGGER = LoggerFactory.getLogger(MavenBuildFileParser.class); private final MavenSettingsInitializer mavenSettingsInitilizer; - public BuildFileParser(MavenSettingsInitializer mavenSettingsInitilizer) { + public MavenBuildFileParser(MavenSettingsInitializer mavenSettingsInitilizer) { this.mavenSettingsInitilizer = mavenSettingsInitilizer; } diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenConfigFileParser.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenConfigFileParser.java similarity index 99% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenConfigFileParser.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenConfigFileParser.java index 8f8c0b3..b45aacf 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenConfigFileParser.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenConfigFileParser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers.maven; +package org.springframework.rewrite.parser.maven; import org.apache.commons.cli.*; import org.apache.maven.cli.CleanArgument; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenModelReader.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenModelReader.java similarity index 96% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenModelReader.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenModelReader.java index 6b2f430..9316f95 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenModelReader.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenModelReader.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers.maven; +package org.springframework.rewrite.parser.maven; import org.apache.maven.model.Model; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenModuleParser.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenModuleParser.java similarity index 99% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenModuleParser.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenModuleParser.java index bcd49e5..0790b48 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenModuleParser.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenModuleParser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers.maven; +package org.springframework.rewrite.parser.maven; import org.jetbrains.annotations.NotNull; import org.openrewrite.ExecutionContext; @@ -35,7 +35,7 @@ import org.openrewrite.xml.tree.Xml; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.io.Resource; -import org.springframework.rewrite.parsers.*; +import org.springframework.rewrite.parser.*; import org.springframework.rewrite.utils.LinuxWindowsPathUnifier; import org.springframework.rewrite.utils.ResourceUtil; @@ -46,7 +46,6 @@ import java.nio.file.Path; import java.nio.file.PathMatcher; import java.nio.file.Paths; import java.util.*; -import java.util.function.Predicate; import java.util.function.Supplier; import java.util.function.UnaryOperator; import java.util.stream.Collectors; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenPasswordDecrypter.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenPasswordDecrypter.java similarity index 98% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenPasswordDecrypter.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenPasswordDecrypter.java index c8e56b5..4bbb810 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenPasswordDecrypter.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenPasswordDecrypter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers.maven; +package org.springframework.rewrite.parser.maven; import org.openrewrite.maven.MavenSettings; import org.sonatype.plexus.components.cipher.DefaultPlexusCipher; diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/MavenProject.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenProject.java similarity index 98% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/MavenProject.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenProject.java index 4af904c..c9afe61 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/MavenProject.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenProject.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers; +package org.springframework.rewrite.parser.maven; import org.apache.maven.model.*; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; @@ -25,14 +25,17 @@ import org.openrewrite.maven.tree.Scope; import org.openrewrite.maven.utilities.MavenArtifactDownloader; import org.openrewrite.xml.tree.Xml; import org.springframework.core.io.Resource; -import org.springframework.rewrite.parsers.maven.MavenRuntimeInformation; +import org.springframework.rewrite.parser.ProjectId; import org.springframework.rewrite.utils.LinuxWindowsPathUnifier; import org.springframework.rewrite.utils.ResourceUtil; import java.io.File; import java.io.IOException; import java.nio.file.Path; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.Properties; import java.util.function.Predicate; /** diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenProjectAnalyzer.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenProjectAnalyzer.java similarity index 95% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenProjectAnalyzer.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenProjectAnalyzer.java index c500a50..f731bcf 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenProjectAnalyzer.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenProjectAnalyzer.java @@ -13,14 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers.maven; +package org.springframework.rewrite.parser.maven; import org.springframework.core.io.Resource; -import org.springframework.rewrite.parsers.MavenProject; import org.springframework.rewrite.utils.LinuxWindowsPathUnifier; import java.nio.file.Path; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; /** * Implements the ordering of Maven (reactor) build projects. See { diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/ResourceFilterException.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/resource/finder/ResourceFilterException.java similarity index 92% rename from spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/ResourceFilterException.java rename to spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/resource/finder/ResourceFilterException.java index 7413c72..1863c26 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/ResourceFilterException.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/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.rewrite.project.resource.finder; +package org.springframework.rewrite.resource.finder; public class ResourceFilterException extends RuntimeException { diff --git a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/scopes/AbstractBaseScope.java b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/scopes/AbstractBaseScope.java index d03a049..a2a88d4 100644 --- a/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/scopes/AbstractBaseScope.java +++ b/spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/scopes/AbstractBaseScope.java @@ -21,7 +21,7 @@ import org.springframework.beans.factory.ObjectFactory; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.config.Scope; import org.springframework.lang.Nullable; -import org.springframework.rewrite.parsers.RewriteExecutionContextErrorHandler; +import org.springframework.rewrite.parser.RewriteExecutionContextErrorHandler; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; 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 07aa905..612ba6f 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.rewrite.boot.autoconfigure.ScopeConfiguration -org.springframework.rewrite.parsers.RewriteParserConfiguration +org.springframework.rewrite.parser.RewriteParserConfiguration org.springframework.rewrite.boot.autoconfigure.RecipeDiscoveryConfiguration org.springframework.rewrite.boot.autoconfigure.ProjectResourceSetConfiguration org.springframework.rewrite.boot.autoconfigure.SpringRewriteCommonsConfiguration 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 fe066f8..219b929 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,9 +26,9 @@ import org.openrewrite.java.tree.JavaType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.core.io.Resource; -import org.springframework.rewrite.parsers.RewriteParserConfiguration; -import org.springframework.rewrite.parsers.RewriteProjectParser; -import org.springframework.rewrite.parsers.RewriteProjectParsingResult; +import org.springframework.rewrite.parser.RewriteParserConfiguration; +import org.springframework.rewrite.RewriteProjectParser; +import org.springframework.rewrite.parser.RewriteProjectParsingResult; import org.springframework.rewrite.test.util.DummyResource; import org.springframework.rewrite.test.util.TestProjectHelper; import org.springframework.rewrite.utils.LinuxWindowsPathUnifier; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/CompareParserRecipeRunTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/CompareParserRecipeRunTest.java similarity index 94% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/CompareParserRecipeRunTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/CompareParserRecipeRunTest.java index 526b83f..6f458ef 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/CompareParserRecipeRunTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/CompareParserRecipeRunTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers; +package org.springframework.rewrite.parser; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -28,9 +28,10 @@ import org.openrewrite.marker.Markers; import org.openrewrite.marker.SearchResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.rewrite.RewriteProjectParser; import org.springframework.rewrite.boot.autoconfigure.SpringRewriteCommonsConfiguration; -import org.springframework.rewrite.parsers.maven.RewriteMavenProjectParser; -import org.springframework.rewrite.parsers.maven.SbmTestConfiguration; +import org.springframework.rewrite.parser.maven.RewriteMavenProjectParser; +import org.springframework.rewrite.parser.maven.SbmTestConfiguration; import org.springframework.rewrite.test.util.ParallelParsingResult; import org.springframework.rewrite.test.util.ParserExecutionHelper; import org.springframework.rewrite.test.util.TestProjectHelper; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/BuildFileParserTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/MavenBuildFileParserTest.java similarity index 96% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/BuildFileParserTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/MavenBuildFileParserTest.java index cc84bcd..ae86ddf 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/BuildFileParserTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/MavenBuildFileParserTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers; +package org.springframework.rewrite.parser; import org.assertj.core.api.Assertions; import org.intellij.lang.annotations.Language; @@ -27,8 +27,8 @@ import org.openrewrite.java.marker.JavaProject; import org.openrewrite.marker.Marker; import org.openrewrite.xml.tree.Xml; import org.springframework.core.io.Resource; -import org.springframework.rewrite.parsers.maven.BuildFileParser; -import org.springframework.rewrite.parsers.maven.MavenSettingsInitializer; +import org.springframework.rewrite.parser.maven.MavenBuildFileParser; +import org.springframework.rewrite.parser.maven.MavenSettingsInitializer; import org.springframework.rewrite.scopes.ProjectMetadata; import org.springframework.rewrite.test.util.DummyResource; import org.springframework.rewrite.utils.ResourceUtil; @@ -44,7 +44,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; /** * @author Fabian Krüger */ -class BuildFileParserTest { +class MavenBuildFileParserTest { @Nested public class GivenSimpleMavenMultiModuleProject { @@ -100,7 +100,7 @@ class BuildFileParserTest { """; - private BuildFileParser sut; + private MavenBuildFileParser sut; @BeforeEach void beforeEach() { @@ -109,7 +109,7 @@ class BuildFileParserTest { }); MavenSettingsInitializer mavenSettingsInitializer = new MavenSettingsInitializer(executionContext, new ProjectMetadata()); - sut = new BuildFileParser(mavenSettingsInitializer); + sut = new MavenBuildFileParser(mavenSettingsInitializer); } @Test diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/ParserEventPublicationIntegrationTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/ParserEventPublicationIntegrationTest.java similarity index 92% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/ParserEventPublicationIntegrationTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/ParserEventPublicationIntegrationTest.java index 7038328..1aafd8c 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/ParserEventPublicationIntegrationTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/ParserEventPublicationIntegrationTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers; +package org.springframework.rewrite.parser; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -23,9 +23,10 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.context.event.EventListener; import org.springframework.core.io.Resource; -import org.springframework.rewrite.parsers.events.FinishedParsingResourceEvent; -import org.springframework.rewrite.parsers.events.StartedParsingProjectEvent; -import org.springframework.rewrite.parsers.events.SuccessfullyParsedProjectEvent; +import org.springframework.rewrite.RewriteProjectParser; +import org.springframework.rewrite.parser.events.FinishedParsingResourceEvent; +import org.springframework.rewrite.parser.events.StartedParsingProjectEvent; +import org.springframework.rewrite.parser.events.SuccessfullyParsedProjectEvent; import org.springframework.rewrite.utils.LinuxWindowsPathUnifier; import java.nio.file.Path; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteProjectParserIntegrationTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteProjectParserIntegrationTest.java similarity index 93% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteProjectParserIntegrationTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteProjectParserIntegrationTest.java index 0b1f691..9a32091 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteProjectParserIntegrationTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteProjectParserIntegrationTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers; +package org.springframework.rewrite.parser; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -23,9 +23,10 @@ import org.junitpioneer.jupiter.Issue; import org.openrewrite.java.tree.J; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.rewrite.RewriteProjectParser; import org.springframework.rewrite.boot.autoconfigure.SpringRewriteCommonsConfiguration; -import org.springframework.rewrite.parsers.maven.RewriteMavenProjectParser; -import org.springframework.rewrite.parsers.maven.SbmTestConfiguration; +import org.springframework.rewrite.parser.maven.RewriteMavenProjectParser; +import org.springframework.rewrite.parser.maven.SbmTestConfiguration; import org.springframework.rewrite.test.util.ParserParityTestHelper; import org.springframework.rewrite.test.util.TestProjectHelper; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteProjectParserParityTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteProjectParserParityTest.java similarity index 97% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteProjectParserParityTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteProjectParserParityTest.java index e774fdc..5688b42 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteProjectParserParityTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteProjectParserParityTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers; +package org.springframework.rewrite.parser; import org.intellij.lang.annotations.Language; import org.jetbrains.annotations.NotNull; @@ -31,8 +31,8 @@ import org.openrewrite.SourceFile; import org.openrewrite.shaded.jgit.api.errors.GitAPIException; import org.openrewrite.tree.ParsingEventListener; import org.openrewrite.tree.ParsingExecutionContextView; -import org.springframework.rewrite.parsers.maven.ComparingParserFactory; -import org.springframework.rewrite.parsers.maven.RewriteMavenProjectParser; +import org.springframework.rewrite.parser.maven.ComparingParserFactory; +import org.springframework.rewrite.parser.maven.RewriteMavenProjectParser; import org.springframework.rewrite.test.util.DummyResource; import org.springframework.rewrite.test.util.ParserParityTestHelper; import org.springframework.rewrite.test.util.TestProjectHelper; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteProjectParserTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteProjectParserTest.java similarity index 95% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteProjectParserTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteProjectParserTest.java index 680e5a9..459796e 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteProjectParserTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteProjectParserTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers; +package org.springframework.rewrite.parser; import org.intellij.lang.annotations.Language; import org.junit.jupiter.api.DisplayName; @@ -29,7 +29,8 @@ 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.rewrite.parsers.maven.*; +import org.springframework.rewrite.RewriteProjectParser; +import org.springframework.rewrite.parser.maven.*; import org.springframework.rewrite.scopes.ProjectMetadata; import org.springframework.rewrite.scopes.ScanScope; import org.springframework.rewrite.test.util.DummyResource; @@ -102,7 +103,7 @@ class RewriteProjectParserTest { MavenProjectFactory mavenProjectFactory = new MavenProjectFactory(artifactDownloader); RewriteProjectParser projectParser = new RewriteProjectParser( new ProvenanceMarkerFactory(new MavenProvenanceMarkerFactory()), - new BuildFileParser(mavenSettingsInitializer), new SourceFileParser(mavenModuleParser), + new MavenBuildFileParser(mavenSettingsInitializer), new SourceFileParser(mavenModuleParser), new StyleDetector(), springRewriteProperties, mock(ParsingEventListener.class), mock(ApplicationEventPublisher.class), new ScanScope(), mock(ConfigurableListableBeanFactory.class), new ProjectScanner(new DefaultResourceLoader(), springRewriteProperties), executionContext, diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteRecipeDiscoveryTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteRecipeDiscoveryTest.java similarity index 98% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteRecipeDiscoveryTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteRecipeDiscoveryTest.java index 20d243e..f5cb752 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteRecipeDiscoveryTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteRecipeDiscoveryTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers; +package org.springframework.rewrite.parser; import com.example.recipes.DummyRecipe; import io.example.recipes.AnotherDummyRecipe; @@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; import org.openrewrite.Recipe; import org.openrewrite.config.*; -import org.springframework.rewrite.recipes.RewriteRecipeDiscovery; +import org.springframework.rewrite.RewriteRecipeDiscovery; import org.springframework.rewrite.test.util.OpenRewriteDummyRecipeInstaller; import java.nio.file.Path; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteResourceParserTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteResourceParserTest.java similarity index 98% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteResourceParserTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteResourceParserTest.java index 193b001..cc34c7a 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteResourceParserTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteResourceParserTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers; +package org.springframework.rewrite.parser; import org.apache.maven.plugin.logging.Log; import org.junit.jupiter.api.DisplayName; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/Slf4jToMavenLoggerAdapter.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/Slf4jToMavenLoggerAdapter.java similarity index 98% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/Slf4jToMavenLoggerAdapter.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/Slf4jToMavenLoggerAdapter.java index 885c990..dde4bc3 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/Slf4jToMavenLoggerAdapter.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/Slf4jToMavenLoggerAdapter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers; +package org.springframework.rewrite.parser; import org.apache.maven.plugin.logging.Log; import org.slf4j.Logger; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/SpringRewritePropertiesTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/SpringRewritePropertiesTest.java similarity index 97% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/SpringRewritePropertiesTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/SpringRewritePropertiesTest.java index 7753c4f..3e0abc1 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/SpringRewritePropertiesTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/SpringRewritePropertiesTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers; +package org.springframework.rewrite.parser; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -21,7 +21,6 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import java.io.File; import java.nio.file.Path; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/ComparingParserFactory.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/ComparingParserFactory.java similarity index 91% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/ComparingParserFactory.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/ComparingParserFactory.java index 81f01d5..b10a3d9 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/ComparingParserFactory.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/ComparingParserFactory.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers.maven; +package org.springframework.rewrite.parser.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.rewrite.parsers.SpringRewriteProperties; -import org.springframework.rewrite.parsers.events.RewriteParsingEventListenerAdapter; +import org.springframework.rewrite.parser.SpringRewriteProperties; +import org.springframework.rewrite.parser.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/rewrite/parsers/maven/MavenConfigFileParserTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenConfigFileParserTest.java similarity index 97% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenConfigFileParserTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenConfigFileParserTest.java index 101aa12..3a3f560 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenConfigFileParserTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenConfigFileParserTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers.maven; +package org.springframework.rewrite.parser.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/rewrite/parsers/maven/MavenExecutionRequestFactory.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenExecutionRequestFactory.java similarity index 99% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenExecutionRequestFactory.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenExecutionRequestFactory.java index 84da1e1..0cc52de 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenExecutionRequestFactory.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenExecutionRequestFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers.maven; +package org.springframework.rewrite.parser.maven; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenExecutionResultException.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenExecutionResultException.java similarity index 96% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenExecutionResultException.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenExecutionResultException.java index 1161588..ab0410b 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenExecutionResultException.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenExecutionResultException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers.maven; +package org.springframework.rewrite.parser.maven; import org.apache.commons.lang3.exception.ExceptionUtils; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenExecutor.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenExecutor.java similarity index 98% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenExecutor.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenExecutor.java index 5fda379..5455ca7 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenExecutor.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenExecutor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers.maven; +package org.springframework.rewrite.parser.maven; import org.apache.maven.Maven; import org.apache.maven.execution.*; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenExecutorTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenExecutorTest.java similarity index 96% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenExecutorTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenExecutorTest.java index 68333a5..64169f3 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenExecutorTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenExecutorTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers.maven; +package org.springframework.rewrite.parser.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/rewrite/parsers/maven/MavenMojoProjectParserFactory.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenMojoProjectParserFactory.java similarity index 93% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenMojoProjectParserFactory.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenMojoProjectParserFactory.java index 07b72ab..362e55b 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenMojoProjectParserFactory.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenMojoProjectParserFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers.maven; +package org.springframework.rewrite.parser.maven; import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.logging.Log; @@ -25,11 +25,10 @@ import org.jetbrains.annotations.NotNull; import org.openrewrite.maven.MavenMojoProjectParser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.rewrite.parsers.SpringRewriteProperties; -import org.springframework.rewrite.parsers.Slf4jToMavenLoggerAdapter; +import org.springframework.rewrite.parser.Slf4jToMavenLoggerAdapter; +import org.springframework.rewrite.parser.SpringRewriteProperties; import java.nio.file.Path; -import java.util.Collection; import java.util.List; /** diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenPlexusContainer.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenPlexusContainer.java similarity index 98% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenPlexusContainer.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenPlexusContainer.java index 236b619..e33df12 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenPlexusContainer.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenPlexusContainer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers.maven; +package org.springframework.rewrite.parser.maven; import org.codehaus.plexus.*; import org.codehaus.plexus.classworlds.ClassWorld; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenPomCacheTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenPomCacheTest.java similarity index 97% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenPomCacheTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenPomCacheTest.java index fd46b41..dc6f109 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenPomCacheTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenPomCacheTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers.maven; +package org.springframework.rewrite.parser.maven; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; @@ -30,7 +30,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; -import org.springframework.rewrite.parsers.RewriteParserConfiguration; +import org.springframework.rewrite.parser.RewriteParserConfiguration; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.util.ReflectionTestUtils; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenProjectGraphTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenProjectGraphTest.java similarity index 98% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenProjectGraphTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenProjectGraphTest.java index c128aa2..c30f54f 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenProjectGraphTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenProjectGraphTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers.maven; +package org.springframework.rewrite.parser.maven; import com.google.common.base.Supplier; import org.assertj.core.api.AbstractAssert; @@ -25,14 +25,13 @@ import org.junit.jupiter.api.function.Executable; import org.openrewrite.maven.cache.LocalMavenArtifactCache; import org.openrewrite.maven.utilities.MavenArtifactDownloader; import org.springframework.core.io.Resource; -import org.springframework.rewrite.parsers.MavenProject; import org.springframework.rewrite.test.util.DummyResource; import java.nio.file.Path; import java.util.*; import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.rewrite.parsers.maven.MavenProjectGraphTest.MavenProjectBuilder.none; +import static org.springframework.rewrite.parser.maven.MavenProjectGraphTest.MavenProjectBuilder.none; /** * @author Fabian Krüger diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenProjectResolutionTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenProjectResolutionTest.java similarity index 99% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenProjectResolutionTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenProjectResolutionTest.java index 3bc9afb..c120d13 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenProjectResolutionTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenProjectResolutionTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers.maven; +package org.springframework.rewrite.parser.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/rewrite/parsers/maven/MavenProjectSorterTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenProjectSorterTest.java similarity index 99% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenProjectSorterTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenProjectSorterTest.java index 3104292..5eb2ea7 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenProjectSorterTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenProjectSorterTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.rewrite.parsers.maven; +package org.springframework.rewrite.parser.maven; import org.apache.maven.execution.MavenSession; import org.intellij.lang.annotations.Language; @@ -26,7 +26,6 @@ import org.junit.jupiter.api.io.TempDir; import org.mockito.Mockito; import org.openrewrite.maven.utilities.MavenArtifactDownloader; import org.springframework.core.io.Resource; -import org.springframework.rewrite.parsers.MavenProject; import org.springframework.rewrite.test.util.DummyResource; import org.springframework.rewrite.utils.LinuxWindowsPathUnifier; import org.springframework.rewrite.utils.ResourceUtil; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenSettingsInitializerTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenSettingsInitializerTest.java similarity index 96% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenSettingsInitializerTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenSettingsInitializerTest.java index 188324f..512bf19 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenSettingsInitializerTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenSettingsInitializerTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers.maven; +package org.springframework.rewrite.parser.maven; import org.junit.jupiter.api.Test; import org.junitpioneer.jupiter.SetSystemProperty; @@ -21,7 +21,7 @@ import org.openrewrite.maven.MavenExecutionContextView; import org.openrewrite.maven.MavenSettings; import org.openrewrite.maven.tree.MavenRepository; import org.sonatype.plexus.components.cipher.PlexusCipherException; -import org.springframework.rewrite.parsers.RewriteExecutionContext; +import org.springframework.rewrite.parser.RewriteExecutionContext; import org.springframework.rewrite.scopes.ProjectMetadata; import org.springframework.rewrite.utils.LinuxWindowsPathUnifier; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/ProvenanceMarkerFactoryTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/ProvenanceMarkerFactoryTest.java similarity index 98% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/ProvenanceMarkerFactoryTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/ProvenanceMarkerFactoryTest.java index 5e815ae..0b6e61a 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/ProvenanceMarkerFactoryTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/ProvenanceMarkerFactoryTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers.maven; +package org.springframework.rewrite.parser.maven; import org.apache.maven.plugin.logging.Log; import org.apache.maven.rtinfo.RuntimeInformation; @@ -35,9 +35,8 @@ import org.openrewrite.shaded.jgit.api.Git; import org.openrewrite.shaded.jgit.lib.Repository; import org.openrewrite.shaded.jgit.storage.file.FileRepositoryBuilder; import org.springframework.core.io.Resource; -import org.springframework.rewrite.parsers.MavenProject; -import org.springframework.rewrite.parsers.ParserContext; -import org.springframework.rewrite.parsers.SpringRewriteProperties; +import org.springframework.rewrite.parser.ParserContext; +import org.springframework.rewrite.parser.SpringRewriteProperties; import org.springframework.rewrite.test.util.DummyResource; import org.springframework.rewrite.utils.ResourceUtil; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/RewriteMavenProjectParser.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/RewriteMavenProjectParser.java similarity index 97% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/RewriteMavenProjectParser.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/RewriteMavenProjectParser.java index 3efa4a5..2beee34 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/RewriteMavenProjectParser.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/RewriteMavenProjectParser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers.maven; +package org.springframework.rewrite.parser.maven; import org.apache.maven.artifact.DependencyResolutionRequiredException; import org.apache.maven.execution.MavenSession; @@ -31,11 +31,9 @@ import org.openrewrite.style.NamedStyles; import org.openrewrite.tree.ParsingEventListener; import org.openrewrite.tree.ParsingExecutionContextView; import org.openrewrite.xml.tree.Xml; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.core.io.Resource; -import org.springframework.rewrite.parsers.RewriteProjectParsingResult; +import org.springframework.rewrite.parser.RewriteProjectParsingResult; import org.springframework.rewrite.scopes.ScanScope; import java.nio.file.Path; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/RewriteMavenProjectParserIntegrationTest.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/RewriteMavenProjectParserIntegrationTest.java similarity index 93% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/RewriteMavenProjectParserIntegrationTest.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/RewriteMavenProjectParserIntegrationTest.java index 7beea0e..10277b2 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/RewriteMavenProjectParserIntegrationTest.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/RewriteMavenProjectParserIntegrationTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers.maven; +package org.springframework.rewrite.parser.maven; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -27,8 +27,8 @@ import org.openrewrite.tree.ParsingExecutionContextView; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.rewrite.boot.autoconfigure.SpringRewriteCommonsConfiguration; -import org.springframework.rewrite.parsers.RewriteProjectParsingResult; -import org.springframework.rewrite.parsers.events.FinishedParsingResourceEvent; +import org.springframework.rewrite.parser.RewriteProjectParsingResult; +import org.springframework.rewrite.parser.events.FinishedParsingResourceEvent; import java.nio.file.Path; import java.util.ArrayList; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/SbmTestConfiguration.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/SbmTestConfiguration.java similarity index 93% rename from spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/SbmTestConfiguration.java rename to spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/SbmTestConfiguration.java index db349c3..0753d5e 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/SbmTestConfiguration.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/SbmTestConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.rewrite.parsers.maven; +package org.springframework.rewrite.parser.maven; import org.openrewrite.ExecutionContext; import org.openrewrite.tree.ParsingEventListener; @@ -22,8 +22,8 @@ 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.rewrite.parsers.SpringRewriteProperties; -import org.springframework.rewrite.parsers.RewriteParserConfiguration; +import org.springframework.rewrite.parser.RewriteParserConfiguration; +import org.springframework.rewrite.parser.SpringRewriteProperties; import org.springframework.rewrite.scopes.ScanScope; /** diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParallelParsingResult.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParallelParsingResult.java index 89d1571..ea65fcc 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParallelParsingResult.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParallelParsingResult.java @@ -15,7 +15,7 @@ */ package org.springframework.rewrite.test.util; -import org.springframework.rewrite.parsers.RewriteProjectParsingResult; +import org.springframework.rewrite.parser.RewriteProjectParsingResult; /** * @author Fabian Krüger diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParserExecutionHelper.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParserExecutionHelper.java index aa04b36..8d9a0a2 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParserExecutionHelper.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParserExecutionHelper.java @@ -21,11 +21,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.rewrite.boot.autoconfigure.SpringRewriteCommonsConfiguration; -import org.springframework.rewrite.parsers.SpringRewriteProperties; -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 org.springframework.rewrite.RewriteProjectParser; +import org.springframework.rewrite.parser.RewriteProjectParsingResult; +import org.springframework.rewrite.parser.SpringRewriteProperties; +import org.springframework.rewrite.parser.maven.ComparingParserFactory; +import org.springframework.rewrite.parser.maven.RewriteMavenProjectParser; import java.nio.file.Path; import java.util.concurrent.CountDownLatch; diff --git a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParserParityTestHelper.java b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParserParityTestHelper.java index 25e9929..3f4bfe9 100644 --- a/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParserParityTestHelper.java +++ b/spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParserParityTestHelper.java @@ -31,9 +31,9 @@ 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.rewrite.parsers.SpringRewriteProperties; -import org.springframework.rewrite.parsers.RewriteProjectParsingResult; -import org.springframework.rewrite.parsers.maven.ClasspathDependencies; +import org.springframework.rewrite.parser.RewriteProjectParsingResult; +import org.springframework.rewrite.parser.SpringRewriteProperties; +import org.springframework.rewrite.parser.maven.ClasspathDependencies; import java.io.File; import java.net.URI; @@ -69,7 +69,7 @@ public class ParserParityTestHelper { /** * Sequentially parse given project using tested parser and then comparing parser. The - * parsers are executed in parallel by default. + * parser are executed in parallel by default. */ public ParserParityTestHelper parseSequentially() { this.isParallelParse = false;