Move classes to org.springframework.batch.extensions

Author: mdeinum

Diff for: README.adoc

@@ -13,7 +13,7 @@ Configuration of can be done in XML or Java Config.
 ### XML
 
 ```xml
- <bean id="excelReader" class="biz.deinum.batch.item.excel.poi.PoiItemReader" scope="step">
+ <bean id="excelReader" class="PoiItemReader" scope="step">
      <property name="resource" value="file:/path/to/your/excel/file" />
      <property name="rowMapper">
          <bean class="PassThroughRowMapper" />
@@ -70,10 +70,10 @@ Transforms the read row from excel into a `String[]`.
 Uses a `BeanWrapper` to convert a given row into an object. Uses the column names of the given `RowSet` to map column to properties of the `targetType` or prototype bean.
 
 ```java
-<bean id="excelReader" class="biz.deinum.batch.item.excel.poi.PoiItemReader" scope="step">
+<bean id="excelReader" class="PoiItemReader" scope="step">
     <property name="resource" value="file:/path/to/your/excel/file" />
     <property name="rowMapper">
-        <bean class="biz.deinum.batch.item.excel.mapping.BeanWrapperRowMapper">
+        <bean class="BeanWrapperRowMapper">
             <property name="targetType" value="com.your.package.Player" />
         <bean>
     </property>

Diff for: pom.xml

@@ -19,9 +19,9 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>biz.deinum.spring</groupId>
+    <groupId>org.springframework.batch.extensions</groupId>
     <artifactId>spring-batch-excel</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>

Diff for: src/main/java/biz/deinum/batch/item/excel/mapping/package-info.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package biz.deinum.batch.item.excel;
+package org.springframework.batch.extensions.item.excel;
 
-import biz.deinum.batch.item.excel.support.rowset.DefaultRowSetFactory;
-import biz.deinum.batch.item.excel.support.rowset.RowSet;
-import biz.deinum.batch.item.excel.support.rowset.RowSetFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.batch.extensions.item.excel.support.rowset.DefaultRowSetFactory;
+import org.springframework.batch.extensions.item.excel.support.rowset.RowSet;
+import org.springframework.batch.extensions.item.excel.support.rowset.RowSetFactory;
 import org.springframework.batch.item.file.ResourceAwareItemReaderItemStream;
 import org.springframework.batch.item.support.AbstractItemCountingItemStreamItemReader;
 import org.springframework.beans.factory.InitializingBean;

Diff for: src/main/java/biz/deinum/batch/item/excel/package-info.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package biz.deinum.batch.item.excel;
+package org.springframework.batch.extensions.item.excel;
 
 import org.springframework.batch.item.ParseException;
 

Diff for: src/main/java/biz/deinum/batch/item/excel/poi/package-info.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package biz.deinum.batch.item.excel;
+package org.springframework.batch.extensions.item.excel;
 
