Adds commits not pushed into 786-reusable-execution-context

Author: fabapp2

applications/spring-boot-upgrade/pom.xml

@@ -47,6 +47,13 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.sbm</groupId>
+            <artifactId>sbm-core</artifactId>
+            <version>${project.version}</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

applications/spring-boot-upgrade/src/test/java/org/springframework/sbm/architecture/FindIllegalExecutionContextCreationsTest.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2021 - 2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.sbm.architecture;
+
+import com.tngtech.archunit.core.importer.ImportOption;
+import com.tngtech.archunit.junit.AnalyzeClasses;
+import com.tngtech.archunit.junit.ArchTest;
+import com.tngtech.archunit.junit.ArchTests;
+
+/**
+ * @author Fabian Krüger
+ */
+@AnalyzeClasses(packages = {"org.springframework.sbm", "org.openrewrite"}, importOptions = {ImportOption.DoNotIncludeTests.class, ImportOption.DoNotIncludeJars.class})
+public class FindIllegalExecutionContextCreationsTest {
+    @ArchTest
+    static final ArchTests executionContextMustNotBeCreatedWithNew = ArchTests.in(
+            ControlledInstantiationOfExecutionContextTest.class);
+}

ci/pipeline.yml

@@ -159,6 +159,7 @@ jobs:
 
 # Build every new PR
 
+
   - name: create-github-release
     serial: true
     plan:
@@ -194,10 +195,10 @@ jobs:
             - git-repo/applications/spring-boot-upgrade/target/spring-boot-upgrade.jar
             - git-repo/applications/spring-shell/target/spring-boot-migrator.jar
 groups:
+  - name: "builds"
+    jobs: ["build"]
   - name: "ci-images"
     jobs: ["build-ci-images"]
-  - name: "pull-requests"
-    jobs: ["build-pull-requests"]
   - name: "releases"
     jobs: ["create-github-release"]
 

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

@@ -15,18 +15,17 @@
  */
 package org.springframework.sbm.spring.migration.actions;
 
-import org.springframework.sbm.engine.recipe.AbstractAction;
-import org.springframework.sbm.engine.context.ProjectContext;
-import org.springframework.sbm.project.resource.RewriteSourceFileHolder;
-import org.springframework.sbm.project.resource.filter.GenericTypeListFilter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.extern.slf4j.Slf4j;
-import org.openrewrite.InMemoryExecutionContext;
-import org.openrewrite.Recipe;
-import org.openrewrite.Result;
-import org.openrewrite.SourceFile;
+import org.openrewrite.*;
 import org.openrewrite.properties.PropertiesParser;
 import org.openrewrite.xml.XmlParser;
 import org.openrewrite.yaml.YamlParser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.sbm.engine.context.ProjectContext;
+import org.springframework.sbm.engine.recipe.AbstractAction;
+import org.springframework.sbm.project.resource.RewriteSourceFileHolder;
+import org.springframework.sbm.project.resource.filter.GenericTypeListFilter;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -40,6 +39,10 @@ public class OpenRewriteRecipeAdapterAction extends AbstractAction {
 
     private final Recipe recipe;
 
+    @JsonIgnore
+    @Autowired
+    private ExecutionContext executionContext;
+
     public OpenRewriteRecipeAdapterAction(org.openrewrite.Recipe recipe) {
         this.recipe = recipe;
     }
@@ -70,7 +73,7 @@ public void apply(ProjectContext context) {
                                         .filter(Objects::nonNull)
                                         .filter(it -> it.getFileName().toString().endsWith(".yml") || it.endsWith(".yaml"))
                                         .collect(Collectors.toList()),
-                                null, new InMemoryExecutionContext()
+                                null, executionContext
                         )
         );
 
@@ -82,7 +85,7 @@ null, new InMemoryExecutionContext()
                                         .filter(it -> it.getFileName().toString().endsWith(".properties"))
                                         .collect(Collectors.toList()),
                                 null,
-                                new InMemoryExecutionContext()
+                                executionContext
                         )
         );
 
@@ -94,7 +97,7 @@ null, new InMemoryExecutionContext()
                                         .filter(it -> it.getFileName().toString().endsWith(".xml"))
                                         .collect(Collectors.toList()),
                                 null,
