diff --git a/.github/workflows/spring-batch-excel.yml b/.github/workflows/spring-batch-excel.yml index 41bf6262..9fbe9e3e 100644 --- a/.github/workflows/spring-batch-excel.yml +++ b/.github/workflows/spring-batch-excel.yml @@ -15,11 +15,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Set up JDK 21 + - name: Set up JDK 25 uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '21' + java-version: '25' cache: 'maven' - name: Build with Maven run: mvn -B package diff --git a/spring-batch-excel/.mvn/jvm.config b/spring-batch-excel/.mvn/jvm.config new file mode 100644 index 00000000..8488a4fc --- /dev/null +++ b/spring-batch-excel/.mvn/jvm.config @@ -0,0 +1,10 @@ +--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED +--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED +--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED \ No newline at end of file diff --git a/spring-batch-excel/.mvn/wrapper/maven-wrapper.properties b/spring-batch-excel/.mvn/wrapper/maven-wrapper.properties index be4fea70..d0713511 100644 --- a/spring-batch-excel/.mvn/wrapper/maven-wrapper.properties +++ b/spring-batch-excel/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip diff --git a/spring-batch-excel/pom.xml b/spring-batch-excel/pom.xml index 3a3aeb04..2942aff6 100644 --- a/spring-batch-excel/pom.xml +++ b/spring-batch-excel/pom.xml @@ -13,183 +13,209 @@ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. - --> - 4.0.0 + --> + + 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 3.5.6 - - + + org.springframework.boot + spring-boot-starter-parent + 4.0.3 + + - org.springframework.batch.extensions - spring-batch-excel - 0.2.1-SNAPSHOT + org.springframework.batch.extensions + spring-batch-excel + 0.3.0-SNAPSHOT - Spring Batch Excel - Spring Batch extension for Microsoft Excel - https://github.com/spring-projects/spring-batch-extensions/tree/main/spring-batch-excel - - - Apache-2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - + Spring Batch Excel + Spring Batch extension for Microsoft Excel + https://github.com/spring-projects/spring-batch-extensions/tree/main/spring-batch-excel + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + - - - mdeinum - Marten Deinum - marten@deinum.biz - - + + + mdeinum + Marten Deinum + marten@deinum.biz + + - - https://github.com/spring-projects/spring-batch-extensions - git://github.com/spring-projects/spring-batch-extensions.git - git@github.com:spring-projects/spring-batch-extensions.git - + + https://github.com/spring-projects/spring-batch-extensions + git://github.com/spring-projects/spring-batch-extensions.git + git@github.com:spring-projects/spring-batch-extensions.git + - - 5.4.1 - + + 21 + 5.5.1 + - - - - org.apache.poi - poi - ${poi.version} - true - - - org.apache.poi - poi-ooxml - ${poi.version} - true - - - org.springframework.batch - spring-batch-core - - - - org.assertj - assertj-core - test - - - org.junit.jupiter - junit-jupiter - test - - - org.mockito - mockito-core - test - - - org.slf4j - slf4j-nop - test - - + + + + org.apache.poi + poi + ${poi.version} + true + + + org.apache.poi + poi-ooxml + ${poi.version} + true + + + org.springframework.batch + spring-batch-core + + + + org.assertj + assertj-core + test + + + org.junit.jupiter + junit-jupiter + test + + + org.mockito + mockito-core + test + + + org.slf4j + slf4j-nop + test + + - - - - org.apache.maven.plugins - maven-compiler-plugin - - - -Xlint:all,deprecation - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.6.0 - - - com.puppycrawl.tools - checkstyle - 9.3 - - - io.spring.javaformat - spring-javaformat-checkstyle - 0.0.43 - - - - - checkstyle-validation - validate - true - - io/spring/javaformat/checkstyle/checkstyle.xml - true - - - check - - - - - - org.codehaus.mojo - flatten-maven-plugin - 1.6.0 - - - flatten - process-resources - - flatten - - - ossrh - - remove - - - - - flatten-clean - clean - - clean - - - - - - + + + + org.apache.maven.plugins + maven-compiler-plugin + + + -Xlint:all,-varargs + + -XDcompilePolicy=simple + --should-stop=ifError=FLOW + + -Xplugin:ErrorProne + -XepDisableAllChecks + + -Xep:NullAway + -XepOpt:NullAway:OnlyNullMarked + -XepOpt:NullAway:SuppressionNameAliases=DataFlowIssue + + + + + com.google.errorprone + error_prone_core + 2.48.0 + + + com.uber.nullaway + nullaway + 0.13.1 + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.6.0 + + + com.puppycrawl.tools + checkstyle + 13.3.0 + + + io.spring.javaformat + spring-javaformat-checkstyle + 0.0.47 + + + + + checkstyle-validation + validate + true + + io/spring/javaformat/checkstyle/checkstyle.xml + true + + + check + + + + + + org.codehaus.mojo + flatten-maven-plugin + 1.6.0 + + + flatten + process-resources + + flatten + + + ossrh + + remove + + + + + flatten-clean + clean + + clean + + + + + + 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..e5f3d6fa 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,16 @@ 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 @@ -80,7 +79,6 @@ public abstract class AbstractExcelItemReader extends AbstractItemCountingIte public AbstractExcelItemReader() { super(); - this.setName(ClassUtils.getShortName(this.getClass())); } @Override @@ -274,7 +272,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/Sheet.java b/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/Sheet.java index 75760177..ed94466d 100644 --- a/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/Sheet.java +++ b/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/Sheet.java @@ -16,7 +16,7 @@ package org.springframework.batch.extensions.excel; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; /** * Interface to wrap different Excel implementations like JExcel or Apache POI. 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/poi/PoiSheet.java b/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/poi/PoiSheet.java index 3b5b184b..ce51bbb9 100644 --- a/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/poi/PoiSheet.java +++ b/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/poi/PoiSheet.java @@ -25,10 +25,10 @@ import org.apache.poi.ss.usermodel.DataFormatter; import org.apache.poi.ss.usermodel.FormulaEvaluator; import org.apache.poi.ss.usermodel.Row; +import org.jspecify.annotations.Nullable; import org.springframework.batch.extensions.excel.FormulaEvaluatorFactory; import org.springframework.batch.extensions.excel.Sheet; -import org.springframework.lang.Nullable; /** * Sheet implementation for Apache POI. diff --git a/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/streaming/StreamingSheet.java b/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/streaming/StreamingSheet.java index dd4a596c..2a152bcc 100644 --- a/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/streaming/StreamingSheet.java +++ b/spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/streaming/StreamingSheet.java @@ -178,7 +178,7 @@ public String[] next() { }; } - private class ValueRetrievingContentsHandler implements XSSFSheetXMLHandler.SheetContentsHandler { + private final class ValueRetrievingContentsHandler implements XSSFSheetXMLHandler.SheetContentsHandler { private final Log logger = LogFactory.getLog(ValueRetrievingContentsHandler.class); 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/ReflectionTestUtils.java b/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/ReflectionTestUtils.java index 66d4d364..a64a6226 100644 --- a/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/ReflectionTestUtils.java +++ b/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/ReflectionTestUtils.java @@ -18,7 +18,8 @@ import java.lang.reflect.Field; -import org.springframework.lang.Nullable; +import org.jspecify.annotations.Nullable; + import org.springframework.util.ReflectionUtils; /** diff --git a/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/mapping/BeanWrapperRowMapperTests.java b/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/mapping/BeanWrapperRowMapperTests.java index 4ba6aab1..0052966b 100644 --- a/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/mapping/BeanWrapperRowMapperTests.java +++ b/spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/mapping/BeanWrapperRowMapperTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2024 the original author or authors. + * Copyright 2002-2026 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ package org.springframework.batch.extensions.excel.mapping; import java.util.ArrayList; -import java.util.List; import org.assertj.core.api.Assertions; import org.assertj.core.api.SoftAssertions; @@ -26,12 +25,11 @@ import org.springframework.batch.extensions.excel.MockSheet; import org.springframework.batch.extensions.excel.Player; import org.springframework.batch.extensions.excel.support.rowset.DefaultRowSetFactory; -import org.springframework.batch.extensions.excel.support.rowset.RowSet; -import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Scope; +import org.springframework.core.ParameterizedTypeReference; /** * @author Marten Deinum @@ -42,29 +40,29 @@ class BeanWrapperRowMapperTests { @Test void givenNoNameWhenInitCompleteThenIllegalStateShouldOccur() { Assertions.assertThatThrownBy(() -> { - BeanWrapperRowMapper mapper = new BeanWrapperRowMapper<>(); + var mapper = new BeanWrapperRowMapper(); mapper.afterPropertiesSet(); }).isInstanceOf(IllegalStateException.class); } @Test void givenAValidRowWhenMappingThenAValidPlayerShouldBeConstructed() throws Exception { - BeanWrapperRowMapper mapper = new BeanWrapperRowMapper<>(); + var mapper = new BeanWrapperRowMapper(); mapper.setTargetType(Player.class); mapper.afterPropertiesSet(); - List rows = new ArrayList<>(); + var rows = new ArrayList(); rows.add(new String[] { "id", "lastName", "firstName", "position", "birthYear", "debutYear" }); rows.add(new String[] { "AbduKa00", "Abdul-Jabbar", "Karim", "rb", "1974", "1996" }); MockSheet sheet = new MockSheet("players", rows); - RowSet rs = new DefaultRowSetFactory().create(sheet); + var rs = new DefaultRowSetFactory().create(sheet); rs.next(); rs.next(); - Player p = mapper.mapRow(rs); + var p = mapper.mapRow(rs); - SoftAssertions softly = new SoftAssertions(); + var softly = new SoftAssertions(); softly.assertThat(p).isNotNull(); softly.assertThat(p.getId()).isEqualTo("AbduKa00"); softly.assertThat("Abdul-Jabbar").isEqualTo(p.getLastName()); @@ -80,20 +78,21 @@ void givenAValidRowWhenMappingThenAValidPlayerShouldBeConstructed() throws Excep @Test void givenAValidRowWhenMappingThenAValidPlayerShouldBeConstructedBasedOnPrototype() throws Exception { - ApplicationContext ctx = new AnnotationConfigApplicationContext(TestConfig.class); - BeanWrapperRowMapper mapper = ctx.getBean("playerRowMapper", BeanWrapperRowMapper.class); + var ctx = new AnnotationConfigApplicationContext(TestConfig.class); + var mapper = ctx.getBeanProvider(new ParameterizedTypeReference>() { + }).getIfAvailable(); - List rows = new ArrayList<>(); + var rows = new ArrayList(); rows.add(new String[] { "id", "lastName", "firstName", "position", "birthYear", "debutYear" }); rows.add(new String[] { "AbduKa00", "Abdul-Jabbar", "Karim", "rb", "1974", "1996" }); MockSheet sheet = new MockSheet("players", rows); - RowSet rs = new DefaultRowSetFactory().create(sheet); + var rs = new DefaultRowSetFactory().create(sheet); rs.next(); rs.next(); - Player p = mapper.mapRow(rs); + var p = mapper.mapRow(rs); - SoftAssertions softly = new SoftAssertions(); + var softly = new SoftAssertions(); softly.assertThat(p).isNotNull(); softly.assertThat(p.getId()).isEqualTo("AbduKa00"); softly.assertThat("Abdul-Jabbar").isEqualTo(p.getLastName()); @@ -111,7 +110,7 @@ public static class TestConfig { @Bean public BeanWrapperRowMapper playerRowMapper() { - BeanWrapperRowMapper mapper = new BeanWrapperRowMapper<>(); + var mapper = new BeanWrapperRowMapper(); mapper.setPrototypeBeanName("player"); return mapper; } @@ -119,11 +118,9 @@ public BeanWrapperRowMapper playerRowMapper() { @Bean @Scope("prototype") public Player player() { - Player p = new Player(); + var p = new Player(); p.setComment("comment from context"); return p; } - } - } 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;