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

added internal subpackages

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/FootballExceptionHandler.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.football;
+package org.springframework.batch.sample.domain.football.internal;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/GameFieldSetMapper.java

@@ -1,7 +1,8 @@
-package org.springframework.batch.sample.domain.football;
+package org.springframework.batch.sample.domain.football.internal;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.sample.domain.football.Game;
 
 public class GameFieldSetMapper implements FieldSetMapper<Game> {
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/JdbcGameDao.java

@@ -1,8 +1,9 @@
-package org.springframework.batch.sample.domain.football;
+package org.springframework.batch.sample.domain.football.internal;
 
 import org.springframework.batch.item.ClearFailedException;
 import org.springframework.batch.item.FlushFailedException;
 import org.springframework.batch.item.ItemWriter;
+import org.springframework.batch.sample.domain.football.Game;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.SqlParameterSource;
 import org.springframework.jdbc.core.simple.SimpleJdbcDaoSupport;

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/JdbcPlayerDao.java

@@ -1,8 +1,10 @@
 /**
  * 
  */
-package org.springframework.batch.sample.domain.football;
+package org.springframework.batch.sample.domain.football.internal;
 
+import org.springframework.batch.sample.domain.football.Player;
+import org.springframework.batch.sample.domain.football.PlayerDao;
 import org.springframework.jdbc.core.support.JdbcDaoSupport;
 
 /**

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/JdbcPlayerSummaryDao.java

@@ -1,8 +1,9 @@
-package org.springframework.batch.sample.domain.football;
+package org.springframework.batch.sample.domain.football.internal;
 
 import org.springframework.batch.item.ClearFailedException;
 import org.springframework.batch.item.FlushFailedException;
 import org.springframework.batch.item.ItemWriter;
+import org.springframework.batch.sample.domain.football.PlayerSummary;
 import org.springframework.jdbc.core.support.JdbcDaoSupport;
 
 public class JdbcPlayerSummaryDao extends JdbcDaoSupport implements ItemWriter<PlayerSummary> {

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerFieldSetMapper.java

@@ -1,7 +1,8 @@
-package org.springframework.batch.sample.domain.football;
+package org.springframework.batch.sample.domain.football.internal;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.sample.domain.football.Player;
 
 public class PlayerFieldSetMapper implements FieldSetMapper<Player> {
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerItemWriter.java

@@ -1,6 +1,8 @@
-package org.springframework.batch.sample.domain.football;
+package org.springframework.batch.sample.domain.football.internal;
 
 import org.springframework.batch.item.support.AbstractItemWriter;
+import org.springframework.batch.sample.domain.football.Player;
+import org.springframework.batch.sample.domain.football.PlayerDao;
 
 public class PlayerItemWriter extends AbstractItemWriter<Player> {
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerSummaryMapper.java

@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.domain.football;
+package org.springframework.batch.sample.domain.football.internal;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import org.springframework.batch.sample.domain.football.PlayerSummary;
 import org.springframework.jdbc.core.RowMapper;
 
 /**

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/PlayerSummaryRowMapper.java

@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.domain.football;
+package org.springframework.batch.sample.domain.football.internal;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import org.springframework.batch.sample.domain.football.PlayerSummary;
 import org.springframework.jdbc.core.RowMapper;
 
 /**

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

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

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

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

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

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

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

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

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

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

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.order;
+package org.springframework.batch.sample.domain.order.internal;
 
 import java.util.ArrayList;
 
@@ -24,6 +24,12 @@ 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.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.ShippingInfo;
 
 /**
  * @author peter.zozom

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.order;
+package org.springframework.batch.sample.domain.order.internal;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -25,6 +25,11 @@ 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.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;
 
 /**
  * Converts <code>Order</code> object to a String.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/internal/PersonWriter.java

@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.person;
+package org.springframework.batch.sample.domain.person.internal;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.batch.item.support.AbstractItemWriter;
+import org.springframework.batch.sample.domain.person.Person;
 
 
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditIncreaseWriter.java

@@ -1,8 +1,10 @@
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import java.math.BigDecimal;
 
 import org.springframework.batch.item.support.AbstractItemWriter;
+import org.springframework.batch.sample.domain.trade.CustomerCredit;
+import org.springframework.batch.sample.domain.trade.CustomerCreditDao;
 
 /**
  * Increases customer's credit by fixed amount.

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditRowMapper.java

@@ -1,8 +1,9 @@
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import org.springframework.batch.sample.domain.trade.CustomerCredit;
 import org.springframework.jdbc.core.RowMapper;
 
 public class CustomerCreditRowMapper implements RowMapper {

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetter.java

@@ -13,13 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import java.math.BigDecimal;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
 import org.springframework.batch.item.database.ItemPreparedStatementSetter;
+import org.springframework.batch.sample.domain.trade.CustomerCredit;
 
 /**
  * @author Dave Syer

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdateWriter.java

@@ -14,9 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import org.springframework.batch.item.support.AbstractItemWriter;
+import org.springframework.batch.sample.domain.trade.CustomerCredit;
+import org.springframework.batch.sample.domain.trade.CustomerCreditDao;
 
 
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerDebitRowMapper.java

@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import org.springframework.batch.sample.domain.trade.CustomerDebit;
 import org.springframework.jdbc.core.RowMapper;
 
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/CustomerUpdateWriter.java

@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import org.springframework.batch.item.support.AbstractItemWriter;
+import org.springframework.batch.sample.domain.trade.CustomerDebit;
+import org.springframework.batch.sample.domain.trade.CustomerDebitDao;
+import org.springframework.batch.sample.domain.trade.Trade;
 
 
 /**

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDao.java

@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.ItemWriter;
+import org.springframework.batch.sample.domain.trade.CustomerCredit;
+import org.springframework.batch.sample.domain.trade.CustomerCreditDao;
 import org.springframework.beans.factory.DisposableBean;
 
 /**

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/GeneratingTradeItemReader.java

@@ -1,10 +1,11 @@
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import java.math.BigDecimal;
 
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.MarkFailedException;
 import org.springframework.batch.item.ResetFailedException;
+import org.springframework.batch.sample.domain.trade.Trade;
 
 /**
  * Generates configurable number of {@link Trade} items.

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/HibernateCreditDao.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -21,6 +21,8 @@ import java.util.List;
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.RepeatListener;
+import org.springframework.batch.sample.domain.trade.CustomerCredit;
+import org.springframework.batch.sample.domain.trade.CustomerCreditDao;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
 /**
@@ -46,7 +48,7 @@ public class HibernateCreditDao extends HibernateDaoSupport implements
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.springframework.batch.sample.domain.trade.CustomerCreditWriter#write(org.springframework.batch.sample.domain.CustomerCredit)
+	 * @see org.springframework.batch.sample.domain.trade.internal.CustomerCreditWriter#write(org.springframework.batch.sample.domain.CustomerCredit)
 	 */
 	public void writeCredit(CustomerCredit customerCredit) {
 		if (customerCredit.getId() == failOnFlush) {

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/IbatisCustomerCreditDao.java

@@ -13,8 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
+import org.springframework.batch.sample.domain.trade.CustomerCredit;
+import org.springframework.batch.sample.domain.trade.CustomerCreditDao;
 import org.springframework.orm.ibatis.support.SqlMapClientDaoSupport;
 
 /**
@@ -27,7 +29,7 @@ public class IbatisCustomerCreditDao extends SqlMapClientDaoSupport
 	String statementId;
 
 	/* (non-Javadoc)
-	 * @see org.springframework.batch.sample.domain.trade.CustomerCreditWriter#write(org.springframework.batch.sample.domain.CustomerCredit)
+	 * @see org.springframework.batch.sample.domain.trade.internal.CustomerCreditWriter#write(org.springframework.batch.sample.domain.CustomerCredit)
 	 */
 	public void writeCredit(CustomerCredit customerCredit) {
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/JdbcCustomerDebitDao.java

@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import javax.sql.DataSource;
 
+import org.springframework.batch.sample.domain.trade.CustomerDebit;
+import org.springframework.batch.sample.domain.trade.CustomerDebitDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.simple.SimpleJdbcOperations;
 import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/JdbcTradeDao.java

@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.batch.sample.domain.trade.Trade;
+import org.springframework.batch.sample.domain.trade.TradeDao;
 import org.springframework.jdbc.core.JdbcOperations;
 import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapper.java

@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 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.domain.trade.Trade;
 
 
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeRowMapper.java

@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import org.springframework.batch.sample.domain.trade.Trade;
 import org.springframework.jdbc.core.RowMapper;
 
 public class TradeRowMapper implements RowMapper {

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeWriter.java

@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.batch.item.support.AbstractItemWriter;
+import org.springframework.batch.sample.domain.trade.Trade;
+import org.springframework.batch.sample.domain.trade.TradeDao;
 
 /**
  * Delegates the actual writing to custom DAO delegate. Allows configurable