Skip to content

Commit 2d43a84

Browse files
committed
Revert "refactor: Add a null method argument ChangeType constructor"
This reverts commit 8833d81.
1 parent 6a13e3b commit 2d43a84

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

src/main/java/org/openrewrite/java/spring/NoRequestMappingAnnotation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public J.Annotation visitAnnotation(J.Annotation annotation, ExecutionContext ct
103103
// Change the Annotation Type
104104
maybeAddImport("org.springframework.web.bind.annotation." + resolvedRequestMappingAnnotationClassName);
105105
a = (J.Annotation) new ChangeType("org.springframework.web.bind.annotation.RequestMapping",
106-
"org.springframework.web.bind.annotation." + resolvedRequestMappingAnnotationClassName, false, null)
106+
"org.springframework.web.bind.annotation." + resolvedRequestMappingAnnotationClassName, false)
107107
.getVisitor().visit(a, ctx, getCursor().getParentOrThrow());
108108

109109
// if there is only one remaining argument now, and it is "path" or "value", then we can drop the key name

src/main/java/org/openrewrite/java/spring/RenameBean.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
114114
if (beanNameExpression == null && isRelevantType(cd.getType()) && StringUtils.uncapitalize(cd.getSimpleName()).equals(oldName)) {
115115
String newFullyQualifiedTypeName = cd.getType().getFullyQualifiedName()
116116
.replaceAll("^((.+\\.)*)[^.]+$", "$1" + StringUtils.capitalize(newName));
117-
acc.add(new ChangeType(cd.getType().getFullyQualifiedName(), newFullyQualifiedTypeName, false, null).getVisitor());
118-
acc.add(new ChangeType(cd.getType().getFullyQualifiedName() + "Test", newFullyQualifiedTypeName + "Test", false, null).getVisitor());
117+
acc.add(new ChangeType(cd.getType().getFullyQualifiedName(), newFullyQualifiedTypeName, false).getVisitor());
118+
acc.add(new ChangeType(cd.getType().getFullyQualifiedName() + "Test", newFullyQualifiedTypeName + "Test", false).getVisitor());
119119
}
120120

121121
// handle annotation renames

src/main/java/org/openrewrite/java/spring/boot2/ReplaceExtendWithAndContextConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public J.Annotation visitAnnotation(J.Annotation annotation, ExecutionContext ct
8989
// Change the @ContextConfiguration annotation to @SpringJUnitConfig
9090
maybeRemoveImport(FQN_CONTEXT_CONFIGURATION);
9191
maybeAddImport(FQN_SPRING_JUNIT_CONFIG);
92-
a = (J.Annotation) new ChangeType(FQN_CONTEXT_CONFIGURATION, FQN_SPRING_JUNIT_CONFIG, false, null)
92+
a = (J.Annotation) new ChangeType(FQN_CONTEXT_CONFIGURATION, FQN_SPRING_JUNIT_CONFIG, false)
9393
.getVisitor().visitNonNull(a, ctx, getCursor().getParentOrThrow());
9494
a = autoFormat(a, ctx);
9595
}

src/main/java/org/openrewrite/java/spring/data/MigrateQuerydslJpaRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
5151
@Override
5252
public J visitCompilationUnit(J.CompilationUnit cu, ExecutionContext ctx) {
5353
J.CompilationUnit c = (J.CompilationUnit) super.visitCompilationUnit(cu, ctx);
54-
doAfterVisit(new ChangeType(originalFqn, targetFqn, false, null).getVisitor());
54+
doAfterVisit(new ChangeType(originalFqn, targetFqn, false).getVisitor());
5555
return c;
5656
}
5757

src/main/java/org/openrewrite/java/spring/framework/MigrateInstantiationAwareBeanPostProcessorAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
6262
@Override
6363
public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionContext ctx) {
6464
J.CompilationUnit compilationUnit = super.visitCompilationUnit(cu, ctx);
65-
doAfterVisit(new ChangeType(fromExtendingFqn, toImplementsFqn, false, null).getVisitor());
65+
doAfterVisit(new ChangeType(fromExtendingFqn, toImplementsFqn, false).getVisitor());
6666
return compilationUnit;
6767
}
6868
});

src/main/java/org/openrewrite/java/spring/security5/AuthorizeHttpRequests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@ private void changeTypesAfterVisit() {
5757
doAfterVisit(new ChangeType(
5858
"org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer.ExpressionInterceptUrlRegistry",
5959
"org.springframework.security.config.annotation.web.configurers.AuthorizeHttpRequestsConfigurer.AuthorizationManagerRequestMatcherRegistry",
60-
false, null).getVisitor());
60+
false).getVisitor());
6161
doAfterVisit(new ChangeType(
6262
"org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer",
6363
"org.springframework.security.config.annotation.web.configurers.AuthorizeHttpRequestsConfigurer",
64-
false, null).getVisitor());
64+
false).getVisitor());
6565
doAfterVisit(new ChangeType(
6666
"org.springframework.security.config.annotation.web.configurers.AbstractInterceptUrlConfigurer",
6767
"org.springframework.security.config.annotation.web.configurers.AuthorizeHttpRequestsConfigurer",
68-
false, null).getVisitor());
68+
false).getVisitor());
6969
}
7070

7171
@Override

src/main/java/org/openrewrite/java/spring/util/concurrent/ListenableToCompletableFuture.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public J.CompilationUnit visitCompilationUnit(J.CompilationUnit compilationUnit,
3232
.getVisitor().visit(cu, ctx, getCursor().getParent());
3333
cu = (J.CompilationUnit) new ChangeType(
3434
"org.springframework.util.concurrent.ListenableFuture",
35-
"java.util.concurrent.CompletableFuture", null, null)
35+
"java.util.concurrent.CompletableFuture", null)
3636
.getVisitor().visit(cu, ctx, getCursor().getParent());
3737
return cu;
3838
}

0 commit comments

Comments
 (0)