-import biz.deinum.batch.item.excel.support.rowset.RowSet;
+import org.springframework.batch.extensions.item.excel.support.rowset.RowSet;
 
 /**
  * Callback to handle skipped lines. Useful for header/footer processing.

Diff for: src/main/java/biz/deinum/batch/item/excel/support/rowset/package-info.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package biz.deinum.batch.item.excel;
+package org.springframework.batch.extensions.item.excel;
 
-import biz.deinum.batch.item.excel.support.rowset.RowSet;
+import org.springframework.batch.extensions.item.excel.support.rowset.RowSet;
 
 /**
  * Map rows from an excel sheet to an object.

Diff for: src/main/java/biz/deinum/batch/item/excel/AbstractExcelItemReader.java renamed to src/main/java/org/springframework/batch/extensions/item/excel/AbstractExcelItemReader.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package biz.deinum.batch.item.excel;
+package org.springframework.batch.extensions.item.excel;
 
 import org.springframework.lang.Nullable;
 

Diff for: src/main/java/biz/deinum/batch/item/excel/ExcelFileParseException.java renamed to src/main/java/org/springframework/batch/extensions/item/excel/ExcelFileParseException.java

@@ -1,7 +1,7 @@
-package biz.deinum.batch.item.excel.mapping;
+package org.springframework.batch.extensions.item.excel.mapping;
 
-import biz.deinum.batch.item.excel.RowMapper;
-import biz.deinum.batch.item.excel.support.rowset.RowSet;
+import org.springframework.batch.extensions.item.excel.RowMapper;
+import org.springframework.batch.extensions.item.excel.support.rowset.RowSet;
 import org.springframework.batch.support.DefaultPropertyEditorRegistrar;
 import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.beans.MutablePropertyValues;

Diff for: src/main/java/biz/deinum/batch/item/excel/RowCallbackHandler.java renamed to src/main/java/org/springframework/batch/extensions/item/excel/RowCallbackHandler.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package biz.deinum.batch.item.excel.mapping;
+package org.springframework.batch.extensions.item.excel.mapping;
 
-import biz.deinum.batch.item.excel.RowMapper;
-import biz.deinum.batch.item.excel.support.rowset.RowSet;
+import org.springframework.batch.extensions.item.excel.RowMapper;
+import org.springframework.batch.extensions.item.excel.support.rowset.RowSet;
 
 /**
  * Pass through {@link RowMapper} useful for passing the orginal {@code String[]}

Diff for: src/main/java/biz/deinum/batch/item/excel/RowMapper.java renamed to src/main/java/org/springframework/batch/extensions/item/excel/RowMapper.java

@@ -1,4 +1,4 @@
-package biz.deinum.batch.item.excel.mapping;
+package org.springframework.batch.extensions.item.excel.mapping;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.util.StringUtils;

Diff for: src/main/java/biz/deinum/batch/item/excel/Sheet.java renamed to src/main/java/org/springframework/batch/extensions/item/excel/Sheet.java

@@ -0,0 +1,4 @@
+/**
+ * Default {@code RowMapper} implementations.
+ */
+package org.springframework.batch.extensions.item.excel.mapping;

Diff for: src/main/java/biz/deinum/batch/item/excel/mapping/BeanWrapperRowMapper.java renamed to src/main/java/org/springframework/batch/extensions/item/excel/mapping/BeanWrapperRowMapper.java

@@ -0,0 +1,4 @@
+/**
+ * Core interfaces for reading Excel files
+ */
+package org.springframework.batch.extensions.item.excel;

Diff for: src/main/java/biz/deinum/batch/item/excel/mapping/PassThroughRowMapper.java renamed to src/main/java/org/springframework/batch/extensions/item/excel/mapping/PassThroughRowMapper.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package biz.deinum.batch.item.excel.poi;
+package org.springframework.batch.extensions.item.excel.poi;
 
-import biz.deinum.batch.item.excel.AbstractExcelItemReader;
-import biz.deinum.batch.item.excel.Sheet;
 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.extensions.item.excel.AbstractExcelItemReader;
+import org.springframework.batch.extensions.item.excel.Sheet;
 import org.springframework.core.io.Resource;
 
 import java.io.File;

Diff for: src/main/java/biz/deinum/batch/item/excel/mapping/PropertyMatches.java renamed to src/main/java/org/springframework/batch/extensions/item/excel/mapping/PropertyMatches.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package biz.deinum.batch.item.excel.poi;
+package org.springframework.batch.extensions.item.excel.poi;
 
-import biz.deinum.batch.item.excel.Sheet;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.DataFormatter;
 import org.apache.poi.ss.usermodel.FormulaEvaluator;
 import org.apache.poi.ss.usermodel.Row;
+import org.springframework.batch.extensions.item.excel.Sheet;
 import org.springframework.lang.Nullable;
 
 import java.util.Iterator;

Diff for: src/main/java/org/springframework/batch/extensions/item/excel/mapping/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * Support classes for the Apache POI library.
+ */
+package org.springframework.batch.extensions.item.excel.poi;

Diff for: src/main/java/org/springframework/batch/extensions/item/excel/package-info.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package biz.deinum.batch.item.excel.support.rowset;
+package org.springframework.batch.extensions.item.excel.support.rowset;
 
