Skip to content

No longer remove String.valueof when it's called on a method invocation #752

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
merged 3 commits into from
Oct 10, 2025
Merged

No longer remove String.valueof when it's called on a method invocation #752

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fbe7506
Fix CSA issue
Laurens-W Oct 8, 2025
77607a3
Merge branch 'main' into fix-csa-issues
timtebeek Oct 10, 2025
f4ed80f
Explain the need to exclude method invocations for now
timtebeek Oct 10, 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
2 changes: 1 addition & 1 deletion src/main/java/org/openrewrite/staticanalysis/NoValueOfOnStringType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx)
J.MethodInvocation mi = (J.MethodInvocation) super.visitMethodInvocation(method, ctx);
if (VALUE_OF.matches(mi) && mi.getArguments().size() == 1) {
Expression argument = mi.getArguments().get(0);
if (TypeUtils.isString(argument.getType()) || removeValueOfForStringConcatenation(argument)) {
if ((TypeUtils.isString(argument.getType()) && !(argument instanceof J.MethodInvocation)) || removeValueOfForStringConcatenation(argument)) {
Copy link
Contributor Author

@Laurens-W Laurens-W Oct 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't look into it too much but if we could determine here whether the result of the method invocation is actually nullable that would allow us to make more transformations

return maybeParenthesize(argument.withPrefix(mi.getPrefix()), updateCursor(mi));
}
}
Expand Down
17 changes: 17 additions & 0 deletions src/test/java/org/openrewrite/staticanalysis/NoValueOfOnStringTypeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,4 +296,21 @@ static void method(int i) {
)
);
}

@Test
void doNotRemoveValueOfForNullableStrings() {
rewriteRun(
//language=java
java(
"""
class Test {

String method(Object some) {
return String.valueOf(some.toString());
}
}
"""
)
);
}
}
24 changes: 24 additions & 0 deletions src/test/java/org/openrewrite/staticanalysis/SimplifyBooleanExpressionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,4 +417,28 @@ boolean notOne(A a) {
)
);
}

@Test
void correctlySimplifyNegatedTernaryEqualsNull() {
rewriteRun(
java(
"""
class A {
void doSome(String o1, String o2) {
if (!(o1 == null ? o2 == null : o1.equals(o2))) {
}
}
}
""",
"""
class A {
void doSome(String o1, String o2) {
if (o1 == null ? o2 != null : !o1.equals(o2)) {
}
}
}
"""
)
);
}
}
Loading