Adjust API changes in spring-rewrite-commons

Author: fabapp2

components/openrewrite-spring-recipes/src/main/java/org/springframework/sbm/spring/migration/actions/OpenRewriteRecipeAdapterAction.java

@@ -24,7 +24,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.sbm.engine.context.ProjectContext;
 import org.springframework.sbm.engine.recipe.AbstractAction;
-import org.springframework.rewrite.project.resource.RewriteSourceFileHolder;
+import org.springframework.rewrite.resource.RewriteSourceFileHolder;
 import org.springframework.sbm.project.resource.filter.GenericTypeListFilter;
 
 import java.io.IOException;

components/recipe-test-support/src/main/java/org/springframework/sbm/test/RecipeTestSupport.java

@@ -22,8 +22,8 @@
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.rewrite.boot.autoconfigure.ScopeConfiguration;
-import org.springframework.rewrite.parsers.maven.MavenSettingsInitializer;
-import org.springframework.rewrite.project.RewriteSourceFileWrapper;
+import org.springframework.rewrite.parser.maven.MavenSettingsInitializer;
+import org.springframework.rewrite.resource.RewriteSourceFileWrapper;
 import org.springframework.sbm.build.impl.MavenBuildFileRefactoringFactory;
 import org.springframework.sbm.build.impl.RewriteMavenParser;
 import org.springframework.sbm.engine.context.ProjectContextHolder;

components/sbm-core/src/main/java/org/springframework/sbm/SbmCoreConfig.java

@@ -19,7 +19,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
-import org.springframework.rewrite.parsers.RewriteExecutionContext;
+import org.springframework.rewrite.parser.RewriteExecutionContext;
 import org.springframework.rewrite.scopes.annotations.ScanScope;
 
 import java.util.function.Supplier;

components/sbm-core/src/main/java/org/springframework/sbm/build/api/BuildFile.java

@@ -16,7 +16,7 @@
 package org.springframework.sbm.build.api;
 
 import org.openrewrite.maven.tree.Scope;
-import org.springframework.rewrite.project.resource.ProjectResource;
+import org.springframework.rewrite.resource.ProjectResource;
 
 import java.nio.file.Path;
 import java.util.List;

components/sbm-core/src/main/java/org/springframework/sbm/build/api/Module.java

@@ -20,11 +20,11 @@
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.SourceFile;
 import org.openrewrite.maven.tree.MavenResolutionResult;
-import org.springframework.rewrite.project.resource.ProjectResourceSet;
-import org.springframework.rewrite.project.resource.ProjectResourceSetFactory;
-import org.springframework.rewrite.project.resource.RewriteMigrationResultMerger;
-import org.springframework.rewrite.project.resource.RewriteSourceFileHolder;
-import org.springframework.rewrite.project.resource.finder.ProjectResourceFinder;
+import org.springframework.rewrite.resource.ProjectResourceSet;
+import org.springframework.rewrite.resource.ProjectResourceSetFactory;
+import org.springframework.rewrite.resource.RewriteMigrationResultMerger;
+import org.springframework.rewrite.resource.RewriteSourceFileHolder;
+import org.springframework.rewrite.resource.finder.ProjectResourceFinder;
 import org.springframework.sbm.build.impl.JavaSourceSetImpl;
 import org.springframework.sbm.build.impl.MavenBuildFileUtil;
 import org.springframework.sbm.build.impl.OpenRewriteMavenBuildFile;
@@ -33,7 +33,7 @@
 import org.springframework.sbm.java.api.JavaSourceLocation;
 import org.springframework.sbm.java.refactoring.JavaRefactoringFactory;
 import org.springframework.sbm.java.util.BasePackageCalculator;
-import org.springframework.rewrite.parsers.JavaParserBuilder;
+import org.springframework.rewrite.parser.JavaParserBuilder;
 
 import java.nio.file.Path;
 import java.util.ArrayList;

components/sbm-core/src/main/java/org/springframework/sbm/build/api/ResourceSet.java

