Finishing touches

openrewrite · Aug 11, 2024 · fa0eb6d · fa0eb6d
1 parent f730a48
commit fa0eb6d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/main/java/org/openrewrite/java/spring/batch/MigrateStepBuilderFactory.java b/src/main/java/org/openrewrite/java/spring/batch/MigrateStepBuilderFactory.java
@@ -17,6 +17,7 @@
 
 import org.openrewrite.*;
 import org.openrewrite.internal.ListUtils;
+import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.java.*;
 import org.openrewrite.java.search.FindMethods;
 import org.openrewrite.java.search.UsesMethod;
@@ -46,9 +47,9 @@ public String getDescription() {
     @Override
     public TreeVisitor<?, ExecutionContext> getVisitor() {
         return Preconditions.check(new UsesMethod<>(STEP_BUILDER_FACTORY_GET),
-                new TreeVisitor<Tree, ExecutionContext>() {
+                new JavaVisitor<ExecutionContext>() {
                     @Override
-                    public Tree visit(Tree tree, ExecutionContext ctx) {
+                    public J visit(@Nullable Tree tree, ExecutionContext ctx) {
                         tree = new AddJobRepositoryVisitor().visit(tree, ctx);
                         return new NewStepBuilderVisitor().visit(tree, ctx);
                     }

diff --git a/...hSpringBoot_3_0/java/org/openrewrite/java/spring/batch/MigrateStepBuilderFactoryTest.java b/...hSpringBoot_3_0/java/org/openrewrite/java/spring/batch/MigrateStepBuilderFactoryTest.java
@@ -33,7 +33,6 @@ public void defaults(RecipeSpec spec) {
             "spring-batch-core-4.3.+",
             "spring-batch-infrastructure-4.3.+",
             "spring-beans-4.3.30.RELEASE",
-//            "spring-core-4.3.30.RELEASE",
             "spring-context-4.3.30.RELEASE"
           ));
     }
@@ -51,7 +50,7 @@ void replaceStepBuilderFactoryWithTasket() {
               import org.springframework.beans.factory.annotation.Autowired;
               import org.springframework.context.annotation.Bean;
 
-              public class MyJobConfig {
+              class MyJobConfig {
 
                   @Autowired
                   private StepBuilderFactory stepBuilderFactory;
@@ -71,7 +70,7 @@ Step myStep(Tasklet myTasklet) {
               import org.springframework.batch.core.step.tasklet.Tasklet;
               import org.springframework.context.annotation.Bean;
 
-              public class MyJobConfig {
+              class MyJobConfig {
 
                   @Bean
                   Step myStep(Tasklet myTasklet, JobRepository jobRepository) {
@@ -98,7 +97,7 @@ void replaceStepBuilderFactoryWithChunk() {
               import org.springframework.beans.factory.annotation.Autowired;
               import org.springframework.context.annotation.Bean;
 
-              public class MyJobConfig {
+              class MyJobConfig {
 
                   @Autowired
                   private StepBuilderFactory stepBuilderFactory;
@@ -129,7 +128,7 @@ private ItemReader<String> reader() {
               import org.springframework.batch.item.ItemWriter;
               import org.springframework.context.annotation.Bean;
 
-              public class MyJobConfig {
+              class MyJobConfig {
 
                   @Bean
                   Step myStep(JobRepository jobRepository) {
@@ -167,7 +166,7 @@ void replaceStepBuilderFactoryWithCompletionPolicyChunk() {
               import org.springframework.beans.factory.annotation.Autowired;
               import org.springframework.context.annotation.Bean;
 
-              public class MyJobConfig {
+              class MyJobConfig {
 
                   @Autowired
                   private StepBuilderFactory stepBuilderFactory;
@@ -203,7 +202,7 @@ private ItemReader<String> reader() {
               import org.springframework.batch.repeat.CompletionPolicy;
               import org.springframework.context.annotation.Bean;
 
-              public class MyJobConfig {
+              class MyJobConfig {
 
                   @Bean
                   Step myStep(JobRepository jobRepository) {