diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Person.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Person.java index a2a1bce7d..f1d8783c7 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Person.java +++ b/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 { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/PersonService.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/PersonService.java index 4a74b3960..a72f66c21 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/PersonService.java +++ b/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 diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Address.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/Address.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Address.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/order/Address.java index 1eba53f9d..918194d65 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Address.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/AddressFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/AddressFieldSetMapper.java similarity index 94% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/AddressFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/order/AddressFieldSetMapper.java index 08d31c4e3..55d4df615 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/AddressFieldSetMapper.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/BillingFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/BillingFieldSetMapper.java similarity index 91% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/BillingFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/order/BillingFieldSetMapper.java index eec8f34e4..cebb1b6b5 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/BillingFieldSetMapper.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/BillingInfo.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/BillingInfo.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/BillingInfo.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/order/BillingInfo.java index d74b3c5b0..cd58a9ccc 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/BillingInfo.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Child.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/Child.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Child.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/order/Child.java index 3ea8ad23a..dd2bc6026 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Child.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Customer.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/Customer.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Customer.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/order/Customer.java index c102b42d3..bc7bdf000 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Customer.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/CustomerFieldSetMapper.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/order/CustomerFieldSetMapper.java index 8f45e63e1..2c305a624 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapper.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/HeaderFieldSetMapper.java similarity index 92% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/order/HeaderFieldSetMapper.java index d4ce2abd7..12a61f276 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapper.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/LineItem.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/LineItem.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/LineItem.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/order/LineItem.java index cdeb81907..537705b34 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/LineItem.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Order.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/Order.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Order.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/order/Order.java index ece967224..176a24ed8 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Order.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/OrderDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/OrderDao.java similarity index 88% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/OrderDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/order/OrderDao.java index 711f77964..5cffce75e 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/OrderDao.java +++ b/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 Order objects. diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/OrderItemFieldSetMapper.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/order/OrderItemFieldSetMapper.java index cfa24a538..6148ff00b 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapper.java +++ b/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 { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/OrderItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/OrderItemReader.java similarity index 92% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/OrderItemReader.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/order/OrderItemReader.java index 9bd07826c..63c5df6d0 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/OrderItemReader.java +++ b/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 diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/OrderTransformer.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/OrderTransformer.java similarity index 92% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/OrderTransformer.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/order/OrderTransformer.java index 0d19d3a11..24a17cbe9 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/OrderTransformer.java +++ b/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 Order object to a String. diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/ShippingFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/ShippingFieldSetMapper.java similarity index 92% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/ShippingFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/order/ShippingFieldSetMapper.java index 3b41c6c44..0dc943279 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/ShippingFieldSetMapper.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/ShippingInfo.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/ShippingInfo.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/ShippingInfo.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/order/ShippingInfo.java index 7feed873c..f0cc55ec2 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/ShippingInfo.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/FutureDateFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/FutureDateFunction.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/FutureDateFunction.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/FutureDateFunction.java index 573d0f8b8..01120f4ba 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/FutureDateFunction.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/TotalOrderItemsFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/TotalOrderItemsFunction.java similarity index 94% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/TotalOrderItemsFunction.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/TotalOrderItemsFunction.java index 326a4004b..8e5e2f24d 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/TotalOrderItemsFunction.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateDiscountsFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateDiscountsFunction.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateDiscountsFunction.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateDiscountsFunction.java index 1b0d16023..8c3a91442 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateDiscountsFunction.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateHandlingPricesFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateHandlingPricesFunction.java similarity index 93% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateHandlingPricesFunction.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateHandlingPricesFunction.java index 0e41ba486..be480d88f 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateHandlingPricesFunction.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateIdsFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateIdsFunction.java similarity index 92% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateIdsFunction.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateIdsFunction.java index f42cdd7c5..12b02ac80 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateIdsFunction.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidatePricesFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidatePricesFunction.java similarity index 93% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidatePricesFunction.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidatePricesFunction.java index 510c6dc6a..b7f888881 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidatePricesFunction.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateQuantitiesFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateQuantitiesFunction.java similarity index 92% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateQuantitiesFunction.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateQuantitiesFunction.java index 652e58bf5..632a470c6 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateQuantitiesFunction.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateShippingPricesFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateShippingPricesFunction.java similarity index 93% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateShippingPricesFunction.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateShippingPricesFunction.java index de278ed8c..69f88e9e8 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateShippingPricesFunction.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateTotalPricesFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateTotalPricesFunction.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateTotalPricesFunction.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateTotalPricesFunction.java index c636cb8b2..12645ec2c 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateTotalPricesFunction.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/xml/Customer.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/xml/Customer.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/xml/Customer.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/order/xml/Customer.java index 0e47c9fd1..65eae7921 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/xml/Customer.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/xml/LineItem.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/xml/LineItem.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/xml/LineItem.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/order/xml/LineItem.java index ed572b215..7c1a2cd0b 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/xml/LineItem.java +++ b/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; /** diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/xml/Order.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/xml/Order.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/xml/Order.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/order/xml/Order.java index 1bb2ad045..f3eb243b4 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/xml/Order.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/xml/Shipper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/xml/Shipper.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/xml/Shipper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/order/xml/Shipper.java index b90d29a10..f72a1fdc6 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/xml/Shipper.java +++ b/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; /** diff --git a/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml b/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml index 557c9c488..d47702ef9 100644 --- a/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml @@ -25,7 +25,7 @@ class="org.springframework.batch.item.validator.ValidatingItemReader"> + class="org.springframework.batch.sample.order.OrderItemReader"> + class="org.springframework.batch.sample.order.OrderTransformer"> + class="org.springframework.batch.sample.order.HeaderFieldSetMapper" /> + class="org.springframework.batch.sample.order.CustomerFieldSetMapper" /> + class="org.springframework.batch.sample.order.AddressFieldSetMapper" /> + class="org.springframework.batch.sample.order.BillingFieldSetMapper" /> + class="org.springframework.batch.sample.order.OrderItemFieldSetMapper" /> + class="org.springframework.batch.sample.order.ShippingFieldSetMapper" /> @@ -131,23 +131,23 @@ + value="org.springframework.batch.sample.order.valang.FutureDateFunction" /> + value="org.springframework.batch.sample.order.valang.TotalOrderItemsFunction" /> + value="org.springframework.batch.sample.order.valang.ValidateIdsFunction" /> + value="org.springframework.batch.sample.order.valang.ValidatePricesFunction" /> + value="org.springframework.batch.sample.order.valang.ValidateDiscountsFunction" /> + value="org.springframework.batch.sample.order.valang.ValidateShippingPricesFunction" /> + value="org.springframework.batch.sample.order.valang.ValidateHandlingPricesFunction" /> + value="org.springframework.batch.sample.order.valang.ValidateQuantitiesFunction" /> + value="org.springframework.batch.sample.order.valang.ValidateTotalPricesFunction" /> diff --git a/spring-batch-samples/src/main/resources/xstream-config.xml b/spring-batch-samples/src/main/resources/xstream-config.xml index 9926d3292..2360aa35b 100644 --- a/spring-batch-samples/src/main/resources/xstream-config.xml +++ b/spring-batch-samples/src/main/resources/xstream-config.xml @@ -22,13 +22,13 @@ - org.springframework.batch.sample.domain.xml.Customer - org.springframework.batch.sample.domain.xml.Order + org.springframework.batch.sample.order.xml.Customer + org.springframework.batch.sample.order.xml.Order customer - org.springframework.batch.sample.domain.xml.Shipper - org.springframework.batch.sample.domain.xml.Order + org.springframework.batch.sample.order.xml.Shipper + org.springframework.batch.sample.order.xml.Order shipper @@ -51,25 +51,25 @@ http://adsj.accenture.com/purchaseorders order - org.springframework.batch.sample.domain.xml.Order + org.springframework.batch.sample.order.xml.Order http://adsj.accenture.com/purchaseorders customer - org.springframework.batch.sample.domain.xml.Customer + org.springframework.batch.sample.order.xml.Customer http://adsj.accenture.com/purchaseorders shipper - org.springframework.batch.sample.domain.xml.Shipper + org.springframework.batch.sample.order.xml.Shipper http://adsj.accenture.com/purchaseorders lineItem - org.springframework.batch.sample.domain.xml.LineItem + org.springframework.batch.sample.order.xml.LineItem diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractCustomerCreditIncreaseTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractCustomerCreditIncreaseTests.java index a0133c318..5a1f3cad8 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractCustomerCreditIncreaseTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractCustomerCreditIncreaseTests.java @@ -1,23 +1,24 @@ package org.springframework.batch.sample; import static org.junit.Assert.assertEquals; + import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; +import javax.sql.DataSource; + import org.springframework.batch.sample.trade.CustomerCreditIncreaseWriter; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcOperations; -import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.RowMapper; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.support.TransactionCallback; import org.springframework.transaction.support.TransactionTemplate; -import org.springframework.beans.factory.annotation.Autowired; - -import javax.sql.DataSource; /** * Test case for jobs that are expected to update customer credit value by fixed diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/BatchSqlUpdateJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/BatchSqlUpdateJobFunctionalTests.java index 976eaecfe..340325441 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/BatchSqlUpdateJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/BatchSqlUpdateJobFunctionalTests.java @@ -1,8 +1,8 @@ package org.springframework.batch.sample; import org.junit.runner.RunWith; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** * Test for BatchSqlUpdateJob - checks that customer credit has been updated to expected value. diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/BeanWrapperMapperSampleJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/BeanWrapperMapperSampleJobFunctionalTests.java index 33a3c70cb..ef50dc9b8 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/BeanWrapperMapperSampleJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/BeanWrapperMapperSampleJobFunctionalTests.java @@ -17,8 +17,8 @@ package org.springframework.batch.sample; import org.junit.runner.RunWith; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeItemWriterSampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeItemWriterSampleFunctionalTests.java index 8502c0867..8e5fa52aa 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeItemWriterSampleFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeItemWriterSampleFunctionalTests.java @@ -2,17 +2,6 @@ package org.springframework.batch.sample; import static org.junit.Assert.assertEquals; -import org.apache.commons.io.IOUtils; -import org.junit.runner.RunWith; -import org.springframework.batch.sample.trade.Trade; -import org.springframework.jdbc.core.JdbcOperations; -import org.springframework.jdbc.core.RowCallbackHandler; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.beans.factory.annotation.Autowired; - -import javax.sql.DataSource; import java.io.FileInputStream; import java.io.IOException; import java.math.BigDecimal; @@ -21,6 +10,18 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.List; +import javax.sql.DataSource; + +import org.apache.commons.io.IOUtils; +import org.junit.runner.RunWith; +import org.springframework.batch.sample.trade.Trade; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jdbc.core.JdbcOperations; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.RowCallbackHandler; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration() diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/DelegatingJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/DelegatingJobFunctionalTests.java index 76e6e6835..6388ac980 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/DelegatingJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/DelegatingJobFunctionalTests.java @@ -3,11 +3,11 @@ package org.springframework.batch.sample; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import org.springframework.batch.sample.domain.PersonService; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.beans.factory.annotation.Autowired; import org.junit.runner.RunWith; +import org.springframework.batch.sample.domain.PersonService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration() diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java index 82f4e837c..8bb921afc 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java @@ -16,31 +16,32 @@ package org.springframework.batch.sample; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; import java.io.BufferedReader; import java.io.FileReader; import java.sql.ResultSet; import java.sql.SQLException; +import javax.sql.DataSource; + +import org.junit.Before; +import org.junit.runner.RunWith; import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.item.file.FlatFileItemReader; import org.springframework.batch.item.file.mapping.FieldSetMapper; import org.springframework.batch.item.file.transform.LineTokenizer; import org.springframework.batch.sample.trade.Trade; import org.springframework.batch.sample.trade.TradeFieldSetMapper; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; import org.springframework.jdbc.core.JdbcOperations; -import org.springframework.jdbc.core.RowCallbackHandler; import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.jdbc.core.RowCallbackHandler; import org.springframework.test.context.ContextConfiguration; -import org.junit.Before; -import org.junit.runner.RunWith; - -import javax.sql.DataSource; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration() diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/FootballJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/FootballJobFunctionalTests.java index f335e3063..bbee97b12 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/FootballJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/FootballJobFunctionalTests.java @@ -1,15 +1,15 @@ package org.springframework.batch.sample; -import static org.junit.Assert.*; -import org.junit.runner.RunWith; +import static org.junit.Assert.assertTrue; import javax.sql.DataSource; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcOperations; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.beans.factory.annotation.Autowired; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration() diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTests.java index 0c29815c5..06648f0e4 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTests.java @@ -16,16 +16,18 @@ package org.springframework.batch.sample; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import org.junit.Test; +import org.junit.runner.RunWith; import org.springframework.batch.core.BatchStatus; import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobParameters; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.transaction.annotation.Transactional; -import org.junit.runner.RunWith; -import org.junit.Test; /** * Functional test for graceful shutdown. A batch container is started in a new thread, diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java index 050e73b54..685d23f37 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java @@ -1,6 +1,11 @@ package org.springframework.batch.sample; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.math.BigDecimal; +import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; @@ -14,9 +19,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.transaction.annotation.Transactional; -import java.math.BigDecimal; -import java.util.List; - /** * Test for HibernateJob - checks that customer credit has been updated to * expected value. diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateJobFunctionalTests.java index 2884bb5ca..245554a20 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateJobFunctionalTests.java @@ -1,8 +1,8 @@ package org.springframework.batch.sample; import org.junit.runner.RunWith; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** * Test for HibernateJob - checks that customer credit has been updated to expected value. diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/IbatisJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/IbatisJobFunctionalTests.java index ed1ac9ba1..faa023c79 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/IbatisJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/IbatisJobFunctionalTests.java @@ -1,8 +1,8 @@ package org.springframework.batch.sample; import org.junit.runner.RunWith; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/JobExecutionContextSampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/JobExecutionContextSampleFunctionalTests.java index c7db883e3..e02821902 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/JobExecutionContextSampleFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/JobExecutionContextSampleFunctionalTests.java @@ -1,13 +1,13 @@ package org.springframework.batch.sample; -import static org.junit.Assert.*; -import org.junit.runner.RunWith; +import static org.junit.Assert.assertEquals; +import org.junit.runner.RunWith; import org.springframework.batch.sample.tasklet.DummyMessageReceivingTasklet; import org.springframework.batch.sample.tasklet.DummyMessageSendingTasklet; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.beans.factory.annotation.Autowired; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration() diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultiResourceJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultiResourceJobFunctionalTests.java index a0f89fb42..9e2bda329 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultiResourceJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultiResourceJobFunctionalTests.java @@ -1,11 +1,11 @@ package org.springframework.batch.sample; import org.junit.runner.RunWith; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.ContextConfiguration; +import org.springframework.batch.core.Job; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.batch.core.Job; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration() diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultilineJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultilineJobFunctionalTests.java index 402b86fa0..aae72f662 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultilineJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultilineJobFunctionalTests.java @@ -16,15 +16,15 @@ package org.springframework.batch.sample; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import org.apache.commons.io.IOUtils; +import org.junit.runner.RunWith; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.Resource; -import org.springframework.util.StringUtils; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.ContextConfiguration; -import org.junit.runner.RunWith; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.util.StringUtils; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration() diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultilineOrderJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultilineOrderJobFunctionalTests.java index fc796a387..de877b3e6 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultilineOrderJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultilineOrderJobFunctionalTests.java @@ -16,17 +16,17 @@ package org.springframework.batch.sample; -import static org.junit.Assert.*; -import org.junit.runner.RunWith; +import static org.junit.Assert.assertEquals; import java.io.IOException; import org.apache.commons.io.IOUtils; +import org.junit.runner.RunWith; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.Resource; -import org.springframework.util.StringUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.util.StringUtils; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration() diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/ParallelJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/ParallelJobFunctionalTests.java index 5637946ac..cdb5b3fc2 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/ParallelJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/ParallelJobFunctionalTests.java @@ -1,16 +1,16 @@ package org.springframework.batch.sample; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import javax.sql.DataSource; +import org.junit.runner.RunWith; import org.springframework.batch.sample.common.StagingItemWriter; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcOperations; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.beans.factory.annotation.Autowired; -import org.junit.runner.RunWith; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration() diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RestartFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RestartFunctionalTests.java index b12f08a04..b30104147 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RestartFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RestartFunctionalTests.java @@ -16,21 +16,23 @@ package org.springframework.batch.sample; -import static org.junit.Assert.*; -import org.junit.runner.RunWith; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import javax.sql.DataSource; + +import org.junit.Test; +import org.junit.runner.RunWith; import org.springframework.batch.core.UnexpectedJobExecutionException; import org.springframework.batch.core.converter.DefaultJobParametersConverter; import org.springframework.batch.support.PropertiesConverter; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcOperations; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.transaction.BeforeTransaction; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.beans.factory.annotation.Autowired; - -import javax.sql.DataSource; +import org.springframework.test.context.transaction.BeforeTransaction; /** * Simple restart scenario. diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RetrySampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RetrySampleFunctionalTests.java index 8e6d326f6..f8e2ddbee 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RetrySampleFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RetrySampleFunctionalTests.java @@ -1,13 +1,13 @@ package org.springframework.batch.sample; -import static org.junit.Assert.*; -import org.junit.runner.RunWith; +import static org.junit.Assert.assertEquals; +import org.junit.runner.RunWith; import org.springframework.batch.sample.item.writer.RetrySampleItemWriter; import org.springframework.batch.sample.trade.GeneratingTradeItemReader; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.ContextConfiguration; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** * Checks that expected number of items have been processed. diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java index 32e621298..2ef20550d 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java @@ -1,6 +1,9 @@ package org.springframework.batch.sample; import static org.junit.Assert.assertEquals; + +import javax.sql.DataSource; + import org.junit.Before; import org.junit.runner.RunWith; import org.springframework.batch.sample.common.ItemTrackingItemWriter; @@ -9,8 +12,6 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import javax.sql.DataSource; - /** * Error is encountered during writing - transaction is rolled back and the * error item is skipped on second attempt to process the chunk. diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/TaskletJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/TaskletJobFunctionalTests.java index ca07c465d..fa82ab4cd 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/TaskletJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/TaskletJobFunctionalTests.java @@ -2,13 +2,13 @@ package org.springframework.batch.sample; import java.io.File; -import org.springframework.core.io.Resource; -import org.springframework.util.Assert; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.beans.factory.annotation.Autowired; -import org.junit.runner.RunWith; import org.junit.Before; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.io.Resource; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.util.Assert; /** * Deletes files in the given directory. diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java index 0090b13d3..7da527f29 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java @@ -18,6 +18,7 @@ package org.springframework.batch.sample; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; + import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; @@ -27,21 +28,21 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import javax.sql.DataSource; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; import org.springframework.batch.sample.trade.Trade; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.Resource; import org.springframework.jdbc.core.JdbcOperations; -import org.springframework.jdbc.core.RowCallbackHandler; import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.jdbc.core.RowCallbackHandler; import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; -import org.junit.runner.RunWith; -import org.junit.Test; -import org.junit.Before; - -import javax.sql.DataSource; @RunWith(SpringJUnit4ClassRunner.class) diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/advice/JobExecutionNotificationPublisherTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/advice/JobExecutionNotificationPublisherTests.java index 0cbe42e8a..6250093f1 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/advice/JobExecutionNotificationPublisherTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/advice/JobExecutionNotificationPublisherTests.java @@ -18,14 +18,15 @@ package org.springframework.batch.sample.advice; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import java.util.ArrayList; +import java.util.List; + +import javax.management.Notification; + import org.junit.Test; import org.springframework.jmx.export.notification.NotificationPublisher; import org.springframework.jmx.export.notification.UnableToSendNotificationException; -import javax.management.Notification; -import java.util.ArrayList; -import java.util.List; - /** * @author Dave Syer * @author Thomas Risberg diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDaoTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDaoTests.java index c283797dc..294d5949e 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDaoTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDaoTests.java @@ -15,7 +15,11 @@ */ package org.springframework.batch.sample.dao; -import static org.easymock.EasyMock.*; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; + +import java.math.BigDecimal; import org.junit.Before; import org.junit.Test; @@ -24,8 +28,6 @@ import org.springframework.batch.item.ItemStream; import org.springframework.batch.item.ItemWriter; import org.springframework.batch.sample.trade.CustomerCredit; -import java.math.BigDecimal; - public class FlatFileCustomerCreditDaoTests { //private MockControl outputControl; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileOrderWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileOrderWriterTests.java index 55919e59b..02e7212b4 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileOrderWriterTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileOrderWriterTests.java @@ -32,11 +32,12 @@ import org.springframework.batch.item.file.transform.LineAggregator; import org.springframework.batch.item.support.AbstractItemWriter; import org.springframework.batch.item.transform.ItemTransformerItemWriter; import org.springframework.batch.sample.StubLineAggregator; -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.order.Address; +import org.springframework.batch.sample.order.BillingInfo; +import org.springframework.batch.sample.order.Customer; +import org.springframework.batch.sample.order.LineItem; +import org.springframework.batch.sample.order.Order; +import org.springframework.batch.sample.order.OrderTransformer; public class FlatFileOrderWriterTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcCustomerDebitDaoTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcCustomerDebitDaoTests.java index ae71d2155..b6d56a288 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcCustomerDebitDaoTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcCustomerDebitDaoTests.java @@ -16,6 +16,13 @@ package org.springframework.batch.sample.dao; import static org.junit.Assert.assertEquals; + +import java.math.BigDecimal; +import java.sql.ResultSet; +import java.sql.SQLException; + +import javax.sql.DataSource; + import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.batch.sample.trade.CustomerDebit; @@ -26,11 +33,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.transaction.annotation.Transactional; -import javax.sql.DataSource; -import java.math.BigDecimal; -import java.sql.ResultSet; -import java.sql.SQLException; - @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration() public class JdbcCustomerDebitDaoTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcGameDaoIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcGameDaoIntegrationTests.java index 7dd2a5d63..5cf3256e1 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcGameDaoIntegrationTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcGameDaoIntegrationTests.java @@ -16,6 +16,12 @@ package org.springframework.batch.sample.dao; import static org.junit.Assert.assertEquals; + +import java.sql.ResultSet; +import java.sql.SQLException; + +import javax.sql.DataSource; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -28,10 +34,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.transaction.annotation.Transactional; -import javax.sql.DataSource; -import java.sql.ResultSet; -import java.sql.SQLException; - /** * @author Lucas Ward * diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java index 14f5fd966..8faf1d318 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java @@ -15,9 +15,23 @@ */ package org.springframework.batch.sample.dao; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.io.Serializable; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +import javax.sql.DataSource; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import static org.junit.Assert.*; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -37,15 +51,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.TransactionCallback; import org.springframework.transaction.support.TransactionTemplate; -import javax.sql.DataSource; -import java.io.Serializable; -import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = {"/simple-job-launcher-context.xml"}) public class JdbcJobRepositoryTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDaoIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDaoIntegrationTests.java index 0100168d2..1f7b8c792 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDaoIntegrationTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDaoIntegrationTests.java @@ -16,6 +16,9 @@ package org.springframework.batch.sample.dao; import static org.junit.Assert.assertEquals; + +import javax.sql.DataSource; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -28,8 +31,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.transaction.annotation.Transactional; -import javax.sql.DataSource; - /** * @author Lucas Ward diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/OrderTransformerTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/OrderTransformerTests.java index 88b39ecfc..b064b3d43 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/OrderTransformerTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/OrderTransformerTests.java @@ -26,11 +26,12 @@ import java.util.HashMap; import org.junit.Test; import org.springframework.batch.item.file.transform.DelimitedLineAggregator; import org.springframework.batch.item.file.transform.LineAggregator; -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.order.Address; +import org.springframework.batch.sample.order.BillingInfo; +import org.springframework.batch.sample.order.Customer; +import org.springframework.batch.sample.order.LineItem; +import org.springframework.batch.sample.order.Order; +import org.springframework.batch.sample.order.OrderTransformer; /** * @author Dave Syer diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/GeneratingItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/GeneratingItemReaderTests.java index 30c7fe47d..ffc6704ec 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/GeneratingItemReaderTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/GeneratingItemReaderTests.java @@ -1,6 +1,7 @@ package org.springframework.batch.sample.item.reader; import static org.junit.Assert.assertEquals; + import org.junit.Test; import org.springframework.batch.sample.trade.GeneratingTradeItemReader; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/OrderItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/OrderItemReaderTests.java index 79c60d01d..2dcdc96f1 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/OrderItemReaderTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/OrderItemReaderTests.java @@ -18,12 +18,13 @@ import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.file.mapping.DefaultFieldSet; import org.springframework.batch.item.file.mapping.FieldSet; import org.springframework.batch.item.file.mapping.FieldSetMapper; -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; +import org.springframework.batch.sample.order.Address; +import org.springframework.batch.sample.order.BillingInfo; +import org.springframework.batch.sample.order.Customer; +import org.springframework.batch.sample.order.LineItem; +import org.springframework.batch.sample.order.Order; +import org.springframework.batch.sample.order.OrderItemReader; +import org.springframework.batch.sample.order.ShippingInfo; public class OrderItemReaderTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/StagingItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/StagingItemReaderTests.java index f40a5e246..f552b81da 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/StagingItemReaderTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/StagingItemReaderTests.java @@ -2,6 +2,8 @@ package org.springframework.batch.sample.item.reader; import static org.junit.Assert.assertEquals; +import javax.sql.DataSource; + import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -25,8 +27,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.TransactionCallback; import org.springframework.transaction.support.TransactionTemplate; -import javax.sql.DataSource; - @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration() public class StagingItemReaderTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditIncreaseProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditIncreaseProcessorTests.java index 69e4c500d..87729476b 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditIncreaseProcessorTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditIncreaseProcessorTests.java @@ -1,10 +1,10 @@ package org.springframework.batch.sample.item.writer; -import static org.junit.Assert.*; -import org.junit.Test; +import static org.junit.Assert.assertTrue; import java.math.BigDecimal; +import org.junit.Test; import org.springframework.batch.sample.dao.CustomerCreditDao; import org.springframework.batch.sample.trade.CustomerCredit; import org.springframework.batch.sample.trade.CustomerCreditIncreaseWriter; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateProcessorTests.java index 9727a8fc0..bf3da9feb 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateProcessorTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateProcessorTests.java @@ -3,11 +3,11 @@ package org.springframework.batch.sample.item.writer; import java.math.BigDecimal; import org.easymock.MockControl; +import org.junit.Before; +import org.junit.Test; import org.springframework.batch.sample.dao.CustomerCreditDao; import org.springframework.batch.sample.trade.CustomerCredit; import org.springframework.batch.sample.trade.CustomerCreditUpdateWriter; -import org.junit.Before; -import org.junit.Test; public class CustomerCreditUpdateProcessorTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerUpdateProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerUpdateProcessorTests.java index 43c02cc0f..a223bbe33 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerUpdateProcessorTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerUpdateProcessorTests.java @@ -1,10 +1,10 @@ package org.springframework.batch.sample.item.writer; -import static org.junit.Assert.*; -import org.junit.Test; +import static org.junit.Assert.assertEquals; import java.math.BigDecimal; +import org.junit.Test; import org.springframework.batch.sample.dao.CustomerDebitDao; import org.springframework.batch.sample.trade.CustomerDebit; import org.springframework.batch.sample.trade.CustomerUpdateWriter; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/RetrySampleItemWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/RetrySampleItemWriterTests.java index 4bad672c8..0e7cb37f7 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/RetrySampleItemWriterTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/RetrySampleItemWriterTests.java @@ -1,6 +1,8 @@ package org.springframework.batch.sample.item.writer; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + import org.junit.Test; /** diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AbstractFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AbstractFieldSetMapperTests.java index 2bd7e5de7..49cf537a0 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AbstractFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AbstractFieldSetMapperTests.java @@ -1,6 +1,7 @@ package org.springframework.batch.sample.mapping; import static org.junit.Assert.assertEquals; + import org.junit.Test; import org.springframework.batch.item.file.mapping.FieldSet; import org.springframework.batch.item.file.mapping.FieldSetMapper; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AddressFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AddressFieldSetMapperTests.java index 9b01493ff..bbc5d33b5 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AddressFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AddressFieldSetMapperTests.java @@ -3,8 +3,8 @@ package org.springframework.batch.sample.mapping; import org.springframework.batch.item.file.mapping.DefaultFieldSet; import org.springframework.batch.item.file.mapping.FieldSet; import org.springframework.batch.item.file.mapping.FieldSetMapper; -import org.springframework.batch.sample.domain.Address; -import org.springframework.batch.sample.mapping.AddressFieldSetMapper; +import org.springframework.batch.sample.order.Address; +import org.springframework.batch.sample.order.AddressFieldSetMapper; public class AddressFieldSetMapperTests extends AbstractFieldSetMapperTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/BillingFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/BillingFieldSetMapperTests.java index 3ca0bb8c6..e240533c7 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/BillingFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/BillingFieldSetMapperTests.java @@ -3,7 +3,8 @@ package org.springframework.batch.sample.mapping; import org.springframework.batch.item.file.mapping.DefaultFieldSet; import org.springframework.batch.item.file.mapping.FieldSet; import org.springframework.batch.item.file.mapping.FieldSetMapper; -import org.springframework.batch.sample.domain.BillingInfo; +import org.springframework.batch.sample.order.BillingFieldSetMapper; +import org.springframework.batch.sample.order.BillingInfo; public class BillingFieldSetMapperTests extends AbstractFieldSetMapperTests{ diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapperTests.java index 8478282ad..bf34a63a2 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapperTests.java @@ -3,7 +3,8 @@ package org.springframework.batch.sample.mapping; import org.springframework.batch.item.file.mapping.DefaultFieldSet; import org.springframework.batch.item.file.mapping.FieldSet; import org.springframework.batch.item.file.mapping.FieldSetMapper; -import org.springframework.batch.sample.domain.Customer; +import org.springframework.batch.sample.order.Customer; +import org.springframework.batch.sample.order.CustomerFieldSetMapper; public class CustomerFieldSetMapperTests extends AbstractFieldSetMapperTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapperTests.java index 2da8f002f..9bff23d6d 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapperTests.java @@ -5,7 +5,8 @@ import java.util.Calendar; import org.springframework.batch.item.file.mapping.DefaultFieldSet; import org.springframework.batch.item.file.mapping.FieldSet; import org.springframework.batch.item.file.mapping.FieldSetMapper; -import org.springframework.batch.sample.domain.Order; +import org.springframework.batch.sample.order.HeaderFieldSetMapper; +import org.springframework.batch.sample.order.Order; public class HeaderFieldSetMapperTests extends AbstractFieldSetMapperTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapperTests.java index 95bb42307..19f7bf6ff 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapperTests.java @@ -5,7 +5,8 @@ import java.math.BigDecimal; import org.springframework.batch.item.file.mapping.DefaultFieldSet; import org.springframework.batch.item.file.mapping.FieldSet; import org.springframework.batch.item.file.mapping.FieldSetMapper; -import org.springframework.batch.sample.domain.LineItem; +import org.springframework.batch.sample.order.LineItem; +import org.springframework.batch.sample.order.OrderItemFieldSetMapper; public class OrderItemFieldSetMapperTests extends AbstractFieldSetMapperTests{ diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/ShippingFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/ShippingFieldSetMapperTests.java index f3bd329dc..b694e54f9 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/ShippingFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/ShippingFieldSetMapperTests.java @@ -3,8 +3,8 @@ package org.springframework.batch.sample.mapping; import org.springframework.batch.item.file.mapping.DefaultFieldSet; import org.springframework.batch.item.file.mapping.FieldSet; import org.springframework.batch.item.file.mapping.FieldSetMapper; -import org.springframework.batch.sample.domain.ShippingInfo; -import org.springframework.batch.sample.mapping.ShippingFieldSetMapper; +import org.springframework.batch.sample.order.ShippingFieldSetMapper; +import org.springframework.batch.sample.order.ShippingInfo; public class ShippingFieldSetMapperTests extends AbstractFieldSetMapperTests{ diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java index f7f08c889..54fe94911 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java @@ -1,6 +1,9 @@ package org.springframework.batch.sample.mapping; import static org.junit.Assert.assertEquals; + +import java.math.BigDecimal; + import org.junit.Test; import org.springframework.batch.item.file.mapping.DefaultFieldSet; import org.springframework.batch.item.file.mapping.FieldSet; @@ -9,8 +12,6 @@ import org.springframework.batch.item.support.AggregateItemReader; import org.springframework.batch.sample.trade.Trade; import org.springframework.batch.sample.trade.TradeFieldSetMapper; -import java.math.BigDecimal; - public class TradeFieldSetMapperTests extends AbstractFieldSetMapperTests { private static final String CUSTOMER = "Mike Tomcat"; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/FutureDateFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/FutureDateFunctionTests.java similarity index 79% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/FutureDateFunctionTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/FutureDateFunctionTests.java index 24947160a..8803a7b4d 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/FutureDateFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/FutureDateFunctionTests.java @@ -1,14 +1,19 @@ -package org.springframework.batch.sample.validation.valang.custom; +package org.springframework.batch.sample.order.valang; -import static org.easymock.EasyMock.*; -import static org.junit.Assert.*; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.util.Date; import org.junit.Before; import org.junit.Test; +import org.springframework.batch.sample.order.valang.FutureDateFunction; import org.springmodules.validation.valang.functions.Function; -import java.util.Date; - public class FutureDateFunctionTests { private FutureDateFunction function; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/TotalOrderItemsFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/TotalOrderItemsFunctionTests.java similarity index 79% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/TotalOrderItemsFunctionTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/TotalOrderItemsFunctionTests.java index dd188932b..848b87cd9 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/TotalOrderItemsFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/TotalOrderItemsFunctionTests.java @@ -1,16 +1,21 @@ -package org.springframework.batch.sample.validation.valang.custom; +package org.springframework.batch.sample.order.valang; -import static org.easymock.EasyMock.*; -import static org.junit.Assert.*; - -import org.springframework.batch.sample.domain.LineItem; -import org.springmodules.validation.valang.functions.Function; -import org.junit.Before; -import org.junit.Test; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.util.ArrayList; import java.util.List; +import org.junit.Before; +import org.junit.Test; +import org.springframework.batch.sample.order.LineItem; +import org.springframework.batch.sample.order.valang.TotalOrderItemsFunction; +import org.springmodules.validation.valang.functions.Function; + public class TotalOrderItemsFunctionTests { private TotalOrderItemsFunction function; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateDiscountsFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateDiscountsFunctionTests.java similarity index 92% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateDiscountsFunctionTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateDiscountsFunctionTests.java index 4da9b53ae..de48b84a9 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateDiscountsFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateDiscountsFunctionTests.java @@ -1,17 +1,21 @@ -package org.springframework.batch.sample.validation.valang.custom; +package org.springframework.batch.sample.order.valang; -import static org.easymock.EasyMock.*; -import static org.junit.Assert.*; - -import org.junit.Before; -import org.junit.Test; -import org.springframework.batch.sample.domain.LineItem; -import org.springmodules.validation.valang.functions.Function; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; +import org.junit.Before; +import org.junit.Test; +import org.springframework.batch.sample.order.LineItem; +import org.springframework.batch.sample.order.valang.ValidateDiscountsFunction; +import org.springmodules.validation.valang.functions.Function; + public class ValidateDiscountsFunctionTests { private ValidateDiscountsFunction function; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateHandlingPricesFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateHandlingPricesFunctionTests.java similarity index 83% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateHandlingPricesFunctionTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateHandlingPricesFunctionTests.java index 7e6b83da0..3f63e47aa 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateHandlingPricesFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateHandlingPricesFunctionTests.java @@ -1,17 +1,19 @@ -package org.springframework.batch.sample.validation.valang.custom; +package org.springframework.batch.sample.order.valang; -import static org.easymock.EasyMock.*; - -import static org.junit.Assert.*; -import org.junit.Before; -import org.junit.Test; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; -import org.springframework.batch.sample.domain.LineItem; - +import org.junit.Before; +import org.junit.Test; +import org.springframework.batch.sample.order.LineItem; +import org.springframework.batch.sample.order.valang.ValidateHandlingPricesFunction; import org.springmodules.validation.valang.functions.Function; public class ValidateHandlingPricesFunctionTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateIdsFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateIdsFunctionTests.java similarity index 82% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateIdsFunctionTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateIdsFunctionTests.java index c6a2aaa13..4aefd95a8 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateIdsFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateIdsFunctionTests.java @@ -1,16 +1,20 @@ -package org.springframework.batch.sample.validation.valang.custom; +package org.springframework.batch.sample.order.valang; -import static org.easymock.EasyMock.*; -import static org.junit.Assert.*; - -import org.junit.Before; -import org.junit.Test; -import org.springframework.batch.sample.domain.LineItem; -import org.springmodules.validation.valang.functions.Function; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; +import org.junit.Before; +import org.junit.Test; +import org.springframework.batch.sample.order.LineItem; +import org.springframework.batch.sample.order.valang.ValidateIdsFunction; +import org.springmodules.validation.valang.functions.Function; + public class ValidateIdsFunctionTests { private ValidateIdsFunction function; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidatePricesFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidatePricesFunctionTests.java similarity index 87% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidatePricesFunctionTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidatePricesFunctionTests.java index 7856a4561..5de2e4be5 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidatePricesFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidatePricesFunctionTests.java @@ -1,17 +1,21 @@ -package org.springframework.batch.sample.validation.valang.custom; +package org.springframework.batch.sample.order.valang; -import static org.easymock.EasyMock.*; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.junit.Before; -import org.junit.Test; -import org.springframework.batch.sample.domain.LineItem; -import org.springmodules.validation.valang.functions.Function; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; +import org.junit.Before; +import org.junit.Test; +import org.springframework.batch.sample.order.LineItem; +import org.springframework.batch.sample.order.valang.ValidatePricesFunction; +import org.springmodules.validation.valang.functions.Function; + public class ValidatePricesFunctionTests { private ValidatePricesFunction function; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateQuantitiesFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateQuantitiesFunctionTests.java similarity index 86% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateQuantitiesFunctionTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateQuantitiesFunctionTests.java index 364933ddd..a53b49739 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateQuantitiesFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateQuantitiesFunctionTests.java @@ -1,16 +1,20 @@ -package org.springframework.batch.sample.validation.valang.custom; +package org.springframework.batch.sample.order.valang; -import static org.easymock.EasyMock.*; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.junit.Before; -import org.junit.Test; -import org.springframework.batch.sample.domain.LineItem; -import org.springmodules.validation.valang.functions.Function; import java.util.ArrayList; import java.util.List; +import org.junit.Before; +import org.junit.Test; +import org.springframework.batch.sample.order.LineItem; +import org.springframework.batch.sample.order.valang.ValidateQuantitiesFunction; +import org.springmodules.validation.valang.functions.Function; + public class ValidateQuantitiesFunctionTests { private ValidateQuantitiesFunction function; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateShippingPricesFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateShippingPricesFunctionTests.java similarity index 87% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateShippingPricesFunctionTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateShippingPricesFunctionTests.java index 04b971522..c2b2ae14e 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateShippingPricesFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateShippingPricesFunctionTests.java @@ -1,17 +1,21 @@ -package org.springframework.batch.sample.validation.valang.custom; +package org.springframework.batch.sample.order.valang; -import static org.easymock.EasyMock.*; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.junit.Before; -import org.junit.Test; -import org.springframework.batch.sample.domain.LineItem; -import org.springmodules.validation.valang.functions.Function; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; +import org.junit.Before; +import org.junit.Test; +import org.springframework.batch.sample.order.LineItem; +import org.springframework.batch.sample.order.valang.ValidateShippingPricesFunction; +import org.springmodules.validation.valang.functions.Function; + public class ValidateShippingPricesFunctionTests { private ValidateShippingPricesFunction function; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateTotalPricesFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateTotalPricesFunctionTests.java similarity index 89% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateTotalPricesFunctionTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateTotalPricesFunctionTests.java index f70ebba85..0e4421f4c 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateTotalPricesFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateTotalPricesFunctionTests.java @@ -1,16 +1,22 @@ -package org.springframework.batch.sample.validation.valang.custom; +package org.springframework.batch.sample.order.valang; -import static org.easymock.EasyMock.*; -import static org.junit.Assert.*; -import org.junit.Before; -import org.junit.Test; -import org.springframework.batch.sample.domain.LineItem; -import org.springmodules.validation.valang.functions.Function; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; +import org.junit.Before; +import org.junit.Test; +import org.springframework.batch.sample.order.LineItem; +import org.springframework.batch.sample.order.valang.ValidateTotalPricesFunction; +import org.springmodules.validation.valang.functions.Function; + public class ValidateTotalPricesFunctionTests { private ValidateTotalPricesFunction function; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/quartz/JobLauncherDetailsTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/quartz/JobLauncherDetailsTests.java index 926ed6d0b..ab28b94e9 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/quartz/JobLauncherDetailsTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/quartz/JobLauncherDetailsTests.java @@ -18,6 +18,11 @@ package org.springframework.batch.sample.quartz; import static org.easymock.EasyMock.createNiceMock; import static org.junit.Assert.assertEquals; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + import org.junit.Before; import org.junit.Test; import org.quartz.Job; @@ -35,11 +40,6 @@ import org.springframework.batch.core.repository.JobRestartException; import org.springframework.batch.core.repository.NoSuchJobException; import org.springframework.batch.sample.tasklet.JobSupport; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - /** * @author Dave Syer * diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ConfigurableSystemProcessExitCodeMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ConfigurableSystemProcessExitCodeMapperTests.java index a340b0ae0..5cbd81808 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ConfigurableSystemProcessExitCodeMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ConfigurableSystemProcessExitCodeMapperTests.java @@ -2,13 +2,14 @@ package org.springframework.batch.sample.tasklet; import static org.junit.Assert.assertSame; import static org.junit.Assert.fail; -import org.junit.Test; -import org.springframework.batch.repeat.ExitStatus; -import org.springframework.batch.sample.common.ConfigurableSystemProcessExitCodeMapper; import java.util.HashMap; import java.util.Map; +import org.junit.Test; +import org.springframework.batch.repeat.ExitStatus; +import org.springframework.batch.sample.common.ConfigurableSystemProcessExitCodeMapper; + /** * Tests for {@link ConfigurableSystemProcessExitCodeMapper} */ diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionThrowingItemReaderProxyTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionThrowingItemReaderProxyTests.java index 5a497d802..a2df9309b 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionThrowingItemReaderProxyTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionThrowingItemReaderProxyTests.java @@ -1,16 +1,17 @@ package org.springframework.batch.sample.tasklet; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.util.ArrayList; +import org.junit.After; +import org.junit.Test; import org.springframework.batch.core.UnexpectedJobExecutionException; import org.springframework.batch.item.support.ListItemReader; import org.springframework.batch.repeat.context.RepeatContextSupport; import org.springframework.batch.repeat.support.RepeatSynchronizationManager; import org.springframework.batch.sample.common.ExceptionThrowingItemReaderProxy; -import org.junit.After; -import org.junit.Test; public class ExceptionThrowingItemReaderProxyTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/JobSupport.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/JobSupport.java index 527edd94c..068b29a07 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/JobSupport.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/JobSupport.java @@ -19,10 +19,10 @@ package org.springframework.batch.sample.tasklet; import java.util.ArrayList; import java.util.List; -import org.springframework.batch.core.UnexpectedJobExecutionException; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.Step; +import org.springframework.batch.core.UnexpectedJobExecutionException; import org.springframework.beans.factory.BeanNameAware; import org.springframework.util.ClassUtils; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/SimpleSystemProcessExitCodeMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/SimpleSystemProcessExitCodeMapperTests.java index d8c7f203b..bb7155e28 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/SimpleSystemProcessExitCodeMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/SimpleSystemProcessExitCodeMapperTests.java @@ -1,8 +1,8 @@ package org.springframework.batch.sample.tasklet; -import static org.junit.Assert.*; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import org.junit.Test; import org.springframework.batch.repeat.ExitStatus; import org.springframework.batch.sample.common.SimpleSystemProcessExitCodeMapper; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/StepSupport.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/StepSupport.java index a7b403efc..c499ee3b1 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/StepSupport.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/StepSupport.java @@ -15,10 +15,10 @@ */ package org.springframework.batch.sample.tasklet; -import org.springframework.batch.core.UnexpectedJobExecutionException; import org.springframework.batch.core.JobInterruptedException; import org.springframework.batch.core.Step; import org.springframework.batch.core.StepExecution; +import org.springframework.batch.core.UnexpectedJobExecutionException; import org.springframework.beans.factory.BeanNameAware; /** diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/SystemCommandTaskletIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/SystemCommandTaskletIntegrationTests.java index c663ffc04..cbf292e67 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/SystemCommandTaskletIntegrationTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/SystemCommandTaskletIntegrationTests.java @@ -1,8 +1,13 @@ package org.springframework.batch.sample.tasklet; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.io.File; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import static org.junit.Assert.*; import org.junit.Before; import org.junit.Test; import org.springframework.batch.core.JobExecution; @@ -16,8 +21,6 @@ import org.springframework.batch.sample.common.SystemCommandTasklet; import org.springframework.batch.sample.common.SystemProcessExitCodeMapper; import org.springframework.util.Assert; -import java.io.File; - /** * Tests for {@link SystemCommandTasklet}. */