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

spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractCustomerCreditIncreaseTests.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 import javax.sql.DataSource;
 
-import org.springframework.batch.sample.trade.CustomerCreditIncreaseWriter;
+import org.springframework.batch.sample.domain.trade.CustomerCreditIncreaseWriter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcOperations;
 import org.springframework.jdbc.core.JdbcTemplate;

spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeItemWriterSampleFunctionalTests.java

@@ -14,7 +14,7 @@ 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.batch.sample.domain.trade.Trade;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcOperations;
 import org.springframework.jdbc.core.JdbcTemplate;

spring-batch-samples/src/test/java/org/springframework/batch/sample/DelegatingJobFunctionalTests.java

@@ -4,7 +4,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.runner.RunWith;
-import org.springframework.batch.sample.person.PersonService;
+import org.springframework.batch.sample.domain.person.PersonService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java

@@ -32,8 +32,8 @@ 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.batch.sample.domain.trade.Trade;
+import org.springframework.batch.sample.domain.trade.TradeFieldSetMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;

spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java

@@ -11,7 +11,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.sample.trade.HibernateCreditDao;
+import org.springframework.batch.sample.domain.trade.HibernateCreditDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.UncategorizedSQLException;
 import org.springframework.orm.hibernate3.HibernateJdbcException;

spring-batch-samples/src/test/java/org/springframework/batch/sample/RetrySampleFunctionalTests.java

@@ -3,8 +3,8 @@ package org.springframework.batch.sample;
 import static org.junit.Assert.assertEquals;
 
 import org.junit.runner.RunWith;
-import org.springframework.batch.sample.retry.RetrySampleItemWriter;
-import org.springframework.batch.sample.trade.GeneratingTradeItemReader;
+import org.springframework.batch.sample.domain.trade.GeneratingTradeItemReader;
+import org.springframework.batch.sample.support.RetrySampleItemWriter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java

@@ -33,7 +33,7 @@ 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.batch.sample.domain.trade.Trade;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;

spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDaoTests.java

