Skip to content

Commit 9deb572

Browse files
Pass correct cursor in visitNonNull() calls (#495)
* Pass correct cursor in `visitNonNull()` calls * Fix compile error in `DowngradeServletApiWhenUsingJetty` * Fix two compiler warnings * Revert "Fix compile error in `DowngradeServletApiWhenUsingJetty`" This reverts commit 5548109.
1 parent 9ab5f86 commit 9deb572

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

src/main/java/org/openrewrite/java/spring/batch/ReplaceSupportClassWithItsInterface.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl,
8484
getCursor(),
8585
cd.getCoordinates().addImplementsClause()
8686
);
87-
cd = (J.ClassDeclaration) new RemoveSuperStatementVisitor().visitNonNull(cd, ctx, getCursor());
87+
cd = (J.ClassDeclaration) new RemoveSuperStatementVisitor().visitNonNull(cd, ctx, getCursor().getParentOrThrow());
8888
maybeRemoveImport(fullyQualifiedClassName);
8989
maybeAddImport(fullyQualifiedInterfaceName);
9090
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public J.Annotation visitAnnotation(J.Annotation annotation, ExecutionContext ct
9090
maybeRemoveImport(FQN_CONTEXT_CONFIGURATION);
9191
maybeAddImport(FQN_SPRING_JUNIT_CONFIG);
9292
a = (J.Annotation) new ChangeType(FQN_CONTEXT_CONFIGURATION, FQN_SPRING_JUNIT_CONFIG, false)
93-
.getVisitor().visitNonNull(a, ctx, getCursor());
93+
.getVisitor().visitNonNull(a, ctx, getCursor().getParentOrThrow());
9494
a = autoFormat(a, ctx);
9595
}
9696

src/main/java/org/openrewrite/java/spring/boot3/AddRouteTrailingSlash.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public J.Annotation visitAnnotation(J.Annotation annotation, ExecutionContext ct
7171
.build()
7272
.apply(getCursor(),
7373
anno.getCoordinates().replaceArguments(),
74-
buildTwoStringsArray(str));
74+
(Object[]) buildTwoStringsArray(str));
7575
return autoFormat(replacement, ctx);
7676
}
7777
} else {
@@ -90,7 +90,7 @@ public J.Annotation visitAnnotation(J.Annotation annotation, ExecutionContext ct
9090
.build()
9191
.<J.Annotation>apply(getCursor(),
9292
anno.getCoordinates().replaceArguments(),
93-
buildTwoStringsArray(str)).getArguments().get(0);
93+
(Object[]) buildTwoStringsArray(str)).getArguments().get(0);
9494
}
9595
}
9696
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
6363
.classpathFromResources(ctx, "spring-webmvc-5.*"))
6464
.build().apply(getCursor(), cd.getCoordinates().addImplementsClause());
6565
updateCursor(cd);
66-
cd = (J.ClassDeclaration) new RemoveSuperStatementVisitor().visitNonNull(cd, ctx, getCursor());
66+
cd = (J.ClassDeclaration) new RemoveSuperStatementVisitor().visitNonNull(cd, ctx, getCursor().getParentOrThrow());
6767
maybeRemoveImport("org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter");
6868
maybeAddImport("org.springframework.web.servlet.config.annotation.WebMvcConfigurer");
6969
}

0 commit comments

Comments
 (0)