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

Update for SI latest interface changes. Transactional stuff still broken, but now it compiles.

Browse Source
This commit is contained in:
dsyer
2008-08-01 06:57:18 +00:00
parent ccb2467cce
commit 96cbf19f2e
9 changed files with 64 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java
View File

@@ -16,9 +16,10 @@ import org.springframework.batch.item.ItemStreamException;
import org.springframework.batch.item.ItemWriter;
import org.springframework.batch.repeat.ExitStatus;
import org.springframework.batch.repeat.RepeatContext;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.message.BlockingSource;
import org.springframework.integration.message.GenericMessage;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageTarget;
import org.springframework.transaction.support.TransactionSynchronizationManager;
import org.springframework.util.Assert;
@@ -37,9 +38,9 @@ public class ChunkMessageChannelItemWriter<T> extends StepExecutionListenerSuppo
private static final long DEFAULT_THROTTLE_LIMIT = 6;
private MessageChannel requestChannel;
private MessageTarget target;
private MessageChannel replyChannel;
private BlockingSource<ChunkResponse> source;
// TODO: abstract the state or make a factory for this writer?
private LocalState localState = new LocalState();
@@ -55,12 +56,12 @@ public class ChunkMessageChannelItemWriter<T> extends StepExecutionListenerSuppo
this.throttleLimit = throttleLimit;
}
public void setReplyChannel(MessageChannel replyChannel) {
this.replyChannel = replyChannel;
public void setSource(BlockingSource<ChunkResponse> source) {
this.source = source;
}
public void setRequestChannel(MessageChannel requestChannel) {
this.requestChannel = requestChannel;
public void setTarget(MessageTarget target) {
this.target = target;
}
public void write(T item) throws Exception {
@@ -95,7 +96,7 @@ public class ChunkMessageChannelItemWriter<T> extends StepExecutionListenerSuppo
logger.debug("Dispatching chunk: " + processed);
ChunkRequest<T> request = new ChunkRequest<T>(processed, localState.getJobId(), localState.getSkipCount());
GenericMessage<ChunkRequest<T>> message = new GenericMessage<ChunkRequest<T>>(request);
requestChannel.send(message);
target.send(message);
localState.expected++;
}
@@ -176,9 +177,10 @@ public class ChunkMessageChannelItemWriter<T> extends StepExecutionListenerSuppo
* otherwise return null.
*/
private void getNextResult(long timeout) {
Message<?> message = replyChannel.receive(timeout);
// TODO: use the timeout
Message<ChunkResponse> message = source.receive(timeout);
if (message != null) {
ChunkResponse payload = (ChunkResponse) message.getPayload();
ChunkResponse payload = message.getPayload();
Long jobInstanceId = payload.getJobId();
Assert.state(jobInstanceId != null, "Message did not contain job instance id.");
Assert.state(jobInstanceId.equals(localState.getJobId()), "Message contained wrong job instance id ["

31
spring-batch-integration/src/main/java/org/springframework/batch/integration/job/MessageOrientedStep.java
View File

@@ -23,9 +23,10 @@ import org.springframework.batch.core.step.AbstractStep;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.batch.repeat.ExitStatus;
import org.springframework.beans.factory.annotation.Required;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.message.BlockingSource;
import org.springframework.integration.message.GenericMessage;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageTarget;
import org.springframework.util.Assert;
/**
@@ -39,9 +40,9 @@ public class MessageOrientedStep extends AbstractStep {
*/
public static final String WAITING = MessageOrientedStep.class.getName() + ".WAITING";
private MessageChannel requestChannel;
private MessageTarget target;
private MessageChannel replyChannel;
private BlockingSource<JobExecutionRequest> source;
private static int MINUTE = 1000 * 60;
@@ -75,21 +76,21 @@ public class MessageOrientedStep extends AbstractStep {
}
/**
* Public setter for the requestChannel.
* @param requestChannel the requestChannel to set
* Public setter for the target.
* @param target the target to set
*/
@Required
public void setRequestChannel(MessageChannel requestChannel) {
this.requestChannel = requestChannel;
public void setTarget(MessageTarget target) {
this.target = target;
}
/**
* Public setter for the replyChannel.
* @param replyChannel the replyChannel to set
* Public setter for the source.
* @param source the source to set
*/
@Required
public void setReplyChannel(MessageChannel replyChannel) {
this.replyChannel = replyChannel;
public void setSource(BlockingSource<JobExecutionRequest> source) {
this.source = source;
}
/*
@@ -112,7 +113,7 @@ public class MessageOrientedStep extends AbstractStep {
executionContext.putString(WAITING, "true");
// TODO: need these two lines to be atomic
getJobRepository().update(stepExecution);
requestChannel.send(new GenericMessage<JobExecutionRequest>(request));
target.send(new GenericMessage<JobExecutionRequest>(request));
waitForReply(request.getJobId());
}
@@ -128,14 +129,14 @@ public class MessageOrientedStep extends AbstractStep {
long maxCount = executionTimeout / timeout;
long count = 0;
// TODO: use a ReponseCorrelator?, or just a SynchronousChannel
while (count++ < maxCount) {
Message<?> message = replyChannel.receive(timeout);
// TODO: timeout?
Message<JobExecutionRequest> message = source.receive(timeout);
if (message != null) {
JobExecutionRequest payload = (JobExecutionRequest) message.getPayload();
JobExecutionRequest payload = message.getPayload();
Long jobInstanceId = payload.getJobId();
Assert.state(jobInstanceId != null, "Message did not contain job instance id.");
Assert.state(jobInstanceId.equals(expectedJobId), "Message contained wrong job instance id ["