Revert "Introduce support package"

This reverts commit 8b017871c62258dfba884cb92e82cbb6532fa158.

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;

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;

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;

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;

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;
 

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;

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;

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

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() {

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 {
 

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 {