Skip to content

Drop forced maybeAddImport(.., false) where templates already attribute the added types #1234

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 2 commits into from
Oct 25, 2026
Merged

Drop forced maybeAddImport(.., false) where templates already attribute the added types #1234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b6a8d4
Drop forced maybeAddImport now that templates attribute the added types
timtebeek Oct 25, 2026
de4ff40
Remove comments about the dropped forced imports
timtebeek Oct 25, 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
4 changes: 2 additions & 2 deletions src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertArrayEqualsToAssertThat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
}

maybeRemoveImport(JUNIT);
maybeAddImport(ASSERTJ, "assertThat", false);
maybeAddImport(ASSERTJ, "assertThat");

List<Expression> args = md.getArguments();
Expression expected = args.get(0);
Expand All @@ -79,7 +79,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
.apply(getCursor(), md.getCoordinates().replace(), actual, message, expected);
}

maybeAddImport(ASSERTJ, "within", false);
maybeAddImport(ASSERTJ, "within");
Expression delta = args.get(2);
if (args.size() == 3) {
return JavaTemplate.builder("assertThat(#{anyArray()}).containsExactly(#{anyArray()}, within(" + widenedTo(deltaType, delta) + "));")
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertEqualsToAssertThat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
}

maybeRemoveImport(JUNIT);
maybeAddImport(ASSERTJ, "assertThat", false);
maybeAddImport(ASSERTJ, "assertThat");

List<Expression> args = mi.getArguments();
Expression expected = args.get(0);
Expand Down Expand Up @@ -96,7 +96,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
.build()
.apply(getCursor(), mi.getCoordinates().replace(), actual, expected);
}
maybeAddImport(ASSERTJ, "within", false);
maybeAddImport(ASSERTJ, "within");
return JavaTemplate.builder("assertThat(" + widenedTo(deltaType, actual) + ").isCloseTo(#{any()}, within(" + widenedTo(deltaType, delta) + "));")
.staticImports(ASSERTJ + ".assertThat", ASSERTJ + ".within")
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "assertj-core-3"))
Expand All @@ -113,7 +113,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
.build()
.apply(getCursor(), mi.getCoordinates().replace(), actual, message, expected);
}
maybeAddImport(ASSERTJ, "within", false);
maybeAddImport(ASSERTJ, "within");
return JavaTemplate.builder("assertThat(" + widenedTo(deltaType, actual) + ").as(#{any()}).isCloseTo(#{any()}, within(" + widenedTo(deltaType, delta) + "));")
.staticImports(ASSERTJ + ".assertThat", ASSERTJ + ".within")
.imports("java.util.function.Supplier")
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertFalseToAssertThat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
}

maybeRemoveImport("org.junit.jupiter.api.Assertions");
maybeAddImport("org.assertj.core.api.Assertions", "assertThat", false);
maybeAddImport("org.assertj.core.api.Assertions", "assertThat");

List<Expression> args = mi.getArguments();
Expression actual = args.get(0);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertInstanceOfToAssertThat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
}

maybeRemoveImport("org.junit.jupiter.api.Assertions");
maybeAddImport("org.assertj.core.api.Assertions", "assertThat", false);
maybeAddImport("org.assertj.core.api.Assertions", "assertThat");

Expression expected = mi.getArguments().get(0);
Expression actual = mi.getArguments().get(1);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertNotEqualsToAssertThat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
}

maybeRemoveImport(JUNIT);
maybeAddImport(ASSERTJ, "assertThat", false);
maybeAddImport(ASSERTJ, "assertThat");

List<Expression> args = mi.getArguments();
Expression expected = args.get(0);
Expand All @@ -84,7 +84,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
.apply(getCursor(), mi.getCoordinates().replace(), actual, message, expected);
}

maybeAddImport(ASSERTJ, "within", false);
maybeAddImport(ASSERTJ, "within");
Expression delta = args.get(2);
if (args.size() == 3) {
return JavaTemplate.builder("assertThat(" + widenedTo(deltaType, actual) + ").isNotCloseTo(#{any()}, within(" + widenedTo(deltaType, delta) + "));")
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertNotNullToAssertThat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
}

maybeRemoveImport("org.junit.jupiter.api.Assertions");
maybeAddImport("org.assertj.core.api.Assertions", "assertThat", false);
maybeAddImport("org.assertj.core.api.Assertions", "assertThat");

List<Expression> args = mi.getArguments();
Expression actual = args.get(0);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertNullToAssertThat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
}

maybeRemoveImport("org.junit.jupiter.api.Assertions");
maybeAddImport("org.assertj.core.api.Assertions", "assertThat", false);
maybeAddImport("org.assertj.core.api.Assertions", "assertThat");

List<Expression> args = mi.getArguments();
Expression actual = args.get(0);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertSameToAssertThat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
}

maybeRemoveImport("org.junit.jupiter.api.Assertions");
maybeAddImport("org.assertj.core.api.Assertions", "assertThat", false);
maybeAddImport("org.assertj.core.api.Assertions", "assertThat");

