Finish #803 (#860)

fabapp2 · Sourav · web-flow · commit 44fed8a87ae4 · 2023-08-05T21:46:56.000+02:00
* Fixed issue #803 * Remove RewriteRecipeRunner and change all client code --------- Co-authored-by: Sourav <sr734546@dal.ca>
diff --git a/components/recipe-test-support/src/main/java/org/springframework/sbm/test/RecipeTestSupport.java b/components/recipe-test-support/src/main/java/org/springframework/sbm/test/RecipeTestSupport.java
@@ -69,7 +69,6 @@ private RecipeTestSupport() {
             DefaultActionDeserializer.class,
             RewriteJavaSearchActionDeserializer.class,
             RewriteRecipeLoader.class,
-            RewriteRecipeRunner.class,
             RewriteMigrationResultMerger.class,
             RewriteSourceFileWrapper.class,
             SbmRecipeLoader.class,
diff --git a/components/sbm-core/src/main/java/org/springframework/sbm/engine/context/ProjectContext.java b/components/sbm-core/src/main/java/org/springframework/sbm/engine/context/ProjectContext.java
@@ -15,21 +15,26 @@
  */
 package org.springframework.sbm.engine.context;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.openrewrite.ExecutionContext;
+import org.openrewrite.Recipe;
+import org.openrewrite.Result;
+import org.openrewrite.SourceFile;
 import org.openrewrite.java.JavaParser;
 import org.springframework.sbm.build.api.ApplicationModules;
-import org.springframework.sbm.build.api.Module;
 import org.springframework.sbm.build.api.BuildFile;
+import org.springframework.sbm.build.api.Module;
 import org.springframework.sbm.build.api.RootBuildFileFilter;
 import org.springframework.sbm.build.filter.BuildFileProjectResourceFilter;
+import org.springframework.sbm.engine.recipe.OpenRewriteSourceFilesFinder;
+import org.springframework.sbm.engine.recipe.RewriteMigrationResultMerger;
 import org.springframework.sbm.java.api.ProjectJavaSources;
 import org.springframework.sbm.java.impl.ProjectJavaSourcesImpl;
 import org.springframework.sbm.java.refactoring.JavaRefactoringFactory;
 import org.springframework.sbm.java.util.BasePackageCalculator;
 import org.springframework.sbm.project.resource.ProjectResourceSet;
 import org.springframework.sbm.project.resource.filter.ProjectResourceFinder;
-import lombok.Getter;
-import lombok.Setter;
 
 import java.nio.file.Path;
 import java.util.List;
@@ -46,14 +51,16 @@ public class ProjectContext {
     private String revision;
     private final JavaParser javaParser;
     private final ExecutionContext executionContext;
+    private final RewriteMigrationResultMerger resultMerger;
 
-    public ProjectContext(JavaRefactoringFactory javaRefactoringFactory, Path projectRootDirectory, ProjectResourceSet projectResources, BasePackageCalculator basePackageCalculator, JavaParser javaParser, ExecutionContext executionContext) {
+    public ProjectContext(JavaRefactoringFactory javaRefactoringFactory, Path projectRootDirectory, ProjectResourceSet projectResources, BasePackageCalculator basePackageCalculator, JavaParser javaParser, ExecutionContext executionContext, RewriteMigrationResultMerger resultMerger) {
         this.projectRootDirectory = projectRootDirectory.toAbsolutePath();
         this.projectResources = projectResources;
         this.javaRefactoringFactory = javaRefactoringFactory;
         this.basePackageCalculator = basePackageCalculator;
         this.javaParser = javaParser;
         this.executionContext = executionContext;
+        this.resultMerger = resultMerger;
     }
 
     public ProjectResourceSet getProjectResources() {
@@ -103,4 +110,9 @@ public ApplicationModules getApplicationModules() {
         return new ApplicationModules(getModules());
     }
 
+    public void apply(Recipe recipe) {
+        List<? extends SourceFile> rewriteSourceFiles = this.search(new OpenRewriteSourceFilesFinder());
+        List<Result> results = recipe.run(rewriteSourceFiles, executionContext).getResults();
+        resultMerger.mergeResults(this, results);
+    }
 }
diff --git a/components/sbm-core/src/main/java/org/springframework/sbm/engine/context/ProjectContextFactory.java b/components/sbm-core/src/main/java/org/springframework/sbm/engine/context/ProjectContextFactory.java
@@ -19,6 +19,7 @@
 import org.openrewrite.java.JavaParser;
 import org.springframework.sbm.build.api.BuildFile;
 import org.springframework.sbm.build.filter.BuildFileProjectResourceFilter;
+import org.springframework.sbm.engine.recipe.RewriteMigrationResultMerger;
 import org.springframework.sbm.java.refactoring.JavaRefactoringFactory;
 import org.springframework.sbm.java.impl.ClasspathRegistry;
 import org.springframework.sbm.java.util.BasePackageCalculator;
@@ -41,14 +42,15 @@ public class ProjectContextFactory {
     private final BasePackageCalculator basePackageCalculator;
     private final JavaParser javaParser;
     private final ExecutionContext executionContext;
+    private final RewriteMigrationResultMerger resultMerger;
 
     @NotNull
     public ProjectContext createProjectContext(Path projectDir, ProjectResourceSet projectResourceSet) {
         projectResourceSetHolder.setProjectResourceSet(projectResourceSet);
         applyProjectResourceWrappers(projectResourceSet);
         List<BuildFile> buildFiles = new BuildFileProjectResourceFilter().apply(projectResourceSet);
         ClasspathRegistry.initializeFromBuildFiles(buildFiles);
-        ProjectContext projectContext = new ProjectContext(javaRefactoringFactory, projectDir, projectResourceSet, basePackageCalculator, javaParser, executionContext);
+        ProjectContext projectContext = new ProjectContext(javaRefactoringFactory, projectDir, projectResourceSet, basePackageCalculator, javaParser, executionContext, resultMerger);
         return projectContext;
     }
 
diff --git a/components/sbm-core/src/main/java/org/springframework/sbm/engine/recipe/OpenRewriteDeclarativeRecipeAdapter.java b/components/sbm-core/src/main/java/org/springframework/sbm/engine/recipe/OpenRewriteDeclarativeRecipeAdapter.java
@@ -34,10 +34,6 @@ public class OpenRewriteDeclarativeRecipeAdapter extends AbstractAction {
     @JsonIgnore
     @Setter
     private RewriteRecipeLoader rewriteRecipeLoader;
-    @JsonIgnore
-    @Autowired
-    @Setter
-    private RewriteRecipeRunner rewriteRecipeRunner;
 
     public OpenRewriteDeclarativeRecipeAdapter() {
         super(builder());
@@ -51,6 +47,6 @@ public boolean isApplicable(ProjectContext context) {
     @Override
     public void apply(ProjectContext context) {
         Recipe recipe = rewriteRecipeLoader.createRecipe(openRewriteRecipe);
-        rewriteRecipeRunner.run(context, recipe);
+        context.apply(recipe);
     }
 }
diff --git a/components/sbm-core/src/main/java/org/springframework/sbm/engine/recipe/OpenRewriteNamedRecipeAdapter.java b/components/sbm-core/src/main/java/org/springframework/sbm/engine/recipe/OpenRewriteNamedRecipeAdapter.java
@@ -37,13 +37,9 @@ public class OpenRewriteNamedRecipeAdapter extends AbstractAction {
     @JsonIgnore
     private RewriteRecipeLoader rewriteRecipeLoader;
 
-    @JsonIgnore
-    @Autowired
-    private RewriteRecipeRunner rewriteRecipeRunner;
-
     @Override
     public void apply(ProjectContext context) {
         Recipe recipe = rewriteRecipeLoader.loadRewriteRecipe(openRewriteRecipeName);
-        rewriteRecipeRunner.run(context, recipe);
+        context.apply(recipe);
     }
 }
diff --git a/components/sbm-core/src/main/java/org/springframework/sbm/engine/recipe/RewriteRecipeRunner.java b/components/sbm-core/src/main/java/org/springframework/sbm/engine/recipe/RewriteRecipeRunner.java
diff --git a/components/sbm-core/src/test/java/org/springframework/sbm/archfitfun/ExecutionScopeArchFitTest.java b/components/sbm-core/src/test/java/org/springframework/sbm/archfitfun/ExecutionScopeArchFitTest.java
@@ -119,6 +119,7 @@
                     RewritePlainTextParser.class,
                     RewriteMavenParser.class,
                     MavenSettingsInitializer.class,
+                    RewriteMigrationResultMerger.class,
                     RewriteMavenArtifactDownloader.class,
                     JavaProvenanceMarkerFactory.class,
                     MavenConfigHandler.class,
diff --git a/components/sbm-core/src/test/java/org/springframework/sbm/engine/recipe/OpenRewriteDeclarativeRecipeAdapterIntegrationTest.java b/components/sbm-core/src/test/java/org/springframework/sbm/engine/recipe/OpenRewriteDeclarativeRecipeAdapterIntegrationTest.java
@@ -32,7 +32,6 @@
 import java.io.IOException;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 
 @SpringBootTest(classes = {
         RecipeParser.class,
@@ -43,7 +42,6 @@
         ActionDeserializerRegistry.class,
         DefaultActionDeserializer.class,
         RewriteMigrationResultMerger.class,
-        RewriteRecipeRunner.class,
         RewriteSourceFileWrapper.class,
         CustomValidatorBean.class,
         RewriteExecutionContext.class,
diff --git a/components/sbm-core/src/test/java/org/springframework/sbm/engine/recipe/OpenRewriteDeclarativeRecipeAdapterTest.java b/components/sbm-core/src/test/java/org/springframework/sbm/engine/recipe/OpenRewriteDeclarativeRecipeAdapterTest.java
@@ -31,24 +31,20 @@ public class OpenRewriteDeclarativeRecipeAdapterTest {
     @Mock
     RewriteRecipeLoader rewriteRecipeLoader;
 
-    @Mock
-    RewriteRecipeRunner rewriteRecipeRunner;
-
     @InjectMocks
     OpenRewriteDeclarativeRecipeAdapter sut;
 
     @Test
     void testApply() {
         String recipeDeclaration = "name: some-recipe";
         sut.setOpenRewriteRecipe(recipeDeclaration);
-
         org.openrewrite.Recipe recipe = mock(org.openrewrite.Recipe.class);
         when(rewriteRecipeLoader.createRecipe(recipeDeclaration)).thenReturn(recipe);
         ProjectContext context = mock(ProjectContext.class);
 
         sut.apply(context);
 
-        verify(rewriteRecipeRunner).run(context, recipe);
+        verify(context).apply(recipe);
     }
 
 
diff --git a/components/sbm-core/src/test/java/org/springframework/sbm/engine/recipe/OpenRewriteNamedRecipeAdapterIntegrationTest.java b/components/sbm-core/src/test/java/org/springframework/sbm/engine/recipe/OpenRewriteNamedRecipeAdapterIntegrationTest.java
@@ -42,7 +42,6 @@
         ActionDeserializerRegistry.class,
         DefaultActionDeserializer.class,
         RewriteMigrationResultMerger.class,
-        RewriteRecipeRunner.class,
         RewriteSourceFileWrapper.class,
         RewriteRecipeLoader.class,
         CustomValidatorBean.class,
diff --git a/components/sbm-core/src/test/java/org/springframework/sbm/engine/recipe/OpenRewriteNamedRecipeAdapterTest.java b/components/sbm-core/src/test/java/org/springframework/sbm/engine/recipe/OpenRewriteNamedRecipeAdapterTest.java
@@ -21,28 +21,15 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.sbm.engine.context.ProjectContext;
-import org.springframework.sbm.project.RewriteSourceFileWrapper;
-import org.springframework.sbm.project.resource.ResourceHelper;
-import org.springframework.sbm.project.resource.TestProjectContext;
-import org.springframework.validation.beanvalidation.CustomValidatorBean;
 
-import java.io.IOException;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.*;
 
 @ExtendWith(MockitoExtension.class)
 public class OpenRewriteNamedRecipeAdapterTest {
     @Mock
     RewriteRecipeLoader rewriteRecipeLoader;
 
-    @Mock
-    RewriteRecipeRunner rewriteRecipeRunner;
-
     @InjectMocks
     OpenRewriteNamedRecipeAdapter sut;
 
@@ -57,7 +44,7 @@ void testApply() {
 
         sut.apply(context);
 
-        verify(rewriteRecipeRunner).run(context, recipe);
+        verify(context).apply(recipe);
     }
 
 }
diff --git a/components/sbm-core/src/test/java/org/springframework/sbm/project/parser/ProjectContextInitializerTest.java b/components/sbm-core/src/test/java/org/springframework/sbm/project/parser/ProjectContextInitializerTest.java
@@ -43,6 +43,7 @@
 import org.springframework.sbm.engine.context.ProjectRootPathResolver;
 import org.springframework.sbm.engine.git.GitSupport;
 import org.springframework.sbm.engine.precondition.PreconditionVerifier;
+import org.springframework.sbm.engine.recipe.RewriteMigrationResultMerger;
 import org.springframework.sbm.java.impl.RewriteJavaParser;
 import org.springframework.sbm.java.refactoring.JavaRefactoringFactoryImpl;
 import org.springframework.sbm.java.util.BasePackageCalculator;
@@ -75,6 +76,7 @@
         ProjectContextFactory.class,
         MavenPomCacheProvider.class,
         SbmApplicationProperties.class,
+        RewriteMigrationResultMerger.class,
         PathScanner.class,
         RewriteJavaParser.class,
         RewritePlainTextParser.class,
diff --git a/components/sbm-recipes-jee-to-boot/src/main/java/org/springframework/sbm/jee/jaxrs/MigrateJaxRsRecipe.java b/components/sbm-recipes-jee-to-boot/src/main/java/org/springframework/sbm/jee/jaxrs/MigrateJaxRsRecipe.java
@@ -25,7 +25,6 @@
 import org.springframework.sbm.engine.recipe.OpenRewriteDeclarativeRecipeAdapter;
 import org.springframework.sbm.engine.recipe.Recipe;
 import org.springframework.sbm.engine.recipe.RewriteRecipeLoader;
-import org.springframework.sbm.engine.recipe.RewriteRecipeRunner;
 import org.springframework.sbm.java.JavaRecipeAction;
 import org.springframework.sbm.java.impl.ClasspathRegistry;
 import org.springframework.sbm.java.migration.actions.ReplaceTypeAction;
@@ -50,7 +49,7 @@ public class MigrateJaxRsRecipe {
     private final Supplier<JavaParser> javaParserSupplier = () -> JavaParser.fromJavaVersion().classpath(ClasspathRegistry.getInstance().getCurrentDependencies()).build();
 
     @Bean
-    public Recipe jaxRs(RewriteRecipeLoader rewriteRecipeLoader, RewriteRecipeRunner rewriteRecipeRunner) {
+    public Recipe jaxRs(RewriteRecipeLoader rewriteRecipeLoader) {
         return Recipe.builder()
                 .name("migrate-jax-rs")
                 .order(60)
@@ -137,7 +136,6 @@ public Recipe jaxRs(RewriteRecipeLoader rewriteRecipeLoader, RewriteRecipeRunner
                                         .condition(HasAnnotation.builder().annotation("org.springframework.web.bind.annotation.RequestParam").build())
                                         .description("Adds required=false to all @RequestParam annotations")
                                         .rewriteRecipeLoader(rewriteRecipeLoader)
-                                        .rewriteRecipeRunner(rewriteRecipeRunner)
                                         .openRewriteRecipe(
                                                 """
                                                 type: specs.openrewrite.org/v1beta/recipe
diff --git a/components/sbm-recipes-jee-to-boot/src/test/java/org/springframework/sbm/jee/jaxrs/recipes/BootifyJaxRsAnnotationsRecipeTest.java b/components/sbm-recipes-jee-to-boot/src/test/java/org/springframework/sbm/jee/jaxrs/recipes/BootifyJaxRsAnnotationsRecipeTest.java
@@ -15,17 +15,15 @@
  */
 package org.springframework.sbm.jee.jaxrs.recipes;
 
-import org.springframework.sbm.engine.recipe.OpenRewriteDeclarativeRecipeAdapter;
-import org.springframework.sbm.java.impl.RewriteJavaParser;
-import org.springframework.sbm.project.resource.SbmApplicationProperties;
-import org.springframework.sbm.test.RecipeTestSupport;
+import org.junit.jupiter.api.Test;
 import org.springframework.sbm.build.migration.actions.AddDependencies;
+import org.springframework.sbm.engine.recipe.OpenRewriteDeclarativeRecipeAdapter;
 import org.springframework.sbm.engine.recipe.Recipe;
 import org.springframework.sbm.java.JavaRecipeAction;
 import org.springframework.sbm.java.migration.actions.ReplaceTypeAction;
 import org.springframework.sbm.jee.jaxrs.MigrateJaxRsRecipe;
 import org.springframework.sbm.jee.jaxrs.actions.ConvertJaxRsAnnotations;
-import org.junit.jupiter.api.Test;
+import org.springframework.sbm.test.RecipeTestSupport;
 
 import java.util.Optional;
 
@@ -34,7 +32,7 @@ public class BootifyJaxRsAnnotationsRecipeTest {
     @Test
     void test() {
 
-        Recipe jaxRsRecipe = new MigrateJaxRsRecipe().jaxRs(null, null);
+        Recipe jaxRsRecipe = new MigrateJaxRsRecipe().jaxRs(null);
         Optional<Recipe> recipe = Optional.of(jaxRsRecipe);
         RecipeTestSupport.assertThatRecipeExists(recipe);
         RecipeTestSupport.assertThatRecipeHasActions(recipe,

Original file line number	Diff line number	Diff line change
`@@ -37,13 +37,9 @@ public class OpenRewriteNamedRecipeAdapter extends AbstractAction {`
`37`	`37`	`@JsonIgnore`
`38`	`38`	`private RewriteRecipeLoader rewriteRecipeLoader;`
`39`	`39`
`40`		`- @JsonIgnore`
`41`		`- @Autowired`
`42`		`- private RewriteRecipeRunner rewriteRecipeRunner;`
`43`		`-`
`44`	`40`	`@Override`
`45`	`41`	`public void apply(ProjectContext context) {`
`46`	`42`	`Recipe recipe = rewriteRecipeLoader.loadRewriteRecipe(openRewriteRecipeName);`
`47`		`- rewriteRecipeRunner.run(context, recipe);`
	`43`	`+ context.apply(recipe);`
`48`	`44`	`}`
`49`	`45`	`}`