spring-projects-experimental · fabapp2 · Sep 12, 2023 · Sep 19, 2023 · Sep 20, 2023 · Sep 20, 2023
diff --git a/...ts/sbm-openrewrite/src/test/java/org/springframework/sbm/java/OpenRewriteTestSupport.java b/...ts/sbm-openrewrite/src/test/java/org/springframework/sbm/java/OpenRewriteTestSupport.java
@@ -23,6 +23,8 @@
 import org.openrewrite.java.JavaVisitor;
 import org.openrewrite.java.tree.J;
 import org.openrewrite.maven.cache.LocalMavenArtifactCache;
+import org.openrewrite.maven.tree.Dependency;
+import org.openrewrite.maven.tree.GroupArtifactVersion;
 import org.openrewrite.maven.tree.ResolvedDependency;
 import org.openrewrite.maven.tree.ResolvedGroupArtifactVersion;
 import org.openrewrite.maven.utilities.MavenArtifactDownloader;
@@ -250,9 +252,12 @@ public static List<Path> getClasspathFiles(String... gav) {
         });
         return Arrays.stream(gav)
                 .map(g -> g.split(":"))
-                .map(g -> new ResolvedGroupArtifactVersion(null, g[0], g[1], g.length == 3 ? g[2] : null, null))
                 .map(g -> ResolvedDependency.builder()
-                        .gav(g)
+                        .gav(new ResolvedGroupArtifactVersion(null, g[0], g[1], g.length == 3 ? g[2] : null, null))
+                        .requested(Dependency.builder()
+                                .gav(new GroupArtifactVersion(g[0], g[1], g.length == 3 ? g[2] : null))
+                                .build()
+                        )
                         .build()
                 )
                 .map(g -> {

diff --git a/sbm-support-rewrite-integration-test/.gitignore b/sbm-support-rewrite-integration-test/.gitignore
@@ -0,0 +1,38 @@
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
+*.iws
+*.iml
+*.ipr
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store
diff --git a/sbm-support-rewrite-integration-test/pom.xml b/sbm-support-rewrite-integration-test/pom.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2021 - 2023 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.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.example</groupId>
+    <artifactId>sbm-support-rewrite-integration-test</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <spring-boot.version>3.1.3</spring-boot.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.experimental</groupId>
+            <artifactId>sbm-support-rewrite</artifactId>
+            <version>0.1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openrewrite.recipe</groupId>
+            <artifactId>rewrite-spring</artifactId>
+            <version>5.0.10</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>3.1.3</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <requiresUnpack>
+                        <dependency>
+                            <groupId>org.apache.maven.wagon</groupId>
+                            <artifactId>wagon-http</artifactId>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.maven.resolver</groupId>
+                            <artifactId>maven-resolver-transport-wagon</artifactId>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.maven.resolver</groupId>
+                            <artifactId>maven-resolver-connector-basic</artifactId>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.maven</groupId>
+                            <artifactId>maven-compat</artifactId>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.maven</groupId>
+                            <artifactId>maven-embedder</artifactId>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.codehaus.plexus</groupId>
+                            <artifactId>plexus-cipher</artifactId>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.eclipse.sisu</groupId>
+                            <artifactId>org.eclipse.sisu.plexus</artifactId>
+                        </dependency>
+                    </requiresUnpack>
+<!--                    <layers>-->
+<!--                        <enabled>false</enabled>-->
+<!--                    </layers>-->
+                    <mainClass>com.acme.example.SpringBoot3Upgrade</mainClass>
+<!--                    <layout>JAR</layout>-->
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/sbm-support-rewrite-integration-test/src/main/java/com/acme/example/SpringBoot3Upgrade.java b/sbm-support-rewrite-integration-test/src/main/java/com/acme/example/SpringBoot3Upgrade.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2021 - 2023 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 com.acme.example;
+
+import org.openrewrite.InMemoryExecutionContext;
+import org.openrewrite.Recipe;
+import org.openrewrite.internal.InMemoryLargeSourceSet;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.Resource;
+import org.springframework.sbm.boot.autoconfigure.DiscoveryConfiguration;
+import org.springframework.sbm.parsers.ProjectScanner;
+import org.springframework.sbm.parsers.RewriteProjectParser;
+import org.springframework.sbm.parsers.RewriteProjectParsingResult;
+import org.springframework.sbm.recipes.RewriteRecipeDiscovery;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * @author Fabian Krüger
+ */
+@SpringBootApplication
+public class SpringBoot3Upgrade implements CommandLineRunner {
+    public static void main(String[] args) {
+        SpringApplication.run(SpringBoot3Upgrade.class, args);
+    }
+
+    @Autowired
+    RewriteProjectParser parser;
+    @Autowired
+    ProjectScanner scanner;
+    @Autowired
+    RewriteRecipeDiscovery discovery;
+
+    @Override
+    public void run(String... args) throws Exception {
+        Path baseDir = Path.of("/Users/fkrueger/projects/sbm-projects/spring-restbucks");
+        List<Resource> resources = scanner.scan(baseDir);
+        InMemoryExecutionContext executionContext = new InMemoryExecutionContext();
+        RewriteProjectParsingResult parsingResult = parser.parse(baseDir, resources, executionContext);
+        String recipeName = "org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_1";
+        List<Recipe> recipes = discovery.discoverRecipes();
+        Optional<Recipe> recipe = recipes.stream().filter(r -> recipeName.equals(r.getName())).findFirst();
+        recipe.ifPresent(r -> r.run(new InMemoryLargeSourceSet(parsingResult.sourceFiles()), executionContext));
+    }
+}
diff --git a/sbm-support-rewrite-integration-test/src/main/resources/application.properties b/sbm-support-rewrite-integration-test/src/main/resources/application.properties
@@ -0,0 +1,2 @@
+logging.level.root=warn
+logging.level.org.springframework.sbm=debug
diff --git a/sbm-support-rewrite-maven/.gitignore b/sbm-support-rewrite-maven/.gitignore
@@ -0,0 +1,38 @@
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
+*.iws
+*.iml
+*.ipr
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		logging.level.root=warn
		logging.level.org.springframework.sbm=debug