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

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

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.tasklet;
+package org.springframework.batch.sample.common;
 
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.fail;

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

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.tasklet;
+package org.springframework.batch.sample.common;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;

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

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.tasklet;
+package org.springframework.batch.sample.common;
 
 import static org.junit.Assert.assertEquals;
 

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

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.item.reader;
+package org.springframework.batch.sample.common;
 
 import static org.junit.Assert.assertEquals;
 

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.item.writer;
+package org.springframework.batch.sample.common;
 
 import static org.junit.Assert.assertEquals;
 

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

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.tasklet;
+package org.springframework.batch.sample.common;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;

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

@@ -40,7 +40,7 @@ import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
 import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.sample.tasklet.JobSupport;
+import org.springframework.batch.sample.support.JobSupport;
 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

@@ -5,7 +5,7 @@ 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.mapping.AbstractFieldSetMapperTests;
+import org.springframework.batch.sample.support.AbstractFieldSetMapperTests;
 
 
 public class AddressFieldSetMapperTests extends AbstractFieldSetMapperTests {

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

@@ -5,7 +5,7 @@ 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.mapping.AbstractFieldSetMapperTests;
+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

@@ -5,7 +5,7 @@ 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.mapping.AbstractFieldSetMapperTests;
+import org.springframework.batch.sample.support.AbstractFieldSetMapperTests;
 
 public class CustomerFieldSetMapperTests extends AbstractFieldSetMapperTests {
 

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

@@ -7,7 +7,7 @@ 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.mapping.AbstractFieldSetMapperTests;
+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

@@ -7,7 +7,7 @@ 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.mapping.AbstractFieldSetMapperTests;
+import org.springframework.batch.sample.support.AbstractFieldSetMapperTests;
 
 public class OrderItemFieldSetMapperTests extends AbstractFieldSetMapperTests{
 

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

@@ -5,7 +5,7 @@ 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.mapping.AbstractFieldSetMapperTests;
+import org.springframework.batch.sample.support.AbstractFieldSetMapperTests;
 
 public class ShippingFieldSetMapperTests extends AbstractFieldSetMapperTests{
 

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

@@ -7,7 +7,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.mapping.AbstractRowMapperTests;
+import org.springframework.batch.sample.support.AbstractRowMapperTests;
 import org.springframework.jdbc.core.RowMapper;
 
 public class CustomerCreditRowMapperTests extends AbstractRowMapperTests {

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

@@ -11,7 +11,7 @@ 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.mapping.AbstractFieldSetMapperTests;
+import org.springframework.batch.sample.support.AbstractFieldSetMapperTests;
 
 public class TradeFieldSetMapperTests extends AbstractFieldSetMapperTests {
 

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

@@ -7,7 +7,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.mapping.AbstractRowMapperTests;
+import org.springframework.batch.sample.support.AbstractRowMapperTests;
 import org.springframework.jdbc.core.RowMapper;
 
 public class TradeRowMapperTests extends AbstractRowMapperTests {

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.advice;
+package org.springframework.batch.sample.jmx;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;

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

@@ -38,7 +38,7 @@ import org.springframework.batch.core.launch.JobLauncher;
 import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
 import org.springframework.batch.core.repository.JobRestartException;
 import org.springframework.batch.core.repository.NoSuchJobException;
-import org.springframework.batch.sample.tasklet.JobSupport;
+import org.springframework.batch.sample.support.JobSupport;
 
 /**
  * @author Dave Syer

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

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.mapping;
+package org.springframework.batch.sample.support;
 
 import static org.junit.Assert.assertEquals;
 

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

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.mapping;
+package org.springframework.batch.sample.support;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.tasklet;
+package org.springframework.batch.sample.support;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.item.writer;
+package org.springframework.batch.sample.support;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.tasklet;
+package org.springframework.batch.sample.support;
 
 import org.springframework.batch.core.JobInterruptedException;
 import org.springframework.batch.core.Step;