Skip to content

Commit b6b9e3c

Browse files
authored
Merge branch 'main' into junit5-annotation-mocked-static-support
2 parents 291b8c4 + d186f6d commit b6b9e3c

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

src/main/java/org/openrewrite/java/testing/mockito/AnyToNullable.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ public TreeVisitor<?, ExecutionContext> getVisitor(AtomicBoolean acc) {
6363
stopAfterPreVisit();
6464
doAfterVisit(new ChangeMethodName(
6565
"org.mockito.Mockito any(java.lang.Class)", "nullable", null, null).getVisitor());
66-
doAfterVisit(new ChangeMethodTargetToStatic(
67-
"org.mockito.Mockito nullable(java.lang.Class)", "org.mockito.ArgumentMatchers", null, null).getVisitor());
66+
doAfterVisit(new ChangeMethodTargetToStatic("org.mockito.Mockito nullable(java.lang.Class)", "org.mockito.ArgumentMatchers", null, null, false).getVisitor());
6867
doAfterVisit(new AnyStringToNullable().getVisitor());
6968
}
7069
return super.preVisit(tree, ctx);

src/main/java/org/openrewrite/java/testing/mockito/MockUtilsToStatic.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,7 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
5454

5555
public static class MockUtilsToStaticVisitor extends JavaVisitor<ExecutionContext> {
5656
private static final MethodMatcher METHOD_MATCHER = new MethodMatcher("org.mockito.internal.util.MockUtil <constructor>()");
57-
private final ChangeMethodTargetToStatic changeMethodTargetToStatic = new ChangeMethodTargetToStatic(
58-
"org.mockito.internal.util.MockUtil *(..)",
59-
"org.mockito.internal.util.MockUtil",
60-
null, null
61-
);
57+
private final ChangeMethodTargetToStatic changeMethodTargetToStatic = new ChangeMethodTargetToStatic("org.mockito.internal.util.MockUtil *(..)", "org.mockito.internal.util.MockUtil", null, null, false);
6258

6359
@Override
6460
public J visitCompilationUnit(J.CompilationUnit compilationUnit, ExecutionContext ctx) {

0 commit comments

Comments
 (0)