From 62e0194aa16638027ab9409fb7cbcb0e15dab4f5 Mon Sep 17 00:00:00 2001
From: eocantu <eocantu@users.noreply.github.com>
Date: Sun, 23 Jun 2024 04:58:28 -0500
Subject: [PATCH] Remove classifier on dependency added migrating
 LocalServerPort (#544)

* Remove classifier on dependency added migrating LocalServerPort

Fixes https://github.com/openrewrite/rewrite-spring/issues/541

* Verify dependency is added

---------

Co-authored-by: Tim te Beek <tim@moderne.io>
---
 .../MigrateLocalServerPortAnnotation.java     |  2 +-
 .../MigrateLocalServerPortAnnotationTest.java | 85 ++++++++++++++++++-
 2 files changed, 83 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/openrewrite/java/spring/boot2/MigrateLocalServerPortAnnotation.java b/src/main/java/org/openrewrite/java/spring/boot2/MigrateLocalServerPortAnnotation.java
index a21d84c1..b77adaef 100644
--- a/src/main/java/org/openrewrite/java/spring/boot2/MigrateLocalServerPortAnnotation.java
+++ b/src/main/java/org/openrewrite/java/spring/boot2/MigrateLocalServerPortAnnotation.java
@@ -68,7 +68,7 @@ public List<Recipe> getRecipeList() {
             "2.0.x",
             null,
             "org.springframework.boot.web.server.LocalServerPort",
-            "org.springframework.boot.web.server.LocalServerPort",
+            null,
             null,
             null, null, null, null, null, null, null));
     }
diff --git a/src/testWithSpringBoot_1_5/java/org/openrewrite/java/spring/boot2/MigrateLocalServerPortAnnotationTest.java b/src/testWithSpringBoot_1_5/java/org/openrewrite/java/spring/boot2/MigrateLocalServerPortAnnotationTest.java
index 738ac328..f29305c5 100644
--- a/src/testWithSpringBoot_1_5/java/org/openrewrite/java/spring/boot2/MigrateLocalServerPortAnnotationTest.java
+++ b/src/testWithSpringBoot_1_5/java/org/openrewrite/java/spring/boot2/MigrateLocalServerPortAnnotationTest.java
@@ -21,7 +21,8 @@
 import org.openrewrite.test.RecipeSpec;
 import org.openrewrite.test.RewriteTest;
 
-import static org.openrewrite.java.Assertions.java;
+import static org.openrewrite.java.Assertions.*;
+import static org.openrewrite.maven.Assertions.pomXml;
 
 class MigrateLocalServerPortAnnotationTest implements RewriteTest {
     @Override
@@ -32,7 +33,7 @@ public void defaults(RecipeSpec spec) {
 
     @Issue("https://github.com/openrewrite/rewrite-spring/issues/116")
     @Test
-    void givenHasStringVariableWhenRemovingDeprecatedThenReplacesAddEnvironmentWithSetProperties() {
+    void shouldReplaceType() {
         //language=java
         rewriteRun(
           java(
@@ -46,7 +47,7 @@ public class RandomTestClass {
               """,
             """
               import org.springframework.boot.web.server.LocalServerPort;
-              
+
               public class RandomTestClass {
                   @LocalServerPort
                   private int port;
@@ -55,4 +56,82 @@ public class RandomTestClass {
           )
         );
     }
+
+    @Issue("https://github.com/openrewrite/rewrite-spring/issues/541")
+    @Test
+    void shouldAddDependencyCorrectly() {
+        rewriteRun(
+          spec -> spec.expectedCyclesThatMakeChanges(2),
+          mavenProject("project",
+            srcMainJava(
+              //language=Java
+              java(
+                """
+                  import org.springframework.boot.context.embedded.LocalServerPort;
+
+                  class RandomTestClass {
+                      @LocalServerPort
+                      private int port;
+                  }
+                  """,
+                """
+                  import org.springframework.boot.web.server.LocalServerPort;
+
+                  class RandomTestClass {
+                      @LocalServerPort
+                      private int port;
+                  }
+                  """
+              )
+            ),
+            //language=XML
+            pomXml(
+              """
+                <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>
+                    <parent>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-starter-parent</artifactId>
+                        <version>2.0.9.RELEASE</version>
+                        <relativePath/>
+                    </parent>
+                    <groupId>com.example</groupId>
+                    <artifactId>acme</artifactId>
+                    <version>0.0.1-SNAPSHOT</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.springframework.boot</groupId>
+                            <artifactId>spring-boot-starter</artifactId>
+                        </dependency>
+                    </dependencies>
+                </project>
+                """,
+              """
+                <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>
+                    <parent>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-starter-parent</artifactId>
+                        <version>2.0.9.RELEASE</version>
+                        <relativePath/>
+                    </parent>
+                    <groupId>com.example</groupId>
+                    <artifactId>acme</artifactId>
+                    <version>0.0.1-SNAPSHOT</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.springframework.boot</groupId>
+                            <artifactId>spring-boot-starter</artifactId>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.springframework.boot</groupId>
+                            <artifactId>spring-boot-starter-web</artifactId>
+                        </dependency>
+                    </dependencies>
+                </project>
+                """
+            )
+          )
+        );
+    }
 }