@@ -18,8 +18,8 @@
 import lombok.RequiredArgsConstructor;
 import org.openrewrite.ExecutionContext;
 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 org.springframework.sbm.project.resource.StringProjectResource;
 
 import java.nio.file.Path;

components/sbm-core/src/main/java/org/springframework/sbm/build/api/RootBuildFileFilter.java

@@ -16,8 +16,8 @@
 package org.springframework.sbm.build.api;
 
 
-import org.springframework.rewrite.project.resource.ProjectResourceSet;
-import org.springframework.rewrite.project.resource.finder.ProjectResourceFinder;
+import org.springframework.rewrite.resource.ProjectResourceSet;
+import org.springframework.rewrite.resource.finder.ProjectResourceFinder;
 
 public class RootBuildFileFilter implements ProjectResourceFinder<BuildFile> {
     @Override

components/sbm-core/src/main/java/org/springframework/sbm/build/filter/BuildFileProjectResourceFinder.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.sbm.build.filter;
 
-import org.springframework.rewrite.project.resource.finder.GenericTypeListFinder;
+import org.springframework.rewrite.resource.finder.GenericTypeListFinder;
 import org.springframework.sbm.build.api.BuildFile;
 
 public class BuildFileProjectResourceFinder extends GenericTypeListFinder<BuildFile> {

components/sbm-core/src/main/java/org/springframework/sbm/build/impl/JavaSourceSetImpl.java

@@ -19,15 +19,15 @@
 import org.openrewrite.Recipe;
 import org.openrewrite.SourceFile;
 import org.openrewrite.java.tree.J;
-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.sbm.build.api.JavaSourceSet;
 import org.springframework.sbm.java.api.JavaSource;
 import org.springframework.sbm.java.api.JavaSourceLocation;
 import org.springframework.sbm.java.impl.OpenRewriteJavaSource;
 import org.springframework.sbm.java.refactoring.JavaRefactoringFactory;
 import org.springframework.sbm.java.util.BasePackageCalculator;
-import org.springframework.rewrite.parsers.JavaParserBuilder;
+import org.springframework.rewrite.parser.JavaParserBuilder;
 
 import java.nio.file.Files;
 import java.nio.file.Path;

components/sbm-core/src/main/java/org/springframework/sbm/build/impl/MavenBuildFileRefactoring.java

@@ -24,9 +24,9 @@
 import org.openrewrite.maven.MavenVisitor;
 import org.openrewrite.maven.tree.MavenResolutionResult;
 import org.openrewrite.xml.tree.Xml;
-import org.springframework.rewrite.project.resource.ProjectResourceSet;
-import org.springframework.rewrite.project.resource.RewriteSourceFileHolder;
-import org.springframework.rewrite.support.openrewrite.GenericOpenRewriteRecipe;
+import org.springframework.rewrite.resource.ProjectResourceSet;
+import org.springframework.rewrite.resource.RewriteSourceFileHolder;
+import org.springframework.rewrite.recipes.GenericOpenRewriteRecipe;
 
 import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;

components/sbm-core/src/main/java/org/springframework/sbm/build/impl/OpenRewriteMavenBuildFile.java

@@ -26,9 +26,9 @@
 import org.openrewrite.xml.tree.Content;
 import org.openrewrite.xml.tree.Xml;
 import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.rewrite.parsers.maven.RewriteMavenArtifactDownloader;
-import org.springframework.rewrite.project.resource.RewriteSourceFileHolder;
-import org.springframework.rewrite.support.openrewrite.GenericOpenRewriteRecipe;
+import org.springframework.rewrite.parser.maven.RewriteMavenArtifactDownloader;
+import org.springframework.rewrite.resource.RewriteSourceFileHolder;
+import org.springframework.rewrite.recipes.GenericOpenRewriteRecipe;
 import org.springframework.sbm.build.api.Dependency;
 import org.springframework.sbm.build.api.Plugin;
 import org.springframework.sbm.build.api.*;

components/sbm-core/src/main/java/org/springframework/sbm/build/impl/OpenRewriteMavenPlugin.java

@@ -30,7 +30,7 @@
 import org.openrewrite.maven.internal.MavenXmlMapper;
 import org.openrewrite.xml.tree.Xml;
 import org.openrewrite.xml.tree.Xml.Document;
-import org.springframework.rewrite.project.resource.RewriteSourceFileHolder;
+import org.springframework.rewrite.resource.RewriteSourceFileHolder;
 import org.springframework.sbm.build.api.Plugin;
 
 import java.util.*;

components/sbm-core/src/main/java/org/springframework/sbm/build/impl/RewriteMavenParser.java

@@ -21,7 +21,7 @@
 import org.openrewrite.SourceFile;
 import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.maven.MavenParser;
-import org.springframework.rewrite.parsers.maven.MavenSettingsInitializer;
+import org.springframework.rewrite.parser.maven.MavenSettingsInitializer;
 import org.springframework.stereotype.Component;
 
 import java.nio.file.Path;

components/sbm-core/src/main/java/org/springframework/sbm/build/migration/actions/AddMinimalPomXml.java

@@ -23,7 +23,7 @@
 import org.openrewrite.Parser;
 import org.openrewrite.SourceFile;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.rewrite.parsers.maven.RewriteMavenArtifactDownloader;
+import org.springframework.rewrite.parser.maven.RewriteMavenArtifactDownloader;
 import org.springframework.sbm.build.impl.MavenBuildFileRefactoringFactory;
 import org.springframework.sbm.build.impl.OpenRewriteMavenBuildFile;
 import org.springframework.sbm.build.impl.RewriteMavenParser;

components/sbm-core/src/main/java/org/springframework/sbm/build/resource/BuildFileResourceWrapper.java

@@ -21,8 +21,8 @@
 import org.openrewrite.xml.tree.Xml;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.core.annotation.Order;
-import org.springframework.rewrite.parsers.maven.RewriteMavenArtifactDownloader;
-import org.springframework.rewrite.project.resource.RewriteSourceFileHolder;
+import org.springframework.rewrite.parser.maven.RewriteMavenArtifactDownloader;
+import org.springframework.rewrite.resource.RewriteSourceFileHolder;
 import org.springframework.sbm.build.impl.MavenBuildFileRefactoring;
 import org.springframework.sbm.build.impl.MavenBuildFileRefactoringFactory;
 import org.springframework.sbm.build.impl.OpenRewriteMavenBuildFile;

components/sbm-core/src/main/java/org/springframework/sbm/common/api/TextResource/TextSource.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.sbm.common.api.TextResource;
 
-import org.springframework.rewrite.project.resource.RewriteSourceFileHolder;
+import org.springframework.rewrite.resource.RewriteSourceFileHolder;
 import org.openrewrite.text.PlainText;
 
 import java.nio.file.Path;

components/sbm-core/src/main/java/org/springframework/sbm/common/migration/actions/DeleteFileMatchingPattern.java

@@ -16,10 +16,10 @@
 package org.springframework.sbm.common.migration.actions;
 
 import lombok.Setter;
-import org.springframework.rewrite.project.resource.finder.PathPatternMatchingProjectResourceFinder;
+import org.springframework.rewrite.resource.finder.PathPatternMatchingProjectResourceFinder;
 import org.springframework.sbm.engine.context.ProjectContext;
 import org.springframework.sbm.engine.recipe.AbstractAction;
-import org.springframework.rewrite.project.resource.ProjectResource;
+import org.springframework.rewrite.resource.ProjectResource;
 
 /**
  * Delete files matching path pattern.

components/sbm-core/src/main/java/org/springframework/sbm/common/migration/actions/MoveFilesAction.java

@@ -15,8 +15,8 @@
  */
 package org.springframework.sbm.common.migration.actions;
 
-import org.springframework.rewrite.project.resource.ProjectResource;
-import org.springframework.rewrite.project.resource.finder.PathPatternMatchingProjectResourceFinder;
+import org.springframework.rewrite.resource.ProjectResource;
+import org.springframework.rewrite.resource.finder.PathPatternMatchingProjectResourceFinder;
 import org.springframework.sbm.engine.recipe.AbstractAction;
 import org.springframework.sbm.engine.context.ProjectContext;
 import lombok.Getter;

components/sbm-core/src/main/java/org/springframework/sbm/engine/commands/ApplyCommand.java

@@ -16,8 +16,8 @@
 package org.springframework.sbm.engine.commands;
 
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.rewrite.project.resource.finder.DeletedResourcePathStringFilter;
-import org.springframework.rewrite.project.resource.finder.ModifiedResourcePathStringFilter;
+import org.springframework.rewrite.resource.finder.DeletedResourcePathStringFilter;
+import org.springframework.rewrite.resource.finder.ModifiedResourcePathStringFilter;
 import org.springframework.rewrite.scopes.ExecutionScope;
 import org.springframework.sbm.engine.context.ProjectContext;
 import org.springframework.sbm.engine.context.ProjectContextSerializer;

components/sbm-core/src/main/java/org/springframework/sbm/engine/commands/ApplyCommandHelper.java

@@ -15,8 +15,8 @@
  */
 package org.springframework.sbm.engine.commands;
 
-import org.springframework.rewrite.project.resource.finder.DeletedResourcePathStringFilter;
-import org.springframework.rewrite.project.resource.finder.ModifiedResourcePathStringFilter;
+import org.springframework.rewrite.resource.finder.DeletedResourcePathStringFilter;
+import org.springframework.rewrite.resource.finder.ModifiedResourcePathStringFilter;
 import org.springframework.sbm.engine.git.GitSupport;
 import org.springframework.sbm.engine.git.ProjectSyncVerifier;
 import org.springframework.sbm.engine.recipe.Recipe;

components/sbm-core/src/main/java/org/springframework/sbm/engine/commands/ScanCommand.java

@@ -19,7 +19,7 @@
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.core.io.Resource;
-import org.springframework.rewrite.parsers.ProjectScanner;
+import org.springframework.rewrite.parser.ProjectScanner;
 import org.springframework.sbm.engine.context.ProjectContext;
 import org.springframework.sbm.engine.context.ProjectRootPathResolver;
 import org.springframework.sbm.engine.precondition.PreconditionVerificationResult;

components/sbm-core/src/main/java/org/springframework/sbm/engine/context/ProjectContext.java

@@ -22,11 +22,11 @@
 import org.openrewrite.RecipeRun;
 import org.openrewrite.SourceFile;
 import org.openrewrite.internal.InMemoryLargeSourceSet;
-import org.springframework.rewrite.project.resource.ProjectResourceSet;
-import org.springframework.rewrite.project.resource.ProjectResourceSetFactory;
-import org.springframework.rewrite.project.resource.RewriteMigrationResultMerger;
-import org.springframework.rewrite.project.resource.finder.ProjectResourceFinder;
-import org.springframework.rewrite.project.resource.RewriteSourceFileHolder;
+import org.springframework.rewrite.resource.ProjectResourceSet;
+import org.springframework.rewrite.resource.ProjectResourceSetFactory;
+import org.springframework.rewrite.resource.RewriteMigrationResultMerger;
+import org.springframework.rewrite.resource.finder.ProjectResourceFinder;
+import org.springframework.rewrite.resource.RewriteSourceFileHolder;
 import org.springframework.sbm.build.api.ApplicationModules;
 import org.springframework.sbm.build.api.BuildFile;
 import org.springframework.sbm.build.api.Module;
@@ -36,7 +36,7 @@
 import org.springframework.sbm.java.impl.ProjectJavaSourcesImpl;
 import org.springframework.sbm.java.refactoring.JavaRefactoringFactory;
 import org.springframework.sbm.java.util.BasePackageCalculator;
-import org.springframework.rewrite.parsers.JavaParserBuilder;
+import org.springframework.rewrite.parser.JavaParserBuilder;
 
 import java.nio.file.Path;
 import java.util.List;

components/sbm-core/src/main/java/org/springframework/sbm/engine/context/ProjectContextFactory.java

@@ -16,16 +16,16 @@
 package org.springframework.sbm.engine.context;
 
 import org.openrewrite.ExecutionContext;
-import org.springframework.rewrite.project.resource.ProjectResourceSet;
-import org.springframework.rewrite.project.resource.ProjectResourceSetFactory;
-import org.springframework.rewrite.project.resource.RewriteMigrationResultMerger;
-import org.springframework.rewrite.project.resource.RewriteSourceFileHolder;
+import org.springframework.rewrite.resource.ProjectResourceSet;
+import org.springframework.rewrite.resource.ProjectResourceSetFactory;
+import org.springframework.rewrite.resource.RewriteMigrationResultMerger;
+import org.springframework.rewrite.resource.RewriteSourceFileHolder;
 import org.springframework.sbm.build.api.BuildFile;
 import org.springframework.sbm.build.filter.BuildFileProjectResourceFinder;
 import org.springframework.sbm.java.impl.ClasspathRegistry;
 import org.springframework.sbm.java.refactoring.JavaRefactoringFactory;
 import org.springframework.sbm.java.util.BasePackageCalculator;
-import org.springframework.rewrite.parsers.JavaParserBuilder;
+import org.springframework.rewrite.parser.JavaParserBuilder;
 import org.springframework.sbm.project.resource.*;
 import lombok.RequiredArgsConstructor;
 import org.jetbrains.annotations.NotNull;

components/sbm-core/src/main/java/org/springframework/sbm/engine/context/ProjectContextSerializer.java

@@ -16,7 +16,7 @@
 package org.springframework.sbm.engine.context;
 
 import lombok.RequiredArgsConstructor;
-import org.springframework.rewrite.project.resource.ProjectResourceSetSerializer;
+import org.springframework.rewrite.resource.ProjectResourceSetSerializer;
 import org.springframework.stereotype.Component;
 
 @Component

components/sbm-core/src/main/java/org/springframework/sbm/engine/recipe/MigrationResultProjectContextMerger.java

@@ -17,7 +17,7 @@
 
 import lombok.RequiredArgsConstructor;
 import org.openrewrite.Result;
-import org.springframework.rewrite.project.resource.RewriteMigrationResultMerger;
+import org.springframework.rewrite.resource.RewriteMigrationResultMerger;
 import org.springframework.sbm.engine.context.ProjectContext;
 import org.springframework.stereotype.Component;
 

components/sbm-core/src/main/java/org/springframework/sbm/engine/recipe/OpenRewriteSourceFilesFinder.java

@@ -16,9 +16,9 @@
 package org.springframework.sbm.engine.recipe;
 
 import org.openrewrite.SourceFile;
-import org.springframework.rewrite.project.resource.ProjectResourceSet;
-import org.springframework.rewrite.project.resource.RewriteSourceFileHolder;
-import org.springframework.rewrite.project.resource.finder.ProjectResourceFinder;
+import org.springframework.rewrite.resource.ProjectResourceSet;
+import org.springframework.rewrite.resource.RewriteSourceFileHolder;
+import org.springframework.rewrite.resource.finder.ProjectResourceFinder;
 
 import java.util.List;
 import java.util.stream.Collectors;

components/sbm-core/src/main/java/org/springframework/sbm/java/JavaSourceProjectResourceWrapper.java

@@ -16,11 +16,11 @@
 package org.springframework.sbm.java;
 
 import org.openrewrite.ExecutionContext;
-import org.springframework.rewrite.project.resource.RewriteSourceFileHolder;
+import org.springframework.rewrite.resource.RewriteSourceFileHolder;
 import org.springframework.sbm.java.impl.OpenRewriteJavaSource;
 import org.springframework.sbm.java.refactoring.JavaRefactoring;
 import org.springframework.sbm.java.refactoring.JavaRefactoringFactory;
-import org.springframework.rewrite.parsers.JavaParserBuilder;
+import org.springframework.rewrite.parser.JavaParserBuilder;
 import org.springframework.sbm.project.resource.ProjectResourceWrapper;
 import lombok.RequiredArgsConstructor;
 import org.openrewrite.SourceFile;

components/sbm-core/src/main/java/org/springframework/sbm/java/api/JavaSource.java

@@ -15,8 +15,8 @@
  */
 package org.springframework.sbm.java.api;
 
-import org.springframework.rewrite.project.resource.ProjectResource;
-import org.springframework.rewrite.project.resource.RewriteSourceFileHolder;
+import org.springframework.rewrite.resource.ProjectResource;
+import org.springframework.rewrite.resource.RewriteSourceFileHolder;
 import org.springframework.sbm.java.impl.StaticFieldAccessTransformer;
 import org.openrewrite.Recipe;
 import org.openrewrite.java.tree.J;

components/sbm-core/src/main/java/org/springframework/sbm/java/api/ProjectJavaSources.java

@@ -17,7 +17,7 @@
 
 import org.openrewrite.Recipe;
 import org.openrewrite.java.tree.J;
-import org.springframework.rewrite.project.resource.RewriteSourceFileHolder;
+import org.springframework.rewrite.resource.RewriteSourceFileHolder;
 
 import java.util.List;
 import java.util.Optional;

components/sbm-core/src/main/java/org/springframework/sbm/java/filter/FindJavaSourceContainingType.java

@@ -15,8 +15,8 @@
  */
 package org.springframework.sbm.java.filter;
 
-import org.springframework.rewrite.project.resource.ProjectResourceSet;
-import org.springframework.rewrite.project.resource.finder.ProjectResourceFinder;
+import org.springframework.rewrite.resource.ProjectResourceSet;
+import org.springframework.rewrite.resource.finder.ProjectResourceFinder;
 import org.springframework.sbm.java.api.JavaSourceAndType;
 import org.springframework.sbm.java.impl.OpenRewriteJavaSource;
 import org.springframework.sbm.java.impl.OpenRewriteType;

components/sbm-core/src/main/java/org/springframework/sbm/java/filter/JavaSourceListFinder.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.sbm.java.filter;
 
-import org.springframework.rewrite.project.resource.finder.GenericTypeListFinder;
+import org.springframework.rewrite.resource.finder.GenericTypeListFinder;
 import org.springframework.sbm.java.api.JavaSource;
 
 public class JavaSourceListFinder extends GenericTypeListFinder<JavaSource> {

components/sbm-core/src/main/java/org/springframework/sbm/java/filter/OpenRewriteJavaSourceListFinder.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.sbm.java.filter;
 
-import org.springframework.rewrite.project.resource.finder.GenericTypeListFinder;
+import org.springframework.rewrite.resource.finder.GenericTypeListFinder;
 import org.springframework.sbm.java.impl.OpenRewriteJavaSource;
 
 public class OpenRewriteJavaSourceListFinder extends GenericTypeListFinder<OpenRewriteJavaSource> {

components/sbm-core/src/main/java/org/springframework/sbm/java/impl/ClasspathRegistry.java

@@ -19,7 +19,7 @@
 import org.openrewrite.maven.cache.LocalMavenArtifactCache;
 import org.openrewrite.maven.tree.ResolvedDependency;
 import org.openrewrite.maven.tree.Scope;
-import org.springframework.rewrite.parsers.maven.RewriteMavenArtifactDownloader;
+import org.springframework.rewrite.parser.maven.RewriteMavenArtifactDownloader;
 import org.springframework.sbm.build.api.BuildFile;
 import org.springframework.sbm.build.impl.OpenRewriteMavenBuildFile;
 import org.springframework.sbm.project.parser.DependencyHelper;