Spring/spring-batch-extensions
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Introduce support package"

Browse Source 
This reverts commit 8b017871c62258dfba884cb92e82cbb6532fa158.
This commit is contained in:
Marten Deinum
2014-09-03 14:53:14 +02:00
committed by Michael Minella
parent ee94ef1fdc
commit f486e83eb8
11 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-batch-excel/src/main/java/org/springframework/batch/item/excel/support/AbstractExcelItemReader.java → spring-batch-excel/src/main/java/org/springframework/batch/item/excel/AbstractExcelItemReader.java
View File

@@ -13,14 +13,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * 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.Log;
import org.apache.commons.logging.LogFactory; 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.file.ResourceAwareItemReaderItemStream;
import org.springframework.batch.item.support.AbstractItemCountingItemStreamItemReader; import org.springframework.batch.item.support.AbstractItemCountingItemStreamItemReader;
import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.InitializingBean;

4
spring-batch-excel/src/main/java/org/springframework/batch/item/excel/support/jxl/JxlItemReader.java → spring-batch-excel/src/main/java/org/springframework/batch/item/excel/jxl/JxlItemReader.java
View File

@@ -15,11 +15,11 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.batch.item.excel.support.jxl; package org.springframework.batch.item.excel.jxl;
import jxl.Workbook; import jxl.Workbook;
import jxl.read.biff.WorkbookParser; 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.batch.item.excel.Sheet;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;

2
spring-batch-excel/src/main/java/org/springframework/batch/item/excel/support/jxl/JxlSheet.java → spring-batch-excel/src/main/java/org/springframework/batch/item/excel/jxl/JxlSheet.java
View File

@@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.batch.item.excel.support.jxl; package org.springframework.batch.item.excel.jxl;
import jxl.Cell; import jxl.Cell;
import org.springframework.batch.item.excel.Sheet; import org.springframework.batch.item.excel.Sheet;

2
spring-batch-excel/src/main/java/org/springframework/batch/item/excel/support/jxl/JxlUtils.java → spring-batch-excel/src/main/java/org/springframework/batch/item/excel/jxl/JxlUtils.java
View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.batch.item.excel.support.jxl; package org.springframework.batch.item.excel.jxl;
import jxl.Cell; import jxl.Cell;
import jxl.Workbook; import jxl.Workbook;

4
spring-batch-excel/src/main/java/org/springframework/batch/item/excel/support/poi/PoiItemReader.java → spring-batch-excel/src/main/java/org/springframework/batch/item/excel/poi/PoiItemReader.java
View File

@@ -14,12 +14,12 @@
* limitations under the License. * 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.Row;
import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.usermodel.WorkbookFactory; 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.batch.item.excel.Sheet;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;

2
spring-batch-excel/src/main/java/org/springframework/batch/item/excel/support/poi/PoiSheet.java → spring-batch-excel/src/main/java/org/springframework/batch/item/excel/poi/PoiSheet.java
View File

@@ -14,7 +14,7 @@
* limitations under the License. * 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.Cell;
import org.apache.poi.ss.usermodel.FormulaEvaluator; import org.apache.poi.ss.usermodel.FormulaEvaluator;

5
spring-batch-excel/src/test/java/org/springframework/batch/item/excel/support/AbstractExcelItemReaderTests.java → spring-batch-excel/src/test/java/org/springframework/batch/item/excel/AbstractExcelItemReaderTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * 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.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@@ -21,10 +21,7 @@ import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.springframework.batch.item.ExecutionContext; 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.mapping.PassThroughRowMapper;
import org.springframework.batch.item.excel.support.AbstractExcelItemReader;
import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.ClassPathResource;
import org.springframework.test.util.ReflectionTestUtils; import org.springframework.test.util.ReflectionTestUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;

6
spring-batch-excel/src/test/java/org/springframework/batch/item/excel/support/jxl/JxlItemReaderTest.java → spring-batch-excel/src/test/java/org/springframework/batch/item/excel/jxl/JxlItemReaderTest.java
View File

@@ -14,10 +14,10 @@
* limitations under the License. * 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.AbstractExcelItemReader;
import org.springframework.batch.item.excel.support.AbstractExcelItemReaderTests; import org.springframework.batch.item.excel.AbstractExcelItemReaderTests;
/** /**
* Test * Test

6
spring-batch-excel/src/test/java/org/springframework/batch/item/excel/support/jxl/JxlUtilsTests.java → spring-batch-excel/src/test/java/org/springframework/batch/item/excel/jxl/JxlUtilsTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.batch.item.excel.support.jxl; package org.springframework.batch.item.excel.jxl;
import jxl.Cell; import jxl.Cell;
import jxl.Workbook; import jxl.Workbook;
@@ -23,7 +23,7 @@ import org.junit.Test;
import org.mockito.Mockito; 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 * @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 @Test
public void checkIfCellsAreEmpty() { public void checkIfCellsAreEmpty() {

6
spring-batch-excel/src/test/java/org/springframework/batch/item/excel/support/poi/PoiItemReaderXlsTests.java → spring-batch-excel/src/test/java/org/springframework/batch/item/excel/poi/PoiItemReaderXlsTests.java
View File

@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * 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.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.batch.item.excel.support.AbstractExcelItemReader; import org.springframework.batch.item.excel.AbstractExcelItemReader;
import org.springframework.batch.item.excel.support.AbstractExcelItemReaderTests; import org.springframework.batch.item.excel.AbstractExcelItemReaderTests;
public class PoiItemReaderXlsTests extends AbstractExcelItemReaderTests { public class PoiItemReaderXlsTests extends AbstractExcelItemReaderTests {

6
spring-batch-excel/src/test/java/org/springframework/batch/item/excel/support/poi/PoiItemReaderXlsxTests.java → spring-batch-excel/src/test/java/org/springframework/batch/item/excel/poi/PoiItemReaderXlsxTests.java
View File

@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * 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.AbstractExcelItemReader;
import org.springframework.batch.item.excel.support.AbstractExcelItemReaderTests; import org.springframework.batch.item.excel.AbstractExcelItemReaderTests;
import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.ClassPathResource;
public class PoiItemReaderXlsxTests extends AbstractExcelItemReaderTests { public class PoiItemReaderXlsxTests extends AbstractExcelItemReaderTests {