diff --git a/spring-batch-excel/pom.xml b/spring-batch-excel/pom.xml index d8f4eb9d..acb55381 100644 --- a/spring-batch-excel/pom.xml +++ b/spring-batch-excel/pom.xml @@ -19,7 +19,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.6 + 4.0.3 diff --git a/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/AbstractExcelItemReader.java b/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/AbstractExcelItemReader.java index aa5ac09a..40728603 100644 --- a/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/AbstractExcelItemReader.java +++ b/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/AbstractExcelItemReader.java @@ -25,17 +25,17 @@ import org.springframework.batch.extensions.excel.support.rowset.DefaultRowSetFactory; import org.springframework.batch.extensions.excel.support.rowset.RowSet; import org.springframework.batch.extensions.excel.support.rowset.RowSetFactory; -import org.springframework.batch.item.file.ResourceAwareItemReaderItemStream; -import org.springframework.batch.item.support.AbstractItemCountingItemStreamItemReader; +import org.springframework.batch.infrastructure.item.file.ResourceAwareItemReaderItemStream; +import org.springframework.batch.infrastructure.item.support.AbstractItemCountingItemStreamItemReader; import org.springframework.beans.factory.InitializingBean; import org.springframework.core.io.Resource; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; /** - * {@link org.springframework.batch.item.ItemReader} implementation to read an Excel file. + * {@link org.springframework.batch.infrastructure.item.ItemReader} implementation to read an Excel file. * It will read the file sheet for sheet and row for row. It is loosy based on the - * {@link org.springframework.batch.item.file.FlatFileItemReader} + * {@link org.springframework.batch.infrastructure.item.file.FlatFileItemReader} * * @param the type * @author Marten Deinum @@ -274,7 +274,7 @@ public void setLinesToSkip(final int linesToSkip) { /** * In strict mode the reader will throw an exception on - * {@link #open(org.springframework.batch.item.ExecutionContext)} if the input + * {@link #open(org.springframework.batch.infrastructure.item.ExecutionContext)} if the input * resource does not exist. * @param strict true by default */ diff --git a/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/ExcelFileParseException.java b/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/ExcelFileParseException.java index c419e794..b68d751f 100644 --- a/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/ExcelFileParseException.java +++ b/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/ExcelFileParseException.java @@ -16,7 +16,7 @@ package org.springframework.batch.extensions.excel; -import org.springframework.batch.item.ParseException; +import org.springframework.batch.infrastructure.item.ParseException; /** * Exception thrown when parsing excel files. The name of the sheet, the row number on diff --git a/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/mapping/BeanWrapperRowMapper.java b/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/mapping/BeanWrapperRowMapper.java index 9db70f3f..561adf58 100644 --- a/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/mapping/BeanWrapperRowMapper.java +++ b/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/mapping/BeanWrapperRowMapper.java @@ -26,7 +26,7 @@ import org.springframework.batch.extensions.excel.RowMapper; import org.springframework.batch.extensions.excel.support.rowset.RowSet; -import org.springframework.batch.support.DefaultPropertyEditorRegistrar; +import org.springframework.batch.infrastructure.support.DefaultPropertyEditorRegistrar; import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanWrapperImpl; import org.springframework.beans.MutablePropertyValues; @@ -149,16 +149,16 @@ public void afterPropertiesSet() { } /** - * Map the {@link org.springframework.batch.item.file.transform.FieldSet} to an object + * Map the {@link org.springframework.batch.infrastructure.item.file.transform.FieldSet} to an object * retrieved from the enclosing Spring context, or to a new instance of the required * type if no prototype is available. * @throws org.springframework.validation.BindException if there is a type conversion * or other error (if the {@link org.springframework.validation.DataBinder} from * {@link #createBinder(Object)} has errors after binding). * @throws org.springframework.beans.NotWritablePropertyException if the - * {@link org.springframework.batch.item.file.transform.FieldSet} contains a field + * {@link org.springframework.batch.infrastructure.item.file.transform.FieldSet} contains a field * that cannot be mapped to a bean property. - * @see org.springframework.batch.item.file.mapping.FieldSetMapper#mapFieldSet(org.springframework.batch.item.file.transform.FieldSet) + * @see org.springframework.batch.infrastructure.item.file.mapping.FieldSetMapper#mapFieldSet(org.springframework.batch.infrastructure.item.file.transform.FieldSet) */ @Override public T mapRow(RowSet rs) throws BindException { diff --git a/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/poi/PoiItemReader.java b/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/poi/PoiItemReader.java index 5d51534d..b4280f36 100644 --- a/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/poi/PoiItemReader.java +++ b/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/poi/PoiItemReader.java @@ -28,9 +28,9 @@ import org.springframework.core.io.Resource; /** - * {@link org.springframework.batch.item.ItemReader} implementation which uses apache POI + * {@link org.springframework.batch.infrastructure.item.ItemReader} implementation which uses apache POI * to read an Excel file. It will read the file sheet for sheet and row for row. It is - * based on the {@link org.springframework.batch.item.file.FlatFileItemReader} + * based on the {@link org.springframework.batch.infrastructure.item.file.FlatFileItemReader} * * This class is not thread-safe. * diff --git a/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/support/rowset/RowSet.java b/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/support/rowset/RowSet.java index 7394f9d1..3edae383 100644 --- a/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/support/rowset/RowSet.java +++ b/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/support/rowset/RowSet.java @@ -19,7 +19,7 @@ import java.util.Properties; /** - * Used by the {@code org.springframework.batch.item.excel.AbstractExcelItemReader} to + * Used by the {@code org.springframework.batch.infrastructure.item.excel.AbstractExcelItemReader} to * abstract away the complexities of the underlying Excel API implementations. * * @author Marten Deinum diff --git a/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/AbstractExcelItemReaderTests.java b/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/AbstractExcelItemReaderTests.java index c869640e..88af3fad 100644 --- a/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/AbstractExcelItemReaderTests.java +++ b/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/AbstractExcelItemReaderTests.java @@ -32,7 +32,7 @@ import org.junit.jupiter.params.provider.MethodSource; import org.springframework.batch.extensions.excel.mapping.PassThroughRowMapper; -import org.springframework.batch.item.ExecutionContext; +import org.springframework.batch.infrastructure.item.ExecutionContext; import org.springframework.core.io.DefaultResourceLoader; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/BeanPropertyItemReaderTests.java b/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/BeanPropertyItemReaderTests.java index 8e582bec..13e2c6f4 100644 --- a/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/BeanPropertyItemReaderTests.java +++ b/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/BeanPropertyItemReaderTests.java @@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test; import org.springframework.batch.extensions.excel.mapping.BeanWrapperRowMapper; -import org.springframework.batch.item.ExecutionContext; +import org.springframework.batch.infrastructure.item.ExecutionContext; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/BeanPropertyWithStaticHeaderItemReaderTests.java b/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/BeanPropertyWithStaticHeaderItemReaderTests.java index 64c8db05..b6493809 100644 --- a/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/BeanPropertyWithStaticHeaderItemReaderTests.java +++ b/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/BeanPropertyWithStaticHeaderItemReaderTests.java @@ -26,7 +26,7 @@ import org.springframework.batch.extensions.excel.mapping.BeanWrapperRowMapper; import org.springframework.batch.extensions.excel.support.rowset.DefaultRowSetFactory; import org.springframework.batch.extensions.excel.support.rowset.StaticColumnNameExtractor; -import org.springframework.batch.item.ExecutionContext; +import org.springframework.batch.infrastructure.item.ExecutionContext; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/poi/PoiItemReaderWithBlankRowSheetTests.java b/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/poi/PoiItemReaderWithBlankRowSheetTests.java index eaae0f3a..6a3851eb 100644 --- a/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/poi/PoiItemReaderWithBlankRowSheetTests.java +++ b/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/poi/PoiItemReaderWithBlankRowSheetTests.java @@ -25,7 +25,7 @@ import org.springframework.batch.extensions.excel.ReflectionTestUtils; import org.springframework.batch.extensions.excel.mapping.PassThroughRowMapper; -import org.springframework.batch.item.ExecutionContext; +import org.springframework.batch.infrastructure.item.ExecutionContext; import org.springframework.core.io.ClassPathResource; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/poi/PoiItemReaderWithErrorsTests.java b/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/poi/PoiItemReaderWithErrorsTests.java index 20b93f30..41f1360e 100644 --- a/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/poi/PoiItemReaderWithErrorsTests.java +++ b/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/poi/PoiItemReaderWithErrorsTests.java @@ -26,7 +26,7 @@ import org.springframework.batch.extensions.excel.ReflectionTestUtils; import org.springframework.batch.extensions.excel.mapping.PassThroughRowMapper; -import org.springframework.batch.item.ExecutionContext; +import org.springframework.batch.infrastructure.item.ExecutionContext; import org.springframework.core.io.ClassPathResource; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/poi/PoiItemReaderXlsTypesTests.java b/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/poi/PoiItemReaderXlsTypesTests.java index 2c804c4d..05ada23e 100644 --- a/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/poi/PoiItemReaderXlsTypesTests.java +++ b/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/poi/PoiItemReaderXlsTypesTests.java @@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test; import org.springframework.batch.extensions.excel.mapping.PassThroughRowMapper; -import org.springframework.batch.item.ExecutionContext; +import org.springframework.batch.infrastructure.item.ExecutionContext; import org.springframework.core.io.ClassPathResource; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/poi/PoiItemReaderXlsxTypesTests.java b/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/poi/PoiItemReaderXlsxTypesTests.java index 5add1ffe..3b59effa 100644 --- a/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/poi/PoiItemReaderXlsxTypesTests.java +++ b/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/poi/PoiItemReaderXlsxTypesTests.java @@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test; import org.springframework.batch.extensions.excel.mapping.PassThroughRowMapper; -import org.springframework.batch.item.ExecutionContext; +import org.springframework.batch.infrastructure.item.ExecutionContext; import org.springframework.core.io.ClassPathResource; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/streaming/StreamingXlsxMappingTests.java b/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/streaming/StreamingXlsxMappingTests.java index 567525e9..167b4d77 100644 --- a/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/streaming/StreamingXlsxMappingTests.java +++ b/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/streaming/StreamingXlsxMappingTests.java @@ -25,7 +25,7 @@ import org.springframework.batch.extensions.excel.mapping.BeanWrapperRowMapper; import org.springframework.batch.extensions.excel.support.rowset.DefaultRowSetFactory; import org.springframework.batch.extensions.excel.support.rowset.StaticColumnNameExtractor; -import org.springframework.batch.item.ExecutionContext; +import org.springframework.batch.infrastructure.item.ExecutionContext; import org.springframework.core.io.ClassPathResource; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/streaming/StreamingXlsxTypesTests.java b/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/streaming/StreamingXlsxTypesTests.java index 7489d76b..05c39220 100644 --- a/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/streaming/StreamingXlsxTypesTests.java +++ b/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/streaming/StreamingXlsxTypesTests.java @@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test; import org.springframework.batch.extensions.excel.mapping.PassThroughRowMapper; -import org.springframework.batch.item.ExecutionContext; +import org.springframework.batch.infrastructure.item.ExecutionContext; import org.springframework.core.io.ClassPathResource; import static org.assertj.core.api.Assertions.assertThat;