diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/BatchListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/BatchListener.java similarity index 94% rename from spring-batch-core/src/main/java/org/springframework/batch/core/domain/BatchListener.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/BatchListener.java index 4f5ea859b..6f54b66f8 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/BatchListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/BatchListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; /** * Marker interface that acts as a parent to all Batch diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/BatchStatus.java b/spring-batch-core/src/main/java/org/springframework/batch/core/BatchStatus.java similarity index 98% rename from spring-batch-core/src/main/java/org/springframework/batch/core/domain/BatchStatus.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/BatchStatus.java index cd7be3574..bd70585bb 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/BatchStatus.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/BatchStatus.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; import java.io.Serializable; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/ChunkListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/ChunkListener.java similarity index 95% rename from spring-batch-core/src/main/java/org/springframework/batch/core/domain/ChunkListener.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/ChunkListener.java index 24edcc548..2ba574e5a 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/ChunkListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/ChunkListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; /** * Listener interface for the lifecycle of a chunk. A chunk diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/Entity.java b/spring-batch-core/src/main/java/org/springframework/batch/core/Entity.java similarity index 98% rename from spring-batch-core/src/main/java/org/springframework/batch/core/domain/Entity.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/Entity.java index db31f6707..a23baebd3 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/Entity.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/Entity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; import java.io.Serializable; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/ItemReadListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/ItemReadListener.java similarity index 96% rename from spring-batch-core/src/main/java/org/springframework/batch/core/domain/ItemReadListener.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/ItemReadListener.java index 0ad2b0f2e..dfc3ba147 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/ItemReadListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/ItemReadListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.ItemWriter; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/ItemSkipPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/core/ItemSkipPolicy.java similarity index 96% rename from spring-batch-core/src/main/java/org/springframework/batch/core/domain/ItemSkipPolicy.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/ItemSkipPolicy.java index 97e22939f..0282b8275 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/ItemSkipPolicy.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/ItemSkipPolicy.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; /** diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/ItemWriteListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/ItemWriteListener.java similarity index 96% rename from spring-batch-core/src/main/java/org/springframework/batch/core/domain/ItemWriteListener.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/ItemWriteListener.java index 6520cb2f1..5ba6fdd13 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/ItemWriteListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/ItemWriteListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; import org.springframework.batch.item.ItemWriter; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/Job.java b/spring-batch-core/src/main/java/org/springframework/batch/core/Job.java similarity index 96% rename from spring-batch-core/src/main/java/org/springframework/batch/core/domain/Job.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/Job.java index aa649e8a0..a253cd557 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/Job.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/Job.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; import java.util.List; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobExecution.java b/spring-batch-core/src/main/java/org/springframework/batch/core/JobExecution.java similarity index 98% rename from spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobExecution.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/JobExecution.java index 1ab86ec04..b6c7dec49 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobExecution.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/JobExecution.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; import java.util.Collection; import java.util.Date; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobExecutionException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/JobExecutionException.java similarity index 94% rename from spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobExecutionException.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/JobExecutionException.java index 11205e980..b2c6fe776 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobExecutionException.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/JobExecutionException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; /** * @author Dave Syer diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobInstance.java b/spring-batch-core/src/main/java/org/springframework/batch/core/JobInstance.java similarity index 97% rename from spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobInstance.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/JobInstance.java index 7668420ae..1418562c8 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobInstance.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/JobInstance.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; import org.springframework.util.Assert; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobInterruptedException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/JobInterruptedException.java similarity index 96% rename from spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobInterruptedException.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/JobInterruptedException.java index 112e8d6ba..1a159e1cb 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobInterruptedException.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/JobInterruptedException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; import org.springframework.batch.io.exception.InfrastructureException; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/JobListener.java similarity index 96% rename from spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobListener.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/JobListener.java index b998d8474..c54004ea2 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/JobListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; /** * Provide callbacks at specific points in the lifecycle of a {@link Job}. diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobParameters.java b/spring-batch-core/src/main/java/org/springframework/batch/core/JobParameters.java similarity index 99% rename from spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobParameters.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/JobParameters.java index b49fa68a4..3580c22b4 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobParameters.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/JobParameters.java @@ -1,7 +1,7 @@ /** * */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; import java.util.Collections; import java.util.Date; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobParametersBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/JobParametersBuilder.java similarity index 98% rename from spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobParametersBuilder.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/JobParametersBuilder.java index 312856c8a..d6f175e60 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobParametersBuilder.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/JobParametersBuilder.java @@ -1,7 +1,7 @@ /** * */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; import java.util.Date; import java.util.LinkedHashMap; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/Step.java b/spring-batch-core/src/main/java/org/springframework/batch/core/Step.java similarity index 97% rename from spring-batch-core/src/main/java/org/springframework/batch/core/domain/Step.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/Step.java index 20cf92b25..106ea8e6a 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/Step.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/Step.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; import org.springframework.batch.io.exception.InfrastructureException; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/StepContribution.java b/spring-batch-core/src/main/java/org/springframework/batch/core/StepContribution.java similarity index 98% rename from spring-batch-core/src/main/java/org/springframework/batch/core/domain/StepContribution.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/StepContribution.java index 5938284fe..1779c52c8 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/StepContribution.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/StepContribution.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; import org.springframework.batch.item.ExecutionContext; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/StepExecution.java b/spring-batch-core/src/main/java/org/springframework/batch/core/StepExecution.java similarity index 99% rename from spring-batch-core/src/main/java/org/springframework/batch/core/domain/StepExecution.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/StepExecution.java index 9a12bf02e..2ab2202bd 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/StepExecution.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/StepExecution.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; import java.util.Date; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/StepListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/StepListener.java similarity index 97% rename from spring-batch-core/src/main/java/org/springframework/batch/core/domain/StepListener.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/StepListener.java index 5a854d4d2..7cc85fbfc 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/StepListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/StepListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; import org.springframework.batch.repeat.ExitStatus; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/BatchStatusTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/BatchStatusTests.java similarity index 82% rename from spring-batch-core/src/test/java/org/springframework/batch/core/domain/BatchStatusTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/BatchStatusTests.java index c50e07782..50b504536 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/BatchStatusTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/BatchStatusTests.java @@ -13,13 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import org.springframework.batch.core.BatchStatus; + import junit.framework.TestCase; /** @@ -30,7 +32,7 @@ public class BatchStatusTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.domain.BatchStatus#toString()}. + * {@link org.springframework.batch.core.BatchStatus#toString()}. */ public void testToString() { assertEquals("FAILED", BatchStatus.FAILED.toString()); @@ -38,7 +40,7 @@ public class BatchStatusTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.domain.BatchStatus#getStatus(java.lang.String)}. + * {@link org.springframework.batch.core.BatchStatus#getStatus(java.lang.String)}. */ public void testGetStatus() { assertEquals(BatchStatus.FAILED, BatchStatus.getStatus(BatchStatus.FAILED.toString())); @@ -46,7 +48,7 @@ public class BatchStatusTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.domain.BatchStatus#getStatus(java.lang.String)}. + * {@link org.springframework.batch.core.BatchStatus#getStatus(java.lang.String)}. */ public void testGetStatusWrongCode() { try { @@ -60,7 +62,7 @@ public class BatchStatusTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.domain.BatchStatus#getStatus(java.lang.String)}. + * {@link org.springframework.batch.core.BatchStatus#getStatus(java.lang.String)}. */ public void testGetStatusNullCode() { assertNull(BatchStatus.getStatus(null)); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/EntityTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/EntityTests.java similarity index 66% rename from spring-batch-core/src/test/java/org/springframework/batch/core/domain/EntityTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/EntityTests.java index 2570360f8..30f412d0f 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/EntityTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/EntityTests.java @@ -13,7 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; + +import org.springframework.batch.core.Entity; import junit.framework.TestCase; @@ -26,14 +28,14 @@ public class EntityTests extends TestCase { Entity entity = new Entity(new Long(11)); /** - * Test method for {@link org.springframework.batch.core.domain.Entity#hashCode()}. + * Test method for {@link org.springframework.batch.core.Entity#hashCode()}. */ public void testHashCode() { assertEquals(entity.hashCode(), new Entity(entity.getId()).hashCode()); } /** - * Test method for {@link org.springframework.batch.core.domain.Entity#hashCode()}. + * Test method for {@link org.springframework.batch.core.Entity#hashCode()}. */ public void testHashCodeNullId() { int withoutNull = entity.hashCode(); @@ -43,14 +45,14 @@ public class EntityTests extends TestCase { } /** - * Test method for {@link org.springframework.batch.core.domain.Entity#getVersion()}. + * Test method for {@link org.springframework.batch.core.Entity#getVersion()}. */ public void testGetVersion() { assertEquals(null, entity.getVersion()); } /** - * Test method for {@link org.springframework.batch.core.domain.Entity#getVersion()}. + * Test method for {@link org.springframework.batch.core.Entity#getVersion()}. */ public void testIncrementVersion() { entity.incrementVersion(); @@ -58,7 +60,7 @@ public class EntityTests extends TestCase { } /** - * Test method for {@link org.springframework.batch.core.domain.Entity#getVersion()}. + * Test method for {@link org.springframework.batch.core.Entity#getVersion()}. */ public void testIncrementVersionTwice() { entity.incrementVersion(); @@ -75,14 +77,14 @@ public class EntityTests extends TestCase { } /** - * Test method for {@link org.springframework.batch.core.domain.Entity#equals(java.lang.Object)}. + * Test method for {@link org.springframework.batch.core.Entity#equals(java.lang.Object)}. */ public void testEqualsSelf() { assertEquals(entity, entity); } /** - * Test method for {@link org.springframework.batch.core.domain.Entity#equals(java.lang.Object)}. + * Test method for {@link org.springframework.batch.core.Entity#equals(java.lang.Object)}. */ public void testEqualsSelfWithNullId() { entity = new Entity(null); @@ -90,7 +92,7 @@ public class EntityTests extends TestCase { } /** - * Test method for {@link org.springframework.batch.core.domain.Entity#equals(java.lang.Object)}. + * Test method for {@link org.springframework.batch.core.Entity#equals(java.lang.Object)}. */ public void testEqualsEntityWithNullId() { entity = new Entity(null); @@ -98,28 +100,28 @@ public class EntityTests extends TestCase { } /** - * Test method for {@link org.springframework.batch.core.domain.Entity#equals(java.lang.Object)}. + * Test method for {@link org.springframework.batch.core.Entity#equals(java.lang.Object)}. */ public void testEqualsEntity() { assertEquals(entity, new Entity(entity.getId())); } /** - * Test method for {@link org.springframework.batch.core.domain.Entity#equals(java.lang.Object)}. + * Test method for {@link org.springframework.batch.core.Entity#equals(java.lang.Object)}. */ public void testEqualsEntityWrongId() { assertFalse(entity.equals(new Entity())); } /** - * Test method for {@link org.springframework.batch.core.domain.Entity#equals(java.lang.Object)}. + * Test method for {@link org.springframework.batch.core.Entity#equals(java.lang.Object)}. */ public void testEqualsObject() { assertFalse(entity.equals(new Object())); } /** - * Test method for {@link org.springframework.batch.core.domain.Entity#equals(java.lang.Object)}. + * Test method for {@link org.springframework.batch.core.Entity#equals(java.lang.Object)}. */ public void testEqualsNull() { assertFalse(entity.equals(null)); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/JobExecutionExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/JobExecutionExceptionTests.java new file mode 100644 index 000000000..45fff1eb8 --- /dev/null +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/JobExecutionExceptionTests.java @@ -0,0 +1,40 @@ +/* + * Copyright 2006-2007 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.batch.core; + +import org.springframework.batch.core.JobExecutionException; + +/** + * @author Dave Syer + * + */ +public class JobExecutionExceptionTests extends AbstractExceptionTests { + + /* (non-Javadoc) + * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String) + */ + public Exception getException(String msg) throws Exception { + return new JobExecutionException(msg); + } + + /* (non-Javadoc) + * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String, java.lang.Throwable) + */ + public Exception getException(String msg, Throwable t) throws Exception { + return new JobExecutionException(msg, t); + } + +} diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobExecutionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/JobExecutionTests.java similarity index 80% rename from spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobExecutionTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/JobExecutionTests.java index 5076db9f4..fbf043c3f 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobExecutionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/JobExecutionTests.java @@ -13,12 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; import java.util.Date; import junit.framework.TestCase; +import org.springframework.batch.core.BatchStatus; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobInstance; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.repeat.ExitStatus; /** @@ -31,7 +36,7 @@ public class JobExecutionTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.domain.JobExecution#JobExecution()}. + * {@link org.springframework.batch.core.JobExecution#JobExecution()}. */ public void testJobExecution() { assertNull(new JobExecution().getId()); @@ -39,7 +44,7 @@ public class JobExecutionTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.domain.JobExecution#getEndTime()}. + * {@link org.springframework.batch.core.JobExecution#getEndTime()}. */ public void testGetEndTime() { assertNull(execution.getEndTime()); @@ -49,7 +54,7 @@ public class JobExecutionTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.domain.JobExecution#getEndTime()}. + * {@link org.springframework.batch.core.JobExecution#getEndTime()}. */ public void testIsRunning() { assertTrue(execution.isRunning()); @@ -59,7 +64,7 @@ public class JobExecutionTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.domain.JobExecution#getEndTime()}. + * {@link org.springframework.batch.core.JobExecution#getEndTime()}. */ public void testIsRunningWithStoppedExecution() { assertTrue(execution.isRunning()); @@ -70,7 +75,7 @@ public class JobExecutionTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.domain.JobExecution#getStartTime()}. + * {@link org.springframework.batch.core.JobExecution#getStartTime()}. */ public void testGetStartTime() { assertNull(execution.getStartTime()); @@ -80,7 +85,7 @@ public class JobExecutionTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.domain.JobExecution#getStatus()}. + * {@link org.springframework.batch.core.JobExecution#getStatus()}. */ public void testGetStatus() { assertEquals(BatchStatus.STARTING, execution.getStatus()); @@ -90,7 +95,7 @@ public class JobExecutionTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.domain.JobExecution#getJobId()}. + * {@link org.springframework.batch.core.JobExecution#getJobId()}. */ public void testGetJobId() { assertEquals(11, execution.getJobId().longValue()); @@ -100,7 +105,7 @@ public class JobExecutionTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.domain.JobExecution#getJobId()}. + * {@link org.springframework.batch.core.JobExecution#getJobId()}. */ public void testGetJobIdForNullJob() { execution = new JobExecution(null); @@ -109,7 +114,7 @@ public class JobExecutionTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.domain.JobExecution#getJobId()}. + * {@link org.springframework.batch.core.JobExecution#getJobId()}. */ public void testGetJob() { assertNotNull(execution.getJobInstance()); @@ -117,7 +122,7 @@ public class JobExecutionTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.domain.JobExecution#getExitStatus()}. + * {@link org.springframework.batch.core.JobExecution#getExitStatus()}. */ public void testGetExitCode() { assertEquals(ExitStatus.UNKNOWN, execution.getExitStatus()); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobInstanceTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/JobInstanceTests.java similarity index 86% rename from spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobInstanceTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/JobInstanceTests.java index 3f73e9485..937444953 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobInstanceTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/JobInstanceTests.java @@ -13,7 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; + +import org.springframework.batch.core.JobInstance; +import org.springframework.batch.core.JobParameters; import junit.framework.TestCase; @@ -26,7 +29,7 @@ public class JobInstanceTests extends TestCase { private JobInstance instance = new JobInstance(new Long(11), new JobParameters(), new JobSupport("job")); /** - * Test method for {@link org.springframework.batch.core.domain.JobInstance#getIdentifier()}. + * Test method for {@link org.springframework.batch.core.JobInstance#getIdentifier()}. */ public void testGetName() { instance = new JobInstance(new Long(1), new JobParameters(), new JobSupport("foo")); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobInterruptedExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/JobInterruptedExceptionTests.java similarity index 87% rename from spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobInterruptedExceptionTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/JobInterruptedExceptionTests.java index e53e7a19a..02ecfe8eb 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobInterruptedExceptionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/JobInterruptedExceptionTests.java @@ -13,10 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; -import org.springframework.batch.core.AbstractExceptionTests; -import org.springframework.batch.core.domain.JobInterruptedException; +import org.springframework.batch.core.JobInterruptedException; /** * @author Dave Syer diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobParametersBuilderTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/JobParametersBuilderTests.java similarity index 91% rename from spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobParametersBuilderTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/JobParametersBuilderTests.java index 5b494d119..f21eee6c8 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobParametersBuilderTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/JobParametersBuilderTests.java @@ -1,11 +1,14 @@ /** * */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; import java.util.Date; import java.util.Iterator; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.JobParametersBuilder; + import junit.framework.TestCase; /** diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobParametersTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/JobParametersTests.java similarity index 98% rename from spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobParametersTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/JobParametersTests.java index 72043f566..77c77d148 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobParametersTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/JobParametersTests.java @@ -1,7 +1,7 @@ /** * */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; import java.util.Date; import java.util.HashMap; @@ -9,6 +9,8 @@ import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; +import org.springframework.batch.core.JobParameters; + import junit.framework.TestCase; /** diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobSupport.java b/spring-batch-core/src/test/java/org/springframework/batch/core/JobSupport.java similarity index 94% rename from spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobSupport.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/JobSupport.java index f861eb58e..3db5a401b 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobSupport.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/JobSupport.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; import java.util.ArrayList; import java.util.List; -import org.springframework.batch.core.domain.Job; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.Step; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.Step; import org.springframework.batch.io.exception.InfrastructureException; import org.springframework.beans.factory.BeanNameAware; import org.springframework.util.ClassUtils; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/SpringBeanJobTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/SpringBeanJobTests.java similarity index 98% rename from spring-batch-core/src/test/java/org/springframework/batch/core/domain/SpringBeanJobTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/SpringBeanJobTests.java index 95f8c4b4e..d819f2fcb 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/SpringBeanJobTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/SpringBeanJobTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; import junit.framework.TestCase; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/StepContributionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/StepContributionTests.java similarity index 79% rename from spring-batch-core/src/test/java/org/springframework/batch/core/domain/StepContributionTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/StepContributionTests.java index 3a7a42fd7..93eb13e33 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/StepContributionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/StepContributionTests.java @@ -13,10 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; import junit.framework.TestCase; +import org.springframework.batch.core.StepContribution; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.item.ExecutionContext; /** @@ -31,7 +33,7 @@ public class StepContributionTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.domain.StepContribution#incrementTaskCount()}. + * {@link org.springframework.batch.core.StepContribution#incrementTaskCount()}. */ public void testIncrementTaskCount() { assertEquals(0, contribution.getTaskCount()); @@ -41,7 +43,7 @@ public class StepContributionTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.domain.StepContribution#setExecutionContext(ExecutionContext)}. + * {@link org.springframework.batch.core.StepContribution#setExecutionContext(ExecutionContext)}. */ public void testSetExecutionContext() { assertEquals(null, contribution.getExecutionContext()); @@ -53,7 +55,7 @@ public class StepContributionTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.domain.StepContribution#incrementCommitCount()}. + * {@link org.springframework.batch.core.StepContribution#incrementCommitCount()}. */ public void testIncrementCommitCount() { assertEquals(0, contribution.getCommitCount()); @@ -63,7 +65,7 @@ public class StepContributionTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.domain.StepContribution#isTerminateOnly()}. + * {@link org.springframework.batch.core.StepContribution#isTerminateOnly()}. */ public void testIsTerminateOnly() { assertFalse(contribution.isTerminateOnly()); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/StepExecutionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/StepExecutionTests.java similarity index 84% rename from spring-batch-core/src/test/java/org/springframework/batch/core/domain/StepExecutionTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/StepExecutionTests.java index aabf77f9d..fcb42a994 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/StepExecutionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/StepExecutionTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; import java.util.Date; import java.util.HashSet; @@ -21,6 +21,14 @@ import java.util.Set; import junit.framework.TestCase; +import org.springframework.batch.core.BatchStatus; +import org.springframework.batch.core.Entity; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobInstance; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.StepContribution; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.repeat.ExitStatus; import org.springframework.batch.support.PropertiesConverter; @@ -37,7 +45,7 @@ public class StepExecutionTests extends TestCase { private StepExecution blankExecution = new StepExecution(new StepSupport("blank"), new JobExecution()); /** * Test method for - * {@link org.springframework.batch.core.domain.JobExecution#JobExecution()}. + * {@link org.springframework.batch.core.JobExecution#JobExecution()}. */ public void testStepExecution() { assertNull(new StepExecution().getId()); @@ -45,7 +53,7 @@ public class StepExecutionTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.domain.JobExecution#JobExecution()}. + * {@link org.springframework.batch.core.JobExecution#JobExecution()}. */ public void testStepExecutionWithNullId() { assertNull(new StepExecution(new StepSupport("stepName"), new JobExecution()).getId()); @@ -53,7 +61,7 @@ public class StepExecutionTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.domain.JobExecution#getEndTime()}. + * {@link org.springframework.batch.core.JobExecution#getEndTime()}. */ public void testGetEndTime() { assertNull(execution.getEndTime()); @@ -63,7 +71,7 @@ public class StepExecutionTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.domain.JobExecution#getStartTime()}. + * {@link org.springframework.batch.core.JobExecution#getStartTime()}. */ public void testGetStartTime() { assertNotNull(execution.getStartTime()); @@ -73,7 +81,7 @@ public class StepExecutionTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.domain.JobExecution#getStatus()}. + * {@link org.springframework.batch.core.JobExecution#getStatus()}. */ public void testGetStatus() { assertEquals(BatchStatus.STARTING, execution.getStatus()); @@ -83,7 +91,7 @@ public class StepExecutionTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.domain.JobExecution#getJobId()}. + * {@link org.springframework.batch.core.JobExecution#getJobId()}. */ public void testGetJobId() { assertEquals(23, execution.getJobExecutionId().longValue()); @@ -91,7 +99,7 @@ public class StepExecutionTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.domain.JobExecution#getExitStatus()}. + * {@link org.springframework.batch.core.JobExecution#getExitStatus()}. */ public void testGetExitCode() { assertEquals(ExitStatus.UNKNOWN, execution.getExitStatus()); @@ -101,7 +109,7 @@ public class StepExecutionTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.domain.StepExecution#incrementCommitCount()}. + * {@link org.springframework.batch.core.StepExecution#incrementCommitCount()}. */ public void testIncrementCommitCount() { int before = execution.getCommitCount().intValue(); @@ -112,7 +120,7 @@ public class StepExecutionTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.domain.StepExecution#incrementTaskCount()}. + * {@link org.springframework.batch.core.StepExecution#incrementTaskCount()}. */ public void testIncrementLuwCount() { int before = execution.getTaskCount().intValue(); @@ -123,7 +131,7 @@ public class StepExecutionTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.domain.StepExecution#rollback()}. + * {@link org.springframework.batch.core.StepExecution#rollback()}. */ public void testIncrementRollbackCount() { int before = execution.getRollbackCount().intValue(); @@ -134,7 +142,7 @@ public class StepExecutionTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.domain.StepExecution#getCommitCount()}. + * {@link org.springframework.batch.core.StepExecution#getCommitCount()}. */ public void testGetCommitCount() { execution.setCommitCount(123); @@ -143,7 +151,7 @@ public class StepExecutionTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.domain.StepExecution#getTaskCount()}. + * {@link org.springframework.batch.core.StepExecution#getTaskCount()}. */ public void testGetTaskCount() { execution.setTaskCount(123); @@ -152,7 +160,7 @@ public class StepExecutionTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.core.domain.StepExecution#getRollbackCount()}. + * {@link org.springframework.batch.core.StepExecution#getRollbackCount()}. */ public void testGetRollbackCount() { execution.setRollbackCount(123); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/StepSupport.java b/spring-batch-core/src/test/java/org/springframework/batch/core/StepSupport.java similarity index 90% rename from spring-batch-core/src/test/java/org/springframework/batch/core/domain/StepSupport.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/StepSupport.java index 4abc07b64..7ee5b418b 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/StepSupport.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/StepSupport.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.domain; +package org.springframework.batch.core; -import org.springframework.batch.core.domain.JobInterruptedException; -import org.springframework.batch.core.domain.Step; -import org.springframework.batch.core.domain.StepExecution; +import org.springframework.batch.core.JobInterruptedException; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.io.exception.InfrastructureException; import org.springframework.beans.factory.BeanNameAware; @@ -108,7 +108,7 @@ public class StepSupport implements Step, BeanNameAware { * * @throws UnsupportedOperationException always * - * @see org.springframework.batch.core.domain.Step#execute(org.springframework.batch.core.domain.StepExecution) + * @see org.springframework.batch.core.Step#execute(org.springframework.batch.core.StepExecution) */ public void execute(StepExecution stepExecution) throws JobInterruptedException, InfrastructureException { throw new UnsupportedOperationException( diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobLauncher.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobLauncher.java index f9bc960f5..6a848fb83 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobLauncher.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobLauncher.java @@ -17,10 +17,10 @@ package org.springframework.batch.execution.launch; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.batch.core.domain.Job; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.domain.JobParameters; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobInstance; +import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.repository.JobRestartException; import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException; import org.springframework.batch.core.repository.JobRepository; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/CommandLineJobRunner.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/CommandLineJobRunner.java index 98f299f63..82e57b3c6 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/CommandLineJobRunner.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/CommandLineJobRunner.java @@ -19,10 +19,10 @@ import java.util.Properties; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.configuration.JobLocator; -import org.springframework.batch.core.domain.Job; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobParameters; import org.springframework.batch.core.runtime.ExitStatusExceptionClassifier; import org.springframework.batch.core.runtime.JobParametersFactory; import org.springframework.batch.execution.launch.JobLauncher; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactory.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactory.java index 65b70acfd..fe90e7771 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactory.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactory.java @@ -26,8 +26,8 @@ import java.util.Map; import java.util.Properties; import java.util.Map.Entry; -import org.springframework.batch.core.domain.JobParameters; -import org.springframework.batch.core.domain.JobParametersBuilder; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.JobParametersBuilder; import org.springframework.batch.core.runtime.JobParametersFactory; import org.springframework.util.StringUtils; @@ -125,7 +125,7 @@ public class DefaultJobParametersFactory implements JobParametersFactory { * Use the same suffixes to create properties (omitting the string suffix * because it is the default). * - * @see org.springframework.batch.core.runtime.JobParametersFactory#getProperties(org.springframework.batch.core.domain.JobParameters) + * @see org.springframework.batch.core.runtime.JobParametersFactory#getProperties(org.springframework.batch.core.JobParameters) */ public Properties getProperties(JobParameters params) { diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ExportedJobLauncher.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ExportedJobLauncher.java index 8f50422fb..c745309a2 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ExportedJobLauncher.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ExportedJobLauncher.java @@ -18,7 +18,7 @@ package org.springframework.batch.execution.launch.support; import java.util.Properties; -import org.springframework.batch.core.domain.JobExecution; +import org.springframework.batch.core.JobExecution; import org.springframework.batch.execution.launch.JobLauncher; /** diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactory.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactory.java index 2b4792793..84e983c12 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactory.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactory.java @@ -24,8 +24,8 @@ import java.util.Map; import java.util.Properties; import java.util.Map.Entry; -import org.springframework.batch.core.domain.JobParameters; -import org.springframework.batch.core.domain.JobParametersBuilder; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.JobParametersBuilder; import org.springframework.batch.core.runtime.JobParametersFactory; /** @@ -75,7 +75,7 @@ public class ScheduledJobParametersFactory implements JobParametersFactory { * Convert schedule date to Date, and assume all other parameters can be * represented by their default string value. * - * @see org.springframework.batch.core.runtime.JobParametersFactory#getProperties(org.springframework.batch.core.domain.JobParameters) + * @see org.springframework.batch.core.runtime.JobParametersFactory#getProperties(org.springframework.batch.core.JobParameters) */ public Properties getProperties(JobParameters params) { diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncher.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncher.java index e2d2263ed..8e2e89837 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncher.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncher.java @@ -20,11 +20,11 @@ import java.util.Iterator; import java.util.Map; import java.util.Properties; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.configuration.JobLocator; -import org.springframework.batch.core.domain.Job; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobParameters; -import org.springframework.batch.core.domain.StepExecution; import org.springframework.batch.core.repository.JobRestartException; import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException; import org.springframework.batch.core.repository.NoSuchJobException; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeChunkListener.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeChunkListener.java index 95642dfed..e55c59185 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeChunkListener.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeChunkListener.java @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; -import org.springframework.batch.core.domain.ChunkListener; +import org.springframework.batch.core.ChunkListener; /** * @author Lucas Ward diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeItemReadListener.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeItemReadListener.java index 215e3d297..ce1555862 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeItemReadListener.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeItemReadListener.java @@ -20,8 +20,8 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; -import org.springframework.batch.core.domain.ChunkListener; -import org.springframework.batch.core.domain.ItemReadListener; +import org.springframework.batch.core.ChunkListener; +import org.springframework.batch.core.ItemReadListener; /** * @author Lucas Ward diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeItemWriteListener.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeItemWriteListener.java index 8f2e02496..496e2f636 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeItemWriteListener.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeItemWriteListener.java @@ -20,8 +20,8 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; -import org.springframework.batch.core.domain.ChunkListener; -import org.springframework.batch.core.domain.ItemWriteListener; +import org.springframework.batch.core.ChunkListener; +import org.springframework.batch.core.ItemWriteListener; /** * @author Lucas Ward diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeJobListener.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeJobListener.java index d8436ef81..7290ace15 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeJobListener.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeJobListener.java @@ -20,8 +20,8 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobListener; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobListener; /** * @author Dave Syer diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeStepListener.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeStepListener.java index 677b2c2d9..9550fce2c 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeStepListener.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeStepListener.java @@ -20,8 +20,8 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; -import org.springframework.batch.core.domain.StepExecution; -import org.springframework.batch.core.domain.StepListener; +import org.springframework.batch.core.StepExecution; +import org.springframework.batch.core.StepListener; import org.springframework.batch.repeat.ExitStatus; /** diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/SimpleJobRepository.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/SimpleJobRepository.java index 064b24669..5210a3c5d 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/SimpleJobRepository.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/SimpleJobRepository.java @@ -20,12 +20,12 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.springframework.batch.core.domain.Job; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.domain.JobParameters; -import org.springframework.batch.core.domain.Step; -import org.springframework.batch.core.domain.StepExecution; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobInstance; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.repository.JobRestartException; import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException; import org.springframework.batch.core.repository.JobRepository; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobExecutionDao.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobExecutionDao.java index 66e995cef..0907c8993 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobExecutionDao.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobExecutionDao.java @@ -7,9 +7,9 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.batch.core.domain.BatchStatus; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobInstance; +import org.springframework.batch.core.BatchStatus; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobInstance; import org.springframework.batch.repeat.ExitStatus; import org.springframework.beans.factory.InitializingBean; import org.springframework.jdbc.core.RowMapper; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobInstanceDao.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobInstanceDao.java index 31f874dd0..489d5ad7a 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobInstanceDao.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobInstanceDao.java @@ -9,9 +9,9 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import org.springframework.batch.core.domain.Job; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.domain.JobParameters; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobInstance; +import org.springframework.batch.core.JobParameters; import org.springframework.beans.factory.InitializingBean; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcStepExecutionDao.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcStepExecutionDao.java index 9ed8a84b5..325c6cefa 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcStepExecutionDao.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcStepExecutionDao.java @@ -12,10 +12,10 @@ import java.util.Map.Entry; import org.apache.commons.lang.SerializationUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.batch.core.domain.BatchStatus; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.Step; -import org.springframework.batch.core.domain.StepExecution; +import org.springframework.batch.core.BatchStatus; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.io.exception.InfrastructureException; import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.repeat.ExitStatus; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JobExecutionDao.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JobExecutionDao.java index aac11ba7c..f1bdee39f 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JobExecutionDao.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JobExecutionDao.java @@ -2,8 +2,8 @@ package org.springframework.batch.execution.repository.dao; import java.util.List; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobInstance; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobInstance; /** * Data Access Object for job executions. diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JobInstanceDao.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JobInstanceDao.java index 799551165..c26d20ff8 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JobInstanceDao.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JobInstanceDao.java @@ -1,8 +1,8 @@ package org.springframework.batch.execution.repository.dao; -import org.springframework.batch.core.domain.Job; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.domain.JobParameters; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobInstance; +import org.springframework.batch.core.JobParameters; /** * Data Access Object for job instances. diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapJobExecutionDao.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapJobExecutionDao.java index 99bc9bb05..d4eb0fce3 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapJobExecutionDao.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapJobExecutionDao.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobInstance; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobInstance; import org.springframework.batch.support.transaction.TransactionAwareProxyFactory; /** diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapJobInstanceDao.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapJobInstanceDao.java index 21c26648b..ab2af2ed4 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapJobInstanceDao.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapJobInstanceDao.java @@ -3,9 +3,9 @@ package org.springframework.batch.execution.repository.dao; import java.util.Collection; import java.util.Iterator; -import org.springframework.batch.core.domain.Job; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.domain.JobParameters; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobInstance; +import org.springframework.batch.core.JobParameters; import org.springframework.batch.support.transaction.TransactionAwareProxyFactory; import org.springframework.util.Assert; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapStepExecutionDao.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapStepExecutionDao.java index 0559d4653..a2dace01d 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapStepExecutionDao.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapStepExecutionDao.java @@ -18,9 +18,9 @@ package org.springframework.batch.execution.repository.dao; import java.util.Map; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.Step; -import org.springframework.batch.core.domain.StepExecution; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.support.transaction.TransactionAwareProxyFactory; import org.springframework.dao.OptimisticLockingFailureException; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/StepExecutionDao.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/StepExecutionDao.java index af014946c..8d5d384c5 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/StepExecutionDao.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/StepExecutionDao.java @@ -1,8 +1,8 @@ package org.springframework.batch.execution.repository.dao; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.Step; -import org.springframework.batch.core.domain.StepExecution; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.item.ExecutionContext; public interface StepExecutionDao { diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/StepExecutionProxyResource.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/StepExecutionProxyResource.java index 54c02ff93..df3dabf28 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/StepExecutionProxyResource.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/StepExecutionProxyResource.java @@ -25,9 +25,9 @@ import java.util.Iterator; import java.util.Properties; import java.util.Map.Entry; -import org.springframework.batch.core.domain.JobParameters; -import org.springframework.batch.core.domain.StepExecution; -import org.springframework.batch.core.domain.StepListener; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.StepExecution; +import org.springframework.batch.core.StepListener; import org.springframework.batch.core.listener.StepListenerSupport; import org.springframework.batch.core.runtime.JobParametersFactory; import org.springframework.batch.execution.launch.support.DefaultJobParametersFactory; @@ -276,7 +276,7 @@ public class StepExecutionProxyResource extends StepListenerSupport implements R * Collect the properties of the enclosing {@link StepExecution} that will * be needed to create a file name. * - * @see org.springframework.batch.core.domain.StepListener#beforeStep(org.springframework.batch.core.domain.StepExecution) + * @see org.springframework.batch.core.StepListener#beforeStep(org.springframework.batch.core.StepExecution) */ public void beforeStep(StepExecution execution) { String stepName = execution.getStepName(); diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/AbstractStep.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/AbstractStep.java index c7dd35419..8a15a1c8e 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/AbstractStep.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/AbstractStep.java @@ -15,9 +15,9 @@ */ package org.springframework.batch.execution.step; -import org.springframework.batch.core.domain.JobInterruptedException; -import org.springframework.batch.core.domain.Step; -import org.springframework.batch.core.domain.StepExecution; +import org.springframework.batch.core.JobInterruptedException; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.io.exception.InfrastructureException; /** diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/ItemHandler.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/ItemHandler.java index 0421ce8a7..f956a3373 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/ItemHandler.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/ItemHandler.java @@ -15,7 +15,7 @@ */ package org.springframework.batch.execution.step; -import org.springframework.batch.core.domain.StepContribution; +import org.springframework.batch.core.StepContribution; import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.ItemWriter; import org.springframework.batch.item.exception.ClearFailedException; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/ItemOrientedStep.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/ItemOrientedStep.java index 238976340..1d7b413d4 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/ItemOrientedStep.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/ItemOrientedStep.java @@ -19,12 +19,12 @@ import java.util.Date; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.batch.core.domain.BatchStatus; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.domain.JobInterruptedException; -import org.springframework.batch.core.domain.StepContribution; -import org.springframework.batch.core.domain.StepExecution; -import org.springframework.batch.core.domain.StepListener; +import org.springframework.batch.core.BatchStatus; +import org.springframework.batch.core.JobInstance; +import org.springframework.batch.core.JobInterruptedException; +import org.springframework.batch.core.StepContribution; +import org.springframework.batch.core.StepExecution; +import org.springframework.batch.core.StepListener; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.core.runtime.ExitStatusExceptionClassifier; import org.springframework.batch.core.tasklet.Tasklet; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/TaskletStep.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/TaskletStep.java index 4a2156bcb..8899f711e 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/TaskletStep.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/TaskletStep.java @@ -19,11 +19,11 @@ import java.util.Date; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.batch.core.domain.BatchStatus; -import org.springframework.batch.core.domain.JobInterruptedException; -import org.springframework.batch.core.domain.Step; -import org.springframework.batch.core.domain.StepExecution; -import org.springframework.batch.core.domain.StepListener; +import org.springframework.batch.core.BatchStatus; +import org.springframework.batch.core.JobInterruptedException; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.StepExecution; +import org.springframework.batch.core.StepListener; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.core.tasklet.Tasklet; import org.springframework.batch.execution.listener.CompositeStepListener; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/AbstractStepFactoryBean.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/AbstractStepFactoryBean.java index b76dc6b3c..ea216ce45 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/AbstractStepFactoryBean.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/AbstractStepFactoryBean.java @@ -15,7 +15,7 @@ */ package org.springframework.batch.execution.step.support; -import org.springframework.batch.core.domain.Step; +import org.springframework.batch.core.Step; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.execution.step.ItemOrientedStep; import org.springframework.batch.item.ItemReader; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/AlwaysSkipItemSkipPolicy.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/AlwaysSkipItemSkipPolicy.java index 72819a8b3..98b7f6f83 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/AlwaysSkipItemSkipPolicy.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/AlwaysSkipItemSkipPolicy.java @@ -15,7 +15,7 @@ */ package org.springframework.batch.execution.step.support; -import org.springframework.batch.core.domain.ItemSkipPolicy; +import org.springframework.batch.core.ItemSkipPolicy; /** * Implementation of the {@link ItemSkipPolicy} interface that diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/BatchListenerFactoryHelper.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/BatchListenerFactoryHelper.java index 0e40ab71a..24ce7f9be 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/BatchListenerFactoryHelper.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/BatchListenerFactoryHelper.java @@ -18,11 +18,11 @@ package org.springframework.batch.execution.step.support; import java.util.ArrayList; import java.util.List; -import org.springframework.batch.core.domain.BatchListener; -import org.springframework.batch.core.domain.ChunkListener; -import org.springframework.batch.core.domain.ItemReadListener; -import org.springframework.batch.core.domain.ItemWriteListener; -import org.springframework.batch.core.domain.StepListener; +import org.springframework.batch.core.BatchListener; +import org.springframework.batch.core.ChunkListener; +import org.springframework.batch.core.ItemReadListener; +import org.springframework.batch.core.ItemWriteListener; +import org.springframework.batch.core.StepListener; import org.springframework.batch.execution.listener.CompositeChunkListener; import org.springframework.batch.execution.listener.CompositeItemReadListener; import org.springframework.batch.execution.listener.CompositeItemWriteListener; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/DefaultStepExecutionSynchronizer.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/DefaultStepExecutionSynchronizer.java index 6e2d9e0fd..26209c1df 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/DefaultStepExecutionSynchronizer.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/DefaultStepExecutionSynchronizer.java @@ -15,7 +15,7 @@ */ package org.springframework.batch.execution.step.support; -import org.springframework.batch.core.domain.StepExecution; +import org.springframework.batch.core.StepExecution; import edu.emory.mathcs.backport.java.util.concurrent.Semaphore; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBean.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBean.java index f182901cf..8cd1ca3b5 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBean.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBean.java @@ -15,9 +15,9 @@ */ package org.springframework.batch.execution.step.support; -import org.springframework.batch.core.domain.BatchListener; -import org.springframework.batch.core.domain.Step; -import org.springframework.batch.core.domain.StepListener; +import org.springframework.batch.core.BatchListener; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.StepListener; import org.springframework.batch.execution.step.ItemHandler; import org.springframework.batch.execution.step.ItemOrientedStep; import org.springframework.batch.item.ItemReader; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ItemSkipPolicyItemHandler.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ItemSkipPolicyItemHandler.java index 32d082883..526211869 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ItemSkipPolicyItemHandler.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ItemSkipPolicyItemHandler.java @@ -15,8 +15,8 @@ */ package org.springframework.batch.execution.step.support; -import org.springframework.batch.core.domain.ItemSkipPolicy; -import org.springframework.batch.core.domain.StepContribution; +import org.springframework.batch.core.ItemSkipPolicy; +import org.springframework.batch.core.StepContribution; import org.springframework.batch.io.Skippable; import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.ItemWriter; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/LimitCheckingItemSkipPolicy.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/LimitCheckingItemSkipPolicy.java index 9c63179bc..b0e9ab5c3 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/LimitCheckingItemSkipPolicy.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/LimitCheckingItemSkipPolicy.java @@ -24,9 +24,9 @@ import java.util.Map; import org.springframework.batch.common.ExceptionClassifier; import org.springframework.batch.common.SubclassExceptionClassifier; -import org.springframework.batch.core.domain.ItemSkipPolicy; -import org.springframework.batch.core.domain.Step; -import org.springframework.batch.core.domain.StepExecution; +import org.springframework.batch.core.ItemSkipPolicy; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.io.exception.FlatFileParsingException; /** diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ListenerMulticaster.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ListenerMulticaster.java index 929670d77..788ad9bcd 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ListenerMulticaster.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ListenerMulticaster.java @@ -15,12 +15,12 @@ */ package org.springframework.batch.execution.step.support; -import org.springframework.batch.core.domain.BatchListener; -import org.springframework.batch.core.domain.ChunkListener; -import org.springframework.batch.core.domain.ItemReadListener; -import org.springframework.batch.core.domain.ItemWriteListener; -import org.springframework.batch.core.domain.StepExecution; -import org.springframework.batch.core.domain.StepListener; +import org.springframework.batch.core.BatchListener; +import org.springframework.batch.core.ChunkListener; +import org.springframework.batch.core.ItemReadListener; +import org.springframework.batch.core.ItemWriteListener; +import org.springframework.batch.core.StepExecution; +import org.springframework.batch.core.StepListener; import org.springframework.batch.execution.listener.CompositeChunkListener; import org.springframework.batch.execution.listener.CompositeItemReadListener; import org.springframework.batch.execution.listener.CompositeItemWriteListener; @@ -93,7 +93,7 @@ public class ListenerMulticaster implements StepListener, ChunkListener, ItemRea /** * @param stepExecution - * @see org.springframework.batch.execution.listener.CompositeStepListener#beforeStep(org.springframework.batch.core.domain.StepExecution) + * @see org.springframework.batch.execution.listener.CompositeStepListener#beforeStep(org.springframework.batch.core.StepExecution) */ public void beforeStep(StepExecution stepExecution) { stepListener.beforeStep(stepExecution); diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/NeverSkipItemSkipPolicy.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/NeverSkipItemSkipPolicy.java index 95e3bb074..42eea1ff0 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/NeverSkipItemSkipPolicy.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/NeverSkipItemSkipPolicy.java @@ -15,7 +15,7 @@ */ package org.springframework.batch.execution.step.support; -import org.springframework.batch.core.domain.ItemSkipPolicy; +import org.springframework.batch.core.ItemSkipPolicy; /** * {@link ItemSkipPolicy} implementation that always returns false, diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBean.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBean.java index c5a32fbc6..7a21980c4 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBean.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBean.java @@ -15,9 +15,9 @@ */ package org.springframework.batch.execution.step.support; -import org.springframework.batch.core.domain.BatchListener; -import org.springframework.batch.core.domain.Step; -import org.springframework.batch.core.domain.StepListener; +import org.springframework.batch.core.BatchListener; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.StepListener; import org.springframework.batch.execution.step.ItemOrientedStep; import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.ItemStream; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SimpleExitStatusExceptionClassifier.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SimpleExitStatusExceptionClassifier.java index f1e51ee39..da2222df0 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SimpleExitStatusExceptionClassifier.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SimpleExitStatusExceptionClassifier.java @@ -18,7 +18,7 @@ package org.springframework.batch.execution.step.support; import java.io.PrintWriter; import java.io.StringWriter; -import org.springframework.batch.core.domain.JobInterruptedException; +import org.springframework.batch.core.JobInterruptedException; import org.springframework.batch.core.repository.NoSuchJobException; import org.springframework.batch.core.runtime.ExitStatusExceptionClassifier; import org.springframework.batch.execution.launch.support.ExitCodeMapper; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SimpleItemHandler.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SimpleItemHandler.java index 4ef8d85ac..237144187 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SimpleItemHandler.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SimpleItemHandler.java @@ -15,7 +15,7 @@ */ package org.springframework.batch.execution.step.support; -import org.springframework.batch.core.domain.StepContribution; +import org.springframework.batch.core.StepContribution; import org.springframework.batch.execution.step.ItemHandler; import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.ItemWriter; @@ -69,7 +69,7 @@ public class SimpleItemHandler implements ItemHandler { * Read from the {@link ItemReader} and process (if not null) with the * {@link ItemWriter}. * - * @see org.springframework.batch.execution.step.ItemHandler#handle(org.springframework.batch.core.domain.StepContribution) + * @see org.springframework.batch.execution.step.ItemHandler#handle(org.springframework.batch.core.StepContribution) */ public ExitStatus handle(StepContribution contribution) throws Exception { Object item = itemReader.read(); diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/StatefulRetryStepFactoryBean.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/StatefulRetryStepFactoryBean.java index 4521567f1..62f6ec8cb 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/StatefulRetryStepFactoryBean.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/StatefulRetryStepFactoryBean.java @@ -15,8 +15,8 @@ */ package org.springframework.batch.execution.step.support; -import org.springframework.batch.core.domain.Step; -import org.springframework.batch.core.domain.StepContribution; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.StepContribution; import org.springframework.batch.execution.step.ItemOrientedStep; import org.springframework.batch.item.ItemKeyGenerator; import org.springframework.batch.item.ItemReader; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/StepExecutionSynchronizer.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/StepExecutionSynchronizer.java index 1655a0c19..8cb67df9e 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/StepExecutionSynchronizer.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/StepExecutionSynchronizer.java @@ -15,7 +15,7 @@ */ package org.springframework.batch.execution.step.support; -import org.springframework.batch.core.domain.StepExecution; +import org.springframework.batch.core.StepExecution; /** * Strategy for blocking while a step execution is being updated. diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/StepInterruptionPolicy.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/StepInterruptionPolicy.java index 86726f390..08616e3c1 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/StepInterruptionPolicy.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/StepInterruptionPolicy.java @@ -16,8 +16,8 @@ package org.springframework.batch.execution.step.support; -import org.springframework.batch.core.domain.JobInterruptedException; -import org.springframework.batch.core.domain.Step; +import org.springframework.batch.core.JobInterruptedException; +import org.springframework.batch.core.Step; import org.springframework.batch.repeat.RepeatContext; /** diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ThreadStepInterruptionPolicy.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ThreadStepInterruptionPolicy.java index 9875465b5..b2b49b9da 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ThreadStepInterruptionPolicy.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ThreadStepInterruptionPolicy.java @@ -18,7 +18,7 @@ package org.springframework.batch.execution.step.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.batch.core.domain.JobInterruptedException; +import org.springframework.batch.core.JobInterruptedException; import org.springframework.batch.repeat.RepeatContext; /** diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/job/JobSupport.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/job/JobSupport.java index 3a20bce65..d848de0e7 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/job/JobSupport.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/job/JobSupport.java @@ -19,9 +19,9 @@ package org.springframework.batch.execution.job; import java.util.ArrayList; import java.util.List; -import org.springframework.batch.core.domain.Job; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.Step; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.Step; import org.springframework.batch.io.exception.InfrastructureException; import org.springframework.beans.factory.BeanNameAware; import org.springframework.util.ClassUtils; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/job/SimpleJobTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/job/SimpleJobTests.java index 692ab2e63..34597b542 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/job/SimpleJobTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/job/SimpleJobTests.java @@ -21,14 +21,14 @@ import java.util.List; import junit.framework.TestCase; -import org.springframework.batch.core.domain.BatchStatus; -import org.springframework.batch.core.domain.ItemSkipPolicy; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.domain.JobInterruptedException; -import org.springframework.batch.core.domain.JobParameters; -import org.springframework.batch.core.domain.Step; -import org.springframework.batch.core.domain.StepExecution; +import org.springframework.batch.core.BatchStatus; +import org.springframework.batch.core.ItemSkipPolicy; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobInstance; +import org.springframework.batch.core.JobInterruptedException; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.listener.JobListenerSupport; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.execution.repository.SimpleJobRepository; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobLauncherTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobLauncherTests.java index c54ae8679..09bb42aa0 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobLauncherTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobLauncherTests.java @@ -22,9 +22,9 @@ import java.util.List; import junit.framework.TestCase; import org.easymock.MockControl; -import org.springframework.batch.core.domain.Job; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobParameters; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.execution.job.JobSupport; import org.springframework.batch.repeat.ExitStatus; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/CommandLineJobRunnerTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/CommandLineJobRunnerTests.java index 4a0a414f9..c6269afdd 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/CommandLineJobRunnerTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/CommandLineJobRunnerTests.java @@ -17,9 +17,9 @@ package org.springframework.batch.execution.launch.support; import junit.framework.TestCase; -import org.springframework.batch.core.domain.Job; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobParameters; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException; import org.springframework.batch.core.runtime.ExitStatusExceptionClassifier; import org.springframework.batch.execution.launch.JobLauncher; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactoryTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactoryTests.java index c36bc1e6e..14fbd0dca 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactoryTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactoryTests.java @@ -23,8 +23,8 @@ import java.util.Properties; import junit.framework.TestCase; -import org.springframework.batch.core.domain.JobParameters; -import org.springframework.batch.core.domain.JobParametersBuilder; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.JobParametersBuilder; import org.springframework.batch.execution.launch.support.DefaultJobParametersFactory; import org.springframework.util.StringUtils; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactoryTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactoryTests.java index b6c96a202..a4af6ba0d 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactoryTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactoryTests.java @@ -22,8 +22,8 @@ import java.util.Properties; import junit.framework.TestCase; -import org.springframework.batch.core.domain.JobParameters; -import org.springframework.batch.core.domain.JobParametersBuilder; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.JobParametersBuilder; import org.springframework.batch.execution.launch.support.ScheduledJobParametersFactory; import org.springframework.util.StringUtils; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncherTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncherTests.java index 7fb34d854..b86feb600 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncherTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncherTests.java @@ -21,11 +21,11 @@ import java.util.Properties; import junit.framework.TestCase; -import org.springframework.batch.core.domain.Job; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobParameters; -import org.springframework.batch.core.domain.JobParametersBuilder; -import org.springframework.batch.core.domain.StepExecution; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.JobParametersBuilder; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException; import org.springframework.batch.core.runtime.JobParametersFactory; import org.springframework.batch.execution.configuration.MapJobRegistry; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/StubJobLauncher.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/StubJobLauncher.java index f517e3a17..71467d490 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/StubJobLauncher.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/StubJobLauncher.java @@ -1,8 +1,8 @@ package org.springframework.batch.execution.launch.support; -import org.springframework.batch.core.domain.Job; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobParameters; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException; import org.springframework.batch.execution.launch.JobLauncher; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeChunkListenerTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeChunkListenerTests.java index affc6c6d6..d28f9f087 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeChunkListenerTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeChunkListenerTests.java @@ -16,7 +16,7 @@ package org.springframework.batch.execution.listener; import org.easymock.MockControl; -import org.springframework.batch.core.domain.ChunkListener; +import org.springframework.batch.core.ChunkListener; import junit.framework.TestCase; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeItemReadListenerTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeItemReadListenerTests.java index 4928eace0..d08bb8564 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeItemReadListenerTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeItemReadListenerTests.java @@ -18,7 +18,7 @@ package org.springframework.batch.execution.listener; import junit.framework.TestCase; import org.easymock.MockControl; -import org.springframework.batch.core.domain.ItemReadListener; +import org.springframework.batch.core.ItemReadListener; /** * @author Lucas Ward diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeItemWriteListenerTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeItemWriteListenerTests.java index 67b56073c..d25d78eec 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeItemWriteListenerTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeItemWriteListenerTests.java @@ -18,7 +18,7 @@ package org.springframework.batch.execution.listener; import junit.framework.TestCase; import org.easymock.MockControl; -import org.springframework.batch.core.domain.ItemWriteListener; +import org.springframework.batch.core.ItemWriteListener; /** * @author Lucas Ward diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeJobListenerTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeJobListenerTests.java index 180c87115..853b98450 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeJobListenerTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeJobListenerTests.java @@ -20,9 +20,9 @@ import java.util.List; import junit.framework.TestCase; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.domain.JobListener; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobInstance; +import org.springframework.batch.core.JobListener; import org.springframework.batch.core.listener.JobListenerSupport; import org.springframework.batch.execution.job.JobSupport; import org.springframework.batch.execution.listener.CompositeJobListener; @@ -39,7 +39,7 @@ public class CompositeJobListenerTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.execution.listener.CompositeJobListener#setListeners(org.springframework.batch.core.domain.JobListener[])}. + * {@link org.springframework.batch.execution.listener.CompositeJobListener#setListeners(org.springframework.batch.core.JobListener[])}. */ public void testSetListeners() { listener.setListeners(new JobListener[] { new JobListenerSupport() { @@ -57,7 +57,7 @@ public class CompositeJobListenerTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.execution.listener.CompositeJobListener#registerListener(org.springframework.batch.core.domain.JobListener)}. + * {@link org.springframework.batch.execution.listener.CompositeJobListener#registerListener(org.springframework.batch.core.JobListener)}. */ public void testSetListener() { listener.register(new JobListenerSupport() { diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeStepListenerTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeStepListenerTests.java index af580fcfa..6712f1cfd 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeStepListenerTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeStepListenerTests.java @@ -20,8 +20,8 @@ import java.util.List; import junit.framework.TestCase; -import org.springframework.batch.core.domain.StepExecution; -import org.springframework.batch.core.domain.StepListener; +import org.springframework.batch.core.StepExecution; +import org.springframework.batch.core.StepListener; import org.springframework.batch.core.listener.StepListenerSupport; import org.springframework.batch.execution.step.StepSupport; import org.springframework.batch.repeat.ExitStatus; @@ -38,7 +38,7 @@ public class CompositeStepListenerTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.execution.listener.CompositeStepListener#setListeners(org.springframework.batch.core.domain.StepListener[])}. + * {@link org.springframework.batch.execution.listener.CompositeStepListener#setListeners(org.springframework.batch.core.StepListener[])}. */ public void testSetListeners() { listener.setListeners(new StepListener[] { new StepListenerSupport() { @@ -58,7 +58,7 @@ public class CompositeStepListenerTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.execution.listener.CompositeStepListener#registerListener(org.springframework.batch.core.domain.StepListener)}. + * {@link org.springframework.batch.execution.listener.CompositeStepListener#registerListener(org.springframework.batch.core.StepListener)}. */ public void testSetListener() { listener.register(new StepListenerSupport() { diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/MockStepDao.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/MockStepDao.java index 0b165b26b..2fd61548d 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/MockStepDao.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/MockStepDao.java @@ -18,10 +18,10 @@ package org.springframework.batch.execution.repository; import java.util.List; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.domain.Step; -import org.springframework.batch.core.domain.StepExecution; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobInstance; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.execution.repository.dao.StepExecutionDao; import org.springframework.batch.item.ExecutionContext; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryIntegrationTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryIntegrationTests.java index eb196ba52..6218f5742 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryIntegrationTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryIntegrationTests.java @@ -4,11 +4,11 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -import org.springframework.batch.core.domain.BatchStatus; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobParameters; -import org.springframework.batch.core.domain.Step; -import org.springframework.batch.core.domain.StepExecution; +import org.springframework.batch.core.BatchStatus; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException; import org.springframework.batch.core.repository.JobRestartException; import org.springframework.batch.execution.job.JobSupport; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryTests.java index 47b649e9c..f6adf4ba2 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryTests.java @@ -22,12 +22,12 @@ import java.util.List; import junit.framework.TestCase; import org.easymock.MockControl; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.domain.JobParameters; -import org.springframework.batch.core.domain.JobParametersBuilder; -import org.springframework.batch.core.domain.Step; -import org.springframework.batch.core.domain.StepExecution; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobInstance; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.JobParametersBuilder; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.execution.job.JobSupport; import org.springframework.batch.execution.repository.dao.JobExecutionDao; import org.springframework.batch.execution.repository.dao.JobInstanceDao; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java index caa97afba..99f325013 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java @@ -20,12 +20,12 @@ import java.util.Date; import java.util.List; import java.util.Map; -import org.springframework.batch.core.domain.BatchStatus; -import org.springframework.batch.core.domain.Job; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.domain.JobParameters; -import org.springframework.batch.core.domain.JobParametersBuilder; +import org.springframework.batch.core.BatchStatus; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobInstance; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.JobParametersBuilder; import org.springframework.batch.execution.job.JobSupport; import org.springframework.batch.repeat.ExitStatus; import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractStepDaoTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractStepDaoTests.java index a87198818..fab188b27 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractStepDaoTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractStepDaoTests.java @@ -17,13 +17,14 @@ package org.springframework.batch.execution.repository.dao; import java.util.Date; -import org.springframework.batch.core.domain.BatchStatus; -import org.springframework.batch.core.domain.Job; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.domain.JobParameters; -import org.springframework.batch.core.domain.Step; -import org.springframework.batch.core.domain.StepExecution; + +import org.springframework.batch.core.BatchStatus; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobInstance; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.runtime.ExitStatusExceptionClassifier; import org.springframework.batch.execution.job.JobSupport; import org.springframework.batch.execution.step.StepSupport; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/JdbcJobDaoQueryTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/JdbcJobDaoQueryTests.java index 47e263207..dac08b8fc 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/JdbcJobDaoQueryTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/JdbcJobDaoQueryTests.java @@ -20,9 +20,9 @@ import java.util.List; import junit.framework.TestCase; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.domain.JobParameters; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobInstance; +import org.springframework.batch.core.JobParameters; import org.springframework.batch.execution.job.JobSupport; import org.springframework.dao.DataAccessException; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/JdbcStepDaoPrefixTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/JdbcStepDaoPrefixTests.java index c678cc1f6..42485f418 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/JdbcStepDaoPrefixTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/JdbcStepDaoPrefixTests.java @@ -5,11 +5,11 @@ import java.util.List; import junit.framework.TestCase; import org.easymock.MockControl; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.domain.JobParameters; -import org.springframework.batch.core.domain.Step; -import org.springframework.batch.core.domain.StepExecution; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobInstance; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.execution.job.JobSupport; import org.springframework.batch.execution.step.StepSupport; import org.springframework.dao.DataAccessException; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapJobExecutionDaoTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapJobExecutionDaoTests.java index b829304a8..edd868351 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapJobExecutionDaoTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapJobExecutionDaoTests.java @@ -5,10 +5,10 @@ import java.util.List; import junit.framework.TestCase; -import org.springframework.batch.core.domain.BatchStatus; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.domain.JobParameters; +import org.springframework.batch.core.BatchStatus; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobInstance; +import org.springframework.batch.core.JobParameters; import org.springframework.batch.execution.job.JobSupport; public class MapJobExecutionDaoTests extends TestCase { diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapJobInstanceDaoTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapJobInstanceDaoTests.java index 4dba3166c..b9f9a96e2 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapJobInstanceDaoTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapJobInstanceDaoTests.java @@ -2,10 +2,10 @@ package org.springframework.batch.execution.repository.dao; import junit.framework.TestCase; -import org.springframework.batch.core.domain.Job; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.domain.JobParameters; -import org.springframework.batch.core.domain.JobParametersBuilder; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobInstance; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.JobParametersBuilder; import org.springframework.batch.execution.job.JobSupport; public class MapJobInstanceDaoTests extends TestCase { diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapStepExecutionDaoTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapStepExecutionDaoTests.java index a22bb8ea1..44658974e 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapStepExecutionDaoTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapStepExecutionDaoTests.java @@ -20,12 +20,12 @@ import java.util.HashMap; import junit.framework.TestCase; -import org.springframework.batch.core.domain.BatchStatus; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.domain.JobParameters; -import org.springframework.batch.core.domain.Step; -import org.springframework.batch.core.domain.StepExecution; +import org.springframework.batch.core.BatchStatus; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobInstance; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.execution.job.JobSupport; import org.springframework.batch.execution.step.StepSupport; import org.springframework.batch.item.ExecutionContext; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/resource/StepExecutionProxyResourceTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/resource/StepExecutionProxyResourceTests.java index 3699ff52a..c353706a8 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/resource/StepExecutionProxyResourceTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/resource/StepExecutionProxyResourceTests.java @@ -21,12 +21,12 @@ import java.io.IOException; import junit.framework.TestCase; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.domain.JobParameters; -import org.springframework.batch.core.domain.JobParametersBuilder; -import org.springframework.batch.core.domain.Step; -import org.springframework.batch.core.domain.StepExecution; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobInstance; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.JobParametersBuilder; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.execution.job.JobSupport; import org.springframework.batch.execution.step.StepSupport; import org.springframework.core.io.ByteArrayResource; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/ItemOrientedStepTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/ItemOrientedStepTests.java index 8a252515e..bcdf1485f 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/ItemOrientedStepTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/ItemOrientedStepTests.java @@ -22,14 +22,14 @@ import java.util.List; import junit.framework.TestCase; -import org.springframework.batch.core.domain.BatchStatus; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.domain.JobInterruptedException; -import org.springframework.batch.core.domain.JobParameters; -import org.springframework.batch.core.domain.StepContribution; -import org.springframework.batch.core.domain.StepExecution; -import org.springframework.batch.core.domain.StepListener; +import org.springframework.batch.core.BatchStatus; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobInstance; +import org.springframework.batch.core.JobInterruptedException; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.StepContribution; +import org.springframework.batch.core.StepExecution; +import org.springframework.batch.core.StepListener; import org.springframework.batch.core.listener.StepListenerSupport; import org.springframework.batch.execution.job.JobSupport; import org.springframework.batch.execution.repository.SimpleJobRepository; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/StepSupport.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/StepSupport.java index 59486ee01..a4d792eea 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/StepSupport.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/StepSupport.java @@ -15,9 +15,9 @@ */ package org.springframework.batch.execution.step; -import org.springframework.batch.core.domain.JobInterruptedException; -import org.springframework.batch.core.domain.Step; -import org.springframework.batch.core.domain.StepExecution; +import org.springframework.batch.core.JobInterruptedException; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.io.exception.InfrastructureException; import org.springframework.beans.factory.BeanNameAware; @@ -108,7 +108,7 @@ public class StepSupport implements Step, BeanNameAware { * * @throws UnsupportedOperationException always * - * @see org.springframework.batch.core.domain.Step#execute(org.springframework.batch.core.domain.StepExecution) + * @see org.springframework.batch.core.Step#execute(org.springframework.batch.core.StepExecution) */ public void execute(StepExecution stepExecution) throws JobInterruptedException, InfrastructureException { throw new UnsupportedOperationException( diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/TaskletStepTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/TaskletStepTests.java index 141943414..ad8eb520a 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/TaskletStepTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/TaskletStepTests.java @@ -5,13 +5,13 @@ import java.util.List; import junit.framework.TestCase; -import org.springframework.batch.core.domain.BatchStatus; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.domain.JobInterruptedException; -import org.springframework.batch.core.domain.JobParameters; -import org.springframework.batch.core.domain.StepExecution; -import org.springframework.batch.core.domain.StepListener; +import org.springframework.batch.core.BatchStatus; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobInstance; +import org.springframework.batch.core.JobInterruptedException; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.StepExecution; +import org.springframework.batch.core.StepListener; import org.springframework.batch.core.listener.StepListenerSupport; import org.springframework.batch.core.tasklet.Tasklet; import org.springframework.batch.execution.job.JobSupport; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBeanTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBeanTests.java index 8e43124a1..2f5f13a71 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBeanTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBeanTests.java @@ -23,10 +23,10 @@ import java.util.List; import junit.framework.TestCase; -import org.springframework.batch.core.domain.BatchListener; -import org.springframework.batch.core.domain.BatchStatus; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobParameters; +import org.springframework.batch.core.BatchListener; +import org.springframework.batch.core.BatchStatus; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.listener.ItemListenerSupport; import org.springframework.batch.execution.job.SimpleJob; import org.springframework.batch.execution.repository.SimpleJobRepository; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/JobRepositorySupport.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/JobRepositorySupport.java index f744ed8fd..a8e8232e3 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/JobRepositorySupport.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/JobRepositorySupport.java @@ -15,12 +15,12 @@ */ package org.springframework.batch.execution.step.support; -import org.springframework.batch.core.domain.Job; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.domain.JobParameters; -import org.springframework.batch.core.domain.Step; -import org.springframework.batch.core.domain.StepExecution; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobInstance; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.repository.JobRepository; /** diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBeanTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBeanTests.java index b564740b4..ba030cc69 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBeanTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBeanTests.java @@ -20,11 +20,11 @@ import java.util.List; import junit.framework.TestCase; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.domain.JobParameters; -import org.springframework.batch.core.domain.Step; -import org.springframework.batch.core.domain.StepExecution; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobInstance; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.execution.job.JobSupport; import org.springframework.batch.execution.launch.EmptyItemWriter; import org.springframework.batch.item.reader.ListItemReader; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/SimpleExitStatusExceptionClassifierTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/SimpleExitStatusExceptionClassifierTests.java index bec0b970a..4f7b92899 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/SimpleExitStatusExceptionClassifierTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/SimpleExitStatusExceptionClassifierTests.java @@ -16,7 +16,7 @@ package org.springframework.batch.execution.step.support; -import org.springframework.batch.core.domain.JobInterruptedException; +import org.springframework.batch.core.JobInterruptedException; import org.springframework.batch.core.repository.NoSuchJobException; import org.springframework.batch.core.runtime.ExitStatusExceptionClassifier; import org.springframework.batch.execution.launch.support.ExitCodeMapper; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/StatefulRetryStepFactoryBeanTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/StatefulRetryStepFactoryBeanTests.java index 8dca0adf6..2484a341b 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/StatefulRetryStepFactoryBeanTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/StatefulRetryStepFactoryBeanTests.java @@ -22,11 +22,11 @@ import java.util.List; import junit.framework.TestCase; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobParameters; -import org.springframework.batch.core.domain.JobParametersBuilder; -import org.springframework.batch.core.domain.Step; -import org.springframework.batch.core.domain.StepExecution; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.JobParametersBuilder; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.execution.job.JobSupport; import org.springframework.batch.execution.repository.SimpleJobRepository; import org.springframework.batch.execution.repository.dao.MapJobExecutionDao; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/StepExecutorInterruptionTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/StepExecutorInterruptionTests.java index 34003a911..75a1b4f6a 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/StepExecutorInterruptionTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/StepExecutorInterruptionTests.java @@ -18,11 +18,11 @@ package org.springframework.batch.execution.step.support; import junit.framework.TestCase; -import org.springframework.batch.core.domain.BatchStatus; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobInterruptedException; -import org.springframework.batch.core.domain.JobParameters; -import org.springframework.batch.core.domain.StepExecution; +import org.springframework.batch.core.BatchStatus; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobInterruptedException; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.execution.job.JobSupport; import org.springframework.batch.execution.repository.SimpleJobRepository; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/ThreadStepInterruptionPolicyTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/ThreadStepInterruptionPolicyTests.java index a66e3a19a..08919e694 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/ThreadStepInterruptionPolicyTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/ThreadStepInterruptionPolicyTests.java @@ -17,7 +17,7 @@ package org.springframework.batch.execution.step.support; import junit.framework.TestCase; -import org.springframework.batch.core.domain.JobInterruptedException; +import org.springframework.batch.core.JobInterruptedException; import org.springframework.batch.execution.step.support.ThreadStepInterruptionPolicy; import org.springframework.batch.repeat.RepeatContext; import org.springframework.batch.repeat.context.RepeatContextSupport; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/ClassPathXmlApplicationContextJobFactory.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/ClassPathXmlApplicationContextJobFactory.java index 20538d183..ed20f99b4 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/ClassPathXmlApplicationContextJobFactory.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/ClassPathXmlApplicationContextJobFactory.java @@ -15,8 +15,8 @@ */ package org.springframework.batch.sample; +import org.springframework.batch.core.Job; import org.springframework.batch.core.configuration.JobFactory; -import org.springframework.batch.core.domain.Job; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/DefaultJobInterruptionAdvice.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/DefaultJobInterruptionAdvice.java index 1bbf5703a..4209967c0 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/DefaultJobInterruptionAdvice.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/DefaultJobInterruptionAdvice.java @@ -2,9 +2,9 @@ package org.springframework.batch.sample.advice; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.batch.core.domain.BatchStatus; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobInterruptedException; +import org.springframework.batch.core.BatchStatus; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobInterruptedException; /** * Monitors {@link JobExecution} and throws a {@link JobInterruptedException} in diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/JobInterruptionAdvice.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/JobInterruptionAdvice.java index d26c3ae9a..ab708ccc9 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/JobInterruptionAdvice.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/JobInterruptionAdvice.java @@ -1,6 +1,6 @@ package org.springframework.batch.sample.advice; -import org.springframework.batch.core.domain.JobInterruptedException; +import org.springframework.batch.core.JobInterruptedException; /** * Interface for monitors that check whether a job was interrupted by user. diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/OrderItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/OrderItemReader.java index c224585fe..8449b2b8f 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/OrderItemReader.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/OrderItemReader.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.batch.core.domain.StepExecution; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.io.file.mapping.FieldSet; import org.springframework.batch.io.file.mapping.FieldSetMapper; import org.springframework.batch.item.reader.DelegatingItemReader; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/StagingItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/StagingItemReader.java index 0b96a54ec..f54b2f145 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/StagingItemReader.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/StagingItemReader.java @@ -9,8 +9,8 @@ import java.util.List; import org.apache.commons.lang.SerializationUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.batch.core.domain.StepExecution; -import org.springframework.batch.core.domain.StepListener; +import org.springframework.batch.core.StepExecution; +import org.springframework.batch.core.StepListener; import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.ItemStream; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/StagingItemWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/StagingItemWriter.java index e54ec89df..2582e64b6 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/StagingItemWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/StagingItemWriter.java @@ -5,8 +5,8 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import org.apache.commons.lang.SerializationUtils; -import org.springframework.batch.core.domain.StepExecution; -import org.springframework.batch.core.domain.StepListener; +import org.springframework.batch.core.StepExecution; +import org.springframework.batch.core.StepListener; import org.springframework.batch.item.ItemWriter; import org.springframework.batch.item.exception.ClearFailedException; import org.springframework.batch.item.exception.FlushFailedException; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/TaskExecutorLauncher.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/TaskExecutorLauncher.java index 83afda407..8f07f730b 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/TaskExecutorLauncher.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/TaskExecutorLauncher.java @@ -15,8 +15,8 @@ */ package org.springframework.batch.sample.launch; +import org.springframework.batch.core.Job; import org.springframework.batch.core.configuration.JobRegistry; -import org.springframework.batch.core.domain.Job; import org.springframework.batch.core.repository.DuplicateJobException; import org.springframework.batch.sample.ClassPathXmlApplicationContextJobFactory; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/quartz/JobLauncherDetails.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/quartz/JobLauncherDetails.java index 93614ab42..bba2e30dc 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/quartz/JobLauncherDetails.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/quartz/JobLauncherDetails.java @@ -18,8 +18,8 @@ package org.springframework.batch.sample.quartz; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.quartz.JobExecutionContext; +import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.configuration.JobLocator; -import org.springframework.batch.core.domain.JobParameters; import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException; import org.springframework.batch.core.repository.JobRestartException; import org.springframework.batch.core.repository.NoSuchJobException; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/quartz/QuartzBatchLauncher.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/quartz/QuartzBatchLauncher.java index 6c3e9a481..28b9c0f4c 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/quartz/QuartzBatchLauncher.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/quartz/QuartzBatchLauncher.java @@ -18,8 +18,8 @@ package org.springframework.batch.sample.quartz; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.batch.core.Job; import org.springframework.batch.core.configuration.JobRegistry; -import org.springframework.batch.core.domain.Job; import org.springframework.batch.core.repository.DuplicateJobException; import org.springframework.batch.sample.ClassPathXmlApplicationContextJobFactory; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/step/support/NoopStepInterruptionPolicy.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/step/support/NoopStepInterruptionPolicy.java index c5d8352be..c2c639207 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/step/support/NoopStepInterruptionPolicy.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/step/support/NoopStepInterruptionPolicy.java @@ -1,6 +1,6 @@ package org.springframework.batch.sample.step.support; -import org.springframework.batch.core.domain.JobInterruptedException; +import org.springframework.batch.core.JobInterruptedException; import org.springframework.batch.execution.step.support.StepInterruptionPolicy; import org.springframework.batch.repeat.RepeatContext; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/InfiniteLoopTasklet.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/InfiniteLoopTasklet.java index 7b3712086..6d7d0f9a5 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/InfiniteLoopTasklet.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/InfiniteLoopTasklet.java @@ -18,7 +18,7 @@ package org.springframework.batch.sample.tasklet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.batch.core.domain.StepExecution; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.listener.StepListenerSupport; import org.springframework.batch.core.tasklet.Tasklet; import org.springframework.batch.repeat.ExitStatus; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractBatchLauncherTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractBatchLauncherTests.java index 43824216d..6d09b126a 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractBatchLauncherTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractBatchLauncherTests.java @@ -16,8 +16,8 @@ package org.springframework.batch.sample; -import org.springframework.batch.core.domain.Job; -import org.springframework.batch.core.domain.JobParameters; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobParameters; import org.springframework.batch.execution.launch.JobLauncher; import org.springframework.test.AbstractDependencyInjectionSpringContextTests; import org.springframework.util.ClassUtils; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/DefaultJobLoader.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/DefaultJobLoader.java index b36653dd9..255fb7c08 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/DefaultJobLoader.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/DefaultJobLoader.java @@ -7,8 +7,8 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import org.springframework.batch.core.Job; import org.springframework.batch.core.configuration.ListableJobRegistry; -import org.springframework.batch.core.domain.Job; import org.springframework.batch.core.repository.NoSuchJobException; import org.springframework.beans.BeanWrapperImpl; import org.springframework.beans.BeansException; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTests.java index 94edc747d..b7c14830a 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTests.java @@ -16,9 +16,9 @@ package org.springframework.batch.sample; -import org.springframework.batch.core.domain.BatchStatus; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobParameters; +import org.springframework.batch.core.BatchStatus; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobParameters; /** * Functional test for graceful shutdown. A batch container is started in a new thread, diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java index 234967bb0..172079c6a 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java @@ -3,8 +3,8 @@ package org.springframework.batch.sample; import java.math.BigDecimal; import java.util.List; -import org.springframework.batch.core.domain.JobParameters; -import org.springframework.batch.core.domain.JobParametersBuilder; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.JobParametersBuilder; import org.springframework.batch.sample.dao.HibernateCreditDao; import org.springframework.jdbc.UncategorizedSQLException; import org.springframework.orm.hibernate3.HibernateJdbcException; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RestartFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RestartFunctionalTests.java index b7e2e8a54..ff03347df 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RestartFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RestartFunctionalTests.java @@ -16,7 +16,7 @@ package org.springframework.batch.sample; -import org.springframework.batch.core.domain.JobParameters; +import org.springframework.batch.core.JobParameters; import org.springframework.batch.io.exception.InfrastructureException; import org.springframework.jdbc.core.JdbcOperations; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/advice/DefaultJobInterruptionAdviceTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/advice/DefaultJobInterruptionAdviceTests.java index a1f97fe7a..e94f6f150 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/advice/DefaultJobInterruptionAdviceTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/advice/DefaultJobInterruptionAdviceTests.java @@ -2,11 +2,11 @@ package org.springframework.batch.sample.advice; import junit.framework.TestCase; -import org.springframework.batch.core.domain.BatchStatus; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.domain.JobInterruptedException; -import org.springframework.batch.core.domain.JobParameters; +import org.springframework.batch.core.BatchStatus; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobInstance; +import org.springframework.batch.core.JobInterruptedException; +import org.springframework.batch.core.JobParameters; import org.springframework.batch.sample.tasklet.JobSupport; /** 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 c57d4f2a2..743db46ca 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 @@ -7,9 +7,9 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import org.springframework.batch.core.domain.BatchStatus; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobParameters; +import org.springframework.batch.core.BatchStatus; +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; 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/item/reader/StagingItemReaderTests.java index ae6249528..f2fb02c89 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/item/reader/StagingItemReaderTests.java @@ -1,9 +1,9 @@ package org.springframework.batch.sample.item.reader; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.domain.JobParameters; -import org.springframework.batch.core.domain.StepExecution; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobInstance; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.sample.item.writer.StagingItemWriter; import org.springframework.batch.sample.tasklet.JobSupport; 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/item/writer/StagingItemWriterTests.java index 6853d3a7c..b2a4f4732 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/item/writer/StagingItemWriterTests.java @@ -15,10 +15,10 @@ */ package org.springframework.batch.sample.item.writer; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.domain.JobParameters; -import org.springframework.batch.core.domain.StepExecution; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobInstance; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.sample.tasklet.JobSupport; import org.springframework.batch.sample.tasklet.StepSupport; import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests; 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/tasklet/JobSupport.java index 901c0becf..cc32c73f3 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/tasklet/JobSupport.java @@ -19,9 +19,9 @@ package org.springframework.batch.sample.tasklet; import java.util.ArrayList; import java.util.List; -import org.springframework.batch.core.domain.Job; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.Step; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.Step; import org.springframework.batch.io.exception.InfrastructureException; import org.springframework.beans.factory.BeanNameAware; import org.springframework.util.ClassUtils; 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/tasklet/StepSupport.java index 28eabb74c..dc0ed6f6a 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/tasklet/StepSupport.java @@ -15,9 +15,9 @@ */ package org.springframework.batch.sample.tasklet; -import org.springframework.batch.core.domain.JobInterruptedException; -import org.springframework.batch.core.domain.Step; -import org.springframework.batch.core.domain.StepExecution; +import org.springframework.batch.core.JobInterruptedException; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.io.exception.InfrastructureException; import org.springframework.beans.factory.BeanNameAware; @@ -108,7 +108,7 @@ public class StepSupport implements Step, BeanNameAware { * * @throws UnsupportedOperationException always * - * @see org.springframework.batch.core.domain.Step#execute(org.springframework.batch.core.domain.StepExecution) + * @see org.springframework.batch.core.Step#execute(org.springframework.batch.core.StepExecution) */ public void execute(StepExecution stepExecution) throws JobInterruptedException, InfrastructureException { throw new UnsupportedOperationException(