Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,11 @@ private boolean isEquals(Expression expr) {

J.MethodInvocation methodInvocation = (J.MethodInvocation) expr;

return "equals".equals(methodInvocation.getName().getSimpleName()) &&
methodInvocation.getArguments().size() == 1;
if (!"equals".equals(methodInvocation.getName().getSimpleName()) ||
methodInvocation.getArguments().size() != 1) {
return false;
}
return !J.Literal.isLiteralValue(methodInvocation.getArguments().get(0), null);
}
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,11 @@ private boolean isEquals(Expression expr) {

J.MethodInvocation methodInvocation = (J.MethodInvocation) expr;

return "equals".equals(methodInvocation.getName().getSimpleName()) &&
methodInvocation.getArguments().size() == 1;
if (!"equals".equals(methodInvocation.getName().getSimpleName()) ||
methodInvocation.getArguments().size() != 1) {
return false;
}
return !J.Literal.isLiteralValue(methodInvocation.getArguments().get(0), null);
}
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,27 @@ void test() {
);
}

@SuppressWarnings({"ConstantConditions", "SimplifiableAssertion"})
@Test
void doNotConvertWhenArgumentToEqualsIsNull() {
//language=java
rewriteRun(
java(
"""
import static org.junit.jupiter.api.Assertions.assertFalse;

public class Test {
void test() {
String a = "a";
assertFalse(a.equals(null));
assertFalse(a.equals(null), "message");
}
}
"""
)
);
}

@SuppressWarnings("ConstantConditions")
@Test
void retainEqualsAndedWithSomethingElse() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,27 @@ void test() {
);
}

@SuppressWarnings({"ConstantConditions", "SimplifiableAssertion"})
@Test
void doNotConvertWhenArgumentToEqualsIsNull() {
//language=java
rewriteRun(
java(
"""
import static org.junit.jupiter.api.Assertions.assertTrue;

public class Test {
void test() {
String a = "a";
assertTrue(a.equals(null));
assertTrue(a.equals(null), "message");
}
}
"""
)
);
}

@SuppressWarnings("ConstantConditions")
@Test
void retainEqualsAndedWithSomethingElse() {
Expand Down