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

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.domain.PersonService;
+import org.springframework.batch.sample.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/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.dao.HibernateCreditDao;
+import org.springframework.batch.sample.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,7 +3,7 @@ package org.springframework.batch.sample;
 import static org.junit.Assert.assertEquals;
 
 import org.junit.runner.RunWith;
-import org.springframework.batch.sample.item.writer.RetrySampleItemWriter;
+import org.springframework.batch.sample.retry.RetrySampleItemWriter;
 import org.springframework.batch.sample.trade.GeneratingTradeItemReader;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;

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

@@ -27,6 +27,7 @@ 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;
 
 public class FlatFileCustomerCreditDaoTests {
 

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

@@ -26,6 +26,7 @@ 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.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/JdbcTradeWriterTests.java

@@ -25,6 +25,7 @@ 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.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;

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

@@ -5,8 +5,8 @@ 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.CustomerCreditDao;
 import org.springframework.batch.sample.trade.CustomerCreditIncreaseWriter;
 
 /**

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

@@ -5,8 +5,8 @@ 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.CustomerCreditDao;
 import org.springframework.batch.sample.trade.CustomerCreditUpdateWriter;
 
 public class CustomerCreditUpdateProcessorTests {

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

@@ -5,8 +5,8 @@ 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.CustomerDebitDao;
 import org.springframework.batch.sample.trade.CustomerUpdateWriter;
 import org.springframework.batch.sample.trade.Trade;
 

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

@@ -4,6 +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;
 
 /**
  * Tests for {@link RetrySampleItemWriter}.

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

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

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.dao.JdbcCustomerDebitDao"/>
+	<bean class="org.springframework.batch.sample.trade.JdbcCustomerDebitDao"/>
 
 </beans>