@@ -26,8 +26,8 @@ import org.junit.Test;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.ItemWriter;
-import org.springframework.batch.sample.trade.CustomerCredit;
-import org.springframework.batch.sample.trade.FlatFileCustomerCreditDao;
+import org.springframework.batch.sample.domain.trade.CustomerCredit;
+import org.springframework.batch.sample.domain.trade.FlatFileCustomerCreditDao;
 
 public class FlatFileCustomerCreditDaoTests {
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileOrderWriterTests.java

@@ -32,12 +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.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;
+import org.springframework.batch.sample.domain.order.Address;
+import org.springframework.batch.sample.domain.order.BillingInfo;
+import org.springframework.batch.sample.domain.order.Customer;
+import org.springframework.batch.sample.domain.order.LineItem;
+import org.springframework.batch.sample.domain.order.Order;
+import org.springframework.batch.sample.domain.order.OrderTransformer;
 
 public class FlatFileOrderWriterTests {
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcCustomerDebitDaoTests.java

@@ -25,8 +25,8 @@ import javax.sql.DataSource;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.batch.sample.trade.CustomerDebit;
-import org.springframework.batch.sample.trade.JdbcCustomerDebitDao;
+import org.springframework.batch.sample.domain.trade.CustomerDebit;
+import org.springframework.batch.sample.domain.trade.JdbcCustomerDebitDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.RowCallbackHandler;
 import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;

spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcGameDaoIntegrationTests.java

@@ -25,8 +25,8 @@ import javax.sql.DataSource;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.batch.sample.football.Game;
-import org.springframework.batch.sample.football.JdbcGameDao;
+import org.springframework.batch.sample.domain.football.Game;
+import org.springframework.batch.sample.domain.football.JdbcGameDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
 import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;

spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerDaoIntegrationTests.java

@@ -25,8 +25,8 @@ import javax.sql.DataSource;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.batch.sample.football.JdbcPlayerDao;
-import org.springframework.batch.sample.football.Player;
+import org.springframework.batch.sample.domain.football.JdbcPlayerDao;
+import org.springframework.batch.sample.domain.football.Player;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowCallbackHandler;

spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDaoIntegrationTests.java

@@ -22,9 +22,9 @@ import javax.sql.DataSource;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.batch.sample.football.JdbcPlayerSummaryDao;
-import org.springframework.batch.sample.football.PlayerSummary;
-import org.springframework.batch.sample.football.PlayerSummaryMapper;
+import org.springframework.batch.sample.domain.football.JdbcPlayerSummaryDao;
+import org.springframework.batch.sample.domain.football.PlayerSummary;
+import org.springframework.batch.sample.domain.football.PlayerSummaryMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.context.ContextConfiguration;

spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcTradeWriterTests.java

@@ -25,8 +25,8 @@ import javax.sql.DataSource;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.batch.sample.trade.JdbcTradeDao;
-import org.springframework.batch.sample.trade.Trade;
+import org.springframework.batch.sample.domain.trade.JdbcTradeDao;
+import org.springframework.batch.sample.domain.trade.Trade;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowCallbackHandler;

spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/OrderTransformerTests.java

@@ -26,12 +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.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;
+import org.springframework.batch.sample.domain.order.Address;
+import org.springframework.batch.sample.domain.order.BillingInfo;
+import org.springframework.batch.sample.domain.order.Customer;
+import org.springframework.batch.sample.domain.order.LineItem;
+import org.springframework.batch.sample.domain.order.Order;
+import org.springframework.batch.sample.domain.order.OrderTransformer;
 
 /**
  * @author Dave Syer

spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/FutureDateFunctionTests.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.order.valang;
+package org.springframework.batch.sample.domain.order.valang;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -11,7 +11,7 @@ import java.util.Date;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.batch.sample.order.valang.FutureDateFunction;
+import org.springframework.batch.sample.domain.order.valang.FutureDateFunction;
 import org.springmodules.validation.valang.functions.Function;
 
 public class FutureDateFunctionTests {

spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/TotalOrderItemsFunctionTests.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.order.valang;
+package org.springframework.batch.sample.domain.order.valang;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -12,8 +12,8 @@ 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.springframework.batch.sample.domain.order.LineItem;
+import org.springframework.batch.sample.domain.order.valang.TotalOrderItemsFunction;
 import org.springmodules.validation.valang.functions.Function;
 
 public class TotalOrderItemsFunctionTests {

spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateDiscountsFunctionTests.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.order.valang;
+package org.springframework.batch.sample.domain.order.valang;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -12,8 +12,8 @@ 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.springframework.batch.sample.domain.order.LineItem;
+import org.springframework.batch.sample.domain.order.valang.ValidateDiscountsFunction;
 import org.springmodules.validation.valang.functions.Function;
 
 public class ValidateDiscountsFunctionTests {

spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateHandlingPricesFunctionTests.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.order.valang;
+package org.springframework.batch.sample.domain.order.valang;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -12,8 +12,8 @@ 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.ValidateHandlingPricesFunction;
+import org.springframework.batch.sample.domain.order.LineItem;
+import org.springframework.batch.sample.domain.order.valang.ValidateHandlingPricesFunction;
 import org.springmodules.validation.valang.functions.Function;
 
 public class ValidateHandlingPricesFunctionTests {

spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateIdsFunctionTests.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.order.valang;
+package org.springframework.batch.sample.domain.order.valang;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -11,8 +11,8 @@ 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.springframework.batch.sample.domain.order.LineItem;
+import org.springframework.batch.sample.domain.order.valang.ValidateIdsFunction;
 import org.springmodules.validation.valang.functions.Function;
 
 public class ValidateIdsFunctionTests {

spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidatePricesFunctionTests.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.order.valang;
+package org.springframework.batch.sample.domain.order.valang;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -12,8 +12,8 @@ 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.springframework.batch.sample.domain.order.LineItem;
+import org.springframework.batch.sample.domain.order.valang.ValidatePricesFunction;
 import org.springmodules.validation.valang.functions.Function;
 
 public class ValidatePricesFunctionTests {

spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateQuantitiesFunctionTests.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.order.valang;
+package org.springframework.batch.sample.domain.order.valang;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -11,8 +11,8 @@ 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.springframework.batch.sample.domain.order.LineItem;
+import org.springframework.batch.sample.domain.order.valang.ValidateQuantitiesFunction;
 import org.springmodules.validation.valang.functions.Function;
 
 public class ValidateQuantitiesFunctionTests {

spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateShippingPricesFunctionTests.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.order.valang;
+package org.springframework.batch.sample.domain.order.valang;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -12,8 +12,8 @@ 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.springframework.batch.sample.domain.order.LineItem;
+import org.springframework.batch.sample.domain.order.valang.ValidateShippingPricesFunction;
 import org.springmodules.validation.valang.functions.Function;
 
 public class ValidateShippingPricesFunctionTests {

spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateTotalPricesFunctionTests.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.order.valang;
+package org.springframework.batch.sample.domain.order.valang;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -13,8 +13,8 @@ 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.springframework.batch.sample.domain.order.LineItem;
+import org.springframework.batch.sample.domain.order.valang.ValidateTotalPricesFunction;
 import org.springmodules.validation.valang.functions.Function;
 
 public class ValidateTotalPricesFunctionTests {

spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/GeneratingItemReaderTests.java

@@ -3,7 +3,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;
+import org.springframework.batch.sample.domain.trade.GeneratingTradeItemReader;
 
 /**
  * Tests for {@link GeneratingTradeItemReader}.

spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/OrderItemReaderTests.java

@@ -18,13 +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.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;
+import org.springframework.batch.sample.domain.order.Address;
+import org.springframework.batch.sample.domain.order.BillingInfo;
+import org.springframework.batch.sample.domain.order.Customer;
+import org.springframework.batch.sample.domain.order.LineItem;
+import org.springframework.batch.sample.domain.order.Order;
+import org.springframework.batch.sample.domain.order.OrderItemReader;
+import org.springframework.batch.sample.domain.order.ShippingInfo;
 
 public class OrderItemReaderTests {
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditIncreaseProcessorTests.java

@@ -5,9 +5,9 @@ import static org.junit.Assert.assertTrue;
 import java.math.BigDecimal;
 
 import org.junit.Test;
-import org.springframework.batch.sample.trade.CustomerCredit;
-import org.springframework.batch.sample.trade.CustomerCreditDao;
-import org.springframework.batch.sample.trade.CustomerCreditIncreaseWriter;
+import org.springframework.batch.sample.domain.trade.CustomerCredit;
+import org.springframework.batch.sample.domain.trade.CustomerCreditDao;
+import org.springframework.batch.sample.domain.trade.CustomerCreditIncreaseWriter;
 
 /**
  * Tests for {@link CustomerCreditIncreaseWriter}.

spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdatePreparedStatementSetterTests.java

@@ -22,8 +22,8 @@ import java.sql.SQLException;
 import org.easymock.EasyMock;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.batch.sample.trade.CustomerCredit;
-import org.springframework.batch.sample.trade.CustomerCreditUpdatePreparedStatementSetter;
+import org.springframework.batch.sample.domain.trade.CustomerCredit;
+import org.springframework.batch.sample.domain.trade.CustomerCreditUpdatePreparedStatementSetter;
 
 /**
  * @author Dave Syer
@@ -47,7 +47,7 @@ public class CustomerCreditUpdatePreparedStatementSetterTests {
 	}
 	
 	/**
-	 * Test method for {@link org.springframework.batch.sample.trade.CustomerCreditUpdatePreparedStatementSetter#setValues(CustomerCredit, PreparedStatement) }
+	 * Test method for {@link org.springframework.batch.sample.domain.trade.CustomerCreditUpdatePreparedStatementSetter#setValues(CustomerCredit, PreparedStatement) }
 	 * @throws SQLException 
 	 */
 	@Test

spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateProcessorTests.java

@@ -5,9 +5,9 @@ import java.math.BigDecimal;
 import org.easymock.MockControl;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.batch.sample.trade.CustomerCredit;
-import org.springframework.batch.sample.trade.CustomerCreditDao;
-import org.springframework.batch.sample.trade.CustomerCreditUpdateWriter;
+import org.springframework.batch.sample.domain.trade.CustomerCredit;
+import org.springframework.batch.sample.domain.trade.CustomerCreditDao;
+import org.springframework.batch.sample.domain.trade.CustomerCreditUpdateWriter;
 
 public class CustomerCreditUpdateProcessorTests {
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerUpdateProcessorTests.java

@@ -5,10 +5,10 @@ import static org.junit.Assert.assertEquals;
 import java.math.BigDecimal;
 
 import org.junit.Test;
-import org.springframework.batch.sample.trade.CustomerDebit;
-import org.springframework.batch.sample.trade.CustomerDebitDao;
-import org.springframework.batch.sample.trade.CustomerUpdateWriter;
-import org.springframework.batch.sample.trade.Trade;
+import org.springframework.batch.sample.domain.trade.CustomerDebit;
+import org.springframework.batch.sample.domain.trade.CustomerDebitDao;
+import org.springframework.batch.sample.domain.trade.CustomerUpdateWriter;
+import org.springframework.batch.sample.domain.trade.Trade;
 
 public class CustomerUpdateProcessorTests {
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/RetrySampleItemWriterTests.java

@@ -4,7 +4,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 import org.junit.Test;
-import org.springframework.batch.sample.retry.RetrySampleItemWriter;
+import org.springframework.batch.sample.support.RetrySampleItemWriter;
 
 /**
  * Tests for {@link RetrySampleItemWriter}.

spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/TradeProcessorTests.java

@@ -3,9 +3,9 @@ package org.springframework.batch.sample.item.writer;
 import org.easymock.MockControl;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.batch.sample.trade.Trade;
-import org.springframework.batch.sample.trade.TradeDao;
-import org.springframework.batch.sample.trade.TradeWriter;
+import org.springframework.batch.sample.domain.trade.Trade;
+import org.springframework.batch.sample.domain.trade.TradeDao;
+import org.springframework.batch.sample.domain.trade.TradeWriter;
 
 public class TradeProcessorTests {
 

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.order.Address;
-import org.springframework.batch.sample.order.AddressFieldSetMapper;
+import org.springframework.batch.sample.domain.order.Address;
+import org.springframework.batch.sample.domain.order.AddressFieldSetMapper;
 
 
 public class AddressFieldSetMapperTests extends AbstractFieldSetMapperTests {

spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/BillingFieldSetMapperTests.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.order.BillingFieldSetMapper;
-import org.springframework.batch.sample.order.BillingInfo;
+import org.springframework.batch.sample.domain.order.BillingFieldSetMapper;
+import org.springframework.batch.sample.domain.order.BillingInfo;
 
 public class BillingFieldSetMapperTests extends AbstractFieldSetMapperTests{
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerCreditRowMapperTests.java

@@ -5,8 +5,8 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import org.easymock.MockControl;
-import org.springframework.batch.sample.trade.CustomerCredit;
-import org.springframework.batch.sample.trade.CustomerCreditRowMapper;
+import org.springframework.batch.sample.domain.trade.CustomerCredit;
+import org.springframework.batch.sample.domain.trade.CustomerCreditRowMapper;
 import org.springframework.jdbc.core.RowMapper;
 
 public class CustomerCreditRowMapperTests extends AbstractRowMapperTests {

spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapperTests.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.order.Customer;
-import org.springframework.batch.sample.order.CustomerFieldSetMapper;
+import org.springframework.batch.sample.domain.order.Customer;
+import org.springframework.batch.sample.domain.order.CustomerFieldSetMapper;
 
 public class CustomerFieldSetMapperTests extends AbstractFieldSetMapperTests {
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapperTests.java

@@ -5,8 +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.order.HeaderFieldSetMapper;
-import org.springframework.batch.sample.order.Order;
+import org.springframework.batch.sample.domain.order.HeaderFieldSetMapper;
+import org.springframework.batch.sample.domain.order.Order;
 
 public class HeaderFieldSetMapperTests extends AbstractFieldSetMapperTests {
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapperTests.java

@@ -5,8 +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.order.LineItem;
-import org.springframework.batch.sample.order.OrderItemFieldSetMapper;
+import org.springframework.batch.sample.domain.order.LineItem;
+import org.springframework.batch.sample.domain.order.OrderItemFieldSetMapper;
 
 public class OrderItemFieldSetMapperTests extends AbstractFieldSetMapperTests{
 

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.order.ShippingFieldSetMapper;
-import org.springframework.batch.sample.order.ShippingInfo;
+import org.springframework.batch.sample.domain.order.ShippingFieldSetMapper;
+import org.springframework.batch.sample.domain.order.ShippingInfo;
 
 public class ShippingFieldSetMapperTests extends AbstractFieldSetMapperTests{
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java

@@ -9,8 +9,8 @@ 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.item.support.AggregateItemReader;
-import org.springframework.batch.sample.trade.Trade;
-import org.springframework.batch.sample.trade.TradeFieldSetMapper;
+import org.springframework.batch.sample.domain.trade.Trade;
+import org.springframework.batch.sample.domain.trade.TradeFieldSetMapper;
 
 public class TradeFieldSetMapperTests extends AbstractFieldSetMapperTests {
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeRowMapperTests.java

@@ -5,8 +5,8 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import org.easymock.MockControl;
-import org.springframework.batch.sample.trade.Trade;
-import org.springframework.batch.sample.trade.TradeRowMapper;
+import org.springframework.batch.sample.domain.trade.Trade;
+import org.springframework.batch.sample.domain.trade.TradeRowMapper;
 import org.springframework.jdbc.core.RowMapper;
 
 public class TradeRowMapperTests extends AbstractRowMapperTests {

spring-batch-samples/src/test/resources/org/springframework/batch/sample/dao/JdbcCustomerDebitDaoTests-context.xml

@@ -6,6 +6,6 @@
 
 	<import resource="classpath:data-source-context.xml"/>
 
-	<bean class="org.springframework.batch.sample.trade.JdbcCustomerDebitDao"/>
+	<bean class="org.springframework.batch.sample.domain.trade.JdbcCustomerDebitDao"/>
 
 </beans>