feat: update dependencies

docker-compose.yaml

@@ -0,0 +1,20 @@
+version: "2.2"
+services:
+  mongo:
+    image: mongo:5.0
+    container_name: mongo
+    restart: unless-stopped
+    ports:
+      - "27017:27017"
+
+  mongo-express:
+    image: mongo-express:latest
+    container_name: mongo-express
+    environment:
+      - ME_CONFIG_MONGODB_URL=mongodb://mongo:27017/?authSource=admin
+      - ME_CONFIG_BASICAUTH_USERNAME=admin
+      - ME_CONFIG_BASICAUTH_PASSWORD=pass
+    links:
+      - mongo
+    ports:
+      - "8081:8081"

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.4</version>
+        <version>3.2.1</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.springbatch.excel</groupId>
@@ -14,8 +14,8 @@
     <name>tutorial</name>
     <description>Demo project for Spring Boot</description>
     <properties>
-        <java.version>1.8</java.version>
-        <poi.version>4.1.2</poi.version>
+        <java.version>21</java.version>
+        <poi.version>5.2.4</poi.version>
     </properties>
     <dependencies>
         <dependency>
@@ -43,6 +43,8 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>1.18.30</version>
+            <scope>provided</scope>
             <optional>true</optional>
         </dependency>
         <dependency>
@@ -51,29 +53,16 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.springframework.batch</groupId>
-            <artifactId>spring-batch-test</artifactId>
-            <scope>test</scope>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <!-- <scope>test</scope> -->
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>
-                            <groupId>org.projectlombok</groupId>
-                            <artifactId>lombok</artifactId>
-                        </exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
 
 </project>

src/main/java/com/springbatch/excel/tutorial/TutorialApplication.java