-                                new InMemoryExecutionContext())
+                                executionContext)
         );
 
         List<Result> res = recipe.run(sourceFiles).getResults();

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

@@ -15,7 +15,6 @@
  */
 package org.springframework.sbm.test;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.sbm.build.impl.MavenBuildFileRefactoringFactory;
 import org.springframework.sbm.build.impl.MavenSettingsInitializer;
 import org.springframework.sbm.build.impl.RewriteMavenParser;
@@ -28,10 +27,9 @@
 import org.springframework.sbm.project.resource.ProjectResourceSetHolder;
 import org.springframework.sbm.project.resource.SbmApplicationProperties;
 import org.springframework.sbm.project.resource.ResourceHelper;
-import org.springframework.sbm.scopeplayground.ExecutionScope;
-import org.springframework.sbm.scopeplayground.ScanScope;
-import org.springframework.sbm.scopeplayground.ScopeConfiguration;
-import org.springframework.sbm.search.recipe.actions.OpenRewriteJavaSearchAction;
+import org.springframework.sbm.scopes.ExecutionScope;
+import org.springframework.sbm.scopes.ScanScope;
+import org.springframework.sbm.scopes.ScopeConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;

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

@@ -22,7 +22,7 @@
 import org.springframework.sbm.engine.recipe.Recipes;
 import org.springframework.sbm.engine.recipe.RecipesBuilder;
 import org.springframework.sbm.project.parser.ProjectContextInitializer;
-import org.springframework.sbm.scopeplayground.ExecutionScope;
+import org.springframework.sbm.scopes.ExecutionScope;
 import org.springframework.stereotype.Component;
 
 import java.util.List;

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

@@ -28,7 +28,7 @@
 import org.springframework.sbm.engine.recipe.Action;
 import org.springframework.sbm.engine.recipe.Recipe;
 import org.springframework.sbm.engine.recipe.RecipesBuilder;
-import org.springframework.sbm.scopeplayground.ExecutionScope;
+import org.springframework.sbm.scopes.ExecutionScope;
 import org.springframework.stereotype.Component;
 
 import java.util.List;

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

@@ -26,7 +26,7 @@
 import org.springframework.sbm.engine.precondition.PreconditionVerifier;
 import org.springframework.sbm.project.parser.PathScanner;
 import org.springframework.sbm.project.parser.ProjectContextInitializer;
-import org.springframework.sbm.scopeplayground.ScanScope;
+import org.springframework.sbm.scopes.ScanScope;
 import org.springframework.stereotype.Component;
 
 import java.nio.file.Path;

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

@@ -18,19 +18,15 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.extern.slf4j.Slf4j;
-import org.openrewrite.*;
 import org.openrewrite.Recipe;
+import org.openrewrite.Result;
+import org.openrewrite.SourceFile;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.sbm.common.filter.AbsolutePathResourceFinder;
 import org.springframework.sbm.engine.context.ProjectContext;
-import org.springframework.sbm.project.RewriteSourceFileWrapper;
-import org.springframework.sbm.project.resource.RewriteSourceFileHolder;
 
-import java.nio.file.Path;
-import java.util.*;
+import java.util.List;
 
 @Slf4j
