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

added internal subpackages

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.domain.trade.CustomerCreditIncreaseWriter;
+import org.springframework.batch.sample.domain.trade.internal.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/FixedLengthImportJobFunctionalTests.java

@@ -33,7 +33,7 @@ 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.domain.trade.Trade;
-import org.springframework.batch.sample.domain.trade.TradeFieldSetMapper;
+import org.springframework.batch.sample.domain.trade.internal.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.domain.trade.HibernateCreditDao;
+import org.springframework.batch.sample.domain.trade.internal.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.domain.trade.GeneratingTradeItemReader;
+import org.springframework.batch.sample.domain.trade.internal.GeneratingTradeItemReader;
 import org.springframework.batch.sample.support.RetrySampleItemWriter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;

spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/internal/JdbcGameDaoIntegrationTests.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.football;
+package org.springframework.batch.sample.domain.football.internal;
 
 import static org.junit.Assert.assertEquals;
 
@@ -26,7 +26,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.batch.sample.domain.football.Game;
-import org.springframework.batch.sample.domain.football.JdbcGameDao;
+import org.springframework.batch.sample.domain.football.internal.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/domain/football/internal/JdbcPlayerDaoIntegrationTests.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.football;
+package org.springframework.batch.sample.domain.football.internal;
 
 import static org.junit.Assert.assertEquals;
 
@@ -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.domain.football.JdbcPlayerDao;
 import org.springframework.batch.sample.domain.football.Player;
+import org.springframework.batch.sample.domain.football.internal.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/domain/football/internal/JdbcPlayerSummaryDaoIntegrationTests.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.football;
+package org.springframework.batch.sample.domain.football.internal;
 
 import static org.junit.Assert.assertEquals;
 
@@ -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.domain.football.JdbcPlayerSummaryDao;
 import org.springframework.batch.sample.domain.football.PlayerSummary;
-import org.springframework.batch.sample.domain.football.PlayerSummaryMapper;
+import org.springframework.batch.sample.domain.football.internal.JdbcPlayerSummaryDao;
+import org.springframework.batch.sample.domain.football.internal.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/domain/order/AddressFieldSetMapperTests.java

@@ -4,7 +4,7 @@ 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.Address;
-import org.springframework.batch.sample.domain.order.AddressFieldSetMapper;
+import org.springframework.batch.sample.domain.order.internal.AddressFieldSetMapper;
 import org.springframework.batch.sample.support.AbstractFieldSetMapperTests;
 
 

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

@@ -3,8 +3,8 @@ package org.springframework.batch.sample.domain.order;
 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.BillingFieldSetMapper;
 import org.springframework.batch.sample.domain.order.BillingInfo;
