From 6d34dff7d87bdd638ab045cc8ccf79b89eb86ce2 Mon Sep 17 00:00:00 2001 From: robokaso Date: Fri, 18 Jul 2008 09:17:26 +0000 Subject: [PATCH] RESOLVED - BATCH-570: Job.getSteps() does not need to be exposed in the interface removed the getSteps() method --- .../main/java/org/springframework/batch/core/Job.java | 7 ------- .../ClassPathXmlApplicationContextJobFactory.java | 11 ----------- .../springframework/batch/core/job/AbstractJob.java | 2 +- .../springframework/batch/core/job/JobSupport.java | 7 ------- .../springframework/batch/integration/JobSupport.java | 8 -------- .../batch/sample/tasklet/JobSupport.java | 7 ------- 6 files changed, 1 insertion(+), 41 deletions(-) diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/Job.java b/spring-batch-core/src/main/java/org/springframework/batch/core/Job.java index 7ad894400..515dbd501 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/Job.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/Job.java @@ -15,7 +15,6 @@ */ package org.springframework.batch.core; -import java.util.List; /** * Batch domain object representing a job. Job is an explicit abstraction @@ -30,12 +29,6 @@ public interface Job { String getName(); - /** - * @deprecated planned for removal in 2.0 - * @return the {@link Step}s executed as part of this job. - */ - List getSteps(); - boolean isRestartable(); /** diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ClassPathXmlApplicationContextJobFactory.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ClassPathXmlApplicationContextJobFactory.java index d1754a622..922963e54 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ClassPathXmlApplicationContextJobFactory.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ClassPathXmlApplicationContextJobFactory.java @@ -15,12 +15,9 @@ */ package org.springframework.batch.core.configuration.support; -import java.util.List; - import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobExecutionException; -import org.springframework.batch.core.Step; import org.springframework.batch.core.configuration.JobFactory; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; @@ -138,14 +135,6 @@ public class ClassPathXmlApplicationContextJobFactory implements JobFactory, App return delegate.getName(); } - /** - * @deprecated planned for removal in 2.0 - * @see org.springframework.batch.core.Job#getSteps() - */ - public List getSteps() { - return delegate.getSteps(); - } - /** * @see org.springframework.batch.core.Job#isRestartable() */ diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java index e788c892b..f6a4a01f0 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java @@ -103,7 +103,7 @@ public abstract class AbstractJob implements Job, BeanNameAware, InitializingBea /* (non-Javadoc) * @see org.springframework.batch.core.domain.IJob#getSteps() */ - public List getSteps() { + protected List getSteps() { return steps; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/JobSupport.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/JobSupport.java index 514b6a612..7440f86da 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/JobSupport.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/JobSupport.java @@ -95,13 +95,6 @@ public class JobSupport implements BeanNameAware, Job { return name; } - /* (non-Javadoc) - * @see org.springframework.batch.core.domain.IJob#getSteps() - */ - public List getSteps() { - return steps; - } - public void setSteps(List steps) { this.steps.clear(); this.steps.addAll(steps); diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/JobSupport.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/JobSupport.java index f3b3589c3..b4aef23e3 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/JobSupport.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/JobSupport.java @@ -1,7 +1,5 @@ package org.springframework.batch.integration; -import java.util.List; - import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobExecutionException; @@ -22,12 +20,6 @@ public class JobSupport implements Job { return name; } - @SuppressWarnings("unchecked") - public List getSteps() { - // TODO Auto-generated method stub - return null; - } - public boolean isRestartable() { // TODO Auto-generated method stub return false; 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 fd7e65b4d..527edd94c 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 @@ -95,13 +95,6 @@ public class JobSupport implements BeanNameAware, Job { return name; } - /* (non-Javadoc) - * @see org.springframework.batch.core.domain.IJob#getSteps() - */ - public List getSteps() { - return steps; - } - public void setSteps(List steps) { this.steps.clear(); this.steps.addAll(steps);