- * Simple input source that opens a JDBC cursor and continually retrieves the - * next row in the ResultSet. It is extremely important to note that the - * JdbcDriver used must be version 3.0 or higher. This is because earlier - * versions do not support holding a ResultSet open over commits. + * Simple input source that opens a JDBC cursor and continually retrieves the next row in the ResultSet. It is extremely + * important to note that the JdbcDriver used must be version 3.0 or higher. This is because earlier versions do not + * support holding a ResultSet open over commits. *
* *- * Each call to {@link #read()} will call the provided RowMapper, passing in the - * ResultSet. There is currently no wrapping of the ResultSet to suppress calls - * to next(). However, if the RowMapper (mistakenly) increments the current row, - * the next call to read will verify that the current row is at the expected - * position and throw a DataAccessException if it is not. This means that, in - * theory, a RowMapper could read ahead, as long as it returns the row back to - * the correct position before returning. The reason for such strictness on the - * ResultSet is due to the need to maintain control for transactions, - * restartability and skippability. This ensures that each call to - * {@link #read()} returns the ResultSet at the correct line, regardless of - * rollbacks, restarts, or skips. + * Each call to {@link #read()} will call the provided RowMapper, passing in the ResultSet. There is currently no + * wrapping of the ResultSet to suppress calls to next(). However, if the RowMapper (mistakenly) increments the current + * row, the next call to read will verify that the current row is at the expected position and throw a + * DataAccessException if it is not. This means that, in theory, a RowMapper could read ahead, as long as it returns the + * row back to the correct position before returning. The reason for such strictness on the ResultSet is due to the need + * to maintain control for transactions, restartability and skippability. This ensures that each call to {@link #read()} + * returns the ResultSet at the correct line, regardless of rollbacks, restarts, or skips. *
* *- * {@link ExecutionContext}: The current row is returned as restart data, and - * when restored from that same data, the cursor is opened and the current row - * set to the value within the restart data. Two values are stored: the current + * {@link ExecutionContext}: The current row is returned as restart data, and when restored from that same data, the + * cursor is opened and the current row set to the value within the restart data. Two values are stored: the current * line being processed and the number of lines that have been skipped. *
* *- * Transactions: The same ResultSet is held open regardless of commits or roll - * backs in a surrounding transaction. This means that when such a transaction - * is committed, the input source is notified through the {@link #mark()} and - * {@link #reset()} so that it can save it's current row number. Later, if the - * transaction is rolled back, the current row can be moved back to the same row - * number as it was on when commit was called. + * Transactions: The same ResultSet is held open regardless of commits or roll backs in a surrounding transaction. This + * means that when such a transaction is committed, the input source is notified through the {@link #mark()} and + * {@link #reset()} so that it can save it's current row number. Later, if the transaction is rolled back, the current + * row can be moved back to the same row number as it was on when commit was called. *
* *- * Calling skip will indicate that a record is bad and should not be - * re-presented to the user if the transaction is rolled back. For example, if - * row 2 is read in, and found to be bad, calling skip will inform the - * {@link ItemReader}. If reading is then continued, and a rollback is - * necessary because of an error on output, the input source will be returned to - * row 1. Calling read while on row 1 will move the current row to 3, not 2, - * because 2 has been marked as skipped. + * Calling skip will indicate that a record is bad and should not be re-presented to the user if the transaction is + * rolled back. For example, if row 2 is read in, and found to be bad, calling skip will inform the {@link ItemReader}. + * If reading is then continued, and a rollback is necessary because of an error on output, the input source will be + * returned to row 1. Calling read while on row 1 will move the current row to 3, not 2, because 2 has been marked as + * skipped. *
* *- * Calling close on this {@link ItemStream} will cause all resources it is - * currently using to be freed. (Connection, ResultSet, etc). It is then illegal - * to call {@link #read()} again until it has been opened. + * Calling close on this {@link ItemStream} will cause all resources it is currently using to be freed. (Connection, + * ResultSet, etc). It is then illegal to call {@link #read()} again until it has been opened. *
* * @author Lucas Ward * @author Peter Zozom */ -public class JdbcCursorItemReader extends ExecutionContextUserSupport implements ItemReader, InitializingBean, ItemStream, Skippable { +public class JdbcCursorItemReader extends ExecutionContextUserSupport implements ItemReader, InitializingBean, + ItemStream, Skippable { private static Log log = LogFactory.getLog(JdbcCursorItemReader.class); @@ -151,7 +141,7 @@ public class JdbcCursorItemReader extends ExecutionContextUserSupport implements private boolean initialized = false; private boolean saveState = false; - + public JdbcCursorItemReader() { setName(JdbcCursorItemReader.class.getSimpleName()); } @@ -159,8 +149,7 @@ public class JdbcCursorItemReader extends ExecutionContextUserSupport implements /** * Assert that mandatory properties are set. * - * @throws IllegalArgumentException if either data source or sql properties - * not set. + * @throws IllegalArgumentException if either data source or sql properties not set. */ public void afterPropertiesSet() throws Exception { Assert.notNull(dataSource, "DataSOurce must be provided"); @@ -177,11 +166,10 @@ public class JdbcCursorItemReader extends ExecutionContextUserSupport implements } /** - * Increment the cursor to the next row, validating the cursor position and - * passing the resultset to the RowMapper. If read has not been called on - * this instance before, the cursor will be opened. If there are skipped - * records for this commit scope, an internal list of skipped records will - * be checked to ensure that only a valid row is given to the mapper. + * Increment the cursor to the next row, validating the cursor position and passing the resultset to the RowMapper. + * If read has not been called on this instance before, the cursor will be opened. If there are skipped records for + * this commit scope, an internal list of skipped records will be checked to ensure that only a valid row is given + * to the mapper. * * @returns Object returned by RowMapper * @throws DataAccessException @@ -198,8 +186,7 @@ public class JdbcCursorItemReader extends ExecutionContextUserSupport implements try { if (!rs.next()) { return null; - } - else { + } else { currentProcessedRow++; if (!skippedRows.isEmpty()) { // while is necessary to handle successive skips. @@ -217,8 +204,7 @@ public class JdbcCursorItemReader extends ExecutionContextUserSupport implements return mappedResult; } - } - catch (SQLException se) { + } catch (SQLException se) { throw getExceptionTranslator().translate("Trying to process next row", sql, se); } @@ -229,8 +215,7 @@ public class JdbcCursorItemReader extends ExecutionContextUserSupport implements } /** - * Mark the current row. Calling reset will cause the result set to be set - * to the current row when mark was called. + * Mark the current row. Calling reset will cause the result set to be set to the current row when mark was called. */ public void mark() { lastCommittedRow = currentProcessedRow; @@ -247,22 +232,19 @@ public class JdbcCursorItemReader extends ExecutionContextUserSupport implements currentProcessedRow = lastCommittedRow; if (currentProcessedRow > 0) { rs.absolute((int) currentProcessedRow); - } - else { + } else { rs.beforeFirst(); } - } - catch (SQLException se) { - throw new ResetFailedException(getExceptionTranslator().translate( - "Attempted to move ResultSet to last committed row", sql, se)); + } catch (SQLException se) { + throw new ResetFailedException("Illegal modification of the result set cursor", getExceptionTranslator() + .translate("Attempted to move ResultSet to last committed row", sql, se)); } } /** - * Close this input source. The ResultSet, Statement and Connection created - * will be closed. This must be called or the connection and cursor will be - * held open indefinitely! + * Close this input source. The ResultSet, Statement and Connection created will be closed. This must be called or + * the connection and cursor will be held open indefinitely! * * @see org.springframework.batch.item.ResourceLifecycle#close(ExecutionContext) */ @@ -288,11 +270,10 @@ public class JdbcCursorItemReader extends ExecutionContextUserSupport implements } /* - * Executes the provided SQL query. The statement is created with - * 'READ_ONLY' and 'HOLD_CUSORS_OVER_COMMIT' set to true. This is extremely - * important, since a non read-only cursor may lock tables that shouldn't be - * locked, and not holding the cursor open over a commit would require it to - * be reopened after each commit, which would destroy performance. + * Executes the provided SQL query. The statement is created with 'READ_ONLY' and 'HOLD_CUSORS_OVER_COMMIT' set to + * true. This is extremely important, since a non read-only cursor may lock tables that shouldn't be locked, and not + * holding the cursor open over a commit would require it to be reopened after each commit, which would destroy + * performance. */ private void executeQuery() { @@ -301,12 +282,11 @@ public class JdbcCursorItemReader extends ExecutionContextUserSupport implements try { this.con = dataSource.getConnection(); this.stmt = this.con.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY, - ResultSet.HOLD_CURSORS_OVER_COMMIT); + ResultSet.HOLD_CURSORS_OVER_COMMIT); applyStatementSettings(this.stmt); this.rs = this.stmt.executeQuery(sql); handleWarnings(this.stmt.getWarnings()); - } - catch (SQLException se) { + } catch (SQLException se) { close(null); throw getExceptionTranslator().translate("Executing query", sql, se); } @@ -314,10 +294,8 @@ public class JdbcCursorItemReader extends ExecutionContextUserSupport implements } /* - * Prepare the given JDBC Statement (or PreparedStatement or - * CallableStatement), applying statement settings such as fetch size, max - * rows, and query timeout. @param stmt the JDBC Statement to prepare - * @throws SQLException + * Prepare the given JDBC Statement (or PreparedStatement or CallableStatement), applying statement settings such as + * fetch size, max rows, and query timeout. @param stmt the JDBC Statement to prepare @throws SQLException * * @see #setFetchSize * @see #setMaxRows @@ -337,16 +315,14 @@ public class JdbcCursorItemReader extends ExecutionContextUserSupport implements } /* - * Return the exception translator for this instance.Creates a default - * SQLErrorCodeSQLExceptionTranslator for the specified DataSource if none - * is set. + * Return the exception translator for this instance.
Creates a default SQLErrorCodeSQLExceptionTranslator for
+ * the specified DataSource if none is set.
*/
protected SQLExceptionTranslator getExceptionTranslator() {
if (exceptionTranslator == null) {
if (dataSource != null) {
exceptionTranslator = new SQLErrorCodeSQLExceptionTranslator(dataSource);
- }
- else {
+ } else {
exceptionTranslator = new SQLStateSQLExceptionTranslator();
}
}
@@ -354,11 +330,10 @@ public class JdbcCursorItemReader extends ExecutionContextUserSupport implements
}
/*
- * Throw a SQLWarningException if we're not ignoring warnings, else log the
- * warnings (at debug level).
+ * Throw a SQLWarningException if we're not ignoring warnings, else log the warnings (at debug level).
*
- * @param warning the warnings object from the current statement. May be
- * null, in which case this method does nothing.
+ * @param warning the warnings object from the current statement. May be null, in which case this
+ * method does nothing.
*
* @see org.springframework.jdbc.SQLWarningException
*/
@@ -367,17 +342,17 @@ public class JdbcCursorItemReader extends ExecutionContextUserSupport implements
SQLWarning warningToLog = warnings;
while (warningToLog != null) {
log.debug("SQLWarning ignored: SQL state '" + warningToLog.getSQLState() + "', error code '"
- + warningToLog.getErrorCode() + "', message [" + warningToLog.getMessage() + "]");
+ + warningToLog.getErrorCode() + "', message [" + warningToLog.getMessage() + "]");
warningToLog = warningToLog.getNextWarning();
}
- }
- else if (warnings != null) {
+ } else if (warnings != null) {
throw new SQLWarningException("Warning not ignored", warnings);
}
}
/*
* (non-Javadoc)
+ *
* @see org.springframework.batch.item.stream.ItemStreamAdapter#getExecutionContext()
*/
public void update(ExecutionContext executionContext) {
@@ -392,6 +367,7 @@ public class JdbcCursorItemReader extends ExecutionContextUserSupport implements
/*
* (non-Javadoc)
+ *
* @see org.springframework.batch.item.stream.ItemStreamAdapter#restoreFrom(org.springframework.batch.item.ExecutionContext)
*/
public void open(ExecutionContext context) {
@@ -409,8 +385,7 @@ public class JdbcCursorItemReader extends ExecutionContextUserSupport implements
try {
this.currentProcessedRow = context.getLong(getKey(CURRENT_PROCESSED_ROW));
rs.absolute((int) currentProcessedRow);
- }
- catch (SQLException se) {
+ } catch (SQLException se) {
throw getExceptionTranslator().translate("Attempted to move ResultSet to last committed row", sql, se);
}
@@ -425,10 +400,9 @@ public class JdbcCursorItemReader extends ExecutionContextUserSupport implements
}
/**
- * Skip the current row. If the transaction is rolled back, this row will
- * not be represented to the RowMapper when read() is called. For example,
- * if you read in row 2, find the data to be bad, and call skip(), then
- * continue processing and find
+ * Skip the current row. If the transaction is rolled back, this row will not be represented to the RowMapper when
+ * read() is called. For example, if you read in row 2, find the data to be bad, and call skip(), then continue
+ * processing and find
*/
public void skip() {
skippedRows.add(new Long(currentProcessedRow));
@@ -436,10 +410,9 @@ public class JdbcCursorItemReader extends ExecutionContextUserSupport implements
}
/**
- * Gives the JDBC driver a hint as to the number of rows that should be
- * fetched from the database when more rows are needed for this
- * ResultSet object. If the fetch size specified is zero, the
- * JDBC driver ignores the value.
+ * Gives the JDBC driver a hint as to the number of rows that should be fetched from the database when more rows are
+ * needed for this ResultSet object. If the fetch size specified is zero, the JDBC driver ignores the
+ * value.
*
* @param fetchSize the number of rows to fetch
* @see ResultSet#setFetchSize(int)
@@ -449,8 +422,8 @@ public class JdbcCursorItemReader extends ExecutionContextUserSupport implements
}
/**
- * Sets the limit for the maximum number of rows that any
- * ResultSet object can contain to the given number.
+ * Sets the limit for the maximum number of rows that any ResultSet object can contain to the given
+ * number.
*
* @param maxRows the new max rows limit; zero means there is no limit
* @see Statement#setMaxRows(int)
@@ -460,13 +433,10 @@ public class JdbcCursorItemReader extends ExecutionContextUserSupport implements
}
/**
- * Sets the number of seconds the driver will wait for a
- * Statement object to execute to the given number of
- * seconds. If the limit is exceeded, an SQLException is
- * thrown.
+ * Sets the number of seconds the driver will wait for a Statement object to execute to the given
+ * number of seconds. If the limit is exceeded, an SQLException is thrown.
*
- * @param queryTimeout seconds the new query timeout limit in seconds; zero
- * means there is no limit
+ * @param queryTimeout seconds the new query timeout limit in seconds; zero means there is no limit
* @see Statement#setQueryTimeout(int)
*/
public void setQueryTimeout(int queryTimeout) {
@@ -474,8 +444,7 @@ public class JdbcCursorItemReader extends ExecutionContextUserSupport implements
}
/**
- * Set whether SQLWarnings should be ignored (only logged) or exception
- * should be thrown.
+ * Set whether SQLWarnings should be ignored (only logged) or exception should be thrown.
*
* @param ignoreWarnings if TRUE, warnings are ignored
*/
@@ -484,8 +453,8 @@ public class JdbcCursorItemReader extends ExecutionContextUserSupport implements
}
/**
- * Allow verification of cursor position after current row is processed by
- * RowMapper or RowCallbackHandler. Default value is TRUE.
+ * Allow verification of cursor position after current row is processed by RowMapper or RowCallbackHandler. Default
+ * value is TRUE.
*
* @param verifyCursorPosition if true, cursor position is verified
*/
@@ -503,9 +472,8 @@ public class JdbcCursorItemReader extends ExecutionContextUserSupport implements
}
/**
- * Set the sql statement to be used when creating the cursor. This statement
- * should be a complete and valid Sql statement, as it will be run directly
- * without any modification.
+ * Set the sql statement to be used when creating the cursor. This statement should be a complete and valid Sql
+ * statement, as it will be run directly without any modification.
*
* @param sql
*/
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/DrivingQueryItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/DrivingQueryItemReader.java
index 30fe7caa5..dedf1f6f2 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/DrivingQueryItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/DrivingQueryItemReader.java
@@ -21,7 +21,7 @@ import java.util.List;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.ItemStream;
-import org.springframework.batch.item.exception.NoWorkFoundException;
+import org.springframework.batch.item.NoWorkFoundException;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.util.Assert;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemReader.java
index a0ed3f52a..163156a8b 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemReader.java
@@ -35,28 +35,27 @@ import org.springframework.batch.io.file.transform.LineTokenizer;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.batch.item.ExecutionContextUserSupport;
import org.springframework.batch.item.ItemReader;
+import org.springframework.batch.item.ItemReaderException;
import org.springframework.batch.item.ItemStream;
-import org.springframework.batch.item.exception.StreamException;
+import org.springframework.batch.item.ItemStreamException;
+import org.springframework.batch.item.ReaderNotOpenException;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.io.Resource;
import org.springframework.util.Assert;
/**
- * This class represents a {@link ItemReader}, that reads lines from text file,
- * tokenizes them to structured tuples ({@link FieldSet}s) instances and maps
- * the {@link FieldSet}s to domain objects. The location of the file is defined
- * by the resource property. To separate the structure of the file,
- * {@link LineTokenizer} is used to parse data obtained from the file.
+ * This class represents a {@link ItemReader}, that reads lines from text file, tokenizes them to structured tuples ({@link FieldSet}s)
+ * instances and maps the {@link FieldSet}s to domain objects. The location of the file is defined by the resource
+ * property. To separate the structure of the file, {@link LineTokenizer} is used to parse data obtained from the file.
+ *
*
- * A {@link FlatFileItemReader} is not thread safe because it maintains state in
- * the form of a {@link ResourceLineReader}. Be careful to configure a
- * {@link FlatFileItemReader} using an appropriate factory or scope so that it
- * is not shared between threads.
+ * A {@link FlatFileItemReader} is not thread safe because it maintains state in the form of a
+ * {@link ResourceLineReader}. Be careful to configure a {@link FlatFileItemReader} using an appropriate factory or
+ * scope so that it is not shared between threads.
*
*
- * This class supports restart, skipping invalid lines and storing statistics. - * It can be configured to setup {@link FieldSet} column names from the file - * header, skip given number of lines at the beginning of the file. + * This class supports restart, skipping invalid lines and storing statistics. It can be configured to setup + * {@link FieldSet} column names from the file header, skip given number of lines at the beginning of the file. *
* * @author Waseem Malik @@ -64,7 +63,8 @@ import org.springframework.util.Assert; * @author Robert Kasanicky * @author Dave Syer */ -public class FlatFileItemReader extends ExecutionContextUserSupport implements ItemReader, Skippable, ItemStream, InitializingBean { +public class FlatFileItemReader extends ExecutionContextUserSupport implements ItemReader, Skippable, ItemStream, + InitializingBean { private static Log log = LogFactory.getLog(FlatFileItemReader.class); @@ -96,20 +96,20 @@ public class FlatFileItemReader extends ExecutionContextUserSupport implements I private FieldSetMapper fieldSetMapper; /** - * Encapsulates the state of the input source. If it is null then we are - * uninitialized. + * Encapsulates the state of the input source. If it is null then we are uninitialized. */ private LineReader reader; - + public FlatFileItemReader() { setName(FlatFileItemReader.class.getSimpleName()); } /** * Initialize the reader if necessary. + * * @throws IllegalStateException if the resource cannot be opened */ - public void open(ExecutionContext executionContext) throws StreamException { + public void open(ExecutionContext executionContext) throws ItemStreamException { Assert.state(resource.exists(), "Resource must exist: [" + resource + "]"); @@ -140,14 +140,14 @@ public class FlatFileItemReader extends ExecutionContextUserSupport implements I ((AbstractLineTokenizer) tokenizer).setNames(names); } } - - if (executionContext.containsKey(getKey(READ_STATISTICS_NAME))) { + + if (executionContext.containsKey(getKey(READ_STATISTICS_NAME))) { log.debug("Initializing for restart. Restart data is: " + executionContext); - + long lineCount = executionContext.getLong(getKey(READ_STATISTICS_NAME)); - + LineReader reader = getReader(); - + Object record = ""; while (reader.getPosition() < lineCount && record != null) { record = readLine(); @@ -158,23 +158,23 @@ public class FlatFileItemReader extends ExecutionContextUserSupport implements I /** * Close and null out the reader. + * * @throws Exception */ - public void close(ExecutionContext executionContext) throws StreamException { + public void close(ExecutionContext executionContext) throws ItemStreamException { try { if (reader != null) { log.debug("Closing flat file for reading: " + resource); reader.close(null); } - } - finally { + } finally { reader = null; } } /** - * Reads a line from input, tokenizes is it using the {@link #tokenizer} and - * maps to domain object using {@link #fieldSetMapper}. + * Reads a line from input, tokenizes is it using the {@link #tokenizer} and maps to domain object using + * {@link #fieldSetMapper}. * * @see org.springframework.batch.io.ItemReader#read() */ @@ -185,25 +185,23 @@ public class FlatFileItemReader extends ExecutionContextUserSupport implements I try { FieldSet tokenizedLine = tokenizer.tokenize(line); return fieldSetMapper.mapLine(tokenizedLine); - } - catch (RuntimeException ex) { + } catch (RuntimeException ex) { // add current line count to message and re-throw int lineCount = getReader().getPosition(); throw new FlatFileParsingException("Parsing error at line: " + lineCount + " in resource=" + path - + ", input=[" + line + "]", ex, line, lineCount); + + ", input=[" + line + "]", ex, line, lineCount); } } return null; } /** - * This method returns the execution attributes for the reader. It returns - * the current Line Count which can be used to reinitialise the batch job in - * case of restart. + * This method returns the execution attributes for the reader. It returns the current Line Count which can be used + * to reinitialise the batch job in case of restart. */ public void update(ExecutionContext executionContext) { if (reader == null) { - throw new StreamException("ItemStream not open or already closed."); + throw new ItemStreamException("ItemStream not open or already closed."); } Assert.notNull(executionContext, "ExecutionContext must not be null"); executionContext.putLong(getKey(READ_STATISTICS_NAME), reader.getPosition()); @@ -211,10 +209,8 @@ public class FlatFileItemReader extends ExecutionContextUserSupport implements I } /** - * Mark is supported as long as this {@link ItemStream} is used in a - * single-threaded environment. The state backing the mark is a single - * counter, keeping track of the current position, so multiple threads - * cannot be accommodated. + * Mark is supported as long as this {@link ItemStream} is used in a single-threaded environment. The state backing + * the mark is a single counter, keeping track of the current position, so multiple threads cannot be accommodated. * * @see org.springframework.batch.item.ItemReader#mark() */ @@ -224,6 +220,7 @@ public class FlatFileItemReader extends ExecutionContextUserSupport implements I /* * (non-Javadoc) + * * @see org.springframework.batch.item.ItemStream#reset(org.springframework.batch.item.ExecutionContext) */ public void reset() { @@ -241,8 +238,7 @@ public class FlatFileItemReader extends ExecutionContextUserSupport implements I } /** - * @return next line to be tokenized and mapped (possibly skips multiple - * lines). + * @return next line to be tokenized and mapped (possibly skips multiple lines). */ protected String readLine() { String line = nextLine(); @@ -259,8 +255,9 @@ public class FlatFileItemReader extends ExecutionContextUserSupport implements I private String nextLine() { try { return (String) getReader().read(); - } - catch (StreamException e) { + } catch (ItemStreamException e) { + throw e; + } catch (ItemReaderException e) { throw e; } catch (Exception e) { @@ -273,15 +270,14 @@ public class FlatFileItemReader extends ExecutionContextUserSupport implements I */ protected LineReader getReader() { if (reader == null) { - throw new StreamException("ItemStream must be open before it can be read."); + throw new ReaderNotOpenException("Reader must be open before it can be read."); // reader is now not null, or else an exception is thrown } return reader; } /** - * Setter for resource property. The location of an input stream that can be - * read. + * Setter for resource property. The location of an input stream that can be read. * * @param resource * @throws IOException @@ -295,9 +291,8 @@ public class FlatFileItemReader extends ExecutionContextUserSupport implements I } /** - * Public setter for the recordSeparatorPolicy. Used to determine where the - * line endings are and do things like continue over a line ending if inside - * a quoted string. + * Public setter for the recordSeparatorPolicy. Used to determine where the line endings are and do things like + * continue over a line ending if inside a quoted string. * * @param recordSeparatorPolicy the recordSeparatorPolicy to set */ @@ -306,8 +301,8 @@ public class FlatFileItemReader extends ExecutionContextUserSupport implements I } /** - * Setter for comment prefixes. Can be used to ignore header lines as well - * by using e.g. the first couple of column names as a prefix. + * Setter for comment prefixes. Can be used to ignore header lines as well by using e.g. the first couple of column + * names as a prefix. * * @param comments an array of comment line prefixes. */ @@ -317,10 +312,8 @@ public class FlatFileItemReader extends ExecutionContextUserSupport implements I } /** - * Indicates whether first line is a header. If the tokenizer is an - * {@link AbstractLineTokenizer} and the column names haven't been set - * already then the header will be used to setup column names. Default is - *false.
+ * Indicates whether first line is a header. If the tokenizer is an {@link AbstractLineTokenizer} and the column
+ * names haven't been set already then the header will be used to setup column names. Default is false.
*/
public void setFirstLineIsHeader(boolean firstLineIsHeader) {
this.firstLineIsHeader = firstLineIsHeader;
@@ -343,10 +336,8 @@ public class FlatFileItemReader extends ExecutionContextUserSupport implements I
}
/**
- * Public setter for the number of lines to skip at the start of a file. Can
- * be used if the file contains a header without useful (column name)
- * information, and without a comment delimiter at the beginning of the
- * lines.
+ * Public setter for the number of lines to skip at the start of a file. Can be used if the file contains a header
+ * without useful (column name) information, and without a comment delimiter at the beginning of the lines.
*
* @param linesToSkip the number of lines to skip
*/
@@ -355,11 +346,9 @@ public class FlatFileItemReader extends ExecutionContextUserSupport implements I
}
/**
- * Setter for the encoding for this input source. Default value is
- * {@value #DEFAULT_CHARSET}.
+ * Setter for the encoding for this input source. Default value is {@value #DEFAULT_CHARSET}.
*
- * @param encoding a properties object which possibly contains the encoding
- * for this input file;
+ * @param encoding a properties object which possibly contains the encoding for this input file;
*/
public void setEncoding(String encoding) {
this.encoding = encoding;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemWriter.java
index 7e9f74187..c89bf85a5 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemWriter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemWriter.java
@@ -31,34 +31,30 @@ import org.springframework.batch.io.file.mapping.FieldSet;
import org.springframework.batch.io.file.mapping.FieldSetCreator;
import org.springframework.batch.io.file.transform.DelimitedLineAggregator;
import org.springframework.batch.io.file.transform.LineAggregator;
+import org.springframework.batch.item.ClearFailedException;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.batch.item.ExecutionContextUserSupport;
+import org.springframework.batch.item.FlushFailedException;
import org.springframework.batch.item.ItemStream;
+import org.springframework.batch.item.ItemStreamException;
import org.springframework.batch.item.ItemWriter;
-import org.springframework.batch.item.exception.ClearFailedException;
-import org.springframework.batch.item.exception.FlushFailedException;
-import org.springframework.batch.item.exception.ResetFailedException;
-import org.springframework.batch.item.exception.StreamException;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.io.Resource;
import org.springframework.dao.DataAccessResourceFailureException;
import org.springframework.util.Assert;
/**
- * This class is an output target that writes data to a file or stream. The
- * writer also provides restart, statistics and transaction features by
- * implementing corresponding interfaces where possible (with a file). The
- * location of the file is defined by a {@link Resource} and must represent a
- * writable file.- * This class will be updated in the future to use a buffering approach to - * handling transactions, rather than outputting directly to the file and - * truncating on rollback + * This class will be updated in the future to use a buffering approach to handling transactions, rather than outputting + * directly to the file and truncating on rollback *
* * @author Waseem Malik @@ -66,8 +62,7 @@ import org.springframework.util.Assert; * @author Robert Kasanicky * @author Dave Syer */ -public class FlatFileItemWriter extends ExecutionContextUserSupport implements ItemWriter, ItemStream, - InitializingBean { +public class FlatFileItemWriter extends ExecutionContextUserSupport implements ItemWriter, ItemStream, InitializingBean { private static final String LINE_SEPARATOR = System.getProperty("line.separator"); @@ -84,13 +79,14 @@ public class FlatFileItemWriter extends ExecutionContextUserSupport implements I private LineAggregator lineAggregator = new DelimitedLineAggregator(); private FieldSetCreator fieldSetCreator; - + public FlatFileItemWriter() { setName(FlatFileItemWriter.class.getSimpleName()); } - + /** * Assert that mandatory properties (resource) are set. + * * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() */ public void afterPropertiesSet() throws Exception { @@ -101,8 +97,8 @@ public class FlatFileItemWriter extends ExecutionContextUserSupport implements I } /** - * Public setter for the {@link LineAggregator}. This will be used to - * translate a {@link FieldSet} into a line for output. + * Public setter for the {@link LineAggregator}. This will be used to translate a {@link FieldSet} into a line for + * output. * * @param lineAggregator the {@link LineAggregator} to set */ @@ -111,9 +107,8 @@ public class FlatFileItemWriter extends ExecutionContextUserSupport implements I } /** - * Public setter for the {@link FieldSetCreator}. This will be used to - * transform the item into a {@link FieldSet} before it is aggregated by the - * {@link LineAggregator}. + * Public setter for the {@link FieldSetCreator}. This will be used to transform the item into a {@link FieldSet} + * before it is aggregated by the {@link LineAggregator}. * * @param fieldSetCreator the {@link FieldSetCreator} to set */ @@ -131,16 +126,13 @@ public class FlatFileItemWriter extends ExecutionContextUserSupport implements I } /** - * Writes out a string followed by a "new line", where the format of the new - * line separator is determined by the underlying operating system. If the - * input is not a String and a converter is available the converter will be - * applied and then this method recursively called with the result. If the - * input is an array or collection each value will be written to a separate - * line (recursively calling this method for each value). If no converter is + * Writes out a string followed by a "new line", where the format of the new line separator is determined by the + * underlying operating system. If the input is not a String and a converter is available the converter will be + * applied and then this method recursively called with the result. If the input is an array or collection each + * value will be written to a separate line (recursively calling this method for each value). If no converter is * supplied the input object's toString method will be used.- * Marker interface defining a contract for periodically storing state and - * restoring from that state should an error occur. + * Marker interface defining a contract for periodically storing state and restoring from that state should an error + * occur. *
* * @author Dave Syer @@ -35,23 +33,22 @@ public interface ItemStream { * * @throws IllegalArgumentException if context is null */ - void open(ExecutionContext executionContext) throws StreamException; - + void open(ExecutionContext executionContext) throws ItemStreamException; + /** - * Indicates that the execution context provided during open - * is about to be saved. If any state is remaining, but - * has not been put in the context, it should be added - * here. + * Indicates that the execution context provided during open is about to be saved. If any state is remaining, but + * has not been put in the context, it should be added here. + * * @param executionContext to be updated * @throws IllegalArgumentException if executionContext is null. */ - void update(ExecutionContext executionContext); - + void update(ExecutionContext executionContext) throws ItemStreamException; + /** - * If any resources are needed for the stream to operate they need to be - * destroyed here. Once this method has been called all other methods - * (except open) may throw an exception. + * If any resources are needed for the stream to operate they need to be destroyed here. Once this method has been + * called all other methods (except open) may throw an exception. + * * @param executionContext TODO */ - void close(ExecutionContext executionContext) throws StreamException; + void close(ExecutionContext executionContext) throws ItemStreamException; } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/exception/StreamException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemStreamException.java similarity index 75% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/item/exception/StreamException.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemStreamException.java index 071f66237..508f389a1 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/exception/StreamException.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemStreamException.java @@ -13,40 +13,37 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.item.exception; - -import org.springframework.batch.io.exception.InfrastructureException; +package org.springframework.batch.item; /** - * Exception representing any errors encountered while processing - * a stream. + * Exception representing any errors encountered while processing a stream. * * @author Dave Syer * @author Lucas Ward */ -public class StreamException extends InfrastructureException { +public class ItemStreamException extends RuntimeException { /** * @param message */ - public StreamException(String message) { + public ItemStreamException(String message) { super(message); } - + /** * Constructs a new instance with a message and nested exception. * * @param msg the exception message. * */ - public StreamException(String msg, Throwable nested) { + public ItemStreamException(String msg, Throwable nested) { super(msg, nested); } /** * Constructs a new instance with a nested exception and empty message. */ - public StreamException(Throwable nested) { + public ItemStreamException(Throwable nested) { super(nested); } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemWriter.java index bd8b61ae0..b781a6aab 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemWriter.java @@ -16,8 +16,6 @@ package org.springframework.batch.item; -import org.springframework.batch.item.exception.ClearFailedException; -import org.springframework.batch.item.exception.FlushFailedException; /** *
Basic interface for generic output operations. Class implementing this diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemWriterException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemWriterException.java new file mode 100644 index 000000000..3025dca1f --- /dev/null +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemWriterException.java @@ -0,0 +1,45 @@ +/* + * Copyright 2002-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.item; + +/** + * A base exception class that all exceptions thrown from an {@link ItemWriter} extend. + * + * @author Ben Hale + */ +public abstract class ItemWriterException extends RuntimeException { + + /** + * Create a new {@link ItemWriterException} based on a message and another exception. + * + * @param message the message for this exception + * @param cause the other exception + */ + public ItemWriterException(String message, Throwable cause) { + super(message, cause); + } + + /** + * Create a new {@link ItemWriterException} based on a message. + * + * @param message the message for this exception + */ + public ItemWriterException(String message) { + super(message); + } + +} diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/exception/MarkFailedException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/MarkFailedException.java similarity index 60% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/item/exception/MarkFailedException.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/MarkFailedException.java index e96d6b398..e0a926b08 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/exception/MarkFailedException.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/MarkFailedException.java @@ -13,35 +13,33 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.item.exception; - +package org.springframework.batch.item; /** + * An exception class thrown when an {@link ItemReader} fails to mark its current state for future retry. + * * @author Dave Syer - * + * @author Ben Hale */ -public class MarkFailedException extends StreamException { +public class MarkFailedException extends ItemReaderException { /** - * @param message + * Create a new {@link MarkFailedException} based on a message. + * + * @param message the message for this exception */ public MarkFailedException(String message) { super(message); } /** - * @param msg - * @param nested + * Create a new {@link MarkFailedException} based on a message and another exception. + * + * @param message the message for this exception + * @param cause the other exception */ public MarkFailedException(String msg, Throwable nested) { super(msg, nested); } - /** - * @param msg - * @param nested - */ - public MarkFailedException(Throwable nested) { - super(nested); - } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/NoWorkFoundException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/NoWorkFoundException.java new file mode 100644 index 000000000..f02ae21aa --- /dev/null +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/NoWorkFoundException.java @@ -0,0 +1,44 @@ +/* + * Copyright 2006-2008 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.item; + +/** + * Exception indicating that an {@link ItemReader} found no work to process while initializing. + * + * @author Lucas Ward + * @author Ben Hale + */ +public class NoWorkFoundException extends ItemReaderException { + + /** + * Create a new {@link NoWorkFoundException} based on a message. + * + * @param message the message for this exception + */ + public NoWorkFoundException(String message) { + super(message); + } + + /** + * Create a new {@link NoWorkFoundException} based on a message and another exception. + * + * @param message the message for this exception + * @param cause the other exception + */ + public NoWorkFoundException(String msg, Throwable nested) { + super(msg, nested); + } +} diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ReaderNotOpenException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ReaderNotOpenException.java new file mode 100644 index 000000000..822065e2d --- /dev/null +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ReaderNotOpenException.java @@ -0,0 +1,43 @@ +/* + * Copyright 2006-2008 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.item; + +/** + * Exception indicating that an {@link ItemReader} needed to be opened before read. + * + * @author Ben Hale + */ +public class ReaderNotOpenException extends ItemReaderException { + + /** + * Create a new {@link ReaderNotOpenException} based on a message. + * + * @param message the message for this exception + */ + public ReaderNotOpenException(String message) { + super(message); + } + + /** + * Create a new {@link ReaderNotOpenException} based on a message and another exception. + * + * @param message the message for this exception + * @param cause the other exception + */ + public ReaderNotOpenException(String msg, Throwable nested) { + super(msg, nested); + } +} diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/exception/ResetFailedException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ResetFailedException.java similarity index 60% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/item/exception/ResetFailedException.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ResetFailedException.java index 16e83b697..95445b58c 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/exception/ResetFailedException.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ResetFailedException.java @@ -13,37 +13,33 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.item.exception; - +package org.springframework.batch.item; /** + * An exception class thrown when an {@link ItemReader} fails to reset its state based on the previous mark. + * * @author Dave Syer - * + * @author Ben Hale */ -public class ResetFailedException extends StreamException { +public class ResetFailedException extends ItemReaderException { /** - * @param message + * Create a new {@link ResetFailedException} based on a message. + * + * @param message the message for this exception */ public ResetFailedException(String message) { super(message); - // TODO Auto-generated constructor stub } /** - * @param msg - * @param nested + * Create a new {@link ResetFailedException} based on a message and another exception. + * + * @param message the message for this exception + * @param cause the other exception */ public ResetFailedException(String msg, Throwable nested) { super(msg, nested); } - /** - * @param msg - * @param nested - */ - public ResetFailedException(Throwable nested) { - super(nested); - } - } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/UnexpectedInputException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/UnexpectedInputException.java new file mode 100644 index 000000000..d39f13231 --- /dev/null +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/UnexpectedInputException.java @@ -0,0 +1,46 @@ +/* + * 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.item; + +/** + * Used to signal an unexpected end of an input or message stream. This is an abnormal condition, not just the end of + * the data - e.g. if a resource becomes unavailable, or a stream becomes unreadable. + * + * @author Dave Syer + * @author Ben Hale + */ +public class UnexpectedInputException extends ItemReaderException { + + /** + * Create a new {@link UnexpectedInputException} based on a message. + * + * @param message the message for this exception + */ + public UnexpectedInputException(String message) { + super(message); + } + + /** + * Create a new {@link UnexpectedInputException} based on a message and another exception. + * + * @param message the message for this exception + * @param cause the other exception + */ + public UnexpectedInputException(String msg, Throwable nested) { + super(msg, nested); + } +} diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/exception/CommitFailedException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/exception/CommitFailedException.java deleted file mode 100644 index 9fbadf6d9..000000000 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/exception/CommitFailedException.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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.item.exception; - -/** - * @author Dave Syer - * - */ -public class CommitFailedException extends StreamException { - /** - * @param message - */ - public CommitFailedException(String message) { - super(message); - } - - /** - * @param msg - * @param nested - */ - public CommitFailedException(String msg, Throwable nested) { - super(msg, nested); - } - - /** - * @param msg - * @param nested - */ - public CommitFailedException(Throwable nested) { - super(nested); - } - -} diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/exception/NoWorkFoundException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/exception/NoWorkFoundException.java deleted file mode 100644 index 5640f94d4..000000000 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/exception/NoWorkFoundException.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2006-2008 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.item.exception; - -/** - * Exception indicating that an {@link ItemReader} found - * no work to process while initializing. - * - * @author Lucas Ward - * - */ -public class NoWorkFoundException extends StreamException { - - public NoWorkFoundException(String msg) { - super(msg); - } -} diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/exception/UnexpectedInputException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/exception/UnexpectedInputException.java deleted file mode 100644 index 04d886706..000000000 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/exception/UnexpectedInputException.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * 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.item.exception; - - -/** - * Used to signal an unexpected end of an input or message stream. This is an - * abnormal condition, not just the end of the data - e.g. if a resource becomes - * unavailable, or a stream becomes unreadable. - * - * @author Dave Syer - */ -public class UnexpectedInputException extends StreamException { - - /** - * Generated serial UID. - */ - private static final long serialVersionUID = -8325588758094208905L; - - public UnexpectedInputException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/exception/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/exception/package.html deleted file mode 100644 index 0fc74230d..000000000 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/exception/package.html +++ /dev/null @@ -1,7 +0,0 @@ - -
--Infrastructure implementations of item exception concerns. -
- - diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/AbstractItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/AbstractItemReader.java index c0a8e3c89..241b15b6d 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/AbstractItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/AbstractItemReader.java @@ -17,8 +17,8 @@ package org.springframework.batch.item.reader; import org.springframework.batch.item.ItemReader; -import org.springframework.batch.item.exception.MarkFailedException; -import org.springframework.batch.item.exception.ResetFailedException; +import org.springframework.batch.item.MarkFailedException; +import org.springframework.batch.item.ResetFailedException; /** * Base class for {@link ItemReader} implementations. diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/ItemReaderAdapter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/ItemReaderAdapter.java index fb6b59117..2a73d74cf 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/ItemReaderAdapter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/ItemReaderAdapter.java @@ -18,9 +18,9 @@ package org.springframework.batch.item.reader; import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.item.ItemReader; -import org.springframework.batch.item.exception.MarkFailedException; -import org.springframework.batch.item.exception.ResetFailedException; -import org.springframework.batch.item.exception.StreamException; +import org.springframework.batch.item.ItemStreamException; +import org.springframework.batch.item.MarkFailedException; +import org.springframework.batch.item.ResetFailedException; import org.springframework.batch.support.AbstractMethodInvokingDelegator; /** @@ -43,7 +43,7 @@ public class ItemReaderAdapter extends AbstractMethodInvokingDelegator implement * * @see org.springframework.batch.item.ItemReader#close(ExecutionContext) */ - public void close() throws StreamException { + public void close() throws ItemStreamException { } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/JmsItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/JmsItemReader.java index 7b80e8f3c..a864d8bd3 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/JmsItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/JmsItemReader.java @@ -26,7 +26,7 @@ import org.springframework.batch.item.FailedItemIdentifier; import org.springframework.batch.item.ItemKeyGenerator; import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.ItemRecoverer; -import org.springframework.batch.item.exception.UnexpectedInputException; +import org.springframework.batch.item.UnexpectedInputException; import org.springframework.jms.JmsException; import org.springframework.jms.core.JmsOperations; import org.springframework.jms.core.JmsTemplate; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/stream/CompositeItemStream.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/stream/CompositeItemStream.java index 6baad7422..6531f8337 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/stream/CompositeItemStream.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/stream/CompositeItemStream.java @@ -22,7 +22,7 @@ import java.util.List; import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.item.ItemStream; -import org.springframework.batch.item.exception.StreamException; +import org.springframework.batch.item.ItemStreamException; /** * Simple {@link ItemStream} that delegates to a list of other streams. @@ -83,9 +83,9 @@ public class CompositeItemStream implements ItemStream { /** * Broadcast the call to close from this {@link StreamManager}. - * @throws StreamException + * @throws ItemStreamException */ - public void close(ExecutionContext executionContext) throws StreamException { + public void close(ExecutionContext executionContext) throws ItemStreamException { synchronized (streams) { for (Iterator it = streams.iterator(); it.hasNext();) { ItemStream itemStream = (ItemStream) it.next(); @@ -96,9 +96,9 @@ public class CompositeItemStream implements ItemStream { /** * Broadcast the call to open from this {@link StreamManager}. - * @throws StreamException + * @throws ItemStreamException */ - public void open(ExecutionContext executionContext) throws StreamException { + public void open(ExecutionContext executionContext) throws ItemStreamException { synchronized (streams) { for (Iterator it = streams.iterator(); it.hasNext();) { ItemStream itemStream = (ItemStream) it.next(); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/stream/ItemStreamSupport.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/stream/ItemStreamSupport.java index bafcddb2a..5eb908c7d 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/stream/ItemStreamSupport.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/stream/ItemStreamSupport.java @@ -17,7 +17,7 @@ package org.springframework.batch.item.stream; import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.item.ItemStream; -import org.springframework.batch.item.exception.StreamException; +import org.springframework.batch.item.ItemStreamException; /** * Empty method implementation of {@link ItemStream}. @@ -31,14 +31,14 @@ public class ItemStreamSupport implements ItemStream { * No-op. * @see org.springframework.batch.item.ItemStream#close(ExecutionContext) */ - public void close(ExecutionContext executionContext) throws StreamException { + public void close(ExecutionContext executionContext) throws ItemStreamException { } /** * No-op. * @see org.springframework.batch.item.ItemStream#open() */ - public void open(ExecutionContext executionContext) throws StreamException { + public void open(ExecutionContext executionContext) throws ItemStreamException { } /** diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/AbstractItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/AbstractItemWriter.java index ec0d0e278..601b00521 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/AbstractItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/AbstractItemWriter.java @@ -15,9 +15,9 @@ */ package org.springframework.batch.item.writer; +import org.springframework.batch.item.ClearFailedException; +import org.springframework.batch.item.FlushFailedException; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.item.exception.ClearFailedException; -import org.springframework.batch.item.exception.FlushFailedException; /** * Abstract {@link ItemWriter} that allows for base classes to only diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/DelegatingItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/DelegatingItemWriter.java index 1077b2019..bb05cf5b2 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/DelegatingItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/DelegatingItemWriter.java @@ -1,8 +1,8 @@ package org.springframework.batch.item.writer; +import org.springframework.batch.item.ClearFailedException; +import org.springframework.batch.item.FlushFailedException; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.item.exception.ClearFailedException; -import org.springframework.batch.item.exception.FlushFailedException; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/ItemWriterAdapter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/ItemWriterAdapter.java index 962511b62..cded85919 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/ItemWriterAdapter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/ItemWriterAdapter.java @@ -16,9 +16,9 @@ package org.springframework.batch.item.writer; +import org.springframework.batch.item.ClearFailedException; +import org.springframework.batch.item.FlushFailedException; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.item.exception.ClearFailedException; -import org.springframework.batch.item.exception.FlushFailedException; import org.springframework.batch.support.AbstractMethodInvokingDelegator; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/PropertyExtractingDelegatingItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/PropertyExtractingDelegatingItemWriter.java index 460fcb6dd..2e8d9626e 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/PropertyExtractingDelegatingItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/PropertyExtractingDelegatingItemWriter.java @@ -16,9 +16,9 @@ package org.springframework.batch.item.writer; +import org.springframework.batch.item.ClearFailedException; +import org.springframework.batch.item.FlushFailedException; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.item.exception.ClearFailedException; -import org.springframework.batch.item.exception.FlushFailedException; import org.springframework.batch.support.AbstractMethodInvokingDelegator; import org.springframework.beans.BeanWrapper; import org.springframework.beans.BeanWrapperImpl; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/DrivingQueryItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/DrivingQueryItemReaderTests.java index f7de972a0..1d168f251 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/DrivingQueryItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/DrivingQueryItemReaderTests.java @@ -10,7 +10,7 @@ import org.springframework.batch.io.sample.domain.Foo; import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.ItemStream; -import org.springframework.batch.item.exception.NoWorkFoundException; +import org.springframework.batch.item.NoWorkFoundException; import org.springframework.beans.factory.InitializingBean; import org.springframework.transaction.support.TransactionSynchronizationManager; import org.springframework.util.Assert; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/exception/AbstractExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/exception/AbstractExceptionTests.java index 545e420b6..620655a4e 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/exception/AbstractExceptionTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/exception/AbstractExceptionTests.java @@ -25,11 +25,6 @@ public abstract class AbstractExceptionTests extends TestCase { assertEquals("foo", exception.getMessage()); } - public void testExceptionThrowable() throws Exception { - Exception exception = getException(new RuntimeException("foo")); - assertEquals("foo", exception.getCause().getMessage()); - } - public void testExceptionStringThrowable() throws Exception { Exception exception = getException("foo", new IllegalStateException()); assertEquals("foo", exception.getMessage().substring(0, 3)); @@ -37,8 +32,6 @@ public abstract class AbstractExceptionTests extends TestCase { public abstract Exception getException(String msg) throws Exception; - public abstract Exception getException(Throwable t) throws Exception; - public abstract Exception getException(String msg, Throwable t) throws Exception; } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/exception/ConfigurationExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/exception/ConfigurationExceptionTests.java index b229c5cb6..038537143 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/exception/ConfigurationExceptionTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/exception/ConfigurationExceptionTests.java @@ -16,7 +16,6 @@ package org.springframework.batch.io.exception; -import org.springframework.batch.io.exception.ConfigurationException; public class ConfigurationExceptionTests extends AbstractExceptionTests { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FlatFileItemReaderBasicTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FlatFileItemReaderBasicTests.java index 3c0839f90..61de6631c 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FlatFileItemReaderBasicTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FlatFileItemReaderBasicTests.java @@ -29,7 +29,8 @@ import org.springframework.batch.io.file.separator.DefaultRecordSeparatorPolicy; import org.springframework.batch.io.file.transform.DelimitedLineTokenizer; import org.springframework.batch.io.file.transform.LineTokenizer; import org.springframework.batch.item.ExecutionContext; -import org.springframework.batch.item.exception.StreamException; +import org.springframework.batch.item.ItemStreamException; +import org.springframework.batch.item.ReaderNotOpenException; import org.springframework.core.io.AbstractResource; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.Resource; @@ -148,8 +149,8 @@ public class FlatFileItemReaderBasicTests extends TestCase { itemReader.setFieldSetMapper(fieldSetMapper); try { itemReader.read(); - fail("Expected StreamException"); - } catch (StreamException e) { + fail("Expected ReaderNotOpenException"); + } catch (ReaderNotOpenException e) { assertTrue(e.getMessage().contains("open")); } } @@ -210,7 +211,7 @@ public class FlatFileItemReaderBasicTests extends TestCase { itemReader.open(executionContext); fail("Expected BatchEnvironmentException"); } - catch (StreamException e) { + catch (ItemStreamException e) { // expected assertEquals("foo", e.getCause().getMessage()); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/ResourceLineReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/ResourceLineReaderTests.java index 6c9395050..959dd8c5d 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/ResourceLineReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/ResourceLineReaderTests.java @@ -23,7 +23,8 @@ import junit.framework.TestCase; import org.springframework.batch.io.file.separator.ResourceLineReader; import org.springframework.batch.io.file.separator.SuffixRecordSeparatorPolicy; -import org.springframework.batch.item.exception.StreamException; +import org.springframework.batch.item.ItemStreamException; +import org.springframework.batch.item.UnexpectedInputException; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.InputStreamResource; import org.springframework.core.io.Resource; @@ -41,9 +42,9 @@ public class ResourceLineReaderTests extends TestCase { })); try { reader.read(); - fail("Expected InputException"); + fail("Expected UnexpectedInputException"); } - catch (StreamException e) { + catch (UnexpectedInputException e) { // expected assertTrue(e.getMessage().startsWith("Unable to read")); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/mapping/PropertyMatchesTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/mapping/PropertyMatchesTests.java index db6bfdaeb..e02bd8e5c 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/mapping/PropertyMatchesTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/mapping/PropertyMatchesTests.java @@ -16,8 +16,6 @@ package org.springframework.batch.io.file.mapping; -import org.springframework.batch.io.file.mapping.PropertyMatches; - import junit.framework.TestCase; public class PropertyMatchesTests extends TestCase { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/separator/DefaultRecordSeparatorPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/separator/DefaultRecordSeparatorPolicyTests.java index d319975c8..8425932ee 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/separator/DefaultRecordSeparatorPolicyTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/separator/DefaultRecordSeparatorPolicyTests.java @@ -16,8 +16,6 @@ package org.springframework.batch.io.file.separator; -import org.springframework.batch.io.file.separator.DefaultRecordSeparatorPolicy; - import junit.framework.TestCase; public class DefaultRecordSeparatorPolicyTests extends TestCase { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/separator/SimpleRecordSeparatorPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/separator/SimpleRecordSeparatorPolicyTests.java index 444008ba4..2a95d1b23 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/separator/SimpleRecordSeparatorPolicyTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/separator/SimpleRecordSeparatorPolicyTests.java @@ -16,8 +16,6 @@ package org.springframework.batch.io.file.separator; -import org.springframework.batch.io.file.separator.SimpleRecordSeparatorPolicy; - import junit.framework.TestCase; public class SimpleRecordSeparatorPolicyTests extends TestCase { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/separator/SuffixRecordSeparatorPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/separator/SuffixRecordSeparatorPolicyTests.java index af455832b..bad53e097 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/separator/SuffixRecordSeparatorPolicyTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/separator/SuffixRecordSeparatorPolicyTests.java @@ -16,8 +16,6 @@ package org.springframework.batch.io.file.separator; -import org.springframework.batch.io.file.separator.SuffixRecordSeparatorPolicy; - import junit.framework.TestCase; public class SuffixRecordSeparatorPolicyTests extends TestCase { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/CommonLineTokenizerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/CommonLineTokenizerTests.java index fc01e61bd..0f889e2d5 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/CommonLineTokenizerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/CommonLineTokenizerTests.java @@ -2,8 +2,6 @@ package org.springframework.batch.io.file.transform; import java.util.List; -import org.springframework.batch.io.file.transform.AbstractLineTokenizer; - import junit.framework.TestCase; /** diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/DelimitedLineTokenizerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/DelimitedLineTokenizerTests.java index e8d3b4380..a102414bb 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/DelimitedLineTokenizerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/DelimitedLineTokenizerTests.java @@ -19,8 +19,6 @@ package org.springframework.batch.io.file.transform; import junit.framework.TestCase; import org.springframework.batch.io.file.mapping.FieldSet; -import org.springframework.batch.io.file.transform.AbstractLineTokenizer; -import org.springframework.batch.io.file.transform.DelimitedLineTokenizer; public class DelimitedLineTokenizerTests extends TestCase { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/FixedLengthLineAggregatorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/FixedLengthLineAggregatorTests.java index b3f234741..1cb72b32e 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/FixedLengthLineAggregatorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/FixedLengthLineAggregatorTests.java @@ -16,12 +16,10 @@ package org.springframework.batch.io.file.transform; -import org.springframework.batch.io.file.mapping.DefaultFieldSet; -import org.springframework.batch.io.file.transform.FixedLengthLineAggregator; -import org.springframework.batch.io.file.transform.Range; - import junit.framework.TestCase; +import org.springframework.batch.io.file.mapping.DefaultFieldSet; + /** * Unit tests for {@link FixedLengthLineAggregator} * diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/FixedLengthTokenizerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/FixedLengthTokenizerTests.java index 8c5575673..0ff3a2a70 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/FixedLengthTokenizerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/FixedLengthTokenizerTests.java @@ -19,8 +19,6 @@ package org.springframework.batch.io.file.transform; import junit.framework.TestCase; import org.springframework.batch.io.file.mapping.FieldSet; -import org.springframework.batch.io.file.transform.FixedLengthTokenizer; -import org.springframework.batch.io.file.transform.Range; public class FixedLengthTokenizerTests extends TestCase { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/LineAggregatorItemTransformerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/LineAggregatorItemTransformerTests.java index e593ac543..ea174f830 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/LineAggregatorItemTransformerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/LineAggregatorItemTransformerTests.java @@ -15,10 +15,10 @@ */ package org.springframework.batch.io.file.transform; -import org.springframework.batch.io.file.mapping.FieldSet; - import junit.framework.TestCase; +import org.springframework.batch.io.file.mapping.FieldSet; + /** * @author Dave Syer * diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/PrefixMatchingCompositeLineTokenizerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/PrefixMatchingCompositeLineTokenizerTests.java index 455758ce4..5609ef180 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/PrefixMatchingCompositeLineTokenizerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/PrefixMatchingCompositeLineTokenizerTests.java @@ -25,8 +25,6 @@ import junit.framework.TestCase; import org.springframework.batch.io.file.mapping.DefaultFieldSet; import org.springframework.batch.io.file.mapping.FieldSet; -import org.springframework.batch.io.file.transform.DelimitedLineTokenizer; -import org.springframework.batch.io.file.transform.PrefixMatchingCompositeLineTokenizer; public class PrefixMatchingCompositeLineTokenizerTests extends TestCase { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/RangeArrayPropertyEditorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/RangeArrayPropertyEditorTests.java index 27e1a7eca..6151635b5 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/RangeArrayPropertyEditorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/RangeArrayPropertyEditorTests.java @@ -1,8 +1,5 @@ package org.springframework.batch.io.file.transform; -import org.springframework.batch.io.file.transform.Range; -import org.springframework.batch.io.file.transform.RangeArrayPropertyEditor; - import junit.framework.TestCase; public class RangeArrayPropertyEditorTests extends TestCase { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/RecursiveCollectionItemTransformerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/RecursiveCollectionItemTransformerTests.java index fd3cc5835..bc9c7f43a 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/RecursiveCollectionItemTransformerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/transform/RecursiveCollectionItemTransformerTests.java @@ -18,11 +18,11 @@ package org.springframework.batch.io.file.transform; import java.util.Arrays; import java.util.Collections; +import junit.framework.TestCase; + import org.springframework.batch.item.writer.ItemTransformer; import org.springframework.util.StringUtils; -import junit.framework.TestCase; - /** * @author Dave Syer * diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/support/FileUtilsTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/support/FileUtilsTests.java index b97299de4..296f564ee 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/support/FileUtilsTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/support/FileUtilsTests.java @@ -5,11 +5,11 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; +import junit.framework.TestCase; + import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.util.Assert; -import junit.framework.TestCase; - /** * Tests for {@link FileUtils} * diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/support/HibernateAwareItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/support/HibernateAwareItemWriterTests.java index 95cff533b..76436de0c 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/support/HibernateAwareItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/support/HibernateAwareItemWriterTests.java @@ -22,9 +22,9 @@ import java.util.Map; import junit.framework.TestCase; +import org.springframework.batch.item.ClearFailedException; +import org.springframework.batch.item.FlushFailedException; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.item.exception.ClearFailedException; -import org.springframework.batch.item.exception.FlushFailedException; import org.springframework.batch.repeat.context.RepeatContextSupport; import org.springframework.batch.repeat.synch.RepeatSynchronizationManager; import org.springframework.dao.DataAccessException; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/StaxEventItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/StaxEventItemReaderTests.java index 09a57e7d9..8acdc01a6 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/StaxEventItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/StaxEventItemReaderTests.java @@ -15,7 +15,8 @@ import javax.xml.stream.events.XMLEvent; import junit.framework.TestCase; import org.springframework.batch.item.ExecutionContext; -import org.springframework.batch.item.exception.StreamException; +import org.springframework.batch.item.ItemStreamException; +import org.springframework.batch.item.ReaderNotOpenException; import org.springframework.core.io.AbstractResource; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.Resource; @@ -139,7 +140,7 @@ public class StaxEventItemReaderTests extends TestCase { source.open(context); fail("Expected StreamException"); } - catch (StreamException e) { + catch (ItemStreamException e) { // expected String message = e.getMessage(); assertTrue("Wrong message: "+message, message.contains("must be before")); @@ -241,9 +242,9 @@ public class StaxEventItemReaderTests extends TestCase { // calling read again should require re-initialization because of close try { item = newSource.read(); - fail("Expected StreamException"); + fail("Expected ReaderNotOpenException"); } - catch (StreamException e) { + catch (ReaderNotOpenException e) { // expected } } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/oxm/MarshallingObjectToXmlSerializerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/oxm/MarshallingObjectToXmlSerializerTests.java index 8d94da11b..0a6d01931 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/oxm/MarshallingObjectToXmlSerializerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/oxm/MarshallingObjectToXmlSerializerTests.java @@ -26,7 +26,6 @@ import javax.xml.transform.Result; import junit.framework.TestCase; -import org.springframework.batch.io.xml.oxm.MarshallingEventWriterSerializer; import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.oxm.Marshaller; import org.springframework.oxm.XmlMappingException; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/oxm/UnmarshallingFragmentDeserializerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/oxm/UnmarshallingFragmentDeserializerTests.java index e1a56fa76..731f28a05 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/oxm/UnmarshallingFragmentDeserializerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/oxm/UnmarshallingFragmentDeserializerTests.java @@ -8,7 +8,6 @@ import javax.xml.stream.XMLInputFactory; import junit.framework.TestCase; import org.easymock.MockControl; -import org.springframework.batch.io.xml.oxm.UnmarshallingEventReaderDeserializer; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.Resource; import org.springframework.dao.DataAccessException; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/AbstractEventReaderWrapperTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/AbstractEventReaderWrapperTests.java index 907cf88fa..06b2922ef 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/AbstractEventReaderWrapperTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/AbstractEventReaderWrapperTests.java @@ -22,7 +22,6 @@ import javax.xml.stream.events.XMLEvent; import junit.framework.TestCase; import org.easymock.MockControl; -import org.springframework.batch.io.xml.stax.AbstractEventReaderWrapper; import com.bea.xml.stream.events.StartDocumentEvent; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/AbstractEventWriterWrapperTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/AbstractEventWriterWrapperTests.java index 1f9b53bd1..7515f6927 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/AbstractEventWriterWrapperTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/AbstractEventWriterWrapperTests.java @@ -24,7 +24,6 @@ import javax.xml.stream.events.XMLEvent; import junit.framework.TestCase; import org.easymock.MockControl; -import org.springframework.batch.io.xml.stax.AbstractEventWriterWrapper; import com.bea.xml.stream.events.StartDocumentEvent; import com.bea.xml.stream.util.NamespaceContextImpl; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/DefaultFragmentEventReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/DefaultFragmentEventReaderTests.java index 97a22a1b4..c8f12076c 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/DefaultFragmentEventReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/DefaultFragmentEventReaderTests.java @@ -10,8 +10,6 @@ import javax.xml.stream.events.XMLEvent; import junit.framework.TestCase; import org.springframework.batch.io.xml.EventHelper; -import org.springframework.batch.io.xml.stax.DefaultFragmentEventReader; -import org.springframework.batch.io.xml.stax.DefaultTransactionalEventReader; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.Resource; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/DefaultTransactionalEventReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/DefaultTransactionalEventReaderTests.java index c178cc7ea..106e850f1 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/DefaultTransactionalEventReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/DefaultTransactionalEventReaderTests.java @@ -6,7 +6,6 @@ import javax.xml.stream.XMLInputFactory; import junit.framework.TestCase; import org.springframework.batch.io.xml.EventHelper; -import org.springframework.batch.io.xml.stax.DefaultTransactionalEventReader; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.Resource; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/EventSequenceTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/EventSequenceTests.java index b7be0c56b..32eccfaaa 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/EventSequenceTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/EventSequenceTests.java @@ -3,8 +3,6 @@ package org.springframework.batch.io.xml.stax; import javax.xml.stream.XMLEventFactory; import javax.xml.stream.events.XMLEvent; -import org.springframework.batch.io.xml.stax.EventSequence; - import junit.framework.TestCase; /** diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/NoStartEndDocumentWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/NoStartEndDocumentWriterTests.java index 5b7639679..9f4d697c0 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/NoStartEndDocumentWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/stax/NoStartEndDocumentWriterTests.java @@ -7,7 +7,6 @@ import javax.xml.stream.events.XMLEvent; import junit.framework.TestCase; import org.easymock.MockControl; -import org.springframework.batch.io.xml.stax.NoStartEndDocumentStreamWriter; /** * Tests for {@link NoStartEndDocumentStreamWriter} diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/exception/StreamExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ItemStreamExceptionTests.java similarity index 79% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/item/exception/StreamExceptionTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ItemStreamExceptionTests.java index b35fa2136..44ee20a32 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/exception/StreamExceptionTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ItemStreamExceptionTests.java @@ -14,23 +14,22 @@ * limitations under the License. */ -package org.springframework.batch.item.exception; +package org.springframework.batch.item; import org.springframework.batch.io.exception.AbstractExceptionTests; - -public class StreamExceptionTests extends AbstractExceptionTests { +public class ItemStreamExceptionTests extends AbstractExceptionTests { public Exception getException(String msg) throws Exception { - return new StreamException(msg); + return new ItemStreamException(msg); } public Exception getException(Throwable t) throws Exception { - return new StreamException(t); + return new ItemStreamException(t); } public Exception getException(String msg, Throwable t) throws Exception { - return new StreamException(msg, t); + return new ItemStreamException(msg, t); } } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/exception/MarkFailedExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/MarkFailedExceptionTests.java similarity index 86% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/item/exception/MarkFailedExceptionTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/MarkFailedExceptionTests.java index b3bcac0eb..32a73a2c1 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/exception/MarkFailedExceptionTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/MarkFailedExceptionTests.java @@ -14,21 +14,16 @@ * limitations under the License. */ -package org.springframework.batch.item.exception; +package org.springframework.batch.item; import org.springframework.batch.io.exception.AbstractExceptionTests; - public class MarkFailedExceptionTests extends AbstractExceptionTests { public Exception getException(String msg) throws Exception { return new MarkFailedException(msg); } - public Exception getException(Throwable t) throws Exception { - return new MarkFailedException(t); - } - public Exception getException(String msg, Throwable t) throws Exception { return new MarkFailedException(msg, t); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/exception/ResetFailedExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ResetFailedExceptionTests.java similarity index 86% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/item/exception/ResetFailedExceptionTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ResetFailedExceptionTests.java index 209ac7a3c..b85d0ea6c 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/exception/ResetFailedExceptionTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ResetFailedExceptionTests.java @@ -14,21 +14,16 @@ * limitations under the License. */ -package org.springframework.batch.item.exception; +package org.springframework.batch.item; import org.springframework.batch.io.exception.AbstractExceptionTests; - public class ResetFailedExceptionTests extends AbstractExceptionTests { public Exception getException(String msg) throws Exception { return new ResetFailedException(msg); } - public Exception getException(Throwable t) throws Exception { - return new ResetFailedException(t); - } - public Exception getException(String msg, Throwable t) throws Exception { return new ResetFailedException(msg, t); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/exception/UnexpectedInputExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/UnexpectedInputExceptionTests.java similarity index 89% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/item/exception/UnexpectedInputExceptionTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/UnexpectedInputExceptionTests.java index 1098b5a93..b9891e6ff 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/exception/UnexpectedInputExceptionTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/UnexpectedInputExceptionTests.java @@ -14,9 +14,8 @@ * limitations under the License. */ -package org.springframework.batch.item.exception; +package org.springframework.batch.item; -import org.springframework.batch.item.exception.UnexpectedInputException; import org.springframework.batch.repeat.exception.AbstractExceptionTests; public class UnexpectedInputExceptionTests extends AbstractExceptionTests { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/AggregateItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/AggregateItemReaderTests.java index 271521f39..c2965e46b 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/AggregateItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/AggregateItemReaderTests.java @@ -7,7 +7,6 @@ import junit.framework.TestCase; import org.easymock.MockControl; import org.springframework.batch.item.ItemReader; -import org.springframework.batch.item.reader.AggregateItemReader; public class AggregateItemReaderTests extends TestCase { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/JmsItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/JmsItemReaderTests.java index 88f1336ed..41167602b 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/JmsItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/JmsItemReaderTests.java @@ -25,7 +25,6 @@ import javax.jms.Queue; import junit.framework.TestCase; import org.easymock.MockControl; -import org.springframework.batch.item.reader.JmsItemReader; import org.springframework.jms.core.JmsOperations; public class JmsItemReaderTests extends TestCase { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/ListItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/ListItemReaderTests.java index 091d0d9e5..dba07faaa 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/ListItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/ListItemReaderTests.java @@ -20,8 +20,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.springframework.batch.item.reader.ListItemReader; - import junit.framework.TestCase; public class ListItemReaderTests extends TestCase { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/TransactionAwareListItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/TransactionAwareListItemReaderTests.java index 24fee76bc..413c6c214 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/TransactionAwareListItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/TransactionAwareListItemReaderTests.java @@ -22,7 +22,6 @@ import java.util.List; import junit.framework.TestCase; -import org.springframework.batch.item.reader.ListItemReader; import org.springframework.batch.support.transaction.ResourcelessTransactionManager; import org.springframework.batch.support.transaction.TransactionAwareProxyFactory; import org.springframework.transaction.PlatformTransactionManager; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/ValidatingItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/ValidatingItemReaderTests.java index dfcc618cb..6650f4268 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/ValidatingItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/ValidatingItemReaderTests.java @@ -20,8 +20,6 @@ import junit.framework.TestCase; import org.easymock.MockControl; import org.springframework.batch.io.exception.ValidationException; import org.springframework.batch.item.ItemReader; -import org.springframework.batch.item.reader.AbstractItemReader; -import org.springframework.batch.item.reader.ValidatingItemReader; import org.springframework.batch.item.validator.Validator; /** diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/stream/SimpleStreamManagerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/stream/SimpleStreamManagerTests.java index cad01395d..42f75f660 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/stream/SimpleStreamManagerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/stream/SimpleStreamManagerTests.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.item.ItemStream; -import org.springframework.batch.item.exception.StreamException; +import org.springframework.batch.item.ItemStreamException; /** * @author Dave Syer @@ -40,7 +40,7 @@ public class SimpleStreamManagerTests extends TestCase { */ public void testRegisterAndOpen() { ItemStreamSupport stream = new ItemStreamSupport() { - public void open(ExecutionContext executionContext) throws StreamException { + public void open(ExecutionContext executionContext) throws ItemStreamException { list.add("bar"); } }; @@ -55,7 +55,7 @@ public class SimpleStreamManagerTests extends TestCase { */ public void testRegisterTwice() { ItemStreamSupport stream = new ItemStreamSupport() { - public void open(ExecutionContext executionContext) throws StreamException { + public void open(ExecutionContext executionContext) throws ItemStreamException { list.add("bar"); } }; @@ -85,7 +85,7 @@ public class SimpleStreamManagerTests extends TestCase { */ public void testClose() { manager.register(new ItemStreamSupport() { - public void close(ExecutionContext executionContext) throws StreamException { + public void close(ExecutionContext executionContext) throws ItemStreamException { list.add("bar"); } }); @@ -99,7 +99,7 @@ public class SimpleStreamManagerTests extends TestCase { */ public void testCloseDoesNotUnregister() { manager.setStreams(new ItemStream[] { new ItemStreamSupport() { - public void open(ExecutionContext executionContext) throws StreamException { + public void open(ExecutionContext executionContext) throws ItemStreamException { list.add("bar"); } } }); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/SpringValidatorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/SpringValidatorTests.java index fc146d9a4..debe4da50 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/SpringValidatorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/SpringValidatorTests.java @@ -19,7 +19,6 @@ package org.springframework.batch.item.validator; import junit.framework.TestCase; import org.springframework.batch.io.exception.ValidationException; -import org.springframework.batch.item.validator.SpringValidator; import org.springframework.validation.Errors; import org.springframework.validation.Validator; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/writer/CompositeItemTransformerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/writer/CompositeItemTransformerTests.java index e45cfcfb7..5b79468b5 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/writer/CompositeItemTransformerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/writer/CompositeItemTransformerTests.java @@ -5,8 +5,6 @@ import java.util.ArrayList; import junit.framework.TestCase; import org.easymock.MockControl; -import org.springframework.batch.item.writer.CompositeItemTransformer; -import org.springframework.batch.item.writer.ItemTransformer; /** * Tests for {@link CompositeItemTransformer}. diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/writer/DelegatingItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/writer/DelegatingItemWriterTests.java index cea6e7b0c..48aba9040 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/writer/DelegatingItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/writer/DelegatingItemWriterTests.java @@ -15,11 +15,11 @@ */ package org.springframework.batch.item.writer; +import junit.framework.TestCase; + import org.easymock.MockControl; import org.springframework.batch.item.ItemWriter; -import junit.framework.TestCase; - /** * @author Lucas Ward * diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/writer/ItemTransformerItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/writer/ItemTransformerItemWriterTests.java index 0a883e647..b22efca22 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/writer/ItemTransformerItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/writer/ItemTransformerItemWriterTests.java @@ -4,8 +4,6 @@ import junit.framework.TestCase; import org.easymock.MockControl; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.item.writer.ItemTransformer; -import org.springframework.batch.item.writer.ItemTransformerItemWriter; /** * Tests for {@link ItemTransformerItemWriter}. diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/writer/PropertyExtractingDelegatingItemProccessorIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/writer/PropertyExtractingDelegatingItemProccessorIntegrationTests.java index 91fb5568c..991aab329 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/writer/PropertyExtractingDelegatingItemProccessorIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/writer/PropertyExtractingDelegatingItemProccessorIntegrationTests.java @@ -4,7 +4,6 @@ import java.util.List; import org.springframework.batch.io.sample.domain.Foo; import org.springframework.batch.io.sample.domain.FooService; -import org.springframework.batch.item.writer.PropertyExtractingDelegatingItemWriter; import org.springframework.test.AbstractDependencyInjectionSpringContextTests; /** diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/ExitStatusTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/ExitStatusTests.java index b9df67448..5cb916d24 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/ExitStatusTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/ExitStatusTests.java @@ -15,10 +15,10 @@ */ package org.springframework.batch.repeat; -import org.apache.commons.lang.SerializationUtils; - import junit.framework.TestCase; +import org.apache.commons.lang.SerializationUtils; + /** * @author Dave Syer * diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/callback/NestedRepeatCallbackTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/callback/NestedRepeatCallbackTests.java index e50904db6..627d02726 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/callback/NestedRepeatCallbackTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/callback/NestedRepeatCallbackTests.java @@ -18,9 +18,9 @@ package org.springframework.batch.repeat.callback; import junit.framework.TestCase; +import org.springframework.batch.repeat.ExitStatus; import org.springframework.batch.repeat.RepeatCallback; import org.springframework.batch.repeat.RepeatContext; -import org.springframework.batch.repeat.ExitStatus; import org.springframework.batch.repeat.support.RepeatTemplate; public class NestedRepeatCallbackTests extends TestCase { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/RepeatContextCounterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/RepeatContextCounterTests.java index 5f94da4b8..1b3cb0b4e 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/RepeatContextCounterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/RepeatContextCounterTests.java @@ -19,8 +19,6 @@ package org.springframework.batch.repeat.context; import junit.framework.TestCase; import org.springframework.batch.repeat.RepeatContext; -import org.springframework.batch.repeat.context.RepeatContextCounter; -import org.springframework.batch.repeat.context.RepeatContextSupport; public class RepeatContextCounterTests extends TestCase { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/SynchronizedAttributeAccessorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/SynchronizedAttributeAccessorTests.java index fc4580dd4..f0d3f2bdb 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/SynchronizedAttributeAccessorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/SynchronizedAttributeAccessorTests.java @@ -23,7 +23,6 @@ import java.util.Map; import junit.framework.TestCase; -import org.springframework.batch.repeat.context.SynchronizedAttributeAccessor; import org.springframework.core.AttributeAccessorSupport; public class SynchronizedAttributeAccessorTests extends TestCase { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/CompositeRepeatListenerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/CompositeRepeatListenerTests.java index 7e97d70a4..00ac0fe9a 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/CompositeRepeatListenerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/CompositeRepeatListenerTests.java @@ -23,8 +23,6 @@ import junit.framework.TestCase; import org.springframework.batch.repeat.RepeatContext; import org.springframework.batch.repeat.RepeatListener; import org.springframework.batch.repeat.context.RepeatContextSupport; -import org.springframework.batch.repeat.listener.CompositeRepeatListener; -import org.springframework.batch.repeat.listener.RepeatListenerSupport; /** * @author Dave Syer diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/RepeatListenerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/RepeatListenerTests.java index 58da1cd6c..7260928ca 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/RepeatListenerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/RepeatListenerTests.java @@ -25,7 +25,6 @@ import org.springframework.batch.repeat.ExitStatus; import org.springframework.batch.repeat.RepeatCallback; import org.springframework.batch.repeat.RepeatContext; import org.springframework.batch.repeat.RepeatListener; -import org.springframework.batch.repeat.listener.RepeatListenerSupport; import org.springframework.batch.repeat.support.RepeatTemplate; import org.springframework.batch.repeat.support.TaskExecutorRepeatTemplate; import org.springframework.core.task.SimpleAsyncTaskExecutor; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/policy/CompositeCompletionPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/policy/CompositeCompletionPolicyTests.java index 00dfd55ea..7ecfc2a74 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/policy/CompositeCompletionPolicyTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/policy/CompositeCompletionPolicyTests.java @@ -18,9 +18,9 @@ package org.springframework.batch.repeat.policy; import junit.framework.TestCase; +import org.springframework.batch.repeat.CompletionPolicy; import org.springframework.batch.repeat.ExitStatus; import org.springframework.batch.repeat.RepeatContext; -import org.springframework.batch.repeat.CompletionPolicy; public class CompositeCompletionPolicyTests extends TestCase { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AsynchronousRepeatTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AsynchronousRepeatTests.java index 7b056676a..fa5ac5818 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AsynchronousRepeatTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AsynchronousRepeatTests.java @@ -19,9 +19,9 @@ package org.springframework.batch.repeat.support; import java.util.HashSet; import java.util.Set; +import org.springframework.batch.repeat.ExitStatus; import org.springframework.batch.repeat.RepeatCallback; import org.springframework.batch.repeat.RepeatContext; -import org.springframework.batch.repeat.ExitStatus; import org.springframework.batch.repeat.callback.ItemReaderRepeatCallback; import org.springframework.core.task.SimpleAsyncTaskExecutor; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ChunkedRepeatTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ChunkedRepeatTests.java index 56cdbfbbd..729e562bf 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ChunkedRepeatTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ChunkedRepeatTests.java @@ -18,9 +18,9 @@ package org.springframework.batch.repeat.support; import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.reader.AbstractItemReader; +import org.springframework.batch.repeat.ExitStatus; import org.springframework.batch.repeat.RepeatCallback; import org.springframework.batch.repeat.RepeatContext; -import org.springframework.batch.repeat.ExitStatus; import org.springframework.batch.repeat.callback.ItemReaderRepeatCallback; import org.springframework.batch.repeat.callback.NestedRepeatCallback; import org.springframework.batch.repeat.policy.SimpleCompletionPolicy; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/SimpleRepeatTemplateTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/SimpleRepeatTemplateTests.java index 7633d7a45..00f903270 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/SimpleRepeatTemplateTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/SimpleRepeatTemplateTests.java @@ -19,9 +19,9 @@ package org.springframework.batch.repeat.support; import java.util.ArrayList; import java.util.List; +import org.springframework.batch.repeat.ExitStatus; import org.springframework.batch.repeat.RepeatCallback; import org.springframework.batch.repeat.RepeatContext; -import org.springframework.batch.repeat.ExitStatus; import org.springframework.batch.repeat.callback.ItemReaderRepeatCallback; import org.springframework.batch.repeat.callback.NestedRepeatCallback; import org.springframework.batch.repeat.context.RepeatContextSupport; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/synch/RepeatSynchronizationManagerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/synch/RepeatSynchronizationManagerTests.java index 3f348e117..11adcdf3e 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/synch/RepeatSynchronizationManagerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/synch/RepeatSynchronizationManagerTests.java @@ -20,7 +20,6 @@ import junit.framework.TestCase; import org.springframework.batch.repeat.RepeatContext; import org.springframework.batch.repeat.context.RepeatContextSupport; -import org.springframework.batch.repeat.synch.RepeatSynchronizationManager; public class RepeatSynchronizationManagerTests extends TestCase { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/listener/RetryListenerSupportTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/listener/RetryListenerSupportTests.java index 2b449dd30..142385269 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/listener/RetryListenerSupportTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/listener/RetryListenerSupportTests.java @@ -16,8 +16,6 @@ package org.springframework.batch.retry.listener; -import org.springframework.batch.retry.listener.RetryListenerSupport; - import junit.framework.TestCase; public class RetryListenerSupportTests extends TestCase { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/PropertiesConverterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/PropertiesConverterTests.java index c388ff0d1..f962841c3 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/PropertiesConverterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/PropertiesConverterTests.java @@ -18,8 +18,6 @@ package org.springframework.batch.support; import java.util.Properties; -import org.springframework.batch.support.PropertiesConverter; - import junit.framework.TestCase; /** diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcGameDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcGameDao.java index 9a1ef86ff..29871e7e1 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcGameDao.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcGameDao.java @@ -1,8 +1,8 @@ package org.springframework.batch.sample.dao; +import org.springframework.batch.item.ClearFailedException; +import org.springframework.batch.item.FlushFailedException; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.item.exception.ClearFailedException; -import org.springframework.batch.item.exception.FlushFailedException; import org.springframework.batch.sample.domain.Game; import org.springframework.jdbc.core.support.JdbcDaoSupport; import org.springframework.util.Assert; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDao.java index 7dd77d146..25970d1a8 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDao.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDao.java @@ -1,8 +1,8 @@ package org.springframework.batch.sample.dao; +import org.springframework.batch.item.ClearFailedException; +import org.springframework.batch.item.FlushFailedException; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.item.exception.ClearFailedException; -import org.springframework.batch.item.exception.FlushFailedException; import org.springframework.batch.sample.domain.PlayerSummary; import org.springframework.jdbc.core.support.JdbcDaoSupport; import org.springframework.util.Assert; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/GeneratingItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/GeneratingItemReader.java index e247d67ec..240b32442 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/GeneratingItemReader.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/GeneratingItemReader.java @@ -4,8 +4,8 @@ import java.math.BigDecimal; import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.ItemRecoverer; -import org.springframework.batch.item.exception.MarkFailedException; -import org.springframework.batch.item.exception.ResetFailedException; +import org.springframework.batch.item.MarkFailedException; +import org.springframework.batch.item.ResetFailedException; import org.springframework.batch.sample.domain.Trade; /** diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/InfiniteItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/InfiniteItemReader.java index 6bd1b78e0..5ab4c5c6b 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/InfiniteItemReader.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/InfiniteItemReader.java @@ -3,8 +3,8 @@ package org.springframework.batch.sample.item.reader; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.batch.item.ItemReader; -import org.springframework.batch.item.exception.MarkFailedException; -import org.springframework.batch.item.exception.ResetFailedException; +import org.springframework.batch.item.MarkFailedException; +import org.springframework.batch.item.ResetFailedException; /** diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/StagingItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/StagingItemReader.java index f54b2f145..ffd8fda5f 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/StagingItemReader.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/StagingItemReader.java @@ -14,7 +14,7 @@ import org.springframework.batch.core.StepListener; import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.ItemStream; -import org.springframework.batch.item.exception.StreamException; +import org.springframework.batch.item.ReaderNotOpenException; import org.springframework.batch.repeat.ExitStatus; import org.springframework.batch.sample.item.writer.StagingItemWriter; import org.springframework.dao.OptimisticLockingFailureException; @@ -41,9 +41,10 @@ public class StagingItemReader extends JdbcDaoSupport implements ItemStream, Ite private volatile boolean initialized = false; private volatile Iterator keys; - + /** * Public setter for the {@link LobHandler}. + * * @param lobHandler the {@link LobHandler} to set (defaults to {@link DefaultLobHandler}). */ public void setLobHandler(LobHandler lobHandler) { @@ -106,25 +107,25 @@ public class StagingItemReader extends JdbcDaoSupport implements ItemStream, Ite return null; } Object result = getJdbcTemplate().queryForObject("SELECT VALUE FROM BATCH_STAGING WHERE ID=?", - new Object[] { id }, new RowMapper() { - public Object mapRow(ResultSet rs, int rowNum) throws SQLException { - byte[] blob = lobHandler.getBlobAsBytes(rs, 1); - return SerializationUtils.deserialize(blob); - } - }); + new Object[] { id }, new RowMapper() { + public Object mapRow(ResultSet rs, int rowNum) throws SQLException { + byte[] blob = lobHandler.getBlobAsBytes(rs, 1); + return SerializationUtils.deserialize(blob); + } + }); // Update now - changes will rollback if there is a problem later. int count = getJdbcTemplate().update("UPDATE BATCH_STAGING SET PROCESSED=? WHERE ID=? AND PROCESSED=?", - new Object[] { StagingItemWriter.DONE, id, StagingItemWriter.NEW }); + new Object[] { StagingItemWriter.DONE, id, StagingItemWriter.NEW }); if (count != 1) { throw new OptimisticLockingFailureException("The staging record with ID=" + id - + " was updated concurrently when trying to mark as complete (updated " + count + " records."); + + " was updated concurrently when trying to mark as complete (updated " + count + " records."); } return result; } private Long doRead() { if (!initialized) { - throw new StreamException("ItemStream must be open before it can be read."); + throw new ReaderNotOpenException("ItemStream must be open before it can be read."); } Long key = getBuffer().next(); @@ -132,15 +133,14 @@ public class StagingItemReader extends JdbcDaoSupport implements ItemStream, Ite synchronized (lock) { if (keys.hasNext()) { Assert.state(TransactionSynchronizationManager.isActualTransactionActive(), - "Transaction not active for this thread."); + "Transaction not active for this thread."); Long next = (Long) keys.next(); getBuffer().add(next); key = next; logger.debug("Retrieved key from list: " + key); } } - } - else { + } else { logger.debug("Retrieved key from buffer: " + key); } return key; @@ -192,12 +192,9 @@ public class StagingItemReader extends JdbcDaoSupport implements ItemStream, Ite } /** - * Mark is supported in a multi- as well as a single-threaded environment. - * The state backing the mark is a buffer, and access is synchronized, so - * multiple threads can be accommodated. Buffers are stored as transaction - * resources (using - * {@link TransactionSynchronizationManager#bindResource(Object, Object)}), - * so they are thread bound. + * Mark is supported in a multi- as well as a single-threaded environment. The state backing the mark is a buffer, + * and access is synchronized, so multiple threads can be accommodated. Buffers are stored as transaction resources + * (using {@link TransactionSynchronizationManager#bindResource(Object, Object)}), so they are thread bound. * * @see org.springframework.batch.item.ItemReader#mark() */ @@ -222,21 +219,27 @@ public class StagingItemReader extends JdbcDaoSupport implements ItemStream, Ite public void update(ExecutionContext executionContext) { } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see org.springframework.batch.core.domain.StepListener#afterStep(StepExecution) */ public ExitStatus afterStep(StepExecution stepExecution) { return null; } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see org.springframework.batch.core.domain.StepListener#beforeStep(org.springframework.batch.core.domain.StepExecution) */ public void beforeStep(StepExecution stepExecution) { this.stepExecution = stepExecution; } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see org.springframework.batch.core.domain.StepListener#onErrorInStep(java.lang.Throwable) */ public ExitStatus onErrorInStep(StepExecution stepExecution, Throwable e) { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/BatchSqlCustomerCreditIncreaseWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/BatchSqlCustomerCreditIncreaseWriter.java index bfda0bc82..1dbb55fe4 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/BatchSqlCustomerCreditIncreaseWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/BatchSqlCustomerCreditIncreaseWriter.java @@ -3,9 +3,9 @@ package org.springframework.batch.sample.item.writer; import java.math.BigDecimal; import org.springframework.batch.io.support.BatchSqlUpdateItemWriter; +import org.springframework.batch.item.ClearFailedException; +import org.springframework.batch.item.FlushFailedException; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.item.exception.ClearFailedException; -import org.springframework.batch.item.exception.FlushFailedException; import org.springframework.batch.sample.domain.CustomerCredit; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/DummyItemWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/DummyItemWriter.java index d6ea77577..e79f9e34a 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/DummyItemWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/DummyItemWriter.java @@ -15,9 +15,9 @@ */ package org.springframework.batch.sample.item.writer; +import org.springframework.batch.item.ClearFailedException; +import org.springframework.batch.item.FlushFailedException; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.item.exception.ClearFailedException; -import org.springframework.batch.item.exception.FlushFailedException; /** * @author Dave Syer diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/StagingItemWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/StagingItemWriter.java index 2582e64b6..f2bbcf703 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/StagingItemWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/StagingItemWriter.java @@ -7,9 +7,9 @@ import java.sql.SQLException; import org.apache.commons.lang.SerializationUtils; import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.StepListener; +import org.springframework.batch.item.ClearFailedException; +import org.springframework.batch.item.FlushFailedException; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.item.exception.ClearFailedException; -import org.springframework.batch.item.exception.FlushFailedException; import org.springframework.batch.repeat.ExitStatus; import org.springframework.jdbc.core.PreparedStatementSetter; import org.springframework.jdbc.core.support.JdbcDaoSupport; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/SimpleTradeWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/SimpleTradeWriter.java index c91d1d1cd..710300d01 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/SimpleTradeWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/SimpleTradeWriter.java @@ -19,7 +19,7 @@ package org.springframework.batch.sample.tasklet; import org.springframework.batch.core.tasklet.Tasklet; import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.item.ItemStream; -import org.springframework.batch.item.exception.StreamException; +import org.springframework.batch.item.ItemStreamException; import org.springframework.batch.item.writer.AbstractItemWriter; import org.springframework.batch.sample.dao.TradeDao; import org.springframework.batch.sample.domain.Trade; @@ -67,7 +67,7 @@ public class SimpleTradeWriter extends AbstractItemWriter implements ItemStream this.tradeDao = tradeDao; } - public void open(ExecutionContext context) throws StreamException { + public void open(ExecutionContext context) throws ItemStreamException { } /* (non-Javadoc) @@ -77,6 +77,6 @@ public class SimpleTradeWriter extends AbstractItemWriter implements ItemStream executionContext.putLong("trade.count", tradeCount); } - public void close(ExecutionContext executionContext) throws StreamException { + public void close(ExecutionContext executionContext) throws ItemStreamException { } }