It all works (kind of)

Author: fabapp2

components/jaxrs-recipes/pom.xml

@@ -109,11 +109,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.sbm</groupId>-->
-<!--            <artifactId>sbm-support-boot</artifactId>-->
-<!--            <version>0.15.2-SNAPSHOT</version>-->
-<!--        </dependency>-->
 
         <dependency>
             <groupId>com.tngtech.archunit</groupId>
@@ -206,12 +201,6 @@
             <version>8.29.0</version>
             <scope>test</scope>
         </dependency>
-        <!--        <dependency>-->
-<!--            <groupId>org.junit-pioneer</groupId>-->
-<!--            <artifactId>junit-pioneer</artifactId>-->
-<!--            <version>2.1.0</version>-->
-<!--            <scope>test</scope>-->
-<!--        </dependency>-->
 
     </dependencies>
     <build>

components/jaxrs-recipes/src/main/java/example/recipe/SbmAdapterRecipe.java

@@ -92,13 +92,11 @@ public TreeVisitor<?, ExecutionContext> getScanner(List<SourceFile> acc) {
 
     @Override
     public Collection<? extends SourceFile> generate(List<SourceFile> generate, ExecutionContext executionContext) {
-//        Collection<? extends SourceFile> generate = super.generate(acc, executionContext);
-
         // create the required classes
-        initBeans(executionContext);
+        initBeans();
 
         // transform nodes to SourceFiles
-        List<SourceFile> sourceFiles = generate.stream().filter(SourceFile.class::isInstance).map(SourceFile.class::cast).toList();
+        List<SourceFile> sourceFiles = generate;
 
         // FIXME: base dir calculation is fake
         Path baseDir = Path.of(".").resolve("testcode/jee/jaxrs/bootify-jaxrs/given").toAbsolutePath().normalize(); //executionContext.getMessage("base.dir");
@@ -114,61 +112,19 @@ public Collection<? extends SourceFile> generate(List<SourceFile> generate, Exec
         RewriteRecipeLoader recipeLoader = new RewriteRecipeLoader();
         new MigrateJaxRsRecipe().jaxRs(recipeLoader).apply(pc);
 
-        // Merge back result
-        List<? extends SourceFile> modifiedNodes = merge(sourceFiles, pc.getProjectResources());
-
-        return modifiedNodes;
-    }
-
-    private List<? extends SourceFile> merge(List<SourceFile> nodes, ProjectResourceSet projectResources) {
-        // merge the changed results into the given list and return the result
-        ArrayList<SourceFile> merged = new ArrayList<>();
-        merged.addAll(nodes);
-        projectResources.stream()
-                .filter(r -> r.hasChanges())
-                .forEach(changed -> {
-                    int pos = findPosition(merged, changed);
-                    merged.add(pos, changed.getSourceFile());
-                });
-        return merged;
-    }
+        List<? extends SourceFile> list = pc.getProjectResources().stream()
+                .map(pr -> pr.getSourceFile())
+                .toList();
 
-    private int findPosition(List<SourceFile> merged, RewriteSourceFileHolder<? extends SourceFile> changed) {
-        List<String> paths = merged.stream().map(f -> f.getSourcePath().toString()).toList();
-        return paths.indexOf(changed.getSourcePath().toString());
+        return list;
     }
 
-
-    private void initBeans(ExecutionContext executionContext) {
+    private void initBeans() {
+        // ExecutionContext is not retrieved from OpenRewrite here
         AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext("org.springframework.freemarker", "org.springframework.sbm", "org.springframework.rewrite");
         ctx.register(Configuration.class);
         this.projectContextFactory = ctx.getBean(ProjectContextFactory.class);
         this.projectResourceSetFactory = ctx.getBean(ProjectResourceSetFactory.class);
-//        RewriteSourceFileWrapper sourceFileWrapper = new RewriteSourceFileWrapper();
-//        SbmApplicationProperties sbmApplicationProperties = new SbmApplicationProperties();
-//        JavaParserBuilder parserBuilder = new JavaParserBuilder();
-//        List<ProjectResourceWrapper> projectResourceWrappers = new ArrayList<>();
-//        RewriteMigrationResultMerger merger = new RewriteMigrationResultMerger(sourceFileWrapper);
-//        ProjectResourceSetHolder holder = new ProjectResourceSetHolder(executionContext, merger);
-//        JavaRefactoringFactory refactoringFactory = new JavaRefactoringFactoryImpl(holder, executionContext);
-//        projectResourceWrappers.add(new JavaSourceProjectResourceWrapper(refactoringFactory, parserBuilder, executionContext));
-//        ProjectMetadata projectMetadata = new ProjectMetadata();
-//        MavenBuildFileRefactoringFactory buildFileRefactoringFactory = new MavenBuildFileRefactoringFactory(holder, new RewriteMavenParser(new MavenSettingsInitializer(executionContext, projectMetadata), executionContext), executionContext);
-//        projectResourceWrappers.add(new BuildFileResourceWrapper(
-//                event -> System.out.println(event),
-//                buildFileRefactoringFactory,
-//                executionContext,
-//                new RewriteMavenArtifactDownloader(new LocalMavenArtifactCache(Path.of(System.getProperty("user.dir")).resolve(".m2/repository")), new MavenSettings(), t -> {throw new RuntimeException(t);}))
-//        );
-//
-//
-//        projectResourceSetFactory = new ProjectResourceSetFactory(new RewriteMigrationResultMerger(sourceFileWrapper), sourceFileWrapper, executionContext);
-//        ProjectResourceWrapperRegistry registry = new ProjectResourceWrapperRegistry(projectResourceWrappers);
-//        BasePackageCalculator calculator = new BasePackageCalculator(sbmApplicationProperties);
-//
-//        ProjectResourceSetFactory resourceSetFactory = new ProjectResourceSetFactory(merger, sourceFileWrapper, executionContext);
-//
-//        projectContextFactory = new ProjectContextFactory(registry, holder, refactoringFactory, calculator, parserBuilder, executionContext, merger, resourceSetFactory);
     }
 
 }

components/jaxrs-recipes/src/main/java/org/springframework/sbm/FreemarkerConfiguration.java

@@ -15,6 +15,7 @@
  */
 package org.springframework.sbm;
 
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -24,6 +25,7 @@
 @Configuration
 public class FreemarkerConfiguration {
     @Bean
+    @ConditionalOnMissingBean(type = "freemarker.template.Configuration")
     public freemarker.template.Configuration configuration() {
         return new freemarker.template.Configuration();
     }

components/jaxrs-recipes/src/main/java/org/springframework/sbm/UserInteractionsDummy.java

@@ -15,10 +15,12 @@
  */
 package org.springframework.sbm;
 
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.sbm.engine.recipe.UserInteractions;
 import org.springframework.stereotype.Component;
 
 @Component
+@ConditionalOnMissingBean(type = "org.springframework.sbm.UserInteractions")
 public class UserInteractionsDummy implements UserInteractions {
     @Override
     public boolean askUserYesOrNo(String question) {

components/jaxrs-recipes/src/test/java/org/springframework/sbm/JaxRsThroughAdapterTest.java

@@ -300,7 +300,7 @@ void jaxRsRecipesThroughAdapterInOpenrewrite(@TempDir Path tmpDir) throws IOExce
             FileUtils.forceMkdir(to.toFile());
             FileUtils.copyDirectory(from.toFile(), to.toFile());
 
-            String mavenPluginVersion = "";
+            String mavenPluginVersion = "5.35.0";
             String gradlePluginVersion = "";
             Path baseDir = tmpDir;
             // mvn -B --fail-at-end -Drewrite.activeRecipes=example.recipe.SbmAdapterRecipe -Drewrite.recipeArtifactCoordinates=org.springframework.sbm:jaxrs-recipes:0.15.2-SNAPSHOT -Dmaven.opts="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=127.0.0.1:8000" org.openrewrite.maven:rewrite-maven-plugin:5.32.1:dryRun

components/jaxrs-recipes/src/test/java/org/springframework/sbm/jee/jaxrs/recipes/BootifyJaxRsAnnotationsRecipeTest.java

@@ -36,7 +36,7 @@ void test() {
         Optional<Recipe> recipe = Optional.of(jaxRsRecipe);
         RecipeTestSupport.assertThatRecipeExists(recipe);
         RecipeTestSupport.assertThatRecipeHasActions(recipe,
-                AddDependencies.class,
+//                AddDependencies.class,
                 ConvertJaxRsAnnotations.class,
                 ReplaceTypeAction.class,
                 ReplaceTypeAction.class,

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

@@ -18,7 +18,7 @@
 import org.springframework.sbm.engine.recipe.UserInteractions;
 import org.springframework.stereotype.Component;
 
-@Component
+//@Component
 public class UserInteractionsDummy implements UserInteractions {
     @Override
     public boolean askUserYesOrNo(String question) {