refactoring

Author: KTC-YoheiMiyashita

dbAndCsvBatch/src/main/java/com/example/batch/job/CsvToDbJob.java

@@ -18,28 +18,22 @@
 @Configuration
 public class CsvToDbJob {
 
+  private final JobRepository jobRepository;
+  private final PlatformTransactionManager transactionManager;
   private final CsvToDbLogic logic;
   private final BatchNotificationListener listener;
 
   private static final String BATCH_NAME = "CSV_TO_DB";
 
   @Bean
-  public Job createCsvToDbJob(
-      JobRepository jobRepository, PlatformTransactionManager transactionManager) {
-    log.info("Registering job: {}", BATCH_NAME);
-
-    Job myJob =
-        new JobBuilder(BATCH_NAME, jobRepository)
-            .incrementer(new RunIdIncrementer())
-            .listener(listener)
-            .start(
-                new StepBuilder(BATCH_NAME + "-step", jobRepository)
-                    .tasklet(logic, transactionManager)
-                    .build())
-            .build();
-
-    log.info("Job registered successfully: {} ", myJob.getName());
-
-    return myJob;
+  public Job createCsvToDbJob() {
+    return new JobBuilder(BATCH_NAME, jobRepository)
+        .incrementer(new RunIdIncrementer())
+        .listener(listener)
+        .start(
+            new StepBuilder(BATCH_NAME + "-step", jobRepository)
+                .tasklet(logic, transactionManager)
+                .build())
+        .build();
   }
 }

dbAndCsvBatch/src/main/java/com/example/batch/job/DbToCsvJob.java

@@ -18,28 +18,23 @@
 @Configuration
 public class DbToCsvJob {
 
+  private final JobRepository jobRepository;
+  private final PlatformTransactionManager transactionManager;
   private final DbToCsvLogic logic;
   private final BatchNotificationListener listener;
 
   private static final String BATCH_NAME = "DB_TO_CSV";
 
   @Bean
-  public Job createDbToCsvJob(
-      JobRepository jobRepository, PlatformTransactionManager transactionManager) {
-    log.info("Registering job: {}", BATCH_NAME);
-
-    Job myJob =
-        new JobBuilder(BATCH_NAME, jobRepository)
-            .incrementer(new RunIdIncrementer())
-            .listener(listener)
-            .start(
-                new StepBuilder(BATCH_NAME + "-step", jobRepository)
-                    .tasklet(logic, transactionManager)
-                    .build())
-            .build();
-
-    log.info("Job registered successfully: {} ", myJob.getName());
-
-    return myJob;
+  public Job createDbToCsvJob() {
+
+    return new JobBuilder(BATCH_NAME, jobRepository)
+        .incrementer(new RunIdIncrementer())
+        .listener(listener)
+        .start(
+            new StepBuilder(BATCH_NAME + "-step", jobRepository)
+                .tasklet(logic, transactionManager)
+                .build())
+        .build();
   }
 }

skeletonBatch/src/main/java/com/example/batch/job/SampleJob.java

@@ -9,31 +9,30 @@
 import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.batch.core.step.builder.StepBuilder;
 import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.transaction.PlatformTransactionManager;
 
 @Slf4j
 @RequiredArgsConstructor
-@Component
+@Configuration
 public class SampleJob {
 
+  private final JobRepository jobRepository;
+  private final PlatformTransactionManager transactionManager;
   private final SampleLogic logic;
 
-  private static final String BATCH_NAME = "sample";
-
   @Bean
-  public Job createSampleJob(
-      JobRepository jobRepository, PlatformTransactionManager transactionManager) {
-    log.info("----------- Registering job: {} -----------", BATCH_NAME);
+  public Job createSampleJob() {
 
+    // Create a step for processing
     Step myStep =
-        new StepBuilder(BATCH_NAME + "-step", jobRepository)
+        new StepBuilder("processing-step", jobRepository)
             .tasklet(logic, transactionManager)
             .build();
 
-    Job myJob = new JobBuilder(BATCH_NAME + "-job", jobRepository).start(myStep).build();
-
-    log.info("----------- Job registered successfully: {} -----------", myJob.getName());
-    return myJob;
+    // Build and return the job
+    return new JobBuilder("sample-job", jobRepository)
+            .start(myStep)
+            .build();
   }
 }

skeletonBatch/src/main/java/com/example/batch/logic/SampleLogic.java

@@ -16,17 +16,17 @@ public class SampleLogic implements Tasklet {
   private final SampleService sampleService;
 
   @Override
-  public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext)
-      throws Exception {
+  public RepeatStatus execute(StepContribution contribution,
+                              ChunkContext chunkContext) throws Exception {
 
-    log.info("----------- START ----------- SampleLogic ----------- START -----------");
     try {
-      sampleService.execute();
+      // Execute business logic
+      sampleService.process();
+      log.info("Processing completed successfully");
     } catch (Exception e) {
-      log.error("Job failure", e);
+      log.error("Error occurred during processing", e);
       throw e;
     }
-    log.info("-----------  END  ----------- SampleLogic -----------  END  -----------");
 
     return RepeatStatus.FINISHED;
   }

skeletonBatch/src/main/java/com/example/batch/service/SampleService.java

@@ -9,20 +9,15 @@
 @Service
 public class SampleService {
 
-  public void execute() throws Exception {
-    log.info("----------- START ----------- SampleService ----------- START -----------");
+  public void process() throws Exception {
+    log.info("--- Starting batch process ---");
 
-    log.info(
-        System.lineSeparator().repeat(3)
-            + "***************************************************************************************"
-            + System.lineSeparator()
-            + "***                     ここにバッチの業務ロジックを記述する !!!                          ***"
-            + System.lineSeparator()
-            + "***                     Write your batch business logic here!                       ***"
-            + System.lineSeparator()
-            + "***************************************************************************************"
-            + System.lineSeparator().repeat(3));
+    // Add your business logic here
+    // Example:
+    // - Data validation
+    // - Data transformation
+    // - External system integration
 
-    log.info("-----------  END  ----------- SampleService -----------  END  -----------");
+    log.info("--- Batch process completed ---");
   }
 }