diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java index ec51cb6a3..c016ce5d0 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java @@ -246,10 +246,7 @@ public class BeanWrapperFieldSetMapper extends DefaultPropertyEditorRegistrar try { return type.newInstance(); } - catch (InstantiationException e) { - ReflectionUtils.handleReflectionException(e); - } - catch (IllegalAccessException e) { + catch (InstantiationException | IllegalAccessException e) { ReflectionUtils.handleReflectionException(e); } // should not happen @@ -370,10 +367,7 @@ public class BeanWrapperFieldSetMapper extends DefaultPropertyEditorRegistrar nestedValue = wrapper.getPropertyType(nestedName).newInstance(); wrapper.setPropertyValue(nestedName, nestedValue); } - catch (InstantiationException e) { - ReflectionUtils.handleReflectionException(e); - } - catch (IllegalAccessException e) { + catch (InstantiationException | IllegalAccessException e) { ReflectionUtils.handleReflectionException(e); } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/RecursiveCollectionLineAggregator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/RecursiveCollectionLineAggregator.java index 4ab2beab5..7948cef2d 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/RecursiveCollectionLineAggregator.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/RecursiveCollectionLineAggregator.java @@ -30,7 +30,7 @@ public class RecursiveCollectionLineAggregator implements LineAggregator delegate = new PassThroughLineAggregator(); + private LineAggregator delegate = new PassThroughLineAggregator<>(); /** * Public setter for the {@link LineAggregator} to use on single items, that @@ -47,13 +47,13 @@ public class RecursiveCollectionLineAggregator implements LineAggregator items) { StringBuilder builder = new StringBuilder(); for (T value : items) { - builder.append(delegate.aggregate(value) + LINE_SEPARATOR); + builder.append(delegate.aggregate(value)).append(LINE_SEPARATOR); } - return builder.delete(builder.length()-LINE_SEPARATOR.length(),builder.length()).toString(); + return builder.delete(builder.length() - LINE_SEPARATOR.length(), builder.length()).toString(); } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/IteratorItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/IteratorItemReader.java index 9cbcbc159..c6da82aae 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/IteratorItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/IteratorItemReader.java @@ -64,7 +64,7 @@ public class IteratorItemReader implements ItemReader { * iterator provided. */ @Override - public T read() throws Exception, UnexpectedInputException, ParseException { + public T read() { if (iterator.hasNext()) return iterator.next(); else