replace edits lost in merge

Author: dsgrieve

src/main/java/org/openrewrite/java/testing/junit5/UpdateMockWebServerMockResponse.java

@@ -30,6 +30,7 @@
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.MethodMatcher;
 import org.openrewrite.java.search.UsesType;
+import org.openrewrite.java.tree.Flag;
 import org.openrewrite.java.tree.J;
 import org.openrewrite.java.tree.JavaType;
 import org.openrewrite.java.tree.TypeUtils;
@@ -54,6 +55,7 @@ public class UpdateMockWebServerMockResponse extends Recipe {
     private static final String NEW_MOCKRESPONSE_FQN_BUILDER = NEW_MOCKRESPONSE_FQN + "$Builder";
 
     private static final JavaType.FullyQualified newMockResponseBuilderType = (JavaType.FullyQualified) JavaType.buildType(NEW_MOCKRESPONSE_FQN_BUILDER);
+    private static final JavaType.FullyQualified newMockResponseType = (JavaType.FullyQualified) JavaType.buildType(NEW_MOCKRESPONSE_FQN);
 
     private static class MethodInvocationReplacement {
         private final MethodMatcher methodMatcher;
@@ -213,10 +215,49 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                                 if (isChainedCall) {
                                     transformed = transformed.withPrefix(arg.getPrefix());
                                 }
-                                return transformed;
+                                return patchBuilderBuildReturnTypeAndName(transformed);
+                            }
+                            return arg;
                         }));
+                    }
                 }.visit(j, ctx);
             }
         });
     }
+
+    private static J.MethodInvocation patchReturnTypeAndName(J.MethodInvocation mi, JavaType.Method method, JavaType.FullyQualified declaringType, JavaType returnType, String newName) {
+        assert method != null;
+        J.MethodInvocation updated = mi.withMethodType(
+                method.withDeclaringType(declaringType)
+                        .withReturnType(returnType)
+                        .withName(newName)
+        );
+        return updated.withName(
+                updated.getName()
+                        .withSimpleName(newName)
+                        .withType(updated.getMethodType())
+        );
+    }
+
+    private J.MethodInvocation patchBuilderBuildReturnTypeAndName(J.MethodInvocation builder) {
+        return patchReturnTypeAndName(
+                builder,
+                new JavaType.Method(
+                        null,
+                        Flag.Public.getBitMask() | Flag.Final.getBitMask(),
+                        newMockResponseBuilderType,
+                        "build",
+                        newMockResponseType,
+                        (List<String>) null,
+                        null,
+                        null,
+                        null,
+                        null,
+                        null
+                ),
+                newMockResponseBuilderType,
+                newMockResponseType,
+                "build"
+        );
+    }
 }

src/test/java/org/openrewrite/java/testing/junit5/UpgradeOkHttpMockWebServerTest.java

@@ -87,81 +87,6 @@ void shouldUpgradeMavenDependency() {
         );
     }
 
-//    @Test
-//    void wip() {
-//        rewriteRun(
-//          //language=java
-//          java(
-//            """
-//              import okhttp3.Headers;
-//              import okhttp3.mockwebserver.MockResponse;
-//
-//              class A {
-//                  void someMethod() {
-//                      Headers headers = new Headers.Builder().build();
-//                      MockResponse a = new MockResponse();
-//                      // .status(String): void
-//                      // .getStatus(): String
-//                      // --
-//                      // .setStatus(String): MockResponse[this]
-//                      // ---
-//                      // .headers(Headers): void
-//                      // .setHeaders(Headers): MockResponse
-//                      // .getHeaders(): Headers
-//                      // ---
-//                      // .addHeader(String): MockResponse
-//                      // .addHeader(String,Object): MockResponse
-//                      // .addHeaderLenient(String,Object): MockResponse
-//                      // ---
-//                      // .setHeader(String,Object): MockResponse
-//                      // .removeHeader(String): MockResponse
-//                      // .clearHeaders(): MockResponse
-//                      a.header
-//                      a.trailers(headers);
-//                  }
-//              }
-//              """
-//          )
-//        );
-//    }
-
-    @DocumentExample
-    @Test
-    void shouldUpgradeMavenDependency() {
-        rewriteRun(
-          spec -> spec.recipeFromResource("/META-INF/rewrite/junit5.yml", "org.openrewrite.java.testing.junit5.UpgradeOkHttpMockWebServer"),
-          mavenProject("project",
-            // TODO: handle solely J.NewClass and update declarative recipe to include new one.
-            //language=xml
-            pomXml(
-              """
-                <project>
-                  <modelVersion>4.0.0</modelVersion>
-                  <groupId>com.example</groupId>
-                  <artifactId>demo</artifactId>
-                  <version>0.0.1-SNAPSHOT</version>
-                  <dependencies>
-                    <dependency>
-                      <groupId>com.squareup.okhttp3</groupId>
-                      <artifactId>mockwebserver</artifactId>
-                      <version>4.10.0</version>
-                      <scope>test</scope>
-                    </dependency>
-                  </dependencies>
-                </project>
-                """,
-              spec -> spec.after(pom ->
-                assertThat(pom)
-                  .doesNotContain("<artifactId>mockwebserver</artifactId>")
-                  .contains("<artifactId>mockwebserver3</artifactId>")
-                  .containsPattern("<version>5\\.(.*)</version>")
-                  .actual()
-              )
-            )
-          )
-        );
-    }
-
     // TODO: methods receiving MockResponse - maybe add comment instructing to double check?
     @Test
     void shouldMigrateMockResponseToBuilder() {