diff --git a/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/ExcelFileParseException.java b/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/ExcelFileParseException.java index 8517869..d3690cb 100644 --- a/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/ExcelFileParseException.java +++ b/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/ExcelFileParseException.java @@ -27,11 +27,6 @@ import org.springframework.batch.item.ParseException; */ public class ExcelFileParseException extends ParseException { - /** - * - */ - private static final long serialVersionUID = -3939056060545496492L; - private final String filename; private final String sheet; private final String[] row; diff --git a/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/jxl/JxlSheet.java b/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/jxl/JxlSheet.java index b22ab9e..ed0dcdf 100644 --- a/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/jxl/JxlSheet.java +++ b/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/jxl/JxlSheet.java @@ -43,6 +43,7 @@ public class JxlSheet implements Sheet { /** * {@inheritDoc} */ + @Override public int getNumberOfRows() { return this.delegate.getRows(); } @@ -50,6 +51,7 @@ public class JxlSheet implements Sheet { /** * {@inheritDoc} */ + @Override public String[] getHeader() { return this.getRow(0); } @@ -57,6 +59,7 @@ public class JxlSheet implements Sheet { /** * {@inheritDoc} */ + @Override public String[] getRow(final int rowNumber) { final Cell[] row = this.delegate.getRow(rowNumber); return JxlUtils.extractContents(row); @@ -65,6 +68,7 @@ public class JxlSheet implements Sheet { /** * {@inheritDoc} */ + @Override public String getName() { return this.delegate.getName(); } @@ -72,6 +76,7 @@ public class JxlSheet implements Sheet { /** * {@inheritDoc} */ + @Override public int getNumberOfColumns() { return this.delegate.getColumns(); } diff --git a/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/mapping/DefaultRowMapper.java b/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/mapping/DefaultRowMapper.java index e6dd86d..70dd89b 100644 --- a/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/mapping/DefaultRowMapper.java +++ b/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/mapping/DefaultRowMapper.java @@ -39,6 +39,7 @@ public class DefaultRowMapper implements RowMapper, InitializingBean { private RowTokenizer rowTokenizer = new DefaultRowTokenizer(); private FieldSetMapper fieldSetMapper; + @Override public T mapRow(final Sheet sheet, final String[] row, final int rowNum) throws Exception { return this.fieldSetMapper.mapFieldSet(this.rowTokenizer.tokenize(sheet, row)); } @@ -56,6 +57,7 @@ public class DefaultRowMapper implements RowMapper, InitializingBean { this.rowTokenizer = rowTokenizer; } + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(this.rowTokenizer, "The RowTokenizer must be set"); Assert.notNull(this.fieldSetMapper, "The FieldSetMapper must be set"); diff --git a/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/mapping/PassThroughRowMapper.java b/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/mapping/PassThroughRowMapper.java index c4245fc..9fdcbf6 100644 --- a/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/mapping/PassThroughRowMapper.java +++ b/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/mapping/PassThroughRowMapper.java @@ -28,6 +28,7 @@ import org.springframework.batch.item.excel.Sheet; */ public class PassThroughRowMapper implements RowMapper { + @Override public String[] mapRow(final Sheet sheet, final String[] row, final int rowNum) throws Exception { return row; } diff --git a/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/poi/PoiSheet.java b/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/poi/PoiSheet.java index d489e59..f50ecde 100644 --- a/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/poi/PoiSheet.java +++ b/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/poi/PoiSheet.java @@ -47,6 +47,7 @@ public class PoiSheet implements Sheet { /** * {@inheritDoc} */ + @Override public int getNumberOfRows() { return this.delegate.getLastRowNum() + 1; } @@ -54,6 +55,7 @@ public class PoiSheet implements Sheet { /** * {@inheritDoc} */ + @Override public String getName() { return this.delegate.getSheetName(); } @@ -61,6 +63,7 @@ public class PoiSheet implements Sheet { /** * {@inheritDoc} */ + @Override public String[] getRow(final int rowNumber) { if (rowNumber > this.delegate.getLastRowNum()) { return null; @@ -94,6 +97,7 @@ public class PoiSheet implements Sheet { /** * {@inheritDoc} */ + @Override public String[] getHeader() { return this.getRow(0); } @@ -101,6 +105,7 @@ public class PoiSheet implements Sheet { /** * {@inheritDoc} */ + @Override public int getNumberOfColumns() { final String[] columns = this.getHeader(); if (columns != null) { diff --git a/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/transform/DefaultRowTokenizer.java b/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/transform/DefaultRowTokenizer.java index 7b0ce7e..04deff4 100644 --- a/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/transform/DefaultRowTokenizer.java +++ b/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/transform/DefaultRowTokenizer.java @@ -40,6 +40,7 @@ public class DefaultRowTokenizer implements RowTokenizer, InitializingBean { private boolean includeSheetName = false; private String attributeForSheetName = null; + @Override public FieldSet tokenize(final Sheet sheet, final String[] row) { String[] values = new String[sheet.getNumberOfColumns()]; System.arraycopy(row, 0, values, 0, row.length); diff --git a/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/transform/MappingColumnToAttributeConverter.java b/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/transform/MappingColumnToAttributeConverter.java index 390cb6f..a1b5e73 100644 --- a/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/transform/MappingColumnToAttributeConverter.java +++ b/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/transform/MappingColumnToAttributeConverter.java @@ -31,6 +31,7 @@ public class MappingColumnToAttributeConverter implements ColumnToAttributeConve private final Map mapping = new HashMap(); + @Override public String toAttribute(final String column) { if (this.mapping.containsKey(column)) { return this.mapping.get(column); @@ -38,6 +39,7 @@ public class MappingColumnToAttributeConverter implements ColumnToAttributeConve return column; } + @Override public String toColumn(final String attribute) { if (this.mapping.containsValue(attribute)) { for (Map.Entry entry : this.mapping.entrySet()) { diff --git a/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/transform/PassThroughColumnToAttributeConverter.java b/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/transform/PassThroughColumnToAttributeConverter.java index bb8544e..0b99d93 100644 --- a/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/transform/PassThroughColumnToAttributeConverter.java +++ b/spring-batch-excel/src/main/java/org/springframework/batch/item/excel/transform/PassThroughColumnToAttributeConverter.java @@ -23,10 +23,12 @@ package org.springframework.batch.item.excel.transform; */ public class PassThroughColumnToAttributeConverter implements ColumnToAttributeConverter { + @Override public String toAttribute(final String column) { return column; } + @Override public String toColumn(final String attribute) { return attribute; }