diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/tasklet/support/TaskletAdapter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/tasklet/TaskletAdapter.java similarity index 95% rename from spring-batch-core/src/main/java/org/springframework/batch/core/tasklet/support/TaskletAdapter.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/tasklet/TaskletAdapter.java index 2a97af09e..6dff96ac8 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/tasklet/support/TaskletAdapter.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/tasklet/TaskletAdapter.java @@ -13,9 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.tasklet.support; +package org.springframework.batch.core.tasklet; -import org.springframework.batch.core.tasklet.Tasklet; import org.springframework.batch.item.adapter.AbstractMethodInvokingDelegator; import org.springframework.batch.repeat.ExitStatus; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/tasklet/support/package.html b/spring-batch-core/src/main/java/org/springframework/batch/core/tasklet/support/package.html deleted file mode 100644 index 85c3fc49e..000000000 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/tasklet/support/package.html +++ /dev/null @@ -1,7 +0,0 @@ - - -

-Specific implementations of tasklet concerns. -

- - diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/tasklet/support/TaskletAdapterTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/tasklet/TaskletAdapterTests.java similarity index 87% rename from spring-batch-core/src/test/java/org/springframework/batch/core/tasklet/support/TaskletAdapterTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/tasklet/TaskletAdapterTests.java index 12d1821cf..452fede14 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/tasklet/support/TaskletAdapterTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/tasklet/TaskletAdapterTests.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.tasklet.support; +package org.springframework.batch.core.tasklet; -import org.springframework.batch.core.tasklet.support.TaskletAdapter; +import org.springframework.batch.core.tasklet.TaskletAdapter; import org.springframework.batch.repeat.ExitStatus; import junit.framework.TestCase; @@ -46,7 +46,7 @@ public class TaskletAdapterTests extends TestCase { } /** - * Test method for {@link org.springframework.batch.core.tasklet.support.TaskletAdapter#execute()}. + * Test method for {@link org.springframework.batch.core.tasklet.TaskletAdapter#execute()}. * @throws Exception */ public void testExecuteWithExitStatus() throws Exception { @@ -54,7 +54,7 @@ public class TaskletAdapterTests extends TestCase { } /** - * Test method for {@link org.springframework.batch.core.tasklet.support.TaskletAdapter#mapResult(java.lang.Object)}. + * Test method for {@link org.springframework.batch.core.tasklet.TaskletAdapter#mapResult(java.lang.Object)}. */ public void testMapResultWithNull() throws Exception { tasklet.setTargetMethod("process"); @@ -62,7 +62,7 @@ public class TaskletAdapterTests extends TestCase { } /** - * Test method for {@link org.springframework.batch.core.tasklet.support.TaskletAdapter#mapResult(java.lang.Object)}. + * Test method for {@link org.springframework.batch.core.tasklet.TaskletAdapter#mapResult(java.lang.Object)}. */ public void testMapResultWithNonNull() throws Exception { tasklet.setTargetMethod("process");