Bump OpenRewrite to 7.29.0 closes #380

- bumps rewrite-.. to 7.29.0
- bumps rewrite-spring to 4.26.0

Author: fabapp2

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

@@ -97,7 +97,7 @@ null, new InMemoryExecutionContext()
                                 new InMemoryExecutionContext())
         );
 
-        List<Result> res = recipe.run(sourceFiles);
+        List<Result> res = recipe.run(sourceFiles).getResults();
 		for (Result r : res) {
 			replaceWrappedResource(projectResources.get(r.getBefore().getSourcePath()), r);
 		}

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

@@ -145,7 +145,7 @@ public void apply(Recipe recipe) {
         // FIXME: #7 Make ExecutionContext a Spring Bean and caching configurable, also if the project root is used as workdir it must be added to .gitignore
         // FIXME: #7 this made it veeery slow
         //executionContext.putMessage("org.openrewrite.maven.pomCache", new RocksdbMavenPomCache(this.getAbsoluteProjectDir()));
-        List<Result> result = recipe.run(List.of(getSourceFile()), executionContext);
+        List<Result> result = recipe.run(List.of(getSourceFile()), executionContext).getResults();
         if (!result.isEmpty()) {
             replaceWith((Xml.Document) result.get(0).getAfter());
         }
@@ -838,7 +838,7 @@ public void removePlugins(String... coordinates) {
             recipe.doNext(new RemoveMavenPlugin(split[0], split[1]));
         }
 
-        List<Result> run = recipe.run(List.of(getSourceFile()), executionContext);
+        List<Result> run = recipe.run(List.of(getSourceFile()), executionContext).getResults();
         if (!run.isEmpty()) {
             replaceWith((Xml.Document) run.get(0).getAfter());
         }

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

@@ -51,7 +51,7 @@ public void execute(Recipe... visitors) {
     }
 
     private List<Result> executeRecipe(Recipe recipe) {
-        List<Result> results = recipe.run(List.of(pom.getSourceFile()));
+        List<Result> results = recipe.run(List.of(pom.getSourceFile())).getResults();
         return results;
     }
 

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

@@ -77,7 +77,7 @@ public String getDescription() {
     @Override
     public void apply(ProjectContext context) {
         List<? extends SourceFile> rewriteSourceFiles = context.search(new OpenRewriteSourceFilesFinder());
-        List<Result> results = recipe.run(rewriteSourceFiles);
+        List<Result> results = recipe.run(rewriteSourceFiles).getResults();
         resultMerger.mergeResults(context, results);
     }
 

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

@@ -37,7 +37,7 @@ public void run(ProjectContext context, Recipe recipe) {
                 (t) -> {
                     throw new RuntimeException(t);
                 }
-        ));
+        )).getResults();
         resultMerger.mergeResults(context, results);
     }
 

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

@@ -142,7 +142,7 @@ public boolean hasAnnotation(String annotation) {
             annotation = "@" + annotation;
         }
         FindAnnotations findAnnotation = new FindAnnotations(annotation);
-        List<Result> results = findAnnotation.run(List.of(getCompilationUnit()));
+        List<Result> results = findAnnotation.run(List.of(getCompilationUnit())).getResults();
         return !results.isEmpty();
     }
 

components/sbm-core/src/main/java/org/springframework/sbm/java/refactoring/JavaGlobalRefactoringImpl.java

@@ -130,7 +130,7 @@ private RewriteSourceFileHolder<J.CompilationUnit> findRewriteSourceFileHolderHo
 
     List<Result> executeRecipe(List<J.CompilationUnit> compilationUnits, Recipe recipe) {
         // FIXME #7 added RewriteExecutionContext here, remove again?
-        List<Result> results = recipe.run(compilationUnits, new RewriteExecutionContext());
+        List<Result> results = recipe.run(compilationUnits, new RewriteExecutionContext()).getResults();
 //         List<Result> results = recipe.run(compilationUnits, new RewriteExecutionContext(), new ForkJoinScheduler(new ForkJoinPool(1)), 10, 1);
         return results;
     }

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

@@ -81,7 +81,7 @@ public Optional<String> getProperty(String key) {
 
     private void apply(Recipe r) {
         File rewriteResource = getSourceFile();
-        List<Result> results = r.run(List.of(rewriteResource), executionContext);
+        List<Result> results = r.run(List.of(rewriteResource), executionContext).getResults();
         if (!results.isEmpty()) {
             replaceWith(getSourceFile().getClass().cast(results.get(0).getAfter()));
         }

components/sbm-core/src/main/java/org/springframework/sbm/search/recipe/actions/OpenRewriteJavaSearchAction.java

@@ -72,7 +72,7 @@ public boolean isAutomated() {
 
 
     public void apply(ProjectContext context) {
-        OpenRewriteRecipeJavaSearch recipeJavaSearch = new OpenRewriteRecipeJavaSearch((compilationUnits -> rewriteRecipe.run(compilationUnits)), javaParser);
+        OpenRewriteRecipeJavaSearch recipeJavaSearch = new OpenRewriteRecipeJavaSearch((compilationUnits -> rewriteRecipe.run(compilationUnits).getResults()), javaParser);
         recipeJavaSearch.commentFindings(context.getProjectJavaSources().list(), commentText);
     }
 

components/sbm-core/src/test/java/org/springframework/sbm/java/impl/OpenRewriteSearchAndCommentTest.java

@@ -45,7 +45,7 @@ void markMatches() {
         String markerText = "marker text";
 
         JavaParser javaParser = new RewriteJavaParser(new SbmApplicationProperties());
-        OpenRewriteRecipeJavaSearch sut = new OpenRewriteRecipeJavaSearch(compilationUnits -> new FindAnnotations("@java.lang.Deprecated").run(compilationUnits), javaParser);
+        OpenRewriteRecipeJavaSearch sut = new OpenRewriteRecipeJavaSearch(compilationUnits -> new FindAnnotations("@java.lang.Deprecated").run(compilationUnits).getResults(), javaParser);
 
         sut.commentFindings(projectContext.getProjectJavaSources().list(), markerText);