@@ -2,11 +2,10 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @EnableScheduling
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
+@SpringBootApplication
 public class TutorialApplication {
 
     public static void main(String[] args) {

src/main/java/com/springbatch/excel/tutorial/batch/BatchConfiguration.java

@@ -4,39 +4,37 @@
 import com.springbatch.excel.tutorial.batch.processors.EmployeeItemProcessor;
 import com.springbatch.excel.tutorial.batch.validators.EmployeeJobParametersValidator;
 import com.springbatch.excel.tutorial.domain.Employee;
+import lombok.RequiredArgsConstructor;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobParametersValidator;
 import org.springframework.batch.core.Step;
-import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
-import org.springframework.batch.core.configuration.annotation.JobBuilderFactory;
-import org.springframework.batch.core.configuration.annotation.StepBuilderFactory;
 import org.springframework.batch.core.job.CompositeJobParametersValidator;
+import org.springframework.batch.core.job.builder.JobBuilder;
 import org.springframework.batch.core.launch.support.RunIdIncrementer;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.step.builder.StepBuilder;
 import org.springframework.batch.item.ItemProcessor;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.data.MongoItemWriter;
 import org.springframework.batch.item.data.builder.MongoItemWriterBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.transaction.PlatformTransactionManager;
 
 import java.util.Collections;
 
 /**
  * Configuration for batch
  */
-@EnableBatchProcessing
 @Configuration
+@RequiredArgsConstructor
 public class BatchConfiguration {
 
-    public final JobBuilderFactory jobBuilderFactory;
+    public final JobRepository jobRepository;
+    public final MongoTemplate mongoTemplate;
+    public final PlatformTransactionManager transactionManager;
 
-    public final StepBuilderFactory stepBuilderFactory;
-
-    public BatchConfiguration(JobBuilderFactory jobBuilderFactory, StepBuilderFactory stepBuilderFactory) {
-        this.jobBuilderFactory = jobBuilderFactory;
-        this.stepBuilderFactory = stepBuilderFactory;
-    }
 
     @Bean
     public JobParametersValidator jobParametersValidator() {
@@ -61,39 +59,41 @@ public ItemReader<Employee> itemReader() {
     }
 
     @Bean
-    public MongoItemWriter<Employee> writer(MongoTemplate mongoTemplate) {
-        return new MongoItemWriterBuilder<Employee>().template(mongoTemplate).collection("employee")
+    public MongoItemWriter<Employee> writerMongo() {
+        return new MongoItemWriterBuilder<Employee>()
+                .template(mongoTemplate)
+                .collection("employee")
                 .build();
     }
 
 
-    /**
-     * step declaration
-     * @return {@link Step}
-     */
     @Bean
-    public Step employeeStep(MongoItemWriter<Employee> itemWriter) {
-        return stepBuilderFactory.get("employeeStep")
-                .<Employee, Employee>chunk(50)
+    public Step employeeStep() {
+        return new StepBuilder("employeeStep", jobRepository)
+                .<Employee, Employee>chunk(50, transactionManager)
                 .reader(itemReader())
                 .processor(itemProcessor())
-                .writer(itemWriter)
+                .writer(writerMongo())
                 .build();
     }
 
+    @Bean
+    public JobCompletionListener listener() {
+        return new JobCompletionListener();
+    }
 
 
     /**
      * job declaration
-     * @param listener {@link JobCompletionListener}
+     *
      * @return {@link Job}
      */
     @Bean
-    public Job employeeJob(JobCompletionListener listener, Step employeeStep) {
-        return jobBuilderFactory.get("employeeJob")
+    public Job employeeJob() {
+        return new JobBuilder("employeeJob", jobRepository)
                 .incrementer(new RunIdIncrementer())
-                .listener(listener)
-                .flow(employeeStep)
+                .listener(listener())
+                .flow(employeeStep())
                 .end()
                 .validator(compositeJobParametersValidator())
                 .build();

src/main/java/com/springbatch/excel/tutorial/batch/EmployeeItemReader.java

@@ -3,9 +3,8 @@
 import com.springbatch.excel.tutorial.batch.mappers.EmployeeItemRowMapper;
 import com.springbatch.excel.tutorial.domain.Employee;
 import com.springbatch.excel.tutorial.support.poi.AbstractExcelPoi;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.formula.eval.NotImplementedException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.batch.core.ExitStatus;
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.StepExecutionListener;
@@ -15,10 +14,9 @@
 
 import java.util.List;
 
+@Slf4j
 @Component
-public class EmployeeItemReader extends AbstractExcelPoi<Employee> implements ItemReader<Employee> , StepExecutionListener {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(EmployeeItemReader.class);
+public class EmployeeItemReader extends AbstractExcelPoi<Employee> implements ItemReader<Employee>, StepExecutionListener {
 
     private int employeeIndex = 0;
 
@@ -40,7 +38,7 @@ public Employee read() {
             // read data in file
             employeeList = read(path, new EmployeeItemRowMapper());
 
-            if(!employeeList.isEmpty()) {
+            if (!employeeList.isEmpty()) {
 
                 if (employeeIndex < employeeList.size()) {
                     employee = employeeList.get(employeeIndex);
@@ -50,14 +48,14 @@ public Employee read() {
                 }
             }
         } catch (Exception e) {
-            LOGGER.warn("Cannot read the excel file: {}", e.getMessage());
+            log.warn("Cannot read the excel file: {}", e.getMessage());
         }
 
         return employee;
     }
 
     @Override
-    public void write(String filePath , List<Employee> aList) {
+    public void write(String filePath, List<Employee> aList) {
         throw new NotImplementedException("No need to implement this method in the context");
     }
 

src/main/java/com/springbatch/excel/tutorial/batch/EmployeeJobLauncher.java

@@ -1,7 +1,7 @@
 package com.springbatch.excel.tutorial.batch;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.JobParametersBuilder;
@@ -19,38 +19,33 @@
 /**
  * @author aek
  */
+@Slf4j
 @Component
+@RequiredArgsConstructor
 public class EmployeeJobLauncher {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(EmployeeJobLauncher.class);
-
     private final Job job;
 
     private final JobLauncher jobLauncher;
 
     @Value("${employee.excel.processingfolder}")
     private String processingDir;
 
-    EmployeeJobLauncher(Job job, JobLauncher jobLauncher) {
-        this.job = job;
-        this.jobLauncher = jobLauncher;
-    }
-
     // run every 2 min
     @Scheduled(fixedRate = 120000)
     void launchFileToJob() throws JobParametersInvalidException, JobExecutionAlreadyRunningException, JobInstanceAlreadyCompleteException, JobRestartException {
-        LOGGER.info("Starting job");
+        log.info("Starting job");
         String excelFilePath = String.format("%s/employee.xlsx", processingDir);
 
         JobParameters params = new JobParametersBuilder()
-                .addLong("jobId",System.currentTimeMillis())
-                .addDate("currentTime",new Date())
-                .addString("excelPath",excelFilePath)
+                .addLong("jobId", System.currentTimeMillis())
+                .addDate("currentTime", new Date())
+                .addString("excelPath", excelFilePath)
                 .toJobParameters();
 
         jobLauncher.run(job, params);
 
-        LOGGER.info("Stopping job");
+        log.info("Stopping job");
     }
 
 }

src/main/java/com/springbatch/excel/tutorial/batch/listeners/JobCompletionListener.java

@@ -1,40 +1,38 @@
 package com.springbatch.excel.tutorial.batch.listeners;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.listener.JobExecutionListenerSupport;
 import org.springframework.stereotype.Component;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 
+@Slf4j
 @Component
 public class JobCompletionListener extends JobExecutionListenerSupport {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(JobCompletionListener.class);
-
     @Override
     public void afterJob(JobExecution jobExecution) {
 
-        String jobId = jobExecution.getJobParameters().getString("jobId");
+        String jobId = jobExecution.getJobParameters().getParameter("jobId").toString();
         String excelFilePath = jobExecution.getJobParameters().getString("excelPath");
 
-         // get job's start time
-        Date start = jobExecution.getCreateTime();
+        // get job's start time
+        LocalDateTime start = jobExecution.getCreateTime();
         //  get job's end time
-        Date end = jobExecution.getEndTime();
+        LocalDateTime end = jobExecution.getEndTime();
 
-        if(jobExecution.getStatus() == BatchStatus.COMPLETED) {
+        if (jobExecution.getStatus() == BatchStatus.COMPLETED) {
 
-            LOGGER.info("==========JOB FINISHED=======");
-            LOGGER.info("JobId      : {}",jobId);
-            LOGGER.info("excel Path      : {}",excelFilePath);
-            LOGGER.info("Start Date: {}", start);
-            LOGGER.info("End Date: {}", end);
-            LOGGER.info("==============================");
+            log.info("==========JOB FINISHED=======");
+            log.info("JobId      : {}", jobId);
+            log.info("excel Path      : {}", excelFilePath);
+            log.info("Start Date: {}", start);
+            log.info("End Date: {}", end);
+            log.info("==============================");
         }
 
     }
 
-}
+}

src/main/java/com/springbatch/excel/tutorial/batch/mappers/EmployeeItemRowMapper.java

@@ -10,15 +10,12 @@ public class EmployeeItemRowMapper extends CellFactory implements RowMapper<Empl
 
     @Override
     public Employee transformerRow(Row row) {
-        Employee employee = new Employee();
-
-        employee.setFirstName((String) getCellValue(row.getCell(0)));
-        employee.setLastName((String) getCellValue(row.getCell(1)));
-        employee.setNumber((String) getCellValue(row.getCell(2)));
-        employee.setEmail((String) getCellValue(row.getCell(3)));
-        employee.setDepartment((String) getCellValue(row.getCell(4)));
-        employee.setSalary((Double) getCellValue(row.getCell(5)));
-
-        return employee;
+        return new Employee(null,
+                (String) getCellValue(row.getCell(0)),
+                (String) getCellValue(row.getCell(1)),
+                (String) getCellValue(row.getCell(2)),
+                (String) getCellValue(row.getCell(3)),
+                (String) getCellValue(row.getCell(4)),
+                (Double) getCellValue(row.getCell(5)));
     }
 }