+import org.springframework.batch.sample.domain.order.internal.BillingFieldSetMapper;
 import org.springframework.batch.sample.support.AbstractFieldSetMapperTests;
 
 public class BillingFieldSetMapperTests extends AbstractFieldSetMapperTests{

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

@@ -4,7 +4,7 @@ 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.Customer;
-import org.springframework.batch.sample.domain.order.CustomerFieldSetMapper;
+import org.springframework.batch.sample.domain.order.internal.CustomerFieldSetMapper;
 import org.springframework.batch.sample.support.AbstractFieldSetMapperTests;
 
 public class CustomerFieldSetMapperTests extends AbstractFieldSetMapperTests {

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

@@ -37,7 +37,7 @@ 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;
+import org.springframework.batch.sample.domain.order.internal.OrderTransformer;
 
 public class FlatFileOrderWriterTests {
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/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.domain.order.HeaderFieldSetMapper;
 import org.springframework.batch.sample.domain.order.Order;
+import org.springframework.batch.sample.domain.order.internal.HeaderFieldSetMapper;
 import org.springframework.batch.sample.support.AbstractFieldSetMapperTests;
 
 public class HeaderFieldSetMapperTests extends AbstractFieldSetMapperTests {

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

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

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

@@ -23,8 +23,8 @@ 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;
+import org.springframework.batch.sample.domain.order.internal.OrderItemReader;
 
 public class OrderItemReaderTests {
 

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

@@ -31,7 +31,7 @@ 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;
+import org.springframework.batch.sample.domain.order.internal.OrderTransformer;
 
 /**
  * @author Dave Syer

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

@@ -3,8 +3,8 @@ package org.springframework.batch.sample.domain.order;
 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.ShippingFieldSetMapper;
 import org.springframework.batch.sample.domain.order.ShippingInfo;
+import org.springframework.batch.sample.domain.order.internal.ShippingFieldSetMapper;
 import org.springframework.batch.sample.support.AbstractFieldSetMapperTests;
 
 public class ShippingFieldSetMapperTests extends AbstractFieldSetMapperTests{

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

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.order.valang;
+package org.springframework.batch.sample.domain.order.internal.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.domain.order.valang.FutureDateFunction;
+import org.springframework.batch.sample.domain.order.internal.valang.FutureDateFunction;
 import org.springmodules.validation.valang.functions.Function;
 
 public class FutureDateFunctionTests {

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

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.order.valang;
+package org.springframework.batch.sample.domain.order.internal.valang;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -13,7 +13,7 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.batch.sample.domain.order.LineItem;
-import org.springframework.batch.sample.domain.order.valang.TotalOrderItemsFunction;
+import org.springframework.batch.sample.domain.order.internal.valang.TotalOrderItemsFunction;
 import org.springmodules.validation.valang.functions.Function;
 
 public class TotalOrderItemsFunctionTests {

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

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.order.valang;
+package org.springframework.batch.sample.domain.order.internal.valang;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -13,7 +13,7 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.batch.sample.domain.order.LineItem;
-import org.springframework.batch.sample.domain.order.valang.ValidateDiscountsFunction;
+import org.springframework.batch.sample.domain.order.internal.valang.ValidateDiscountsFunction;
 import org.springmodules.validation.valang.functions.Function;
 
 public class ValidateDiscountsFunctionTests {

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

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.order.valang;
+package org.springframework.batch.sample.domain.order.internal.valang;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -13,7 +13,7 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.batch.sample.domain.order.LineItem;
-import org.springframework.batch.sample.domain.order.valang.ValidateHandlingPricesFunction;
+import org.springframework.batch.sample.domain.order.internal.valang.ValidateHandlingPricesFunction;
 import org.springmodules.validation.valang.functions.Function;
 
 public class ValidateHandlingPricesFunctionTests {

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

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.order.valang;
+package org.springframework.batch.sample.domain.order.internal.valang;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -12,7 +12,7 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.batch.sample.domain.order.LineItem;
-import org.springframework.batch.sample.domain.order.valang.ValidateIdsFunction;
+import org.springframework.batch.sample.domain.order.internal.valang.ValidateIdsFunction;
 import org.springmodules.validation.valang.functions.Function;
 
 public class ValidateIdsFunctionTests {

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

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.order.valang;
+package org.springframework.batch.sample.domain.order.internal.valang;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -13,7 +13,7 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.batch.sample.domain.order.LineItem;
-import org.springframework.batch.sample.domain.order.valang.ValidatePricesFunction;
+import org.springframework.batch.sample.domain.order.internal.valang.ValidatePricesFunction;
 import org.springmodules.validation.valang.functions.Function;
 
 public class ValidatePricesFunctionTests {

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

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.order.valang;
+package org.springframework.batch.sample.domain.order.internal.valang;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -12,7 +12,7 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.batch.sample.domain.order.LineItem;
-import org.springframework.batch.sample.domain.order.valang.ValidateQuantitiesFunction;
+import org.springframework.batch.sample.domain.order.internal.valang.ValidateQuantitiesFunction;
 import org.springmodules.validation.valang.functions.Function;
 
 public class ValidateQuantitiesFunctionTests {

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

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.order.valang;
+package org.springframework.batch.sample.domain.order.internal.valang;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -13,7 +13,7 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.batch.sample.domain.order.LineItem;
-import org.springframework.batch.sample.domain.order.valang.ValidateShippingPricesFunction;
+import org.springframework.batch.sample.domain.order.internal.valang.ValidateShippingPricesFunction;
 import org.springmodules.validation.valang.functions.Function;
 
 public class ValidateShippingPricesFunctionTests {

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

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.order.valang;
+package org.springframework.batch.sample.domain.order.internal.valang;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -14,7 +14,7 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.batch.sample.domain.order.LineItem;
-import org.springframework.batch.sample.domain.order.valang.ValidateTotalPricesFunction;
+import org.springframework.batch.sample.domain.order.internal.valang.ValidateTotalPricesFunction;
 import org.springmodules.validation.valang.functions.Function;
 
 public class ValidateTotalPricesFunctionTests {

spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditIncreaseProcessorTests.java

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

spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditRowMapperTests.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import java.math.BigDecimal;
 import java.sql.ResultSet;
@@ -6,7 +6,7 @@ import java.sql.SQLException;
 
 import org.easymock.MockControl;
 import org.springframework.batch.sample.domain.trade.CustomerCredit;
-import org.springframework.batch.sample.domain.trade.CustomerCreditRowMapper;
+import org.springframework.batch.sample.domain.trade.internal.CustomerCreditRowMapper;
 import org.springframework.batch.sample.support.AbstractRowMapperTests;
 import org.springframework.jdbc.core.RowMapper;
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetterTests.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.math.BigDecimal;
 import java.sql.PreparedStatement;
@@ -23,7 +23,7 @@ import org.easymock.EasyMock;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.batch.sample.domain.trade.CustomerCredit;
-import org.springframework.batch.sample.domain.trade.CustomerCreditUpdatePreparedStatementSetter;
+import org.springframework.batch.sample.domain.trade.internal.CustomerCreditUpdatePreparedStatementSetter;
 
 /**
  * @author Dave Syer
@@ -47,7 +47,7 @@ public class CustomerCreditUpdatePreparedStatementSetterTests {
 	}
 	
 	/**
-	 * Test method for {@link org.springframework.batch.sample.domain.trade.CustomerCreditUpdatePreparedStatementSetter#setValues(CustomerCredit, PreparedStatement) }
+	 * Test method for {@link org.springframework.batch.sample.domain.trade.internal.CustomerCreditUpdatePreparedStatementSetter#setValues(CustomerCredit, PreparedStatement) }
 	 * @throws SQLException 
 	 */
 	@Test

spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdateProcessorTests.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import java.math.BigDecimal;
 
@@ -7,7 +7,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.batch.sample.domain.trade.CustomerCredit;
 import org.springframework.batch.sample.domain.trade.CustomerCreditDao;
-import org.springframework.batch.sample.domain.trade.CustomerCreditUpdateWriter;
+import org.springframework.batch.sample.domain.trade.internal.CustomerCreditUpdateWriter;
 
 public class CustomerCreditUpdateProcessorTests {
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerUpdateProcessorTests.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import static org.junit.Assert.assertEquals;
 
@@ -7,8 +7,8 @@ import java.math.BigDecimal;
 import org.junit.Test;
 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;
+import org.springframework.batch.sample.domain.trade.internal.CustomerUpdateWriter;
 
 public class CustomerUpdateProcessorTests {
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDaoTests.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 static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.replay;
@@ -27,7 +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.domain.trade.CustomerCredit;
-import org.springframework.batch.sample.domain.trade.FlatFileCustomerCreditDao;
+import org.springframework.batch.sample.domain.trade.internal.FlatFileCustomerCreditDao;
 
 public class FlatFileCustomerCreditDaoTests {
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/GeneratingItemReaderTests.java

@@ -1,9 +1,9 @@
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
-import org.springframework.batch.sample.domain.trade.GeneratingTradeItemReader;
+import org.springframework.batch.sample.domain.trade.internal.GeneratingTradeItemReader;
 
 /**
  * Tests for {@link GeneratingTradeItemReader}.

spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/JdbcCustomerDebitDaoTests.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 static org.junit.Assert.assertEquals;
 
@@ -26,7 +26,7 @@ import javax.sql.DataSource;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.batch.sample.domain.trade.CustomerDebit;
-import org.springframework.batch.sample.domain.trade.JdbcCustomerDebitDao;
+import org.springframework.batch.sample.domain.trade.internal.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/domain/trade/internal/JdbcTradeWriterTests.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 static org.junit.Assert.assertEquals;
 
@@ -25,8 +25,8 @@ import javax.sql.DataSource;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.batch.sample.domain.trade.JdbcTradeDao;
 import org.springframework.batch.sample.domain.trade.Trade;
+import org.springframework.batch.sample.domain.trade.internal.JdbcTradeDao;
 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/domain/trade/internal/TradeFieldSetMapperTests.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import static org.junit.Assert.assertEquals;
 
@@ -10,7 +10,7 @@ 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;
-import org.springframework.batch.sample.domain.trade.TradeFieldSetMapper;
+import org.springframework.batch.sample.domain.trade.internal.TradeFieldSetMapper;
 import org.springframework.batch.sample.support.AbstractFieldSetMapperTests;
 
 public class TradeFieldSetMapperTests extends AbstractFieldSetMapperTests {

spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeProcessorTests.java

@@ -1,11 +1,11 @@
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import org.easymock.MockControl;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.batch.sample.domain.trade.Trade;
 import org.springframework.batch.sample.domain.trade.TradeDao;
-import org.springframework.batch.sample.domain.trade.TradeWriter;
+import org.springframework.batch.sample.domain.trade.internal.TradeWriter;
 
 public class TradeProcessorTests {
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeRowMapperTests.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.sample.domain.trade.internal;
 
 import java.math.BigDecimal;
 import java.sql.ResultSet;
@@ -6,7 +6,7 @@ import java.sql.SQLException;
 
 import org.easymock.MockControl;
 import org.springframework.batch.sample.domain.trade.Trade;
-import org.springframework.batch.sample.domain.trade.TradeRowMapper;
+import org.springframework.batch.sample.domain.trade.internal.TradeRowMapper;
 import org.springframework.batch.sample.support.AbstractRowMapperTests;
 import org.springframework.jdbc.core.RowMapper;
 

spring-batch-samples/src/test/resources/org/springframework/batch/sample/domain/trade/internal/JdbcCustomerDebitDaoTests-context.xml

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