List<Expression> args = mi.getArguments();
Expression expected = args.get(0);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertTrueToAssertThat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
}

maybeRemoveImport("org.junit.jupiter.api.Assertions");
maybeAddImport("org.assertj.core.api.Assertions", "assertThat", false);
maybeAddImport("org.assertj.core.api.Assertions", "assertThat");

List<Expression> args = mi.getArguments();
Expression actual = args.get(0);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/openrewrite/java/testing/assertj/JUnitFailToAssertJFail.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
}

maybeRemoveImport(JUNIT + ".fail");
maybeAddImport(ASSERTJ, "fail", false);
maybeAddImport(ASSERTJ, "fail");

List<Expression> arguments = mi.getArguments();
String anyArgs = String.join(",", nCopies(arguments.size(), "#{any()}"));
Expand Down
10 changes: 4 additions & 6 deletions src/main/java/org/openrewrite/java/testing/jmockit/JMockitBlockRewriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,9 +315,7 @@ private void rewriteResult(J.MethodInvocation invocation, List<Expression> resul
}

setNextStatementCoordinates(++numStatementsAdded);
// do this last making sure rewrite worked and specify onlyifReferenced=false because framework cannot find static
// reference for when method invocation when another static mockit reference is added
visitor.maybeAddImport(MOCKITO_IMPORT_FQN_PREFX, "when", false);
visitor.maybeAddImport(MOCKITO_IMPORT_FQN_PREFX, "when");
if (lenient) {
visitor.maybeAddImport(MOCKITO_IMPORT_FQN_PREFX, "lenient");
}
Expand Down Expand Up @@ -431,15 +429,15 @@ private void rewriteVerify(J.MethodInvocation invocation, @Nullable Expression t
setNextStatementCoordinates(++numStatementsAdded);
}

visitor.maybeAddImport(MOCKITO_IMPORT_FQN_PREFX, "verify", false);
visitor.maybeAddImport(MOCKITO_IMPORT_FQN_PREFX, "verify");
if (!verificationMode.isEmpty()) {
visitor.maybeAddImport(MOCKITO_IMPORT_FQN_PREFX, verificationMode);
}
}

private void rewriteFullVerify(List<Object> mocks) {
if (rewriteMultipleMocks(mocks, VERIFY_NO_INTERACTIONS_TEMPLATE_PREFIX)) { // verifyNoMoreInteractions(mock1, mock2 ...
visitor.maybeAddImport(MOCKITO_IMPORT_FQN_PREFX, "verifyNoMoreInteractions", false);
visitor.maybeAddImport(MOCKITO_IMPORT_FQN_PREFX, "verifyNoMoreInteractions");
}
}

Expand All @@ -450,7 +448,7 @@ private void rewriteInOrderVerify(List<Object> mocks) {
}
sb.append(VERIFY_IN_ORDER_TEMPLATE_PREFIX_2); // InOrder inOrder1 = inOrder(
if (rewriteMultipleMocks(mocks, sb.toString())) { // InOrder inOrder = inOrder(mock1, mock2 ..)
visitor.maybeAddImport(MOCKITO_IMPORT_FQN_PREFX, "inOrder", false);
visitor.maybeAddImport(MOCKITO_IMPORT_FQN_PREFX, "inOrder");
visitor.maybeAddImport(IN_ORDER_IMPORT_FQN);
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/openrewrite/java/testing/jmockit/JMockitMockUpToMockito.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,8 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration methodDecl
}

maybeAddImport(MOCKITO_CONSTRUCTION_IMPORT);
maybeAddImport("org.mockito.Answers", "CALLS_REAL_METHODS", false);
maybeAddImport("org.mockito.AdditionalAnswers", "delegatesTo", false);
maybeAddImport("org.mockito.Answers", "CALLS_REAL_METHODS");
maybeAddImport("org.mockito.AdditionalAnswers", "delegatesTo");
}

List<Statement> statements = md.getBody().getStatements();
Expand Down Expand Up @@ -300,15 +300,15 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration methodDecl

maybeRemoveImport(JMOCKIT_MOCK_IMPORT);
maybeRemoveImport(JMOCKIT_MOCKUP_IMPORT);
maybeAddImport(MOCKITO_ALL_IMPORT.replace(".*", ""), "*", false);
maybeAddImport(MOCKITO_ALL_IMPORT.replace(".*", ""), "*");

doAfterVisit(new LambdaBlockToExpression().getVisitor());
doAfterVisit(ShortenFullyQualifiedTypeReferences.modifyOnly(md));
return maybeAutoFormat(methodDecl, md, ctx);
}

