Skip to content

Fix AddTimeUnitArgument crash on arithmetic argument expressions #139

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

Merged
timtebeek merged 4 commits into from
Jul 23, 2026
Merged

Fix AddTimeUnitArgument crash on arithmetic argument expressions #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a6fecf8
Fix AddTimeUnitArgument crash on arithmetic argument expressions
timtebeek Jul 23, 2026
35fe008
Use ListUtils.concat instead of ArrayList copies
timtebeek Jul 23, 2026
0a8240a
Drop contextSensitive and inline the JavaTemplate
timtebeek Jul 23, 2026
f401caf
Drop httpclient5 JavaParser classpath; template only needs JDK TimeUnit
timtebeek Jul 23, 2026
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
38 changes: 21 additions & 17 deletions src/main/java/org/openrewrite/apache/httpclient5/AddTimeUnitArgument.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
import org.openrewrite.Option;
import org.openrewrite.Recipe;
import org.openrewrite.TreeVisitor;
import org.openrewrite.internal.StringUtils;
import org.openrewrite.internal.ListUtils;
import org.openrewrite.java.JavaIsoVisitor;
import org.openrewrite.java.JavaParser;
import org.openrewrite.java.JavaTemplate;
import org.openrewrite.java.MethodMatcher;
import org.openrewrite.java.tree.Expression;
import org.openrewrite.java.tree.J;
import org.openrewrite.java.tree.JavaType;
import org.openrewrite.java.tree.Space;

import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;

@EqualsAndHashCode(callSuper = false)
Expand Down Expand Up @@ -67,21 +67,25 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
J.MethodInvocation m = super.visitMethodInvocation(method, ctx);
if (matcher.matches(m)) {
JavaTemplate template = JavaTemplate
.builder(StringUtils.repeat("#{any()}, ", m.getArguments().size()) + "TimeUnit.#{}")
.contextSensitive()
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "httpclient5", "httpcore5"))
J.MethodInvocation templated = JavaTemplate
.builder("TimeUnit.#{}")
.imports("java.util.concurrent.TimeUnit")
.build();
.build()
.apply(
updateCursor(m),
m.getCoordinates().replaceArguments(),
timeUnit != null ? timeUnit : TimeUnit.MILLISECONDS
);
Expression timeUnitArgument = templated.getArguments().get(0).withPrefix(Space.SINGLE_SPACE);
m = m.withArguments(ListUtils.concat(m.getArguments(), timeUnitArgument));

List<Object> arguments = new ArrayList<>(m.getArguments());
arguments.add(timeUnit != null ? timeUnit : TimeUnit.MILLISECONDS);

m = template.apply(
updateCursor(m),
m.getCoordinates().replaceArguments(),
arguments.toArray(new Object[0])
);
JavaType.Method methodType = m.getMethodType();
if (methodType != null) {
methodType = methodType
.withParameterTypes(ListUtils.concat(methodType.getParameterTypes(), timeUnitArgument.getType()))
.withParameterNames(ListUtils.concat(methodType.getParameterNames(), "timeUnit"));
m = m.withMethodType(methodType).withName(m.getName().withType(methodType));
}
maybeAddImport("java.util.concurrent.TimeUnit");
}
return m;
Expand Down
29 changes: 29 additions & 0 deletions src/test/java/org/openrewrite/apache/httpclient5/AddTimeUnitArgumentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,35 @@ void test() {
);
}

@Test
void arithmeticTimeoutArgument() {
rewriteRun(
spec -> spec.recipe(new AddTimeUnitArgument("A method(int)", null)),
stubCode,
//language=java
java(
"""
class B {
void test() {
A a = new A();
a.method(60 * 1000);
}
}
""",
"""
import java.util.concurrent.TimeUnit;

class B {
void test() {
A a = new A();
a.method(60 * 1000, TimeUnit.MILLISECONDS);
}
}
"""
)
);
}

@Test
void doesModifyMethodsWithMoreThanOneArgument() {
rewriteRun(
Expand Down
Loading