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.
openrewrite · Feb 20, 2024 · 9deb572 · 9deb572
1 parent 9ab5f86
commit 9deb572
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/org/openrewrite/java/spring/batch/ReplaceSupportClassWithItsInterface.java b/src/main/java/org/openrewrite/java/spring/batch/ReplaceSupportClassWithItsInterface.java
@@ -84,7 +84,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl,
                             getCursor(),
                             cd.getCoordinates().addImplementsClause()
                         );
-                    cd = (J.ClassDeclaration) new RemoveSuperStatementVisitor().visitNonNull(cd, ctx, getCursor());
+                    cd = (J.ClassDeclaration) new RemoveSuperStatementVisitor().visitNonNull(cd, ctx, getCursor().getParentOrThrow());
                     maybeRemoveImport(fullyQualifiedClassName);
                     maybeAddImport(fullyQualifiedInterfaceName);
                 }

diff --git a/...main/java/org/openrewrite/java/spring/boot2/ReplaceExtendWithAndContextConfiguration.java b/...main/java/org/openrewrite/java/spring/boot2/ReplaceExtendWithAndContextConfiguration.java
@@ -90,7 +90,7 @@ public J.Annotation visitAnnotation(J.Annotation annotation, ExecutionContext ct
                             maybeRemoveImport(FQN_CONTEXT_CONFIGURATION);
                             maybeAddImport(FQN_SPRING_JUNIT_CONFIG);
                             a = (J.Annotation) new ChangeType(FQN_CONTEXT_CONFIGURATION, FQN_SPRING_JUNIT_CONFIG, false)
-                                    .getVisitor().visitNonNull(a, ctx, getCursor());
+                                    .getVisitor().visitNonNull(a, ctx, getCursor().getParentOrThrow());
                             a = autoFormat(a, ctx);
                         }
 

diff --git a/src/main/java/org/openrewrite/java/spring/boot3/AddRouteTrailingSlash.java b/src/main/java/org/openrewrite/java/spring/boot3/AddRouteTrailingSlash.java
@@ -71,7 +71,7 @@ public J.Annotation visitAnnotation(J.Annotation annotation, ExecutionContext ct
                                 .build()
                                 .apply(getCursor(),
                                         anno.getCoordinates().replaceArguments(),
-                                        buildTwoStringsArray(str));
+                                        (Object[]) buildTwoStringsArray(str));
                         return autoFormat(replacement, ctx);
                     }
                 } else {
@@ -90,7 +90,7 @@ public J.Annotation visitAnnotation(J.Annotation annotation, ExecutionContext ct
                                             .build()
                                             .<J.Annotation>apply(getCursor(),
                                                     anno.getCoordinates().replaceArguments(),
-                                                    buildTwoStringsArray(str)).getArguments().get(0);
+                                                    (Object[]) buildTwoStringsArray(str)).getArguments().get(0);
                                 }
                             }
                         }

diff --git a/src/main/java/org/openrewrite/java/spring/framework/MigrateWebMvcConfigurerAdapter.java b/src/main/java/org/openrewrite/java/spring/framework/MigrateWebMvcConfigurerAdapter.java
@@ -63,7 +63,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
                                             .classpathFromResources(ctx, "spring-webmvc-5.*"))
                                     .build().apply(getCursor(), cd.getCoordinates().addImplementsClause());
                     updateCursor(cd);
-                    cd = (J.ClassDeclaration) new RemoveSuperStatementVisitor().visitNonNull(cd, ctx, getCursor());
+                    cd = (J.ClassDeclaration) new RemoveSuperStatementVisitor().visitNonNull(cd, ctx, getCursor().getParentOrThrow());
                     maybeRemoveImport("org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter");
                     maybeAddImport("org.springframework.web.servlet.config.annotation.WebMvcConfigurer");
                 }