Correcting MockWebServer migration for OkHttp #849

steve-aom-elliott · 2025-11-21T22:48:53Z

What's changed?

New artifactId corrected from mockwebserver3-junit5 to mockwebserver3
In-progress work for changing how some classes are built / manipulated. Previously there were many methods existing on MockResponse. Now everything has to be switched to using MockResponse.Builder to change all these values.

What's your motivation?

Compilation failures after previous setup's migration ran.

Anything in particular you'd like reviewers to focus on?

Trying to see if I can cut down on additional recipe calls given there are a fair number of methods yet to migrate.

Checklist

I've added unit tests to cover both positive and negative cases
I've read and applied the recipe conventions and best practices
I've used the IntelliJ IDEA auto-formatter on affected files

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

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

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

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

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

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

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

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

github-actions · 2025-11-27T21:50:38Z

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

 import static org.assertj.core.api.Assertions.assertThat;
-import static org.openrewrite.java.Assertions.java;
-import static org.openrewrite.java.Assertions.mavenProject;
+import static org.openrewrite.java.Assertions.*;


Suggested change

import static org.openrewrite.java.Assertions.*;

import static org.openrewrite.java.Assertions.java;

import static org.openrewrite.java.Assertions.mavenProject;

github-actions · 2025-11-27T21:50:38Z

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

    }

-    @DocumentExample
+    // TODO: methods receiving MockResponse - maybe add comment instructing to double check?


Suggested change

// TODO: methods receiving MockResponse - maybe add comment instructing to double check?

// @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?

steve-aom-elliott · 2025-11-27T21:54:59Z

I'm going to try to look into whether I can set up a single visitor to perform all the type changes needed prior to using the JavaTemplate to write the .build() chaining in, as the problem I'm hitting here is that I'm changing MockResponse fields to MockResponse.Builder fields, return types from some of the methods of MockResponse to be on MockResponse.Builder instead, followed by introducing a .build() call that belongs to MockResponse.Builder but returns MockResponse, meaning ChangeType recipe effectively breaks the type attribution, but covers a lot of the scenarios otherwise that I'd want to be changing. Going to probably roll my own visitor that combines functionality from some of the other ones, or create a visitor that is capable of altering a method invocation's signature's parameter types, which I don't believe we have easily accessible a the moment.

github-actions · 2025-12-11T14:16:00Z

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

 import static org.assertj.core.api.Assertions.assertThat;
-import static org.openrewrite.java.Assertions.java;
-import static org.openrewrite.java.Assertions.mavenProject;
+import static org.openrewrite.java.Assertions.*;


Suggested change

import static org.openrewrite.java.Assertions.*;

import static org.openrewrite.java.Assertions.java;

import static org.openrewrite.java.Assertions.mavenProject;

github-actions · 2025-12-11T14:16:00Z

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

    }

-    @DocumentExample
+    // TODO: methods receiving MockResponse - maybe add comment instructing to double check?


Suggested change

// TODO: methods receiving MockResponse - maybe add comment instructing to double check?

// @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?

…padding (including the newline), leading to it changing wrapping.