private String getMatcher(JavaType s) {
maybeAddImport(MOCKITO_MATCHER_IMPORT.replace(".*", ""), "*", false);
maybeAddImport(MOCKITO_MATCHER_IMPORT.replace(".*", ""), "*");
if (s instanceof JavaType.Primitive) {
switch (s.toString()) {
case "int":
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/openrewrite/java/testing/junit5/AssertThrowsOnLastStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,17 +194,17 @@ private Statement extractExpressionArguments(J.Block body, Statement lambdaState
// TODO look into possibly employing `TypeUtils.toString()` here, possibly with some changes upstream allowing for non-fully-qualified names
variableTypeShort = buildParameterizedTypeName(paramType);
variableTypeFqn = paramType;
maybeAddImport(paramType.getFullyQualifiedName(), false);
maybeAddImport(paramType.getFullyQualifiedName());
for (JavaType typeParam : paramType.getTypeParameters()) {
if (typeParam instanceof JavaType.FullyQualified) {
maybeAddImport(((JavaType.FullyQualified) typeParam).getFullyQualifiedName(), false);
maybeAddImport(((JavaType.FullyQualified) typeParam).getFullyQualifiedName());
}
}
} else if (type instanceof JavaType.FullyQualified) {
JavaType.FullyQualified aClass = (JavaType.FullyQualified) type;
variableTypeShort = aClass.getClassName();
variableTypeFqn = aClass;
maybeAddImport(aClass.getFullyQualifiedName(), false);
maybeAddImport(aClass.getFullyQualifiedName());
}

Cursor blockCursor = new Cursor(getCursor(), body);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/openrewrite/java/testing/junit5/ExpectedExceptionToAssertThrows.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ public J.Block visitBlock(J.Block block, ExecutionContext ctx) {
exceptionClass = "Exception.class";
}

maybeAddImport("org.junit.jupiter.api.Assertions", "assertThrows", false);
maybeAddImport("org.junit.jupiter.api.Assertions", "assertThrows");
Statement firstExpectedExceptionMethodInvocation = getCursor().getMessage(FIRST_EXPECTED_EXCEPTION_METHOD_INVOCATION);
String templateString = exceptionClass instanceof String ? "#{}assertThrows(#{}, () -> #{any()});" : "#{}assertThrows(#{any()}, () -> #{any()});";
b = JavaTemplate.builder(templateString)
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/org/openrewrite/java/testing/junit5/UpdateTestAnnotation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,7 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex
.apply(updateCursor(m), m.getCoordinates().replaceBody(), cta.expectedException, lambda);
// Only remove the throws clause for the specific exception being tested
m = removeSpecificThrowsClause(m, cta.expectedException);
// Unconditionally add the import for assertThrows, got a report where the above template adds the method successfully
// but with missing type attribution for assertThrows so the import was missing
maybeAddImport("org.junit.jupiter.api.Assertions", "assertThrows", false);
maybeAddImport("org.junit.jupiter.api.Assertions", "assertThrows");
}
}
if (cta.timeout != null) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/openrewrite/java/testing/mockito/AnyStringToNullable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
J.MethodInvocation mi = super.visitMethodInvocation(method, ctx);
if (ANY_STRING.matches(mi)) {
maybeRemoveImport("org.mockito.Mockito.anyString");
maybeAddImport("org.mockito.ArgumentMatchers", "nullable", false);
maybeAddImport("org.mockito.ArgumentMatchers", "nullable");
return JavaTemplate.builder("nullable(String.class)")
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "mockito-core-3.12"))
.staticImports("org.mockito.ArgumentMatchers.nullable")
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/org/openrewrite/java/testing/mockito/MockitoWhenOnStaticToMockStatic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,11 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
J.ClassDeclaration after = JavaTemplate
.builder(String.format("private%s MockedStatic<%s> %s;", staticSetup ? " static" : "", className, variableName))
.contextSensitive()
.imports("org.mockito.MockedStatic")
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "mockito-core-5"))
.build()
.apply(updateCursor(classDecl), classDecl.getBody().getCoordinates().firstStatement());
maybeAddImport("org.mockito.MockedStatic");

List<Statement> afterStatements = after.getBody().getStatements();
AnnotationMatcher specificBeforeMatcher = new AnnotationMatcher(matchedAnnotation);
Expand Down Expand Up @@ -298,7 +301,7 @@ private JavaTemplate javaTemplateMockStatic(J.MethodInvocation stubbing, String
if (((J.MethodInvocation) requireNonNull(stubbing.getSelect())).getSelect() != null) {
maybeRemoveImport("org.mockito.Mockito");
}
maybeAddImport("org.mockito.MockedStatic", false);
maybeAddImport("org.mockito.MockedStatic");
maybeAddImport("org.mockito.Mockito", "mockStatic");
return JavaTemplate.builder(code)
.contextSensitive()
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/openrewrite/java/testing/testng/TestNgAssertEqualsDeepToAssertThat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
}

maybeRemoveImport("org.testng.Assert");
maybeAddImport(ASSERTJ, "assertThat", false);
maybeAddImport(ASSERTJ, "assertThat");

List<Expression> args = method.getArguments();
Expression actual = args.get(0);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/openrewrite/java/testing/testng/TestNgAssertEqualsNoOrderToAssertThat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
}

maybeRemoveImport("org.testng.Assert");
maybeAddImport("org.assertj.core.api.Assertions", "assertThat", false);
maybeAddImport("org.assertj.core.api.Assertions", "assertThat");

List<Expression> args = method.getArguments();
Expression actual = args.get(0);
Expand Down
Loading
Loading