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

packaged football job

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.*;
 import org.junit.runner.RunWith;
 
-import org.springframework.batch.sample.item.reader.GeneratingItemReader;
+import org.springframework.batch.sample.item.reader.GeneratingTradeItemReader;
 import org.springframework.batch.sample.item.writer.RetrySampleItemWriter;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.ContextConfiguration;
@@ -19,7 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 public class RetrySampleFunctionalTests extends AbstractValidatingBatchLauncherTests {
 
 	@Autowired
-	private GeneratingItemReader itemGenerator;
+	private GeneratingTradeItemReader itemGenerator;
 	
 	@Autowired
 	private RetrySampleItemWriter<?> itemProcessor;

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

@@ -20,6 +20,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.batch.sample.domain.Game;
+import org.springframework.batch.sample.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

@@ -26,6 +26,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.batch.sample.domain.Player;
+import org.springframework.batch.sample.football.JdbcPlayerDao;
 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

@@ -20,7 +20,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.batch.sample.domain.PlayerSummary;
-import org.springframework.batch.sample.mapping.PlayerSummaryMapper;
+import org.springframework.batch.sample.football.JdbcPlayerSummaryDao;
+import org.springframework.batch.sample.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/item/reader/GeneratingItemReaderTests.java

@@ -4,13 +4,13 @@ import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 
 /**
- * Tests for {@link GeneratingItemReader}.
+ * Tests for {@link GeneratingTradeItemReader}.
  * 
  * @author Robert Kasanicky
  */
 public class GeneratingItemReaderTests {
 
-	private GeneratingItemReader reader = new GeneratingItemReader();
+	private GeneratingTradeItemReader reader = new GeneratingTradeItemReader();
 	
 	/**
 	 * Generates a given number of not-null records,