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

RESOLVED - issue BATCH-870: Cannot add description to empty ExitStatus

Browse Source
This commit is contained in:
dsyer
2008-10-09 07:18:40 +00:00
parent 0a404494bb
commit a98d26b353
4 changed files with 50 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/ExitStatus.java
View File

@@ -39,8 +39,7 @@ public class ExitStatus implements Serializable {
/**
* Convenient constant value representing unfinished processing.
*/
public static final ExitStatus CONTINUABLE = new ExitStatus(true,
"CONTINUABLE");
public static final ExitStatus CONTINUABLE = new ExitStatus(true, "CONTINUABLE");
/**
* Convenient constant value representing continuable state where processing
@@ -81,8 +80,7 @@ public class ExitStatus implements Serializable {
this(continuable, exitCode, "");
}
public ExitStatus(boolean continuable, String exitCode,
String exitDescription) {
public ExitStatus(boolean continuable, String exitCode, String exitDescription) {
super();
this.continuable = continuable;
this.exitCode = exitCode;
@@ -121,14 +119,12 @@ public class ExitStatus implements Serializable {
* Create a new {@link ExitStatus} with a logical combination of the
* continuable flag.
*
* @param continuable
* true if the caller thinks it is safe to continue.
* @param continuable true if the caller thinks it is safe to continue.
* @return a new {@link ExitStatus} with {@link #isContinuable()} the
* logical and of the current value and the argument provided.
* logical and of the current value and the argument provided.
*/
public ExitStatus and(boolean continuable) {
return new ExitStatus(this.continuable && continuable, this.exitCode,
this.exitDescription);
return new ExitStatus(this.continuable && continuable, this.exitCode, this.exitDescription);
}
/**
@@ -139,17 +135,15 @@ public class ExitStatus implements Serializable {
*
* If the input is null just return this.
*
* @param status
* an {@link ExitStatus} to combine with this one.
* @param status an {@link ExitStatus} to combine with this one.
* @return a new {@link ExitStatus} with {@link #isContinuable()} the
* logical and of the current value and the argument provided.
* logical and of the current value and the argument provided.
*/
public ExitStatus and(ExitStatus status) {
if (status == null) {
return this;
}
ExitStatus result = and(status.continuable).addExitDescription(
status.exitDescription);
ExitStatus result = and(status.continuable).addExitDescription(status.exitDescription);
if (result.continuable || !status.continuable) {
result = result.replaceExitCode(status.exitCode);
}
@@ -162,8 +156,7 @@ public class ExitStatus implements Serializable {
* @see java.lang.Object#toString()
*/
public String toString() {
return "continuable=" + continuable + ";exitCode=" + exitCode
+ ";exitDescription=" + exitDescription;
return "continuable=" + continuable + ";exitCode=" + exitCode + ";exitDescription=" + exitDescription;
}
/**
@@ -188,13 +181,12 @@ public class ExitStatus implements Serializable {
}
/**
* Add an exit code to an existing {@link ExitStatus}. If there is already
* a code present tit will be replaced.
* Add an exit code to an existing {@link ExitStatus}. If there is already a
* code present tit will be replaced.
*
* @param code
* the code to add
* @param code the code to add
* @return a new {@link ExitStatus} with the same properties but a new exit
* code.
* code.
*/
public ExitStatus replaceExitCode(String code) {
return new ExitStatus(continuable, code, exitDescription);
@@ -206,8 +198,7 @@ public class ExitStatus implements Serializable {
* @return true if the exit code is "RUNNING" or "UNKNOWN"
*/
public boolean isRunning() {
return "RUNNING".equals(this.exitCode)
|| "UNKNOWN".equals(this.exitCode);
return "RUNNING".equals(this.exitCode) || "UNKNOWN".equals(this.exitCode);
}
/**
@@ -215,18 +206,23 @@ public class ExitStatus implements Serializable {
* already a description present the two will be concatenated with a
* semicolon.
*
* @param description
* the description to add
* @param description the description to add
* @return a new {@link ExitStatus} with the same properties but a new exit
* description
* description
*/
public ExitStatus addExitDescription(String description) {
if (StringUtils.hasText(exitDescription)
&& StringUtils.hasText(description)
&& !exitDescription.equals(description)) {
description = exitDescription + "; " + description;
StringBuffer buffer = new StringBuffer();
boolean changed = StringUtils.hasText(description) && !exitDescription.equals(description);
if (StringUtils.hasText(exitDescription)) {
buffer.append(exitDescription);
if (changed) {
buffer.append("; ");
}
}
return new ExitStatus(continuable, exitCode, description);
if (changed) {
buffer.append(description);
}
return new ExitStatus(continuable, exitCode, buffer.toString());
}
}