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

Minor refactoring

Browse Source 
* Remove unneeded exception declarations
* Collapse catch blocks
* Replace string concatenation with builder append
This commit is contained in:
Stefano Cordio
2018-04-26 22:02:34 +02:00
committed by Mahmoud Ben Hassine
parent dca16fb5bd
commit df2e778fbd
3 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java
View File

@@ -246,10 +246,7 @@ public class BeanWrapperFieldSetMapper<T> 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<T> 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);
}
}

8
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/RecursiveCollectionLineAggregator.java
View File

@@ -30,7 +30,7 @@ public class RecursiveCollectionLineAggregator<T> implements LineAggregator<Coll
private static final String LINE_SEPARATOR = System.getProperty("line.separator");
private LineAggregator<T> delegate = new PassThroughLineAggregator<T>();
private LineAggregator<T> delegate = new PassThroughLineAggregator<>();
/**
* Public setter for the {@link LineAggregator} to use on single items, that
@@ -47,13 +47,13 @@ public class RecursiveCollectionLineAggregator<T> implements LineAggregator<Coll
* (non-Javadoc)
* @see org.springframework.batch.item.file.transform.LineAggregator#aggregate(java.lang.Object)
*/
@Override
@Override
public String aggregate(Collection<T> 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();
}
}

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/IteratorItemReader.java
View File

@@ -64,7 +64,7 @@ public class IteratorItemReader<T> implements ItemReader<T> {
* iterator provided.
*/
@Override
public T read() throws Exception, UnexpectedInputException, ParseException {
public T read() {
if (iterator.hasNext())
return iterator.next();
else