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

[BATCH-432] Moved the domain objects up to the root core directory

Browse Source
This commit is contained in:
nebhale
2008-03-07 09:55:04 +00:00
parent dc40160583
commit fff1f0fb9e
130 changed files with 455 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-batch-core/src/main/java/org/springframework/batch/core/domain/BatchListener.java → spring-batch-core/src/main/java/org/springframework/batch/core/BatchListener.java
View File

@@ -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

2
spring-batch-core/src/main/java/org/springframework/batch/core/domain/BatchStatus.java → spring-batch-core/src/main/java/org/springframework/batch/core/BatchStatus.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.batch.core.domain;
package org.springframework.batch.core;
import java.io.Serializable;

2
spring-batch-core/src/main/java/org/springframework/batch/core/domain/ChunkListener.java → spring-batch-core/src/main/java/org/springframework/batch/core/ChunkListener.java
View File

@@ -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

2
spring-batch-core/src/main/java/org/springframework/batch/core/domain/Entity.java → spring-batch-core/src/main/java/org/springframework/batch/core/Entity.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.batch.core.domain;
package org.springframework.batch.core;
import java.io.Serializable;

2
spring-batch-core/src/main/java/org/springframework/batch/core/domain/ItemReadListener.java → spring-batch-core/src/main/java/org/springframework/batch/core/ItemReadListener.java
View File

@@ -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;

2
spring-batch-core/src/main/java/org/springframework/batch/core/domain/ItemSkipPolicy.java → spring-batch-core/src/main/java/org/springframework/batch/core/ItemSkipPolicy.java
View File

@@ -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;
/**

2
spring-batch-core/src/main/java/org/springframework/batch/core/domain/ItemWriteListener.java → spring-batch-core/src/main/java/org/springframework/batch/core/ItemWriteListener.java
View File

@@ -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;

2
spring-batch-core/src/main/java/org/springframework/batch/core/domain/Job.java → spring-batch-core/src/main/java/org/springframework/batch/core/Job.java
View File

@@ -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;

2
spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobExecution.java → spring-batch-core/src/main/java/org/springframework/batch/core/JobExecution.java
View File

@@ -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;

2
spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobExecutionException.java → spring-batch-core/src/main/java/org/springframework/batch/core/JobExecutionException.java
View File

@@ -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

2
spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobInstance.java → spring-batch-core/src/main/java/org/springframework/batch/core/JobInstance.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.batch.core.domain;
package org.springframework.batch.core;
import org.springframework.util.Assert;

2
spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobInterruptedException.java → spring-batch-core/src/main/java/org/springframework/batch/core/JobInterruptedException.java
View File

@@ -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;

2
spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobListener.java → spring-batch-core/src/main/java/org/springframework/batch/core/JobListener.java
View File

@@ -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}.

2
spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobParameters.java → spring-batch-core/src/main/java/org/springframework/batch/core/JobParameters.java
View File

@@ -1,7 +1,7 @@
/**
*
*/
package org.springframework.batch.core.domain;
package org.springframework.batch.core;
import java.util.Collections;
import java.util.Date;

2
spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobParametersBuilder.java → spring-batch-core/src/main/java/org/springframework/batch/core/JobParametersBuilder.java
View File

@@ -1,7 +1,7 @@
/**
*
*/
package org.springframework.batch.core.domain;
package org.springframework.batch.core;
import java.util.Date;
import java.util.LinkedHashMap;

2
spring-batch-core/src/main/java/org/springframework/batch/core/domain/Step.java → spring-batch-core/src/main/java/org/springframework/batch/core/Step.java
View File

@@ -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;

2
spring-batch-core/src/main/java/org/springframework/batch/core/domain/StepContribution.java → spring-batch-core/src/main/java/org/springframework/batch/core/StepContribution.java
View File

@@ -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;

2
spring-batch-core/src/main/java/org/springframework/batch/core/domain/StepExecution.java → spring-batch-core/src/main/java/org/springframework/batch/core/StepExecution.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.batch.core.domain;
package org.springframework.batch.core;
import java.util.Date;

2
spring-batch-core/src/main/java/org/springframework/batch/core/domain/StepListener.java → spring-batch-core/src/main/java/org/springframework/batch/core/StepListener.java
View File

@@ -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;

12
spring-batch-core/src/test/java/org/springframework/batch/core/domain/BatchStatusTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/BatchStatusTests.java
View File

@@ -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));

28
spring-batch-core/src/test/java/org/springframework/batch/core/domain/EntityTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/EntityTests.java
View File

@@ -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));

40
spring-batch-core/src/test/java/org/springframework/batch/core/JobExecutionExceptionTests.java Normal file
View File

@@ -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);
}
}

27
spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobExecutionTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/JobExecutionTests.java
View File

@@ -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());

7
spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobInstanceTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/JobInstanceTests.java
View File

@@ -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"));

5
spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobInterruptedExceptionTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/JobInterruptedExceptionTests.java
View File

@@ -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

5
spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobParametersBuilderTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/JobParametersBuilderTests.java
View File

