diff --git a/spring-batch-plus/src/integrationTest/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamFluxReaderProcessorIntegrationTest.java b/spring-batch-plus/src/integrationTest/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamFluxReaderProcessorIntegrationTest.java index f77b8ad4..34db8e94 100644 --- a/spring-batch-plus/src/integrationTest/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamFluxReaderProcessorIntegrationTest.java +++ b/spring-batch-plus/src/integrationTest/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamFluxReaderProcessorIntegrationTest.java @@ -18,11 +18,24 @@ package com.navercorp.spring.batch.plus.step.adapter; +import static com.navercorp.spring.batch.plus.step.adapter.AdapterFactory.itemProcessor; +import static com.navercorp.spring.batch.plus.step.adapter.AdapterFactory.itemStreamReader; +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.UUID; +import java.util.concurrent.ThreadLocalRandom; + +import javax.sql.DataSource; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.RepeatedTest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.batch.core.*; +import org.springframework.batch.core.BatchStatus; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.JobParametersBuilder; import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing; import org.springframework.batch.core.configuration.annotation.StepScope; import org.springframework.batch.core.job.builder.JobBuilder; @@ -39,14 +52,8 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; import org.springframework.lang.NonNull; import org.springframework.transaction.TransactionManager; -import reactor.core.publisher.Flux; -import javax.sql.DataSource; -import java.util.UUID; -import java.util.concurrent.ThreadLocalRandom; - -import static com.navercorp.spring.batch.plus.step.adapter.AdapterFactory.*; -import static org.assertj.core.api.Assertions.assertThat; +import reactor.core.publisher.Flux; @SuppressWarnings("unchecked") class ItemStreamFluxReaderProcessorIntegrationTest { diff --git a/spring-batch-plus/src/integrationTest/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamIterableReaderProcessorIntegrationTest.java b/spring-batch-plus/src/integrationTest/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamIterableReaderProcessorIntegrationTest.java index f9510194..09e1412f 100644 --- a/spring-batch-plus/src/integrationTest/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamIterableReaderProcessorIntegrationTest.java +++ b/spring-batch-plus/src/integrationTest/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamIterableReaderProcessorIntegrationTest.java @@ -18,11 +18,25 @@ package com.navercorp.spring.batch.plus.step.adapter; +import static com.navercorp.spring.batch.plus.step.adapter.AdapterFactory.itemProcessor; +import static com.navercorp.spring.batch.plus.step.adapter.AdapterFactory.itemStreamReader; +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.Iterator; +import java.util.UUID; +import java.util.concurrent.ThreadLocalRandom; + +import javax.sql.DataSource; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.RepeatedTest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.batch.core.*; +import org.springframework.batch.core.BatchStatus; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.JobParametersBuilder; import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing; import org.springframework.batch.core.configuration.annotation.StepScope; import org.springframework.batch.core.job.builder.JobBuilder; @@ -40,14 +54,6 @@ import org.springframework.lang.NonNull; import org.springframework.transaction.TransactionManager; -import javax.sql.DataSource; -import java.util.Iterator; -import java.util.UUID; -import java.util.concurrent.ThreadLocalRandom; - -import static com.navercorp.spring.batch.plus.step.adapter.AdapterFactory.*; -import static org.assertj.core.api.Assertions.assertThat; - @SuppressWarnings("unchecked") class ItemStreamIterableReaderProcessorIntegrationTest { diff --git a/spring-batch-plus/src/integrationTest/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamIteratorReaderProcessorIntegrationTest.java b/spring-batch-plus/src/integrationTest/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamIteratorReaderProcessorIntegrationTest.java index b35af1e2..e5ff4afa 100644 --- a/spring-batch-plus/src/integrationTest/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamIteratorReaderProcessorIntegrationTest.java +++ b/spring-batch-plus/src/integrationTest/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamIteratorReaderProcessorIntegrationTest.java @@ -18,11 +18,25 @@ package com.navercorp.spring.batch.plus.step.adapter; +import static com.navercorp.spring.batch.plus.step.adapter.AdapterFactory.itemProcessor; +import static com.navercorp.spring.batch.plus.step.adapter.AdapterFactory.itemStreamReader; +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.Iterator; +import java.util.UUID; +import java.util.concurrent.ThreadLocalRandom; + +import javax.sql.DataSource; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.RepeatedTest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.batch.core.*; +import org.springframework.batch.core.BatchStatus; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.JobParametersBuilder; import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing; import org.springframework.batch.core.configuration.annotation.StepScope; import org.springframework.batch.core.job.builder.JobBuilder; @@ -40,14 +54,6 @@ import org.springframework.lang.NonNull; import org.springframework.transaction.TransactionManager; -import javax.sql.DataSource; -import java.util.Iterator; -import java.util.UUID; -import java.util.concurrent.ThreadLocalRandom; - -import static com.navercorp.spring.batch.plus.step.adapter.AdapterFactory.*; -import static org.assertj.core.api.Assertions.assertThat; - @SuppressWarnings("unchecked") class ItemStreamIteratorReaderProcessorIntegrationTest { diff --git a/spring-batch-plus/src/integrationTest/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamSimpleReaderProcessorIntegrationTest.java b/spring-batch-plus/src/integrationTest/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamSimpleReaderProcessorIntegrationTest.java index 4940570b..2f58dcc3 100644 --- a/spring-batch-plus/src/integrationTest/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamSimpleReaderProcessorIntegrationTest.java +++ b/spring-batch-plus/src/integrationTest/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamSimpleReaderProcessorIntegrationTest.java @@ -18,11 +18,24 @@ package com.navercorp.spring.batch.plus.step.adapter; +import static com.navercorp.spring.batch.plus.step.adapter.AdapterFactory.itemProcessor; +import static com.navercorp.spring.batch.plus.step.adapter.AdapterFactory.itemStreamReader; +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.UUID; +import java.util.concurrent.ThreadLocalRandom; + +import javax.sql.DataSource; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.RepeatedTest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.batch.core.*; +import org.springframework.batch.core.BatchStatus; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.JobParametersBuilder; import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing; import org.springframework.batch.core.configuration.annotation.StepScope; import org.springframework.batch.core.job.builder.JobBuilder; @@ -40,13 +53,6 @@ import org.springframework.lang.NonNull; import org.springframework.transaction.TransactionManager; -import javax.sql.DataSource; -import java.util.UUID; -import java.util.concurrent.ThreadLocalRandom; - -import static com.navercorp.spring.batch.plus.step.adapter.AdapterFactory.*; -import static org.assertj.core.api.Assertions.assertThat; - @SuppressWarnings("unchecked") class ItemStreamSimpleReaderProcessorIntegrationTest { diff --git a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamFluxReaderProcessor.java b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamFluxReaderProcessor.java index 4d38a513..b09d4817 100644 --- a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamFluxReaderProcessor.java +++ b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamFluxReaderProcessor.java @@ -20,6 +20,7 @@ import org.springframework.batch.item.ItemProcessor; import org.springframework.batch.item.ItemStreamReader; + import reactor.core.publisher.Flux; /** diff --git a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamIteratorReaderProcessor.java b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamIteratorReaderProcessor.java index dd1354ee..c64969c5 100644 --- a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamIteratorReaderProcessor.java +++ b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/step/adapter/ItemStreamIteratorReaderProcessor.java @@ -18,11 +18,11 @@ package com.navercorp.spring.batch.plus.step.adapter; +import java.util.Iterator; + import org.springframework.batch.item.ItemProcessor; import org.springframework.batch.item.ItemStreamReader; -import java.util.Iterator; - /** * An {@link Iterator} based adapter for stream reader, processor. It can represent * {@link ItemStreamReader}, {@link ItemProcessor} in a single class.