…possible for future error occurrences. (#853)

…uild()`, and backpatching the parameter types onto the various method invocations. Feels like there could be a lot of improvement still with how this done, as it feels pretty hacky right now.

github-actions · 2025-12-12T22:11:40Z

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

+import static java.util.Collections.emptySet;
+import static java.util.Objects.requireNonNull;


Suggested change

import static java.util.Collections.emptySet;

import static java.util.Objects.requireNonNull;

import static java.util.Collections.emptySet;

github-actions · 2025-12-12T22:11:40Z

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

+    private static final String OLD_MOCKRESPONSE_CONSTRUCTOR = OLD_MOCKRESPONSE_FQN + " <constructor>()";
+    private static final String OLD_MOCKRESPONSE_STATUS = OLD_MOCKRESPONSE_FQN + " status(java.lang.String)";
+    private static final String OLD_MOCKRESPONSE_SETSTATUS = OLD_MOCKRESPONSE_FQN + " setStatus(java.lang.String)";
+    private static final String OLD_MOCKRESPONSE_HEADERS = OLD_MOCKRESPONSE_FQN + " headers(okhttp3.Headers)";
+    private static final String OLD_MOCKRESPONSE_SETHEADERS = OLD_MOCKRESPONSE_FQN + " setHeaders(okhttp3.Headers)";
+    private static final String NEW_MOCKRESPONSE_FQN = NEW_PACKAGE_NAME + ".MockResponse";
+    // TODO: Rename this given this actually includes '$'
+    private static final String NEW_MOCKRESPONSE_FQN_BUILDER = NEW_MOCKRESPONSE_FQN + "$Builder";


Suggested change

private static final String OLD_MOCKRESPONSE_CONSTRUCTOR = OLD_MOCKRESPONSE_FQN + " <constructor>()";

private static final String OLD_MOCKRESPONSE_STATUS = OLD_MOCKRESPONSE_FQN + " status(java.lang.String)";

private static final String OLD_MOCKRESPONSE_SETSTATUS = OLD_MOCKRESPONSE_FQN + " setStatus(java.lang.String)";

private static final String OLD_MOCKRESPONSE_HEADERS = OLD_MOCKRESPONSE_FQN + " headers(okhttp3.Headers)";

private static final String OLD_MOCKRESPONSE_SETHEADERS = OLD_MOCKRESPONSE_FQN + " setHeaders(okhttp3.Headers)";

private static final String NEW_MOCKRESPONSE_FQN = NEW_PACKAGE_NAME + ".MockResponse";

// TODO: Rename this given this actually includes '$'

private static final String NEW_MOCKRESPONSE_FQN_BUILDER = NEW_MOCKRESPONSE_FQN + "$Builder";

private static final String OLD_MOCKRESPONSE_CONSTRUCTOR = OLD_MOCKRESPONSE_FQN + " <constructor>()";

github-actions · 2025-12-12T22:11:41Z

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

 import static org.assertj.core.api.Assertions.assertThat;
-import static org.openrewrite.java.Assertions.java;
-import static org.openrewrite.java.Assertions.mavenProject;
+import static org.openrewrite.java.Assertions.*;


Suggested change

import static org.openrewrite.java.Assertions.*;

import static org.openrewrite.java.Assertions.java;

import static org.openrewrite.java.Assertions.mavenProject;

github-actions · 2025-12-12T22:11:41Z

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

    }

-    @DocumentExample
+    // TODO: methods receiving MockResponse - maybe add comment instructing to double check?


Suggested change

// TODO: methods receiving MockResponse - maybe add comment instructing to double check?

// @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?

steve-aom-elliott self-assigned this Nov 21, 2025

steve-aom-elliott added this to OpenRewrite Nov 21, 2025

steve-aom-elliott added bug Something isn't working dependencies Pull requests that update a dependency file test provided junit labels Nov 21, 2025

github-project-automation bot moved this to In Progress in OpenRewrite Nov 21, 2025

github-actions bot reviewed Nov 21, 2025

View reviewed changes

github-actions bot reviewed Nov 24, 2025

View reviewed changes

github-actions bot reviewed Nov 25, 2025

View reviewed changes

github-actions bot reviewed Nov 27, 2025

View reviewed changes

steve-aom-elliott force-pushed the 1589-correcting-mockwebserver-migration branch 3 times, most recently from 630c51b to 58ef5a9 Compare November 27, 2025 21:47

github-actions bot reviewed Nov 27, 2025

View reviewed changes

steve-aom-elliott force-pushed the 1589-correcting-mockwebserver-migration branch from 58ef5a9 to 9f40caf Compare December 11, 2025 14:13

github-actions bot reviewed Dec 11, 2025

View reviewed changes

steve-aom-elliott and others added 7 commits December 12, 2025 17:09

WiP

67f3f8d

WiP 2 - am able to get .build() added, but seems to drop the after …

c64f90a

…padding (including the newline), leading to it changing wrapping.

Expanding tests and conversions to include headers methods

dccf1fa

Adapted the failing recipe to add as much debug/retry information as …

b8dc783

…possible for future error occurrences. (#853)

Reapplying paddings from arguments as they were prior to chaining `.b…

0ed3333

…uild()`, and backpatching the parameter types onto the various method invocations. Feels like there could be a lot of improvement still with how this done, as it feels pretty hacky right now.

wip

c8ea41f

WiP - Ripped out a lot

7855d82

steve-aom-elliott force-pushed the 1589-correcting-mockwebserver-migration branch from 9f40caf to 7855d82 Compare December 12, 2025 22:09

github-actions bot reviewed Dec 12, 2025

View reviewed changes

	import static org.openrewrite.java.Assertions.*;
	import static org.openrewrite.java.Assertions.java;
	import static org.openrewrite.java.Assertions.mavenProject;

-    // TODO: methods receiving MockResponse - maybe add comment instructing to double check?
+//    @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?

		import static java.util.Collections.emptySet;
		import static java.util.Objects.requireNonNull;

Correcting MockWebServer migration for OkHttp #849

Are you sure you want to change the base?

Correcting MockWebServer migration for OkHttp #849

Conversation

steve-aom-elliott commented Nov 21, 2025

What's changed?

What's your motivation?

Anything in particular you'd like reviewers to focus on?

Checklist

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot Nov 27, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Nov 27, 2025

Choose a reason for hiding this comment

Uh oh!

steve-aom-elliott commented Nov 27, 2025

Uh oh!

github-actions bot Dec 11, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Dec 11, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Dec 12, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Dec 12, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Dec 12, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Dec 12, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants