384 migrate explicit depependencies

applications/spring-shell/src/test/java/org/springframework/sbm/BootUpgrade_27_30_ManuallyManaged_IntegrationTest.java

@@ -0,0 +1,175 @@
+/*
+ * 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;
+
+import org.intellij.lang.annotations.Language;
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.openrewrite.InMemoryExecutionContext;
+import org.openrewrite.maven.MavenParser;
+import org.openrewrite.maven.internal.MavenPomDownloader;
+import org.openrewrite.maven.tree.Dependency;
+import org.openrewrite.maven.tree.MavenResolutionResult;
+import org.openrewrite.maven.tree.ResolvedManagedDependency;
+import org.openrewrite.xml.tree.Xml;
+
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+public class BootUpgrade_27_30_ManuallyManaged_IntegrationTest extends IntegrationTestBaseClass {
+    @Override
+    protected String getTestSubDir() {
+        return "boot-migration-27-30-manual-managed";
+    }
+
+    @Test
+    @Tag("integration")
+    void migrateManuallyManagedApplication() {
+        intializeTestProject();
+
+        scanProject();
+
+        applyRecipe("boot-2.7-3.0-dependency-version-update");
+
+        buildProject();
+
+        Xml.Document rootBuildFile = getRootBuildFile();
+        verifyManagedDependency(rootBuildFile, "spring-boot-starter-test", "3.0.0-M3");
+        verifyManagedDependency(rootBuildFile, "metrics-annotation", "4.2.9");
+
+        Xml.Document applicationBuildFile = getApplicationBuildFile();
+        verifyProperty(applicationBuildFile, "spring-boot-starter-web.version", "3.0.0-M3");
+        verifyDependencyWithClassifier(applicationBuildFile, "ehcache", "3.10.0", "jakarta");
+
+        verifyConstructorBindingRemoval();
+    }
+
+    private void verifyManagedDependency(Xml.Document mavenAsXMLDocument, String artifactId, String version) {
+        Optional<ResolvedManagedDependency> managedDependency = getManagedDependencyByArtifactId(mavenAsXMLDocument, artifactId);
+        assertThat(managedDependency).isPresent();
+        assertThat(managedDependency.get().getVersion()).isEqualTo(version);
+    }
+
+    private void verifyDependency(Xml.Document mavenAsXMLDocument, String artifactId, String version) {
+        verifyDependencyWithClassifier(mavenAsXMLDocument, artifactId, version, null);
+    }
+
+    private void verifyDependencyWithClassifier(Xml.Document mavenAsXMLDocument, String artifactId, String version, String classifier) {
+        Optional<Dependency> dependency = getDependencyByArtifactId(mavenAsXMLDocument, artifactId);
+        assertThat(dependency).isPresent();
+        assertThat(dependency.get().getVersion()).isEqualTo(version);
+        if (classifier != null) {
+            assertThat(dependency.get().getClassifier()).isEqualTo(classifier);
+        }
+    }
+
+    @NotNull
+    private Optional<Dependency> getDependencyByArtifactId(Xml.Document mavenAsXMLDocument, String artifactId) {
+        List<Dependency> dependencies = getDependencies(mavenAsXMLDocument);
+        return dependencies
+                .stream()
+                .filter(dependency -> dependency.getArtifactId().equals(artifactId))
+                .findAny();
+    }
+
+    @NotNull
+    private List<Dependency> getDependencies(Xml.Document mavenAsXMLDocument) {
+        return mavenAsXMLDocument
+                .getMarkers()
+                .findFirst(MavenResolutionResult.class)
+                .get()
+                .getPom()
+                .getRequestedDependencies();
+    }
+
+    private void verifyProperty(Xml.Document mavenAsXMLDocument, String name, String value) {
+        Map<String, String> props = getProperties(mavenAsXMLDocument);
+        assertThat(props.containsKey(name)).isTrue();
+        assertThat(props.get(name)).isEqualTo(value);
+    }
+
+    @NotNull
+    private Map<String, String> getProperties(Xml.Document mavenAsXMLDocument) {
+        return mavenAsXMLDocument
+                .getMarkers()
+                .findFirst(MavenResolutionResult.class)
+                .get()
+                .getPom()
+                .getProperties();
+    }
+
+    @NotNull
+    Optional<ResolvedManagedDependency> getManagedDependencyByArtifactId(Xml.Document mavenAsXMLDocument, String artifactId) {
+        return getManagedDependencies(mavenAsXMLDocument)
+                .stream()
+                .filter(md -> md.getArtifactId().equals(artifactId))
+                .findAny();
+    }
+
+    @NotNull
+    private List<ResolvedManagedDependency> getManagedDependencies(Xml.Document mavenAsXMLDocument) {
+        return mavenAsXMLDocument
+                .getMarkers()
+                .findFirst(MavenResolutionResult.class)
+                .get()
+                .getPom()
+                .getDependencyManagement();
+    }
+
+    @NotNull
+    private Xml.Document getRootBuildFile() {
+        return parsePom(loadFile(Path.of("pom.xml")));
+    }
+
+    @NotNull
+    private Xml.Document getApplicationBuildFile() {
+        return parsePom(loadFile(Path.of("spring-app/pom.xml")), loadFile(Path.of("pom.xml")));
+    }
+
+    @NotNull
+    private Xml.Document parsePom(@Language("xml") String... pomContents) {
+        MavenParser mavenParser = new MavenParser.Builder().build();
+        return mavenParser.parse(pomContents).get(0);
+    }
+
+    private void verifyConstructorBindingRemoval() {
+        String constructorBindingConfigClass = loadJavaFileFromSubmodule("spring-app/", "org.springboot.example.upgrade", "ConstructorBindingConfig");
+        assertThat(constructorBindingConfigClass).isEqualTo("package org.springboot.example.upgrade;\n" +
+                "\n" +
+                "import org.springframework.boot.context.properties.ConfigurationProperties;\n" +
+                "\n" +
+                "@ConfigurationProperties(prefix = \"mail\")\n" +
+                "public class ConstructorBindingConfig {\n" +
+                "    private String hostName;\n" +
+                "\n" +
+                "    public ConstructorBindingConfig(String hostName) {\n" +
+                "        this.hostName = hostName;\n" +
+                "    }\n" +
+                "}" +
+                "\n");
+    }
+
+    private void buildProject() {
+        executeMavenGoals(getTestDir(), "clean", "verify");
+    }
+}

applications/spring-shell/src/test/resources/testcode/boot-migration-27-30-manual-managed/README.md

@@ -0,0 +1,8 @@
+**Features used in the current project**
+
+* ehcache in pom is mentioned this helps validate our migration to spring 3 where ehcache classifier has to be used to resolve version.
+* Uses Constructor binding on classes which will be removed when migrating to Spring 3
+* Uses PagingAndSortingRepo interface where CrudRepo has been removed.
+* Uses properties that will be removed/moved on spring 3 migration
+* Uses micrometer packages which are moved to a new structure.
+

applications/spring-shell/src/test/resources/testcode/boot-migration-27-30-manual-managed/pom.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>pom</packaging>
+    <modules>
+        <module>spring-app</module>
+    </modules>
+
+    <groupId>com.example</groupId>
+    <artifactId>boot-upgrade-27_30</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>boot-upgrade-27_30</name>
+    <description>boot-upgrade-27_30</description>
+    <properties>
+        <java.version>17</java.version>
+    </properties>
+
+    <repositories>
+        <repository>
+            <id>spring-snapshot</id>
+            <url>https://repo.spring.io/snapshot</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
+        <repository>
+            <id>spring-milestone</id>
+            <url>https://repo.spring.io/milestone</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>spring-release</id>
+            <url>https://repo.spring.io/release</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>io.dropwizard.metrics</groupId>
+                <artifactId>metrics-annotation</artifactId>
+                <version>4.2.8</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-test</artifactId>
+                <version>2.7.0</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.jaxb</groupId>
+                <artifactId>jaxb-runtime</artifactId>
+                <version>2.3.6</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>

applications/spring-shell/src/test/resources/testcode/boot-migration-27-30-manual-managed/spring-app/pom.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+
+<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">
+    <parent>
+        <artifactId>boot-upgrade-27_30</artifactId>
+        <groupId>com.example</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>spring-app</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <spring-boot-starter-web.version>2.7.0</spring-boot-starter-web.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.ehcache</groupId>
+            <artifactId>ehcache</artifactId>
+            <version>3.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>${spring-boot-starter-web.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>

applications/spring-shell/src/test/resources/testcode/boot-migration-27-30-manual-managed/spring-app/src/main/java/org/springboot/example/upgrade/BootUpgrade2730Application.java

@@ -0,0 +1,12 @@
+package org.springboot.example.upgrade;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class BootUpgrade2730Application {
+
+    public static void main(String[] args) {
+        SpringApplication.run(BootUpgrade2730Application.class, args);
+    }
+}

applications/spring-shell/src/test/resources/testcode/boot-migration-27-30-manual-managed/spring-app/src/main/java/org/springboot/example/upgrade/ConstructorBindingConfig.java

@@ -0,0 +1,14 @@
+package org.springboot.example.upgrade;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.ConstructorBinding;
+
+@ConfigurationProperties(prefix = "mail")
+@ConstructorBinding
+public class ConstructorBindingConfig {
+    private String hostName;
+
+    public ConstructorBindingConfig(String hostName) {
+        this.hostName = hostName;
+    }
+}

components/sbm-core/src/main/java/org/springframework/sbm/build/api/BuildFile.java

@@ -87,6 +87,8 @@ public interface BuildFile extends ProjectResource {
 
     List<Dependency> getDependencyManagement();
 
+    List<Dependency> getRequestedManagedDependencies();
+
     void addToDependencyManagement(Dependency dependency);
 
     void addToDependencyManagementInner(Dependency dependency);

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

@@ -485,6 +485,19 @@ public List<Dependency> getDependencyManagement() {
                 .collect(Collectors.toList());
     }
 
+    @Override
+    public List<Dependency> getRequestedManagedDependencies() {
+        return this.getPom().getPom().getRequested()
+                .getDependencyManagement()
+                .stream()
+                .map(k -> Dependency.builder()
+                        .artifactId(k.getArtifactId())
+                        .version(k.getVersion())
+                        .groupId(k.getGroupId())
+                        .build())
+                .collect(Collectors.toList());
+    }
+
     private Dependency getDependency(ResolvedManagedDependency d) {
         return Dependency.builder()
                 .groupId(d.getGroupId())