-import biz.deinum.batch.item.excel.Sheet;
+import org.springframework.batch.extensions.item.excel.Sheet;
 
 /**
  * Contract for extracting column names for a given {@code sheet}.

Diff for: src/main/java/biz/deinum/batch/item/excel/poi/PoiItemReader.java renamed to src/main/java/org/springframework/batch/extensions/item/excel/poi/PoiItemReader.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package biz.deinum.batch.item.excel.support.rowset;
+package org.springframework.batch.extensions.item.excel.support.rowset;
 
-import biz.deinum.batch.item.excel.Sheet;
+import org.springframework.batch.extensions.item.excel.Sheet;
 
 import java.util.Iterator;
 import java.util.Properties;

Diff for: src/main/java/biz/deinum/batch/item/excel/poi/PoiSheet.java renamed to src/main/java/org/springframework/batch/extensions/item/excel/poi/PoiSheet.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package biz.deinum.batch.item.excel.support.rowset;
+package org.springframework.batch.extensions.item.excel.support.rowset;
 
-import biz.deinum.batch.item.excel.Sheet;
+import org.springframework.batch.extensions.item.excel.Sheet;
 
 /**
  * {@code RowSetFactory} implementation which constructs a {@code DefaultRowSet} instance

Diff for: src/main/java/org/springframework/batch/extensions/item/excel/poi/package-info.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package biz.deinum.batch.item.excel.support.rowset;
+package org.springframework.batch.extensions.item.excel.support.rowset;
 
-import biz.deinum.batch.item.excel.Sheet;
+import org.springframework.batch.extensions.item.excel.Sheet;
 
 /**
  * Default implementation for the {@code RowSetMetaData} interface.

Diff for: src/main/java/biz/deinum/batch/item/excel/support/rowset/ColumnNameExtractor.java renamed to src/main/java/org/springframework/batch/extensions/item/excel/support/rowset/ColumnNameExtractor.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package biz.deinum.batch.item.excel.support.rowset;
+package org.springframework.batch.extensions.item.excel.support.rowset;
 
-import biz.deinum.batch.item.excel.Sheet;
+import org.springframework.batch.extensions.item.excel.Sheet;
 
 /**
  * {@code ColumnNameExtractor} which returns the values of a given row (default is 0) as the column

Diff for: src/main/java/biz/deinum/batch/item/excel/support/rowset/DefaultRowSet.java renamed to src/main/java/org/springframework/batch/extensions/item/excel/support/rowset/DefaultRowSet.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package biz.deinum.batch.item.excel.support.rowset;
+package org.springframework.batch.extensions.item.excel.support.rowset;
 
 import java.util.Properties;
 

Diff for: src/main/java/biz/deinum/batch/item/excel/support/rowset/DefaultRowSetFactory.java renamed to src/main/java/org/springframework/batch/extensions/item/excel/support/rowset/DefaultRowSetFactory.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package biz.deinum.batch.item.excel.support.rowset;
+package org.springframework.batch.extensions.item.excel.support.rowset;
 
-import biz.deinum.batch.item.excel.Sheet;
+import org.springframework.batch.extensions.item.excel.Sheet;
 
 /**
  * Contract for factories which will construct a {@code RowSet} implementation.

Diff for: src/main/java/biz/deinum/batch/item/excel/support/rowset/DefaultRowSetMetaData.java renamed to src/main/java/org/springframework/batch/extensions/item/excel/support/rowset/DefaultRowSetMetaData.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package biz.deinum.batch.item.excel.support.rowset;
+package org.springframework.batch.extensions.item.excel.support.rowset;
 
 /**
  * Interface representing the the metadata associated with an Excel document.

Diff for: src/main/java/biz/deinum/batch/item/excel/support/rowset/RowNumberColumnNameExtractor.java renamed to src/main/java/org/springframework/batch/extensions/item/excel/support/rowset/RowNumberColumnNameExtractor.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package biz.deinum.batch.item.excel.support.rowset;
+package org.springframework.batch.extensions.item.excel.support.rowset;
 
-import biz.deinum.batch.item.excel.Sheet;
+import org.springframework.batch.extensions.item.excel.Sheet;
 
 import java.util.Arrays;
 

Diff for: src/main/java/biz/deinum/batch/item/excel/support/rowset/RowSet.java renamed to src/main/java/org/springframework/batch/extensions/item/excel/support/rowset/RowSet.java

@@ -0,0 +1,4 @@
+/**
+ * RowSet abstraction for Excel documents
+ */
+package org.springframework.batch.extensions.item.excel.support.rowset;