@@ -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;
/**

4
spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobParametersTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/JobParametersTests.java
View File

@@ -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;
/**

8
spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobSupport.java → spring-batch-core/src/test/java/org/springframework/batch/core/JobSupport.java
View File

@@ -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;

2
spring-batch-core/src/test/java/org/springframework/batch/core/domain/SpringBeanJobTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/SpringBeanJobTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.batch.core.domain;
package org.springframework.batch.core;
import junit.framework.TestCase;

12
spring-batch-core/src/test/java/org/springframework/batch/core/domain/StepContributionTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/StepContributionTests.java
View File

@@ -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());

36
spring-batch-core/src/test/java/org/springframework/batch/core/domain/StepExecutionTests.java → spring-batch-core/src/test/java/org/springframework/batch/core/StepExecutionTests.java
View File

@@ -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);

10
spring-batch-core/src/test/java/org/springframework/batch/core/domain/StepSupport.java → spring-batch-core/src/test/java/org/springframework/batch/core/StepSupport.java
View File

@@ -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(

8
spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobLauncher.java
View File

@@ -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;

6
spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/CommandLineJobRunner.java
View File

@@ -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;

6
spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactory.java
View File

@@ -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) {

2
spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ExportedJobLauncher.java
View File

@@ -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;
/**

6
spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactory.java
View File

@@ -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) {

8
spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncher.java
View File

@@ -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;

2
spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeChunkListener.java
View File

@@ -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

4
spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeItemReadListener.java
View File

@@ -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

4
spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeItemWriteListener.java
View File

@@ -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

4
spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeJobListener.java
View File

@@ -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

4
spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeStepListener.java
View File

@@ -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;
/**

12
spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/SimpleJobRepository.java
View File

@@ -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;

6
spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobExecutionDao.java
View File

@@ -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;

6
spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobInstanceDao.java
View File

@@ -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;

8
spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcStepExecutionDao.java
View File

@@ -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;

4
spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JobExecutionDao.java
View File

@@ -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.

6
spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JobInstanceDao.java
View File

@@ -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.

4
spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapJobExecutionDao.java
View File

@@ -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;
/**

6
spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapJobInstanceDao.java
View File

@@ -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;

6
spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapStepExecutionDao.java
View File

@@ -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;

6
spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/StepExecutionDao.java
View File

@@ -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 {

8
spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/StepExecutionProxyResource.java
View File

@@ -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();

6
spring-batch-execution/src/main/java/org/springframework/batch/execution/step/AbstractStep.java
View File

@@ -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;
/**

2
spring-batch-execution/src/main/java/org/springframework/batch/execution/step/ItemHandler.java
View File

@@ -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;

12
spring-batch-execution/src/main/java/org/springframework/batch/execution/step/ItemOrientedStep.java
View File

@@ -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;

10
spring-batch-execution/src/main/java/org/springframework/batch/execution/step/TaskletStep.java
View File

@@ -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;

2
spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/AbstractStepFactoryBean.java
View File

@@ -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;

2
spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/AlwaysSkipItemSkipPolicy.java
View File

@@ -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

10
spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/BatchListenerFactoryHelper.java
View File

@@ -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;

2
spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/DefaultStepExecutionSynchronizer.java
View File

@@ -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;

6
spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBean.java
View File

@@ -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;

4
spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ItemSkipPolicyItemHandler.java
View File

@@ -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;

6
spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/LimitCheckingItemSkipPolicy.java
View File

@@ -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;
/**

14
spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ListenerMulticaster.java
View File

@@ -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);

2
spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/NeverSkipItemSkipPolicy.java
View File

@@ -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,

6
spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBean.java
View File

@@ -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;

2
spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SimpleExitStatusExceptionClassifier.java
View File

@@ -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;

4
spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SimpleItemHandler.java
View File

@@ -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();

4
spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/StatefulRetryStepFactoryBean.java
View File

@@ -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;

2
spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/StepExecutionSynchronizer.java
View File

@@ -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.

4
spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/StepInterruptionPolicy.java
View File

@@ -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;
/**

2
spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ThreadStepInterruptionPolicy.java
View File

@@ -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;
/**

6
spring-batch-execution/src/test/java/org/springframework/batch/execution/job/JobSupport.java
View File

@@ -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;

16
spring-batch-execution/src/test/java/org/springframework/batch/execution/job/SimpleJobTests.java
View File

@@ -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;

6
spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobLauncherTests.java
View File

@@ -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;

6
spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/CommandLineJobRunnerTests.java
View File

@@ -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;

4
spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactoryTests.java
View File

@@ -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;

4
spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactoryTests.java
View File

@@ -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;

10
spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncherTests.java
View File

@@ -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;

6
spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/StubJobLauncher.java
View File

@@ -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;

2
spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeChunkListenerTests.java
View File

@@ -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;

2
spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeItemReadListenerTests.java
View File

@@ -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

2
spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeItemWriteListenerTests.java
View File

@@ -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

10
spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeJobListenerTests.java
View File

@@ -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() {

8
spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeStepListenerTests.java
View File

@@ -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() {

8
spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/MockStepDao.java
View File

@@ -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;

10
spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryIntegrationTests.java
View File

@@ -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;

12
spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryTests.java
View File

@@ -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;

12
spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java
View File

@@ -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;

15
spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractStepDaoTests.java
View File

@@ -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;

6
spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/JdbcJobDaoQueryTests.java
View File

@@ -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;

10
spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/JdbcStepDaoPrefixTests.java
View File

@@ -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;

8
spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapJobExecutionDaoTests.java
View File

@@ -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 {

8
spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapJobInstanceDaoTests.java
View File

@@ -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 {

12
spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapStepExecutionDaoTests.java
View File

@@ -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;

12
spring-batch-execution/src/test/java/org/springframework/batch/execution/resource/StepExecutionProxyResourceTests.java
View File

@@ -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;

16
spring-batch-execution/src/test/java/org/springframework/batch/execution/step/ItemOrientedStepTests.java
View File

@@ -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;

8
spring-batch-execution/src/test/java/org/springframework/batch/execution/step/StepSupport.java
View File

@@ -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(

Some files were not shown because too many files have changed in this diff Show More