Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RESOLVED - BATCH-1184: DelegatingStep is not used. It should be removed.

Browse Source
This commit is contained in:
dhgarrette
2009-03-30 17:06:34 +00:00
parent f8144a68aa
commit 6358cb2bf2
2 changed files with 0 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/DelegatingStep.java
View File

@@ -1,68 +0,0 @@
/*
* Copyright 2006-2009 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.configuration.xml;
import org.springframework.batch.core.JobInterruptedException;
import org.springframework.batch.core.Step;
import org.springframework.batch.core.StepExecution;
import org.springframework.util.ClassUtils;
/**
* Class used for delegating from a <step> definition to an individual bean
* defining the actual step. This is needed to maintain the id from the <step>
* element for any flow references.
*
* @author Thomas Risberg
* @since 2.0
*/
public class DelegatingStep implements Step {
String name;
Step delegate;
/**
* Constructor taking the step name and the delegate as parameters.
*
* @param name the name to be used for the step
* @param delegate the step definition to delegate to
*/
public DelegatingStep(String name, Step delegate) {
this.name = name;
this.delegate = delegate;
}
public void execute(StepExecution stepExecution)
throws JobInterruptedException {
delegate.execute(stepExecution);
}
public String getName() {
return name;
}
public int getStartLimit() {
return delegate.getStartLimit();
}
public boolean isAllowStartIfComplete() {
return delegate.isAllowStartIfComplete();
}
public String toString() {
return ClassUtils.getShortName(getClass()) + ": [name=" + name + "]";
}
}

6
spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserTests.java
View File

@@ -184,9 +184,6 @@ public class StepParserTests {
Map<String, Object> beans = ctx.getBeansOfType(Step.class);
assertTrue(beans.containsKey(stepName));
Step step = (Step) ctx.getBean(stepName);
if (step instanceof DelegatingStep) {
step = (Step) ReflectionTestUtils.getField(step, "delegate");
}
assertTrue(step instanceof TaskletStep);
Object compositeListener = ReflectionTestUtils.getField(step, "stepExecutionListener");
Object composite = ReflectionTestUtils.getField(compositeListener, "list");
@@ -206,9 +203,6 @@ public class StepParserTests {
Map<String, Object> beans = ctx.getBeansOfType(Step.class);
assertTrue(beans.containsKey(stepName));
Step step = (Step) ctx.getBean(stepName);
if (step instanceof DelegatingStep) {
step = (Step) ReflectionTestUtils.getField(step, "delegate");
}
assertTrue(step instanceof TaskletStep);
Object transactionAttribute = ReflectionTestUtils.getField(step, "transactionAttribute");
DefaultTransactionAttribute txa = (DefaultTransactionAttribute) transactionAttribute;