IN PROGRESS - BATCH-693: Refactor samples along domain contours

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Person.java

@@ -22,6 +22,8 @@ import java.util.List;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
+import org.springframework.batch.sample.order.Address;
+import org.springframework.batch.sample.order.Child;
 
 public class Person {
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/PersonService.java

@@ -21,6 +21,8 @@ import java.util.List;
 
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemWriter;
+import org.springframework.batch.sample.order.Address;
+import org.springframework.batch.sample.order.Child;
 
 /**
  * Custom class that contains logic that would normally be be contained in

spring-batch-samples/src/main/java/org/springframework/batch/sample/order/Address.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain;
+package org.springframework.batch.sample.order;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;

spring-batch-samples/src/main/java/org/springframework/batch/sample/order/AddressFieldSetMapper.java

@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.mapping;
+package org.springframework.batch.sample.order;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
-import org.springframework.batch.sample.domain.Address;
 
 
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/order/BillingFieldSetMapper.java

@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.mapping;
+package org.springframework.batch.sample.order;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
-import org.springframework.batch.sample.domain.BillingInfo;
 
 
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/order/BillingInfo.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain;
+package org.springframework.batch.sample.order;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;

spring-batch-samples/src/main/java/org/springframework/batch/sample/order/Child.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain;
+package org.springframework.batch.sample.order;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;

spring-batch-samples/src/main/java/org/springframework/batch/sample/order/Customer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain;
+package org.springframework.batch.sample.order;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;

spring-batch-samples/src/main/java/org/springframework/batch/sample/order/CustomerFieldSetMapper.java

@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.mapping;
+package org.springframework.batch.sample.order;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
-import org.springframework.batch.sample.domain.Customer;
 
 
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/order/HeaderFieldSetMapper.java

@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.mapping;
+package org.springframework.batch.sample.order;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
-import org.springframework.batch.sample.domain.Order;
 
 
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/order/LineItem.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain;
+package org.springframework.batch.sample.order;
 
 import java.math.BigDecimal;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/order/Order.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain;
+package org.springframework.batch.sample.order;
 
 import java.math.BigDecimal;
 import java.util.Date;

spring-batch-samples/src/main/java/org/springframework/batch/sample/order/OrderDao.java

@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.dao;
+package org.springframework.batch.sample.order;
 
-import org.springframework.batch.sample.domain.Order;
 
 /**
  * Interface for writing <code>Order</code> objects.

spring-batch-samples/src/main/java/org/springframework/batch/sample/order/OrderItemFieldSetMapper.java

@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.mapping;
+package org.springframework.batch.sample.order;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
-import org.springframework.batch.sample.domain.LineItem;
 
 
 public class OrderItemFieldSetMapper implements FieldSetMapper<LineItem> {

spring-batch-samples/src/main/java/org/springframework/batch/sample/order/OrderItemReader.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.item.reader;
+package org.springframework.batch.sample.order;
 
 import java.util.ArrayList;
 
@@ -24,12 +24,6 @@ import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
 import org.springframework.batch.item.support.AbstractItemReader;
-import org.springframework.batch.sample.domain.Address;
-import org.springframework.batch.sample.domain.BillingInfo;
-import org.springframework.batch.sample.domain.Customer;
-import org.springframework.batch.sample.domain.LineItem;
-import org.springframework.batch.sample.domain.Order;
-import org.springframework.batch.sample.domain.ShippingInfo;
 
 /**
  * @author peter.zozom

spring-batch-samples/src/main/java/org/springframework/batch/sample/order/OrderTransformer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.dao;
+package org.springframework.batch.sample.order;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -25,11 +25,6 @@ import org.springframework.batch.item.file.mapping.DefaultFieldSet;
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.transform.LineAggregator;
 import org.springframework.batch.item.transform.ItemTransformer;
-import org.springframework.batch.sample.domain.Address;
-import org.springframework.batch.sample.domain.BillingInfo;
-import org.springframework.batch.sample.domain.Customer;
-import org.springframework.batch.sample.domain.LineItem;
-import org.springframework.batch.sample.domain.Order;
 
 /**
  * Converts <code>Order</code> object to a String.

spring-batch-samples/src/main/java/org/springframework/batch/sample/order/ShippingFieldSetMapper.java

@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.mapping;
+package org.springframework.batch.sample.order;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
-import org.springframework.batch.sample.domain.ShippingInfo;
 
 
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/order/ShippingInfo.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain;
+package org.springframework.batch.sample.order;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;

spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/FutureDateFunction.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.validation.valang.custom;
+package org.springframework.batch.sample.order.valang;
 
 import java.util.Date;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/TotalOrderItemsFunction.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.validation.valang.custom;
+package org.springframework.batch.sample.order.valang;
 
 import java.util.Iterator;
 import java.util.List;
 
-import org.springframework.batch.sample.domain.LineItem;
+import org.springframework.batch.sample.order.LineItem;
 import org.springmodules.validation.valang.functions.AbstractFunction;
 import org.springmodules.validation.valang.functions.Function;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateDiscountsFunction.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.validation.valang.custom;
+package org.springframework.batch.sample.order.valang;
 
 import java.math.BigDecimal;
 import java.util.List;
 
-import org.springframework.batch.sample.domain.LineItem;
+import org.springframework.batch.sample.order.LineItem;
 import org.springmodules.validation.valang.functions.AbstractFunction;
 import org.springmodules.validation.valang.functions.Function;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateHandlingPricesFunction.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.validation.valang.custom;
+package org.springframework.batch.sample.order.valang;
 
 import java.math.BigDecimal;
 import java.util.List;
 
-import org.springframework.batch.sample.domain.LineItem;
+import org.springframework.batch.sample.order.LineItem;
 import org.springmodules.validation.valang.functions.AbstractFunction;
 import org.springmodules.validation.valang.functions.Function;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateIdsFunction.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.validation.valang.custom;
+package org.springframework.batch.sample.order.valang;
 
 import java.util.List;
 
-import org.springframework.batch.sample.domain.LineItem;
+import org.springframework.batch.sample.order.LineItem;
 import org.springmodules.validation.valang.functions.AbstractFunction;
 import org.springmodules.validation.valang.functions.Function;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidatePricesFunction.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.validation.valang.custom;
+package org.springframework.batch.sample.order.valang;
 
 import java.math.BigDecimal;
 import java.util.List;
 
-import org.springframework.batch.sample.domain.LineItem;
+import org.springframework.batch.sample.order.LineItem;
 import org.springmodules.validation.valang.functions.AbstractFunction;
 import org.springmodules.validation.valang.functions.Function;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateQuantitiesFunction.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.validation.valang.custom;
+package org.springframework.batch.sample.order.valang;
 
 import java.util.List;
 
-import org.springframework.batch.sample.domain.LineItem;
+import org.springframework.batch.sample.order.LineItem;
 import org.springmodules.validation.valang.functions.AbstractFunction;
 import org.springmodules.validation.valang.functions.Function;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateShippingPricesFunction.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.validation.valang.custom;
+package org.springframework.batch.sample.order.valang;
 
 import java.math.BigDecimal;
 import java.util.List;
 
-import org.springframework.batch.sample.domain.LineItem;
+import org.springframework.batch.sample.order.LineItem;
 import org.springmodules.validation.valang.functions.AbstractFunction;
 import org.springmodules.validation.valang.functions.Function;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateTotalPricesFunction.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.validation.valang.custom;
+package org.springframework.batch.sample.order.valang;
 
 import java.math.BigDecimal;
 import java.util.List;
 
-import org.springframework.batch.sample.domain.LineItem;
+import org.springframework.batch.sample.order.LineItem;
 import org.springmodules.validation.valang.functions.AbstractFunction;
 import org.springmodules.validation.valang.functions.Function;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/order/xml/Customer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.xml;
+package org.springframework.batch.sample.order.xml;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/order/xml/LineItem.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.xml;
+package org.springframework.batch.sample.order.xml;
 
 
 /**

spring-batch-samples/src/main/java/org/springframework/batch/sample/order/xml/Order.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.xml;
+package org.springframework.batch.sample.order.xml;
 
 import java.util.Date;
 import java.util.List;

spring-batch-samples/src/main/java/org/springframework/batch/sample/order/xml/Shipper.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.xml;
+package org.springframework.batch.sample.order.xml;
 
 
 /**