From f486e83eb8fc03d654e0736b3dc65a74bfba1f8a Mon Sep 17 00:00:00 2001 From: Marten Deinum Date: Wed, 3 Sep 2014 14:53:14 +0200 Subject: [PATCH] Revert "Introduce support package" This reverts commit 8b017871c62258dfba884cb92e82cbb6532fa158. --- .../item/excel/{support => }/AbstractExcelItemReader.java | 6 +----- .../batch/item/excel/{support => }/jxl/JxlItemReader.java | 4 ++-- .../batch/item/excel/{support => }/jxl/JxlSheet.java | 2 +- .../batch/item/excel/{support => }/jxl/JxlUtils.java | 2 +- .../batch/item/excel/{support => }/poi/PoiItemReader.java | 4 ++-- .../batch/item/excel/{support => }/poi/PoiSheet.java | 2 +- .../excel/{support => }/AbstractExcelItemReaderTests.java | 5 +---- .../item/excel/{support => }/jxl/JxlItemReaderTest.java | 6 +++--- .../batch/item/excel/{support => }/jxl/JxlUtilsTests.java | 6 +++--- .../item/excel/{support => }/poi/PoiItemReaderXlsTests.java | 6 +++--- .../excel/{support => }/poi/PoiItemReaderXlsxTests.java | 6 +++--- 11 files changed, 21 insertions(+), 28 deletions(-) rename spring-batch-excel/src/main/java/org/springframework/batch/item/excel/{support => }/AbstractExcelItemReader.java (96%) rename spring-batch-excel/src/main/java/org/springframework/batch/item/excel/{support => }/jxl/JxlItemReader.java (94%) rename spring-batch-excel/src/main/java/org/springframework/batch/item/excel/{support => }/jxl/JxlSheet.java (96%) rename spring-batch-excel/src/main/java/org/springframework/batch/item/excel/{support => }/jxl/JxlUtils.java (98%) rename spring-batch-excel/src/main/java/org/springframework/batch/item/excel/{support => }/poi/PoiItemReader.java (92%) rename spring-batch-excel/src/main/java/org/springframework/batch/item/excel/{support => }/poi/PoiSheet.java (98%) rename spring-batch-excel/src/test/java/org/springframework/batch/item/excel/{support => }/AbstractExcelItemReaderTests.java (93%) rename spring-batch-excel/src/test/java/org/springframework/batch/item/excel/{support => }/jxl/JxlItemReaderTest.java (79%) rename spring-batch-excel/src/test/java/org/springframework/batch/item/excel/{support => }/jxl/JxlUtilsTests.java (92%) rename spring-batch-excel/src/test/java/org/springframework/batch/item/excel/{support => }/poi/PoiItemReaderXlsTests.java (82%) rename spring-batch-excel/src/test/java/org/springframework/batch/item/excel/{support => }/poi/PoiItemReaderXlsxTests.java (83%) diff --git a/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/support/AbstractExcelItemReader.java b/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/AbstractExcelItemReader.java similarity index 96% rename from spring-batch-excel/src/main/java/org/springframework/batch/item/excel/support/AbstractExcelItemReader.java rename to spring-batch-excel/src/main/java/org/springframework/batch/item/excel/AbstractExcelItemReader.java index a9ec734..caba8fa 100644 --- a/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/support/AbstractExcelItemReader.java +++ b/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/AbstractExcelItemReader.java @@ -13,14 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.item.excel.support; +package org.springframework.batch.item.excel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.batch.item.excel.ExcelFileParseException; -import org.springframework.batch.item.excel.RowCallbackHandler; -import org.springframework.batch.item.excel.RowMapper; -import org.springframework.batch.item.excel.Sheet; import org.springframework.batch.item.file.ResourceAwareItemReaderItemStream; import org.springframework.batch.item.support.AbstractItemCountingItemStreamItemReader; import org.springframework.beans.factory.InitializingBean; diff --git a/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/support/jxl/JxlItemReader.java b/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/jxl/JxlItemReader.java similarity index 94% rename from spring-batch-excel/src/main/java/org/springframework/batch/item/excel/support/jxl/JxlItemReader.java rename to spring-batch-excel/src/main/java/org/springframework/batch/item/excel/jxl/JxlItemReader.java index 4301ad4..fc13409 100644 --- a/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/support/jxl/JxlItemReader.java +++ b/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/jxl/JxlItemReader.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.springframework.batch.item.excel.support.jxl; +package org.springframework.batch.item.excel.jxl; import jxl.Workbook; import jxl.read.biff.WorkbookParser; -import org.springframework.batch.item.excel.support.AbstractExcelItemReader; +import org.springframework.batch.item.excel.AbstractExcelItemReader; import org.springframework.batch.item.excel.Sheet; import org.springframework.core.io.Resource; import org.springframework.util.ClassUtils; diff --git a/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/support/jxl/JxlSheet.java b/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/jxl/JxlSheet.java similarity index 96% rename from spring-batch-excel/src/main/java/org/springframework/batch/item/excel/support/jxl/JxlSheet.java rename to spring-batch-excel/src/main/java/org/springframework/batch/item/excel/jxl/JxlSheet.java index 6c2d86d..1d32e83 100644 --- a/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/support/jxl/JxlSheet.java +++ b/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/jxl/JxlSheet.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.springframework.batch.item.excel.support.jxl; +package org.springframework.batch.item.excel.jxl; import jxl.Cell; import org.springframework.batch.item.excel.Sheet; diff --git a/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/support/jxl/JxlUtils.java b/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/jxl/JxlUtils.java similarity index 98% rename from spring-batch-excel/src/main/java/org/springframework/batch/item/excel/support/jxl/JxlUtils.java rename to spring-batch-excel/src/main/java/org/springframework/batch/item/excel/jxl/JxlUtils.java index a0d583a..3009f5e 100644 --- a/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/support/jxl/JxlUtils.java +++ b/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/jxl/JxlUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.item.excel.support.jxl; +package org.springframework.batch.item.excel.jxl; import jxl.Cell; import jxl.Workbook; diff --git a/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/support/poi/PoiItemReader.java b/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/poi/PoiItemReader.java similarity index 92% rename from spring-batch-excel/src/main/java/org/springframework/batch/item/excel/support/poi/PoiItemReader.java rename to spring-batch-excel/src/main/java/org/springframework/batch/item/excel/poi/PoiItemReader.java index 35310ac..d51aac7 100644 --- a/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/support/poi/PoiItemReader.java +++ b/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/poi/PoiItemReader.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.batch.item.excel.support.poi; +package org.springframework.batch.item.excel.poi; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.WorkbookFactory; -import org.springframework.batch.item.excel.support.AbstractExcelItemReader; +import org.springframework.batch.item.excel.AbstractExcelItemReader; import org.springframework.batch.item.excel.Sheet; import org.springframework.core.io.Resource; diff --git a/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/support/poi/PoiSheet.java b/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/poi/PoiSheet.java similarity index 98% rename from spring-batch-excel/src/main/java/org/springframework/batch/item/excel/support/poi/PoiSheet.java rename to spring-batch-excel/src/main/java/org/springframework/batch/item/excel/poi/PoiSheet.java index 82af9b3..423f3e0 100644 --- a/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/support/poi/PoiSheet.java +++ b/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/poi/PoiSheet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.item.excel.support.poi; +package org.springframework.batch.item.excel.poi; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.FormulaEvaluator; diff --git a/spring-batch-excel/src/test/java/org/springframework/batch/item/excel/support/AbstractExcelItemReaderTests.java b/spring-batch-excel/src/test/java/org/springframework/batch/item/excel/AbstractExcelItemReaderTests.java similarity index 93% rename from spring-batch-excel/src/test/java/org/springframework/batch/item/excel/support/AbstractExcelItemReaderTests.java rename to spring-batch-excel/src/test/java/org/springframework/batch/item/excel/AbstractExcelItemReaderTests.java index 181ff5f..21628f5 100644 --- a/spring-batch-excel/src/test/java/org/springframework/batch/item/excel/support/AbstractExcelItemReaderTests.java +++ b/spring-batch-excel/src/test/java/org/springframework/batch/item/excel/AbstractExcelItemReaderTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.item.excel.support; +package org.springframework.batch.item.excel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -21,10 +21,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.springframework.batch.item.ExecutionContext; -import org.springframework.batch.item.excel.RowCallbackHandler; -import org.springframework.batch.item.excel.Sheet; import org.springframework.batch.item.excel.mapping.PassThroughRowMapper; -import org.springframework.batch.item.excel.support.AbstractExcelItemReader; import org.springframework.core.io.ClassPathResource; import org.springframework.test.util.ReflectionTestUtils; import org.springframework.util.StringUtils; diff --git a/spring-batch-excel/src/test/java/org/springframework/batch/item/excel/support/jxl/JxlItemReaderTest.java b/spring-batch-excel/src/test/java/org/springframework/batch/item/excel/jxl/JxlItemReaderTest.java similarity index 79% rename from spring-batch-excel/src/test/java/org/springframework/batch/item/excel/support/jxl/JxlItemReaderTest.java rename to spring-batch-excel/src/test/java/org/springframework/batch/item/excel/jxl/JxlItemReaderTest.java index 9ae32ed..d701b8c 100644 --- a/spring-batch-excel/src/test/java/org/springframework/batch/item/excel/support/jxl/JxlItemReaderTest.java +++ b/spring-batch-excel/src/test/java/org/springframework/batch/item/excel/jxl/JxlItemReaderTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.batch.item.excel.support.jxl; +package org.springframework.batch.item.excel.jxl; -import org.springframework.batch.item.excel.support.AbstractExcelItemReader; -import org.springframework.batch.item.excel.support.AbstractExcelItemReaderTests; +import org.springframework.batch.item.excel.AbstractExcelItemReader; +import org.springframework.batch.item.excel.AbstractExcelItemReaderTests; /** * Test diff --git a/spring-batch-excel/src/test/java/org/springframework/batch/item/excel/support/jxl/JxlUtilsTests.java b/spring-batch-excel/src/test/java/org/springframework/batch/item/excel/jxl/JxlUtilsTests.java similarity index 92% rename from spring-batch-excel/src/test/java/org/springframework/batch/item/excel/support/jxl/JxlUtilsTests.java rename to spring-batch-excel/src/test/java/org/springframework/batch/item/excel/jxl/JxlUtilsTests.java index 3550267..b76e78b 100644 --- a/spring-batch-excel/src/test/java/org/springframework/batch/item/excel/support/jxl/JxlUtilsTests.java +++ b/spring-batch-excel/src/test/java/org/springframework/batch/item/excel/jxl/JxlUtilsTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.item.excel.support.jxl; +package org.springframework.batch.item.excel.jxl; import jxl.Cell; import jxl.Workbook; @@ -23,7 +23,7 @@ import org.junit.Test; import org.mockito.Mockito; /** - * Tests for {@link org.springframework.batch.item.excel.support.jxl.JxlUtils}. + * Tests for {@link org.springframework.batch.item.excel.jxl.JxlUtils}. * * @author Marten Deinum * @@ -46,7 +46,7 @@ public class JxlUtilsTests { } /** - * Test the {@link org.springframework.batch.item.excel.support.jxl.JxlUtils#isEmpty( jxl.Cell)} method. + * Test the {@link org.springframework.batch.item.excel.jxl.JxlUtils#isEmpty( jxl.Cell)} method. */ @Test public void checkIfCellsAreEmpty() { diff --git a/spring-batch-excel/src/test/java/org/springframework/batch/item/excel/support/poi/PoiItemReaderXlsTests.java b/spring-batch-excel/src/test/java/org/springframework/batch/item/excel/poi/PoiItemReaderXlsTests.java similarity index 82% rename from spring-batch-excel/src/test/java/org/springframework/batch/item/excel/support/poi/PoiItemReaderXlsTests.java rename to spring-batch-excel/src/test/java/org/springframework/batch/item/excel/poi/PoiItemReaderXlsTests.java index df27a5a..e395802 100644 --- a/spring-batch-excel/src/test/java/org/springframework/batch/item/excel/support/poi/PoiItemReaderXlsTests.java +++ b/spring-batch-excel/src/test/java/org/springframework/batch/item/excel/poi/PoiItemReaderXlsTests.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.item.excel.support.poi; +package org.springframework.batch.item.excel.poi; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.batch.item.excel.support.AbstractExcelItemReader; -import org.springframework.batch.item.excel.support.AbstractExcelItemReaderTests; +import org.springframework.batch.item.excel.AbstractExcelItemReader; +import org.springframework.batch.item.excel.AbstractExcelItemReaderTests; public class PoiItemReaderXlsTests extends AbstractExcelItemReaderTests { diff --git a/spring-batch-excel/src/test/java/org/springframework/batch/item/excel/support/poi/PoiItemReaderXlsxTests.java b/spring-batch-excel/src/test/java/org/springframework/batch/item/excel/poi/PoiItemReaderXlsxTests.java similarity index 83% rename from spring-batch-excel/src/test/java/org/springframework/batch/item/excel/support/poi/PoiItemReaderXlsxTests.java rename to spring-batch-excel/src/test/java/org/springframework/batch/item/excel/poi/PoiItemReaderXlsxTests.java index 7a90385..563ec55 100644 --- a/spring-batch-excel/src/test/java/org/springframework/batch/item/excel/support/poi/PoiItemReaderXlsxTests.java +++ b/spring-batch-excel/src/test/java/org/springframework/batch/item/excel/poi/PoiItemReaderXlsxTests.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.item.excel.support.poi; +package org.springframework.batch.item.excel.poi; -import org.springframework.batch.item.excel.support.AbstractExcelItemReader; -import org.springframework.batch.item.excel.support.AbstractExcelItemReaderTests; +import org.springframework.batch.item.excel.AbstractExcelItemReader; +import org.springframework.batch.item.excel.AbstractExcelItemReaderTests; import org.springframework.core.io.ClassPathResource; public class PoiItemReaderXlsxTests extends AbstractExcelItemReaderTests {