Spring/spring-rewrite-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactoring

Browse Source 
* Fix package name
* Move classes to the application root package
* Change class names
* Polish
This commit is contained in:
Fabian Krüger
2024-01-26 13:20:40 +00:00
committed by GitHub
parent ff814b4e56
commit 861eabc700
108 changed files with 252 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
README.adoc
View File

@@ -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 {

13
spring-rewrite-commons-docs/src/main/antora/modules/ROOT/pages/partials/example-application-code.adoc
View File

@@ -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 {

12
spring-rewrite-commons-examples/boot-3-upgrade-atomic-example/src/main/java/com/acme/example/SpringBoot3Upgrade.java
View File

@@ -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;

16
spring-rewrite-commons-examples/boot-3-upgrade-iterative-example/src/main/java/com/example/bootupgrade/IterativeBoot3UpgradeExample.java
View File

@@ -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;

8
spring-rewrite-commons-examples/list-applicable-recipes-example/src/main/java/org/example/app/ListApplicableRecipesExampleApplication.java
View File

@@ -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;

10
spring-rewrite-commons-functional-tests/dependency-resolution-tests/src/test/java/org/springframework/rewrite/MavenTypeResolutionTests.java
View File

@@ -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;

13
spring-rewrite-commons-functional-tests/private-artifact-repository-tests/src/test/java/org/springframework/sbm/PrivateArtifactRepositoryTest.java
View File

@@ -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 {

14
spring-rewrite-commons-launcher/README.adoc
View File

@@ -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;

2
spring-rewrite-commons-launcher/pom.xml
View File

@@ -186,7 +186,7 @@
</goals>
<configuration>
<classifier>test</classifier>
<includes>**/parsers/maven/**,**/test/util/**</includes>
<includes>**/parser/maven/**,**/test/util/**</includes>
</configuration>
</execution>
</executions>

19
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteProjectParser.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/RewriteProjectParser.java
View File

@@ -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,

6
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/recipes/RewriteRecipeDiscovery.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/RewriteRecipeDiscovery.java
View File

@@ -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;

12
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/execution/RewriteRecipeLauncher.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/RewriteRecipeLauncher.java
View File

@@ -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;

3
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/ProjectResourceSetConfiguration.java
View File

@@ -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.

6
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/RecipeDiscoveryConfiguration.java
View File

@@ -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}.

12
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/RewriteLauncherConfiguration.java
View File

@@ -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);
}

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/boot/autoconfigure/SpringRewriteCommonsConfiguration.java
View File

@@ -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.

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/JavaParserBuilder.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/JavaParserBuilder.java
View File

@@ -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;

3
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ModuleParsingResult.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/ModuleParsingResult.java
View File

@@ -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;

3
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ParserContext.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/ParserContext.java
View File

@@ -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;

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ProjectId.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/ProjectId.java
View File

@@ -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;

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/ProjectScanner.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/ProjectScanner.java
View File

@@ -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;

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RecipeValidationErrorException.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/RecipeValidationErrorException.java
View File

@@ -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.

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteExecutionContext.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/RewriteExecutionContext.java
View File

@@ -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;

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteExecutionContextErrorHandler.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/RewriteExecutionContextErrorHandler.java
View File

@@ -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;

9
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteParserConfiguration.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/RewriteParserConfiguration.java
View File

@@ -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,

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteProjectParsingResult.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/RewriteProjectParsingResult.java
View File

@@ -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;

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/RewriteResourceParser.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/RewriteResourceParser.java
View File

@@ -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;

5
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/SourceFileParser.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/SourceFileParser.java
View File

@@ -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.*;

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/SourceSetParsingResult.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/SourceSetParsingResult.java
View File

@@ -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;

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/SpringRewriteProperties.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/SpringRewriteProperties.java
View File

@@ -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;

4
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/StyleDetector.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/StyleDetector.java
View File

@@ -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<SourceFile> sourcesWithAutoDetectedStyles(Stream<SourceFile> sourceFiles) {
public List<SourceFile> sourcesWithAutoDetectedStyles(Stream<SourceFile> 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<SourceFile> sourceFileList = sourceFiles.peek(javaDetector::sample).peek(xmlDetector::sample).toList();

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/FinishedParsingResourceEvent.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/events/FinishedParsingResourceEvent.java
View File

@@ -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;

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/IntermediateParsingEvent.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/events/IntermediateParsingEvent.java
View File

@@ -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;

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/RewriteParsingEventListenerAdapter.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/events/RewriteParsingEventListenerAdapter.java
View File

@@ -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;

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/StartedParsingProjectEvent.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/events/StartedParsingProjectEvent.java
View File

@@ -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;

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/StartedParsingResourceEvent.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/events/StartedParsingResourceEvent.java
View File

@@ -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;

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/events/SuccessfullyParsedProjectEvent.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/events/SuccessfullyParsedProjectEvent.java
View File

@@ -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;

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/ClasspathDependencies.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/ClasspathDependencies.java
View File

@@ -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;

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenBuildFileFilter.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenBuildFileFilter.java
View File

@@ -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;

8
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/BuildFileParser.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenBuildFileParser.java
View File

@@ -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;
}

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenConfigFileParser.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenConfigFileParser.java
View File

@@ -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;

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenModelReader.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenModelReader.java
View File

@@ -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;

5
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenModuleParser.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenModuleParser.java
View File

@@ -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;

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenPasswordDecrypter.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenPasswordDecrypter.java
View File

@@ -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;

9
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/MavenProject.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenProject.java
View File

@@ -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;
/**

7
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenProjectAnalyzer.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenProjectAnalyzer.java
View File

@@ -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 <a href=

3
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenProjectFactory.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenProjectFactory.java
View File

@@ -13,12 +13,11 @@
* 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.maven.utilities.MavenArtifactDownloader;
import org.springframework.core.io.Resource;
import org.springframework.rewrite.parsers.MavenProject;
import java.nio.file.Path;
import java.util.List;

5
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenProjectGraph.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenProjectGraph.java
View File

@@ -13,10 +13,9 @@
* 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.rewrite.parsers.MavenProject;
import org.springframework.rewrite.parsers.ProjectId;
import org.springframework.rewrite.parser.ProjectId;
import org.springframework.rewrite.utils.LinuxWindowsPathUnifier;
import java.nio.file.Path;

4
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenProjectSorter.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenProjectSorter.java
View File

@@ -13,9 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.rewrite.parsers.maven;
import org.springframework.rewrite.parsers.MavenProject;
package org.springframework.rewrite.parser.maven;
import java.nio.file.Path;
import java.util.*;

3
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenProvenanceMarkerFactory.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenProvenanceMarkerFactory.java
View File

@@ -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.Plugin;
import org.codehaus.plexus.util.xml.Xpp3Dom;
@@ -29,7 +29,6 @@ import org.openrewrite.marker.OperatingSystemProvenance;
import org.openrewrite.marker.ci.BuildEnvironment;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.rewrite.parsers.MavenProject;
import java.nio.file.Path;
import java.util.List;

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenRuntimeInformation.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenRuntimeInformation.java
View File

@@ -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;
/**
* @author Fabian Krüger

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/MavenSettingsInitializer.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/MavenSettingsInitializer.java
View File

@@ -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.internal.lang.Nullable;

5
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/ProvenanceMarkerFactory.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/ProvenanceMarkerFactory.java
View File

@@ -13,12 +13,11 @@
* 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;
import org.springframework.core.io.Resource;
import org.springframework.rewrite.parsers.ParserContext;
import org.springframework.rewrite.utils.LinuxWindowsPathUnifier;
import org.springframework.rewrite.parser.ParserContext;
import org.springframework.rewrite.utils.ResourceUtil;
import java.nio.file.Path;

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/RewriteMavenArtifactDownloader.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/RewriteMavenArtifactDownloader.java
View File

@@ -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.internal.lang.Nullable;
import org.openrewrite.ipc.http.HttpSender;

6
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parsers/maven/RewriteParserMavenConfiguration.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/parser/maven/RewriteParserMavenConfiguration.java
View File

@@ -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.maven.cache.LocalMavenArtifactCache;
@@ -41,8 +41,8 @@ public class RewriteParserMavenConfiguration {
}
@Bean
BuildFileParser buildFileParser(MavenSettingsInitializer mavenSettingsInitializer) {
return new BuildFileParser(mavenSettingsInitializer);
MavenBuildFileParser buildFileParser(MavenSettingsInitializer mavenSettingsInitializer) {
return new MavenBuildFileParser(mavenSettingsInitializer);
}
@Bean

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/support/openrewrite/GenericOpenRewriteRecipe.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/recipes/GenericOpenRewriteRecipe.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.rewrite.support.openrewrite;
package org.springframework.rewrite.recipes;
import org.openrewrite.ExecutionContext;
import org.openrewrite.Recipe;

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/BaseProjectResource.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/resource/BaseProjectResource.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.rewrite.project.resource;
package org.springframework.rewrite.resource;
public abstract class BaseProjectResource implements InternalProjectResource {

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/InternalProjectResource.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/resource/InternalProjectResource.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.rewrite.project.resource;
package org.springframework.rewrite.resource;
public interface InternalProjectResource extends ProjectResource {

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/ProjectResource.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/resource/ProjectResource.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.rewrite.project.resource;
package org.springframework.rewrite.resource;
import java.nio.file.Path;

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/ProjectResourceSerializer.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/resource/ProjectResourceSerializer.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.rewrite.project.resource;
package org.springframework.rewrite.resource;
import java.io.BufferedWriter;
import java.io.IOException;

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/ProjectResourceSet.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/resource/ProjectResourceSet.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.rewrite.project.resource;
package org.springframework.rewrite.resource;
import org.openrewrite.ExecutionContext;
import org.openrewrite.Recipe;

3
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/ProjectResourceSetFactory.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/resource/ProjectResourceSetFactory.java
View File

@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.rewrite.project.resource;
package org.springframework.rewrite.resource;
import org.openrewrite.ExecutionContext;
import org.openrewrite.SourceFile;
import org.springframework.rewrite.project.RewriteSourceFileWrapper;
import java.nio.file.Path;
import java.util.List;

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/ProjectResourceSetSerializer.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/resource/ProjectResourceSetSerializer.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.rewrite.project.resource;
package org.springframework.rewrite.resource;
public class ProjectResourceSetSerializer {

5
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/RewriteMigrationResultMerger.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/resource/RewriteMigrationResultMerger.java
View File

@@ -13,12 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.rewrite.project.resource;
package org.springframework.rewrite.resource;
import org.openrewrite.Result;
import org.openrewrite.SourceFile;
import org.springframework.rewrite.project.RewriteSourceFileWrapper;
import org.springframework.rewrite.project.resource.finder.AbsolutePathResourceFinder;
import org.springframework.rewrite.resource.finder.AbsolutePathResourceFinder;
import java.nio.file.Path;
import java.util.List;

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/RewriteSourceFileHolder.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/resource/RewriteSourceFileHolder.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.rewrite.project.resource;
package org.springframework.rewrite.resource;
import org.openrewrite.SourceFile;
import org.openrewrite.internal.lang.Nullable;

3
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/RewriteSourceFileWrapper.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/resource/RewriteSourceFileWrapper.java
View File

@@ -13,10 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.rewrite.project;
package org.springframework.rewrite.resource;
import org.openrewrite.SourceFile;
import org.springframework.rewrite.project.resource.RewriteSourceFileHolder;
import java.nio.file.Path;
import java.util.List;

6
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/AbsolutePathResourceFinder.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/resource/finder/AbsolutePathResourceFinder.java
View File

@@ -13,11 +13,11 @@
* 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;
import org.openrewrite.SourceFile;
import org.springframework.rewrite.project.resource.ProjectResourceSet;
import org.springframework.rewrite.project.resource.RewriteSourceFileHolder;
import org.springframework.rewrite.resource.ProjectResourceSet;
import org.springframework.rewrite.resource.RewriteSourceFileHolder;
import java.nio.file.Path;
import java.util.Optional;

6
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/AbsolutePathResourcesFinder.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/resource/finder/AbsolutePathResourcesFinder.java
View File

@@ -13,11 +13,11 @@
* 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;
import org.openrewrite.SourceFile;
import org.springframework.rewrite.project.resource.ProjectResourceSet;
import org.springframework.rewrite.project.resource.RewriteSourceFileHolder;
import org.springframework.rewrite.resource.ProjectResourceSet;
import org.springframework.rewrite.resource.RewriteSourceFileHolder;
import java.nio.file.Path;
import java.util.Arrays;

4
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/DeletedResourcePathStringFilter.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/resource/finder/DeletedResourcePathStringFilter.java
View File

@@ -13,9 +13,9 @@
* 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;
import org.springframework.rewrite.project.resource.ProjectResourceSet;
import org.springframework.rewrite.resource.ProjectResourceSet;
import java.util.List;
import java.util.stream.Collectors;

4
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/GenericTypeFinder.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/resource/finder/GenericTypeFinder.java
View File

@@ -13,9 +13,9 @@
* 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;
import org.springframework.rewrite.project.resource.ProjectResourceSet;
import org.springframework.rewrite.resource.ProjectResourceSet;
import java.util.List;
import java.util.Optional;

4
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/GenericTypeListFinder.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/resource/finder/GenericTypeListFinder.java
View File

@@ -13,9 +13,9 @@
* 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;
import org.springframework.rewrite.project.resource.ProjectResourceSet;
import org.springframework.rewrite.resource.ProjectResourceSet;
import java.util.List;
import java.util.stream.Collectors;

4
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/ModifiedResourcePathStringFilter.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/resource/finder/ModifiedResourcePathStringFilter.java
View File

@@ -13,9 +13,9 @@
* 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;
import org.springframework.rewrite.project.resource.ProjectResourceSet;
import org.springframework.rewrite.resource.ProjectResourceSet;
import java.util.List;
import java.util.stream.Collectors;

6
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/PathPatternMatchingProjectResourceFinder.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/resource/finder/PathPatternMatchingProjectResourceFinder.java
View File

@@ -13,10 +13,10 @@
* 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;
import org.springframework.rewrite.project.resource.ProjectResource;
import org.springframework.rewrite.project.resource.ProjectResourceSet;
import org.springframework.rewrite.resource.ProjectResource;
import org.springframework.rewrite.resource.ProjectResourceSet;
import org.springframework.rewrite.utils.OsAgnosticPathMatcher;
import org.springframework.util.PathMatcher;

4
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/ProjectResourceFinder.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/resource/finder/ProjectResourceFinder.java
View File

@@ -13,9 +13,9 @@
* 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;
import org.springframework.rewrite.project.resource.ProjectResourceSet;
import org.springframework.rewrite.resource.ProjectResourceSet;
public interface ProjectResourceFinder<T> {

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/project/resource/finder/ResourceFilterException.java → spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/resource/finder/ResourceFilterException.java
View File

@@ -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 {

2
spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/scopes/AbstractBaseScope.java
View File

@@ -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;

2
spring-rewrite-commons-launcher/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View File

@@ -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

6
spring-rewrite-commons-launcher/src/test/java/org/openrewrite/maven/CalculateClasspathTest.java
View File

@@ -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;

7
spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/CompareParserRecipeRunTest.java → spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/CompareParserRecipeRunTest.java
View File

@@ -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;

12
spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/BuildFileParserTest.java → spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/MavenBuildFileParserTest.java
View File

@@ -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 {
</project>
""";
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

9
spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/ParserEventPublicationIntegrationTest.java → spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/ParserEventPublicationIntegrationTest.java
View File

@@ -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;

7
spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteProjectParserIntegrationTest.java → spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteProjectParserIntegrationTest.java
View File

@@ -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;

6
spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteProjectParserParityTest.java → spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteProjectParserParityTest.java
View File

@@ -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;

7
spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteProjectParserTest.java → spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteProjectParserTest.java
View File

@@ -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,

4
spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteRecipeDiscoveryTest.java → spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteRecipeDiscoveryTest.java
View File

@@ -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;

2
spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/RewriteResourceParserTest.java → spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteResourceParserTest.java
View File

@@ -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;

2
spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/Slf4jToMavenLoggerAdapter.java → spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/Slf4jToMavenLoggerAdapter.java
View File

@@ -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;

3
spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/SpringRewritePropertiesTest.java → spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/SpringRewritePropertiesTest.java
View File

@@ -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;

6
spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/ComparingParserFactory.java → spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/ComparingParserFactory.java
View File

@@ -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;

2
spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenConfigFileParserTest.java → spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenConfigFileParserTest.java
View File

@@ -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;

2
spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenExecutionRequestFactory.java → spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenExecutionRequestFactory.java
View File

@@ -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;

2
spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenExecutionResultException.java → spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenExecutionResultException.java
View File

@@ -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;

2
spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenExecutor.java → spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenExecutor.java
View File

@@ -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.*;

2
spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenExecutorTest.java → spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenExecutorTest.java
View File

@@ -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;

7
spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenMojoProjectParserFactory.java → spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenMojoProjectParserFactory.java
View File

@@ -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;
/**

2
spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenPlexusContainer.java → spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenPlexusContainer.java
View File

@@ -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;

4
spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenPomCacheTest.java → spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenPomCacheTest.java
View File

@@ -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;

5
spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenProjectGraphTest.java → spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenProjectGraphTest.java
View File

@@ -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

2
spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenProjectResolutionTest.java → spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenProjectResolutionTest.java
View File

@@ -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;

3
spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parsers/maven/MavenProjectSorterTest.java → spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/MavenProjectSorterTest.java
View File

@@ -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;

Some files were not shown because too many files have changed in this diff Show More