Skip to content

Correcting MockWebServer migration for OkHttp #849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Correcting MockWebServer migration for OkHttp #849

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
33e4903
WiP
steve-aom-elliott Nov 21, 2025
9cdc52a
WiP 2 - am able to get `.build()` added, but seems to drop the after …
steve-aom-elliott Nov 24, 2025
0abe5ec
Expanding tests and conversions to include headers methods
steve-aom-elliott Nov 25, 2025
94fd580
Adapted the failing recipe to add as much debug/retry information as …
Jenson3210 Nov 27, 2025
58ef5a9
Reapplying paddings from arguments as they were prior to chaining `.b…
steve-aom-elliott Nov 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ recipeDependencies {
parserClasspath("com.google.guava:guava:33.5.0-jre")
parserClasspath("com.squareup.okhttp3:mockwebserver:3.14.9")
parserClasspath("com.squareup.okhttp3:mockwebserver:4.10.0")
parserClasspath("com.squareup.okhttp3:mockwebserver3:5.1.0")
parserClasspath("junit:junit:4.+")
parserClasspath("org.apiguardian:apiguardian-api:1.1.2")
parserClasspath("org.assertj:assertj-core:3.+")
Expand Down
293 changes: 293 additions & 0 deletions src/main/java/org/openrewrite/java/testing/junit5/UpdateMockWebServerMockResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,293 @@
package org.openrewrite.java.testing.junit5;

import org.jspecify.annotations.NonNull;
import org.jspecify.annotations.Nullable;
import org.openrewrite.*;
import org.openrewrite.internal.ListUtils;
import org.openrewrite.java.*;
import org.openrewrite.java.search.UsesType;
import org.openrewrite.java.tree.*;
import org.openrewrite.marker.Markers;

import java.util.*;
import java.util.stream.IntStream;

import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
import static java.util.Objects.requireNonNull;
import static java.util.stream.Collectors.toList;
import static org.openrewrite.Tree.randomId;

public class UpdateMockWebServerMockResponse extends Recipe {
private static final String OLD_MOCKRESPONSE_FQN = "okhttp3.mockwebserver.MockResponse";
private static final MethodMatcher OLD_MOCKRESPONSE_CONSTRUCTOR_MATCHER = new MethodMatcher(OLD_MOCKRESPONSE_FQN + " <constructor>()");
private static final String OLD_MOCKRESPONSE_STATUS = OLD_MOCKRESPONSE_FQN + " status(java.lang.String)";
private static final MethodMatcher OLD_MOCKRESPONSE_STATUS_MATCHER = new MethodMatcher(OLD_MOCKRESPONSE_STATUS);
private static final String OLD_MOCKRESPONSE_SETSTATUS = OLD_MOCKRESPONSE_FQN + " setStatus(java.lang.String)";
private static final MethodMatcher OLD_MOCKRESPONSE_SETSTATUS_MATCHER = new MethodMatcher(OLD_MOCKRESPONSE_SETSTATUS);
private static final String NEW_MOCKRESPONSE_FQN = "mockwebserver3.MockResponse";
private static final String NEW_MOCKRESPONSE_BUILDER_FQN = NEW_MOCKRESPONSE_FQN + "$Builder";
private static final String NEW_MOCKRESPONSE_BUILDER_CONSTRUCTOR = NEW_MOCKRESPONSE_BUILDER_FQN + " <constructor>()";
private static final String OLD_MOCKWEBSERVER_ENQUEUE = "okthttp3.mockwebserver.MockWebServer enqueue(okhttp3.mockwebserver.MockResponse)";

@Override
public String getDisplayName() {
return "OkHttp `MockWebServer` `MockResponse` to 5.x `MockWebServer3` `MockResponse`";
}

@Override
public String getDescription() {
return "Replace usages of OkHttp MockWebServer `MockResponse` with 5.x MockWebServer3 `MockResponse` and it's `Builder`.";
}

@Override
public TreeVisitor<?, ExecutionContext> getVisitor() {
return Preconditions.check(new UsesType<>(OLD_MOCKRESPONSE_FQN, false), new JavaIsoVisitor<ExecutionContext>() {
private final Map<UUID, List<Integer>> methodInvocationsToAdjust = new HashMap<>();

@Override
public @Nullable J visit(@Nullable Tree tree, ExecutionContext ctx) {
J j = (J) tree;
j = new JavaIsoVisitor<ExecutionContext>() {
@Override
public J.MethodInvocation visitMethodInvocation(J.MethodInvocation methodInv, ExecutionContext ctx) {
J.MethodInvocation mi = super.visitMethodInvocation(methodInv, ctx);
List<Integer> indexes = IntStream.range(0, mi.getArguments().size())
.filter(x -> TypeUtils.isAssignableTo(OLD_MOCKRESPONSE_FQN, mi.getArguments().get(x).getType()))
.boxed().collect(toList());
if (!indexes.isEmpty() && !methodInvocationsToAdjust.containsKey(mi.getId())) {
methodInvocationsToAdjust.put(mi.getId(), indexes);
}
return mi;
}
}.visit(j, ctx);
j = (J) new ChangeMethodInvocationReturnType(
OLD_MOCKRESPONSE_STATUS,
OLD_MOCKRESPONSE_FQN
).getVisitor().visit(j, ctx);
j = (J) new ChangeMethodName(
OLD_MOCKRESPONSE_SETSTATUS,
"status",
null,
null
).getVisitor().visit(j, ctx);
j = (J) new ChangeType(
OLD_MOCKRESPONSE_FQN,
NEW_MOCKRESPONSE_BUILDER_FQN,
null
).getVisitor().visit(j, ctx);
j = new JavaIsoVisitor<ExecutionContext>() {
@Override
public J.MethodInvocation visitMethodInvocation(J.MethodInvocation methodInv, ExecutionContext ctx) {
J.MethodInvocation mi = super.visitMethodInvocation(methodInv, ctx);
List<Integer> indexes = methodInvocationsToAdjust.getOrDefault(mi.getId(), emptyList());
if (!indexes.isEmpty()) {
methodInvocationsToAdjust.remove(mi.getId());
List<JRightPadded<Expression>> exprs = mi.getPadding().getArguments().getPadding().getElements();
//mi.getPadding().getArguments().getPadding().getElements().getFirst().getAfter()
// mi.getCoordinates().replaceArguments()
J.MethodInvocation updated = mi.withArguments(ListUtils.map(mi.getArguments(), (index, arg) -> {
if (indexes.contains(index)) {
// J something = new JavaVisitor<ExecutionContext>() {
// @Override
// public @Nullable J visit(@Nullable Tree tree, ExecutionContext executionContext, Cursor parent) {
// return JavaTemplate
// .builder("#{any()}.build()")
// .build()
// .apply(
// new Cursor(parent, tree),
// ((Expression) tree).getCoordinates().replace(),
// tree
// );
//// return super.visit(tree, executionContext, parent);
// }
// // @Override
//// public J visit(Expression expression, ExecutionContext executionContext) {
//// return JavaTemplate
//// .builder("#{any()}.build()")
////// .contextSensitive()
//// .javaParser(JavaParser.fromJavaVersion().classpath("mockwebserver3"))
//// .build()
//// .apply(getCursor(), expression.getCoordinates().replace(), expression);
//// }
// }.visit(arg, ctx, getCursor());
J.MethodInvocation inner = new J.MethodInvocation(
randomId(),
Space.EMPTY,
Markers.EMPTY,
new JRightPadded<>(arg, Space.EMPTY, arg.getMarkers()),
null,
new J.Identifier(
randomId(),
Space.EMPTY,
Markers.EMPTY,
emptyList(),
"build",
null,
null
),
JContainer.build(Space.EMPTY, emptyList(), Markers.EMPTY),
new JavaType.Method(
null,
Flag.Public.getBitMask(),
TypeUtils.asFullyQualified(arg.getType()),
"build",
JavaType.buildType(NEW_MOCKRESPONSE_FQN),
emptyList(),
null,
null,
null,
null,
null
)
);
return inner;
// return (Expression) something;
}
return arg;
}));
return updated;
}
return mi;
}
}.visit(j, ctx);
// j = (J) new ChangeMethodInvocationReturnType(
// OLD_MOCKRESPONSE_STATUS,
// NEW_MOCKRESPONSE_BUILDER_FQN
// ).getVisitor().visit(j, ctx);
// j = (J) new ChangeMethodInvocationReturnType(
// OLD_MOCKRESPONSE_SETSTATUS,
// NEW_MOCKRESPONSE_BUILDER_FQN
// ).getVisitor().visit(j, ctx);
// j = new ChangeFieldType<ExecutionContext>(
// (JavaType.FullyQualified) JavaType.buildType(OLD_MOCKRESPONSE_FQN),
// (JavaType.FullyQualified) JavaType.buildType(NEW_MOCKRESPONSE_BUILDER_FQN)
// ).visit(j, ctx);
// j = (J) new ChangeMethodName(
// OLD_MOCKRESPONSE_SETSTATUS,
// "status",
// null,
// null
// ).getVisitor().visit(j, ctx);
// j = new JavaIsoVisitor<ExecutionContext>() {
// @Override
// public J.NewClass visitNewClass(J.NewClass newClass, ExecutionContext ctx) {
// J.NewClass nc = super.visitNewClass(newClass, ctx);
// if (OLD_MOCKRESPONSE_CONSTRUCTOR_MATCHER.matches(nc)) {
// maybeAddImport(NEW_MOCKRESPONSE_FQN);
// maybeRemoveImport(OLD_MOCKRESPONSE_FQN);
// return JavaTemplate
// .builder("new MockResponse.Builder()")
// .imports("mockwebserver3.MockResponse", "mockwebserver3.MockResponse.Builder")
// .javaParser(JavaParser.fromJavaVersion().classpath("mockwebserver3"))
// .build()
// .apply(getCursor(), nc.getCoordinates().replace());
// }
// return nc;
// }
// }.visit(j, ctx);
// j = new ChangeMethodInvocationReturnType()
// j = new JavaIsoVisitor<ExecutionContext>() {
// @Override
// public J.MethodInvocation visitMethodInvocation(J.MethodInvocation methodInv, ExecutionContext ctx) {
// J.MethodInvocation mi = super.visitMethodInvocation(methodInv, ctx);
// if (OLD_MOCKRESPONSE_SETSTATUS_MATCHER.matches(mi)) {
// mi = JavaTemplate
// .builder("status(#{any(java.lang.String)})")
// .imports("mockwebserver3.MockResponse", "mockwebserver3.MockResponse.Builder")
// .contextSensitive()
// .build()
// .apply(updateCursor(mi), mi.getCoordinates().replaceMethod(), mi.getArguments().get(0));
// }
//// if (OLD_MOCKRESPONSE_STATUS_MATCHER.matches(mi)) {
//// mi = JavaTemplate
//// .builder("status(#{any(java.lang.String)})")
//// .imports("mockwebserver3.MockResponse", "mockwebserver3.MockResponse.Builder")
//// .contextSensitive()
//// .build()
//// .apply(updateCursor(mi), mi.getCoordinates().replaceMethod(), mi.getArguments().get(0));
//// }
// return mi;
// }
// }.visit(tree, ctx);
j = new JavaIsoVisitor<ExecutionContext>() {
// @Override
// public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations varDecl, ExecutionContext ctx) {
// if (TypeUtils.isAssignableTo(OLD_MOCKRESPONSE_FQN, varDecl.getType())) {
// return varDecl.withTypeExpression(requireNonNull(((J.Identifier) varDecl.getTypeExpression()))
// .withSimpleName("MockResponse.Builder")
// .withType(JavaType.buildType(NEW_MOCKRESPONSE_BUILDER_FQN))
// );
// }
// return super.visitVariableDeclarations(varDecl, ctx);
// }
//
// @Override
// public J.NewClass visitNewClass(J.NewClass newClass, ExecutionContext ctx) {
// J.NewClass nc = super.visitNewClass(newClass, ctx);
// if (OLD_MOCKRESPONSE_CONSTRUCTOR_MATCHER.matches(nc)) {
// maybeAddImport(NEW_MOCKRESPONSE_FQN);
// maybeRemoveImport(OLD_MOCKRESPONSE_FQN);
// return JavaTemplate
// .builder("new MockResponse.Builder()")
// .imports("mockwebserver3.MockResponse")
// .javaParser(JavaParser.fromJavaVersion().classpath("mockwebserver3"))
// .build()
// .apply(getCursor(), nc.getCoordinates().replace());
// }
// return nc;
// }
//
// @Override
// public J.MethodInvocation visitMethodInvocation(J.MethodInvocation methodInv, ExecutionContext ctx) {
// J.MethodInvocation mi = super.visitMethodInvocation(methodInv, ctx);
// if (OLD_MOCKRESPONSE_SETSTATUS_MATCHER.matches(mi)) {
// return JavaTemplate
// .builder("status(#{any(java.lang.String)})")
// .contextSensitive()
// .build()
// .apply(getCursor(), mi.getCoordinates().replaceMethod(), mi.getArguments().get(0));
// }
// return mi;
// }
}.visit(j, ctx);
return j;
}
// @Override
// public J.NewClass visitNewClass(J.NewClass newClass, ExecutionContext ctx) {
// J.NewClass nc = super.visitNewClass(newClass, ctx);
// if (OLD_MOCKRESPONSE_CONSTRUCTOR_MATCHER.matches(nc)) {
// maybeAddImport(NEW_MOCKRESPONSE_FQN);
// maybeRemoveImport(OLD_MOCKRESPONSE_FQN);
// return JavaTemplate
// .builder("new MockResponse.Builder()")
// .imports("mockwebserver3.MockResponse")
// .javaParser(JavaParser.fromJavaVersion().classpath("mockwebserver3"))
// .build()
// .apply(getCursor(), nc.getCoordinates().replace());
// }
// return nc;
// }

// @Override
// public J.MethodInvocation visitMethodInvocation(J.MethodInvocation methodInv, ExecutionContext ctx) {
// J.MethodInvocation mi = super.visitMethodInvocation(methodInv, ctx);
// if (OLD_MOCKRESPONSE_STATUS_MATCHER.matches(mi)) {
// return JavaTemplate
// .builder("setStatus(#{any(java.lang.String)})")
// .contextSensitive()
// .build()
// .apply(getCursor(), mi.getCoordinates().replaceMethod(), mi.getArguments().get(0));
// }
// return mi;
// }

// @Override
// public J.Block visitBlock(J.Block block, ExecutionContext ctx) {
//
// J.Block b = super.visitBlock(block, ctx);
// return b;
// }
});
}
}
2 changes: 1 addition & 1 deletion src/main/resources/META-INF/rewrite/junit5.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ recipeList:
- org.openrewrite.java.dependencies.ChangeDependency:
oldGroupId: com.squareup.okhttp3
oldArtifactId: mockwebserver
newArtifactId: mockwebserver3-junit5
newArtifactId: mockwebserver3
newVersion: 5.x
---
type: specs.openrewrite.org/v1beta/recipe
Expand Down
Loading
Loading