From 6966b1a3f3b4e2c831512ed0745d295103bb7713 Mon Sep 17 00:00:00 2001 From: robokaso Date: Fri, 25 Jul 2008 13:04:38 +0000 Subject: [PATCH] IN PROGRESS - BATCH-693: Refactor samples along domain contours --- .../ConfigurableSystemProcessExitCodeMapperTests.java | 2 +- .../ExceptionThrowingItemReaderProxyTests.java | 2 +- .../SimpleSystemProcessExitCodeMapperTests.java | 2 +- .../sample/{item/reader => common}/StagingItemReaderTests.java | 2 +- .../sample/{item/writer => common}/StagingItemWriterTests.java | 2 +- .../SystemCommandTaskletIntegrationTests.java | 2 +- .../batch/sample/dao/JdbcJobRepositoryTests.java | 2 +- .../batch/sample/domain/order/AddressFieldSetMapperTests.java | 2 +- .../batch/sample/domain/order/BillingFieldSetMapperTests.java | 2 +- .../batch/sample/domain/order/CustomerFieldSetMapperTests.java | 2 +- .../batch/sample/domain/order/HeaderFieldSetMapperTests.java | 2 +- .../batch/sample/domain/order/OrderItemFieldSetMapperTests.java | 2 +- .../batch/sample/domain/order/ShippingFieldSetMapperTests.java | 2 +- .../batch/sample/domain/trade/CustomerCreditRowMapperTests.java | 2 +- .../batch/sample/domain/trade/TradeFieldSetMapperTests.java | 2 +- .../batch/sample/domain/trade/TradeRowMapperTests.java | 2 +- .../{advice => jmx}/JobExecutionNotificationPublisherTests.java | 2 +- .../batch/sample/quartz/JobLauncherDetailsTests.java | 2 +- .../{mapping => support}/AbstractFieldSetMapperTests.java | 2 +- .../sample/{mapping => support}/AbstractRowMapperTests.java | 2 +- .../batch/sample/{tasklet => support}/JobSupport.java | 2 +- .../{item/writer => support}/RetrySampleItemWriterTests.java | 2 +- .../batch/sample/{tasklet => support}/StepSupport.java | 2 +- .../{item/reader => common}/StagingItemReaderTests-context.xml | 0 .../{item/writer => common}/StagingItemWriterTests-context.xml | 0 25 files changed, 23 insertions(+), 23 deletions(-) rename spring-batch-samples/src/test/java/org/springframework/batch/sample/{tasklet => common}/ConfigurableSystemProcessExitCodeMapperTests.java (94%) rename spring-batch-samples/src/test/java/org/springframework/batch/sample/{tasklet => common}/ExceptionThrowingItemReaderProxyTests.java (97%) rename spring-batch-samples/src/test/java/org/springframework/batch/sample/{tasklet => common}/SimpleSystemProcessExitCodeMapperTests.java (90%) rename spring-batch-samples/src/test/java/org/springframework/batch/sample/{item/reader => common}/StagingItemReaderTests.java (99%) rename spring-batch-samples/src/test/java/org/springframework/batch/sample/{item/writer => common}/StagingItemWriterTests.java (97%) rename spring-batch-samples/src/test/java/org/springframework/batch/sample/{tasklet => common}/SystemCommandTaskletIntegrationTests.java (95%) rename spring-batch-samples/src/test/java/org/springframework/batch/sample/{advice => jmx}/JobExecutionNotificationPublisherTests.java (97%) rename spring-batch-samples/src/test/java/org/springframework/batch/sample/{mapping => support}/AbstractFieldSetMapperTests.java (95%) rename spring-batch-samples/src/test/java/org/springframework/batch/sample/{mapping => support}/AbstractRowMapperTests.java (96%) rename spring-batch-samples/src/test/java/org/springframework/batch/sample/{tasklet => support}/JobSupport.java (98%) rename spring-batch-samples/src/test/java/org/springframework/batch/sample/{item/writer => support}/RetrySampleItemWriterTests.java (93%) rename spring-batch-samples/src/test/java/org/springframework/batch/sample/{tasklet => support}/StepSupport.java (98%) rename spring-batch-samples/src/test/resources/org/springframework/batch/sample/{item/reader => common}/StagingItemReaderTests-context.xml (100%) rename spring-batch-samples/src/test/resources/org/springframework/batch/sample/{item/writer => common}/StagingItemWriterTests-context.xml (100%) diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ConfigurableSystemProcessExitCodeMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/ConfigurableSystemProcessExitCodeMapperTests.java similarity index 94% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ConfigurableSystemProcessExitCodeMapperTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/common/ConfigurableSystemProcessExitCodeMapperTests.java index 5cbd81808..ba2953aa2 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ConfigurableSystemProcessExitCodeMapperTests.java +++ b/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; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionThrowingItemReaderProxyTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/ExceptionThrowingItemReaderProxyTests.java similarity index 97% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionThrowingItemReaderProxyTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/common/ExceptionThrowingItemReaderProxyTests.java index 603b94748..43e75dbe3 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionThrowingItemReaderProxyTests.java +++ b/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; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/SimpleSystemProcessExitCodeMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/SimpleSystemProcessExitCodeMapperTests.java similarity index 90% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/SimpleSystemProcessExitCodeMapperTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/common/SimpleSystemProcessExitCodeMapperTests.java index bb7155e28..8072ee293 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/SimpleSystemProcessExitCodeMapperTests.java +++ b/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; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/StagingItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/StagingItemReaderTests.java similarity index 99% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/StagingItemReaderTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/common/StagingItemReaderTests.java index f552b81da..cf9e0bac6 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/StagingItemReaderTests.java +++ b/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; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/StagingItemWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/StagingItemWriterTests.java similarity index 97% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/StagingItemWriterTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/common/StagingItemWriterTests.java index 32f2b8f91..5098548fe 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/StagingItemWriterTests.java +++ b/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; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/SystemCommandTaskletIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/SystemCommandTaskletIntegrationTests.java similarity index 95% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/SystemCommandTaskletIntegrationTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/common/SystemCommandTaskletIntegrationTests.java index cbf292e67..5a2239615 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/SystemCommandTaskletIntegrationTests.java +++ b/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; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java index 8faf1d318..8d86f4c40 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java +++ b/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; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/AddressFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/AddressFieldSetMapperTests.java index 076da5d1b..00e8b905d 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/AddressFieldSetMapperTests.java +++ b/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 { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/BillingFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/BillingFieldSetMapperTests.java index 52395e17d..f7a7f3c27 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/BillingFieldSetMapperTests.java +++ b/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{ diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/CustomerFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/CustomerFieldSetMapperTests.java index 5315ce92e..94d316349 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/CustomerFieldSetMapperTests.java +++ b/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 { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/HeaderFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/HeaderFieldSetMapperTests.java index ec794366c..59ca39634 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/HeaderFieldSetMapperTests.java +++ b/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 { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemFieldSetMapperTests.java index 3af963b41..9bb9e6455 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemFieldSetMapperTests.java +++ b/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{ diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/ShippingFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/ShippingFieldSetMapperTests.java index 1ac9645bd..d3a732541 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/ShippingFieldSetMapperTests.java +++ b/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{ diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerCreditRowMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerCreditRowMapperTests.java index 36b191cb5..e65b97b00 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerCreditRowMapperTests.java +++ b/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 { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/TradeFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/TradeFieldSetMapperTests.java index 1f4258f7e..f73dd4391 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/TradeFieldSetMapperTests.java +++ b/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 { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/TradeRowMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/TradeRowMapperTests.java index 129c1f9da..9c368168b 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/TradeRowMapperTests.java +++ b/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 { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/advice/JobExecutionNotificationPublisherTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/jmx/JobExecutionNotificationPublisherTests.java similarity index 97% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/advice/JobExecutionNotificationPublisherTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/jmx/JobExecutionNotificationPublisherTests.java index 66761cf43..bca4891a4 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/advice/JobExecutionNotificationPublisherTests.java +++ b/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; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/quartz/JobLauncherDetailsTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/quartz/JobLauncherDetailsTests.java index ab28b94e9..c9b3f2f8f 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/quartz/JobLauncherDetailsTests.java +++ b/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 diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AbstractFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/AbstractFieldSetMapperTests.java similarity index 95% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AbstractFieldSetMapperTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/support/AbstractFieldSetMapperTests.java index 49cf537a0..c409e8f49 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AbstractFieldSetMapperTests.java +++ b/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; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AbstractRowMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/AbstractRowMapperTests.java similarity index 96% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AbstractRowMapperTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/support/AbstractRowMapperTests.java index c6d183d42..064983f8f 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AbstractRowMapperTests.java +++ b/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; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/JobSupport.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/JobSupport.java similarity index 98% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/JobSupport.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/support/JobSupport.java index 068b29a07..0d0338c30 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/JobSupport.java +++ b/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; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/RetrySampleItemWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/RetrySampleItemWriterTests.java similarity index 93% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/RetrySampleItemWriterTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/support/RetrySampleItemWriterTests.java index 53b66f211..76a4c6316 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/RetrySampleItemWriterTests.java +++ b/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; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/StepSupport.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/StepSupport.java similarity index 98% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/StepSupport.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/support/StepSupport.java index c499ee3b1..da6b5cce0 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/StepSupport.java +++ b/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; diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/item/reader/StagingItemReaderTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/common/StagingItemReaderTests-context.xml similarity index 100% rename from spring-batch-samples/src/test/resources/org/springframework/batch/sample/item/reader/StagingItemReaderTests-context.xml rename to spring-batch-samples/src/test/resources/org/springframework/batch/sample/common/StagingItemReaderTests-context.xml diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/item/writer/StagingItemWriterTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/common/StagingItemWriterTests-context.xml similarity index 100% rename from spring-batch-samples/src/test/resources/org/springframework/batch/sample/item/writer/StagingItemWriterTests-context.xml rename to spring-batch-samples/src/test/resources/org/springframework/batch/sample/common/StagingItemWriterTests-context.xml