-//@RequiredArgsConstructor
 public class OpenRewriteRecipeAdapterAction extends AbstractAction {
 
     private final Recipe recipe;
@@ -39,30 +35,23 @@ public class OpenRewriteRecipeAdapterAction extends AbstractAction {
     @Autowired
     private RewriteMigrationResultMerger resultMerger;
 
-//    private final ModifiableProjectResourceFactory modifiableProjectResourceFactory = new ModifiableProjectResourceFactory();
-
-
     @Override
     public boolean isApplicable(ProjectContext context) {
         return true;
         // FIXME: use getApplicableTest and getSingleSourceApplicableTest to calculate
-        /*
-        Method getApplicableTest = ReflectionUtils.findMethod(Recipe.class, "getApplicableTest");
+        /*Method getApplicableTest = ReflectionUtils.findMethod(Recipe.class, "getApplicableTest");
         ReflectionUtils.makeAccessible(getApplicableTest);
         try {
             TreeVisitor<?, ExecutionContext> visitor = (TreeVisitor<?, ExecutionContext>) getApplicableTest.invoke(recipe);
             if(visitor == null) {
                 return true;
             } else {
-                List<SourceFile> search = context.search(new OpenRewriteSourceFileFinder());
+                List<SourceFile> search = context.search(new OpenRewriteSourceFilesFinder());
                 return visitor.visit(search, new InMemoryExecutionContext());
             }
         } catch (IllegalAccessException e) {
             throw new RuntimeException(e);
-        } catch (InvocationTargetException e) {
-            throw new RuntimeException(e);
-        }
-         */
+        }*/
     }
 
     public OpenRewriteRecipeAdapterAction(Recipe recipe) {

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

@@ -22,9 +22,10 @@
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.java.marker.JavaSourceSet;
 import org.openrewrite.java.tree.J;
+import org.springframework.sbm.project.resource.SbmApplicationProperties;
+import org.springframework.sbm.scopes.annotations.ScanScope;
 import org.springframework.sbm.engine.annotations.StatefulComponent;
 import org.springframework.sbm.project.resource.SbmApplicationProperties;
-import org.springframework.sbm.scopeplayground.annotations.ScanScope;
 import org.springframework.stereotype.Component;
 
 import java.net.URI;

components/sbm-core/src/main/java/org/springframework/sbm/project/parser/MavenProjectParser.java

@@ -38,7 +38,7 @@
 import org.springframework.sbm.build.impl.MavenBuildFileUtil;
 import org.springframework.sbm.build.impl.RewriteMavenParser;
 import org.springframework.sbm.engine.events.*;
-import org.springframework.sbm.scopeplayground.ProjectMetadata;
+import org.springframework.sbm.scopes.ProjectMetadata;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;

components/sbm-core/src/main/java/org/springframework/sbm/scopes/AbstractBaseScope.java

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2021 - 2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.sbm.scopes;
+
+import lombok.extern.slf4j.Slf4j;
+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 java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @author Fabian Krüger
+ */
+@Slf4j
+public class AbstractBaseScope implements Scope {
+    private final Map<String, Object> scopedBeans = new ConcurrentHashMap<>();
+
+    public void clear(ConfigurableListableBeanFactory beanFactory) {
+        scopedBeans.keySet().stream().forEach(beanName -> beanFactory.destroyScopedBean(beanName));
+    }
+
+    public Object get(String name, ObjectFactory<?> objectFactory) {
+        Object scopedObject = this.scopedBeans.get(name);
+        if (scopedObject == null) {
+            scopedObject = objectFactory.getObject();
+            this.scopedBeans.put(name, scopedObject);
+        }
+        return scopedObject;
+    }
+
+    @Nullable
+    public Object remove(String name) {
+        Map<String, Object> scope = this.scopedBeans;
+        return scope.remove(name);
+    }
+
+    public void registerDestructionCallback(String name, Runnable callback) {
+        log.warn("%s does not support destruction callbacks.".formatted(this.getClass().getName()));
+    }
+
+    @Nullable
+    public Object resolveContextualObject(String key) {
+        return null;
+    }
+
+    public String getConversationId() {
+        return null;
+    }
+}

components/sbm-core/src/main/java/org/springframework/sbm/scopes/ExecutionScope.java

@@ -0,0 +1,31 @@
+
+/*
+ * Copyright 2021 - 2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.sbm.scopes;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * Scope implementation for beans marked with {@link org.springframework.sbm.scopes.annotations.ExecutionScope}.
+ *
+ * @author Fabian Krüger
+ */
+@Component
+public class ExecutionScope extends AbstractBaseScope {
+
+    public final static String SCOPE_NAME = "executionScope";
+
+}

components/sbm-core/src/main/java/org/springframework/sbm/scopes/ProjectMetadata.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2021 - 2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.sbm.scopes;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.openrewrite.maven.MavenSettings;
+
+@Getter
+@Setter
+public class ProjectMetadata {
+    private String metadata;
+    private MavenSettings mavenSettings;
+}