Code polishing

jeffgbutler · jeffgbutler · commit 9020ae9d2bf6 · 2019-03-02T16:33:17.000-05:00
diff --git a/src/test/java/examples/springbatch/BatchConfiguration.java b/src/test/java/examples/springbatch/BatchConfiguration.java
@@ -44,7 +44,6 @@
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.convert.converter.Converter;
-import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
 
@@ -62,12 +61,11 @@ public class BatchConfiguration {
     
     @Bean
     public DataSource dataSource() {
-        EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder();
-        EmbeddedDatabase db = builder.setType(EmbeddedDatabaseType.HSQL)
+        return new EmbeddedDatabaseBuilder()
+                .setType(EmbeddedDatabaseType.HSQL)
                 .addScript("classpath:/examples/springbatch/schema.sql")
                 .addScript("classpath:/examples/springbatch/data.sql")
                 .build();
-        return db;
     }
     
     @Bean
@@ -97,11 +95,6 @@ public MyBatisCursorItemReader<Person> reader(SqlSessionFactory sqlSessionFactor
         return reader;
     }
     
-    @Bean
-    public PersonProcessor processor() {
-        return new PersonProcessor();
-    }
-    
     @Bean
     public MyBatisBatchItemWriter<Person> writer(SqlSessionFactory sqlSessionFactory,
             Converter<Person, UpdateStatementProvider> convertor) {
@@ -112,11 +105,6 @@ public MyBatisBatchItemWriter<Person> writer(SqlSessionFactory sqlSessionFactory
         return writer;
     }
     
-    @Bean
-    public Converter<Person, UpdateStatementProvider> convertor() {
-        return new UpdateStatementConvertor();
-    }
-    
     @Bean
     public Step step1(ItemReader<Person> reader, ItemProcessor<Person, Person> processor, ItemWriter<Person> writer) {
         return stepBuilderFactory.get("step1")
diff --git a/src/test/java/examples/springbatch/PersonMapper.java b/src/test/java/examples/springbatch/PersonMapper.java
@@ -18,6 +18,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Result;
 import org.apache.ibatis.annotations.Results;
 import org.apache.ibatis.annotations.SelectProvider;
@@ -27,7 +28,7 @@
 import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
 import org.mybatis.dynamic.sql.util.springbatch.SpringBatchProviderAdapter;
 
-
+@Mapper
 public interface PersonMapper {
 
     @SelectProvider(type=SpringBatchProviderAdapter.class, method="select")
diff --git a/src/test/java/examples/springbatch/PersonProcessor.java b/src/test/java/examples/springbatch/PersonProcessor.java
@@ -19,7 +19,9 @@
 import org.springframework.batch.core.annotation.BeforeStep;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.ItemProcessor;
+import org.springframework.stereotype.Component;
 
+@Component
 public class PersonProcessor implements ItemProcessor<Person, Person> {
     
     private ExecutionContext executionContext;
diff --git a/src/test/java/examples/springbatch/UpdateStatementConvertor.java b/src/test/java/examples/springbatch/UpdateStatementConvertor.java
@@ -22,7 +22,9 @@
 import org.mybatis.dynamic.sql.update.UpdateDSL;
 import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
 import org.springframework.core.convert.converter.Converter;
+import org.springframework.stereotype.Component;
 
+@Component
 public class UpdateStatementConvertor implements Converter<Person, UpdateStatementProvider> {
 
     @Override
