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

IN PROGRESS - BATCH-601: Findbugs code audit

Browse Source
This commit is contained in:
robokaso
2008-04-24 14:23:42 +00:00
parent a66bbd69c9
commit 8f90970a08
8 changed files with 21 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-batch-core/src/main/java/org/springframework/batch/core/converter/DefaultJobParametersConverter.java
View File

@@ -48,11 +48,11 @@ import org.springframework.util.StringUtils;
*/
public class DefaultJobParametersConverter implements JobParametersConverter {
public static String DATE_TYPE = "(date)";
public static final String DATE_TYPE = "(date)";
public static String STRING_TYPE = "(string)";
public static final String STRING_TYPE = "(string)";
public static String LONG_TYPE = "(long)";
public static final String LONG_TYPE = "(long)";
private DateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd");
@@ -104,7 +104,7 @@ public class DefaultJobParametersConverter implements JobParametersConverter {
} else if (StringUtils.endsWithIgnoreCase(key, STRING_TYPE)) {
propertiesBuilder.addString(StringUtils.replace(key, STRING_TYPE, ""), value);
} else {
propertiesBuilder.addString(key.toString(), value.toString());
propertiesBuilder.addString(key, value.toString());
}
}
@@ -124,9 +124,10 @@ public class DefaultJobParametersConverter implements JobParametersConverter {
Map parameters = params.getParameters();
Properties result = new Properties();
for (Iterator iterator = parameters.keySet().iterator(); iterator.hasNext();) {
String key = (String) iterator.next();
Object value = parameters.get(key);
for (Iterator iterator = parameters.entrySet().iterator(); iterator.hasNext();) {
Entry entry = (Entry) iterator.next();
String key = (String) entry.getKey();
Object value = entry.getValue();
if (value instanceof Date) {
result.setProperty(key + DATE_TYPE, dateFormat.format(value));
} else if (value instanceof Long) {

12
spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/ScheduledJobParametersFactory.java
View File

@@ -34,7 +34,7 @@ import org.springframework.batch.core.converter.JobParametersConverter;
*/
public class ScheduledJobParametersFactory implements JobParametersConverter {
public static String SCHEDULE_DATE_KEY = "schedule.date";
public static final String SCHEDULE_DATE_KEY = "schedule.date";
private DateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd");
@@ -82,13 +82,13 @@ public class ScheduledJobParametersFactory implements JobParametersConverter {
Map parameters = params.getParameters();
Properties result = new Properties();
for (Iterator iterator = parameters.keySet().iterator(); iterator.hasNext();) {
String key = (String) iterator.next();
Object value = parameters.get(key);
for (Iterator iterator = parameters.entrySet().iterator(); iterator.hasNext();) {
Entry entry = (Entry) iterator.next();
String key = (String) entry.getKey();
if (key.equals(SCHEDULE_DATE_KEY)) {
result.setProperty(key, dateFormat.format(value));
result.setProperty(key, dateFormat.format(entry.getValue()));
} else {
result.setProperty(key, "" + value);
result.setProperty(key, "" + entry.getValue());
}
}
return result;

10
spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java
View File

@@ -310,11 +310,9 @@ public abstract class AbstractStep implements Step, InitializingBean, BeanNameAw
}
else {
String message = "";
if (ex != null) {
StringWriter writer = new StringWriter();
ex.printStackTrace(new PrintWriter(writer));
message = writer.toString();
}
StringWriter writer = new StringWriter();
ex.printStackTrace(new PrintWriter(writer));
message = writer.toString();
exitStatus = ExitStatus.FAILED.addExitDescription(message);
}
@@ -326,7 +324,7 @@ public abstract class AbstractStep implements Step, InitializingBean, BeanNameAw
* rollback transaction. Throwing this exception will result in storing
* {@link BatchStatus#UNKNOWN} as step's status.
*/
protected class FatalException extends RuntimeException {
protected static class FatalException extends RuntimeException {
public FatalException(String string, Exception e) {
super(string, e);
}