Diff for: src/main/java/biz/deinum/batch/item/excel/support/rowset/RowSetFactory.java renamed to src/main/java/org/springframework/batch/extensions/item/excel/support/rowset/RowSetFactory.java

@@ -1,4 +1,4 @@
-package biz.deinum.batch.item;
+package org.springframework.batch.extensions.item;
 
 /**
  * Created by in329dei on 17-9-2014.

Diff for: src/main/java/biz/deinum/batch/item/excel/support/rowset/RowSetMetaData.java renamed to src/main/java/org/springframework/batch/extensions/item/excel/support/rowset/RowSetMetaData.java

@@ -1,4 +1,4 @@
-package biz.deinum.batch.item;
+package org.springframework.batch.extensions.item;
 
 import org.springframework.lang.Nullable;
 import org.springframework.util.ReflectionUtils;

Diff for: src/main/java/biz/deinum/batch/item/excel/support/rowset/StaticColumnNameExtractor.java renamed to src/main/java/org/springframework/batch/extensions/item/excel/support/rowset/StaticColumnNameExtractor.java

@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package biz.deinum.batch.item.excel;
+package org.springframework.batch.extensions.item.excel;
 
-import biz.deinum.batch.item.ReflectionTestUtils;
-import biz.deinum.batch.item.excel.mapping.PassThroughRowMapper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.springframework.batch.extensions.item.ReflectionTestUtils;
+import org.springframework.batch.extensions.item.excel.mapping.PassThroughRowMapper;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.core.io.ClassPathResource;
 

Diff for: src/main/java/org/springframework/batch/extensions/item/excel/support/rowset/package-info.java

@@ -1,9 +1,9 @@
-package biz.deinum.batch.item.excel;
+package org.springframework.batch.extensions.item.excel;
 
-import biz.deinum.batch.item.Player;
-import biz.deinum.batch.item.excel.mapping.BeanWrapperRowMapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.springframework.batch.extensions.item.Player;
+import org.springframework.batch.extensions.item.excel.mapping.BeanWrapperRowMapper;
 import org.springframework.batch.item.ExecutionContext;
 
 import java.util.ArrayList;

Diff for: src/test/java/biz/deinum/batch/item/excel/poi/PoiItemReaderXlsTests.java

@@ -1,11 +1,11 @@
-package biz.deinum.batch.item.excel;
+package org.springframework.batch.extensions.item.excel;
 
-import biz.deinum.batch.item.Player;
-import biz.deinum.batch.item.excel.mapping.BeanWrapperRowMapper;
-import biz.deinum.batch.item.excel.support.rowset.DefaultRowSetFactory;
-import biz.deinum.batch.item.excel.support.rowset.StaticColumnNameExtractor;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.springframework.batch.extensions.item.Player;
+import org.springframework.batch.extensions.item.excel.mapping.BeanWrapperRowMapper;
+import org.springframework.batch.extensions.item.excel.support.rowset.DefaultRowSetFactory;
+import org.springframework.batch.extensions.item.excel.support.rowset.StaticColumnNameExtractor;
 import org.springframework.batch.item.ExecutionContext;
 
 import java.util.ArrayList;

Diff for: src/test/java/biz/deinum/batch/item/Player.java renamed to src/test/java/org/springframework/batch/extensions/item/Player.java

@@ -1,4 +1,4 @@
-package biz.deinum.batch.item.excel;
+package org.springframework.batch.extensions.item.excel;
 
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.Resource;

Diff for: src/test/java/biz/deinum/batch/item/ReflectionTestUtils.java renamed to src/test/java/org/springframework/batch/extensions/item/ReflectionTestUtils.java

@@ -1,4 +1,4 @@
-package biz.deinum.batch.item.excel;
+package org.springframework.batch.extensions.item.excel;
 
 import java.util.Iterator;
 import java.util.List;