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

Replace explicit type with diamond operator in infrastructure module

Browse Source
This commit is contained in:
Drummond Dawson
2018-10-09 19:45:51 -04:00
committed by Mahmoud Ben Hassine
parent 3902837c3c
commit 424514a17b
147 changed files with 358 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/SpELMappingGemfireItemWriter.java
View File

@@ -29,6 +29,6 @@ public class SpELMappingGemfireItemWriter<K, V> extends GemfireItemWriter<K, V>
SpELMappingGemfireItemWriter(String keyExpression) {
super();
Assert.hasText(keyExpression, "a valid keyExpression is required.");
setItemKeyMapper(new SpELItemKeyMapper<K, V>(keyExpression));
setItemKeyMapper(new SpELItemKeyMapper<>(keyExpression));
}
}

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernatePagingItemReader.java
View File

@@ -159,7 +159,7 @@ public class HibernatePagingItemReader<T> extends AbstractPagingItemReader<T>
protected void doReadPage() {
if (results == null) {
results = new CopyOnWriteArrayList<T>();
results = new CopyOnWriteArrayList<>();
}
else {
results.clear();

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcParameterUtils.java
View File

@@ -55,7 +55,7 @@ public class JdbcParameterUtils {
char[] statement = sql.toCharArray();
boolean withinQuotes = false;
Map<String, StringBuilder> namedParameters = new HashMap<String, StringBuilder>();
Map<String, StringBuilder> namedParameters = new HashMap<>();
char currentQuote = '-';
int parameterCount = 0;
int i = 0;

6
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/AbstractSqlPagingQueryProvider.java
View File

@@ -60,7 +60,7 @@ public abstract class AbstractSqlPagingQueryProvider implements PagingQueryProvi
private String whereClause;
private Map<String, Order> sortKeys = new LinkedHashMap<String, Order>();
private Map<String, Order> sortKeys = new LinkedHashMap<>();
private String groupClause;
@@ -198,7 +198,7 @@ public abstract class AbstractSqlPagingQueryProvider implements PagingQueryProvi
if(groupClause != null) {
sql.append(" GROUP BY ").append(groupClause);
}
List<String> namedParameters = new ArrayList<String>();
List<String> namedParameters = new ArrayList<>();
parameterCount = JdbcParameterUtils.countParameterPlaceholders(sql.toString(), namedParameters);
if (namedParameters.size() > 0) {
if (parameterCount != namedParameters.size()) {
@@ -257,7 +257,7 @@ public abstract class AbstractSqlPagingQueryProvider implements PagingQueryProvi
*/
@Override
public Map<String, Order> getSortKeysWithoutAliases() {
Map<String, Order> sortKeysWithoutAliases = new LinkedHashMap<String, Order>();
Map<String, Order> sortKeysWithoutAliases = new LinkedHashMap<>();
for (Map.Entry<String, Order> sortKeyEntry : sortKeys.entrySet()) {
String key = sortKeyEntry.getKey();

4
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlPagingQueryProviderFactoryBean.java
View File

@@ -67,7 +67,7 @@ public class SqlPagingQueryProviderFactoryBean implements FactoryBean<PagingQuer
private Map<String, Order> sortKeys;
private Map<DatabaseType, AbstractSqlPagingQueryProvider> providers = new HashMap<DatabaseType, AbstractSqlPagingQueryProvider>();
private Map<DatabaseType, AbstractSqlPagingQueryProvider> providers = new HashMap<>();
{
@@ -138,7 +138,7 @@ public class SqlPagingQueryProviderFactoryBean implements FactoryBean<PagingQuer
public void setSortKey(String key) {
Assert.doesNotContain(key, ",", "String setter is valid for a single ASC key only");
Map<String, Order> keys = new LinkedHashMap<String, Order>();
Map<String, Order> keys = new LinkedHashMap<>();
keys.put(key, Order.ASCENDING);
this.sortKeys = keys;

4
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlPagingQueryUtils.java
View File

@@ -290,8 +290,8 @@ public class SqlPagingQueryUtils {
*/
public static void buildSortConditions(
AbstractSqlPagingQueryProvider provider, StringBuilder sql) {
List<Map.Entry<String, Order>> keys = new ArrayList<Map.Entry<String,Order>>(provider.getSortKeys().entrySet());
List<String> clauses = new ArrayList<String>();
List<Map.Entry<String, Order>> keys = new ArrayList<>(provider.getSortKeys().entrySet());
List<String> clauses = new ArrayList<>();
for(int i = 0; i < keys.size(); i++) {
StringBuilder clause = new StringBuilder();

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

@@ -123,7 +123,7 @@ public class SqlWindowingPagingQueryProvider extends AbstractSqlPagingQueryProvi
private Map<String, Order> getSortKeysReplaced(Object qualifierReplacement) {
final String newQualifier = "" + qualifierReplacement;
final Map<String, Order> sortKeys = new LinkedHashMap<String, Order>();
final Map<String, Order> sortKeys = new LinkedHashMap<>();
for (Map.Entry<String, Order> sortKey : getSortKeys().entrySet()) {
sortKeys.put(sortKey.getKey().replaceFirst("^.*\\.", newQualifier), sortKey.getValue());
}

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

@@ -102,7 +102,7 @@ public class BeanWrapperFieldSetMapper<T> extends DefaultPropertyEditorRegistrar
private BeanFactory beanFactory;
private ConcurrentMap<DistanceHolder, ConcurrentMap<String, String>> propertiesMatched = new ConcurrentHashMap<DistanceHolder, ConcurrentMap<String, String>>();
private ConcurrentMap<DistanceHolder, ConcurrentMap<String, String>> propertiesMatched = new ConcurrentHashMap<>();
private int distanceLimit = 5;

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

@@ -80,6 +80,6 @@ public class PatternMatchingCompositeLineMapper<T> implements LineMapper<T>, Ini
public void setFieldSetMappers(Map<String, FieldSetMapper<T>> fieldSetMappers) {
Assert.isTrue(!fieldSetMappers.isEmpty(), "The 'fieldSetMappers' property must be non-empty");
this.patternMatcher = new PatternMatcher<FieldSetMapper<T>>(fieldSetMappers);
this.patternMatcher = new PatternMatcher<>(fieldSetMappers);
}
}

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

@@ -134,7 +134,7 @@ final class PropertyMatches {
* @param maxDistance the maximum distance to accept
*/
private String[] calculateMatches(PropertyDescriptor[] propertyDescriptors, int maxDistance) {
List<String> candidates = new ArrayList<String>();
List<String> candidates = new ArrayList<>();
for (int i = 0; i < propertyDescriptors.length; i++) {
if (propertyDescriptors[i].getWriteMethod() != null) {
String possibleAlternative = propertyDescriptors[i].getName();

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

@@ -126,7 +126,7 @@ public abstract class AbstractLineTokenizer implements LineTokenizer {
line = "";
}
List<String> tokens = new ArrayList<String>(doTokenize(line));
List<String> tokens = new ArrayList<>(doTokenize(line));
// if names are set and strict flag is false
if ( ( names.length != 0 ) && ( ! strict ) ) {

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

@@ -50,7 +50,7 @@ public class BeanWrapperFieldExtractor<T> implements FieldExtractor<T>, Initiali
*/
@Override
public Object[] extract(T item) {
List<Object> values = new ArrayList<Object>();
List<Object> values = new ArrayList<>();
BeanWrapper bw = new BeanWrapperImpl(item);
for (String propertyName : this.names) {

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

@@ -28,7 +28,7 @@ import org.springframework.util.Assert;
*/
public abstract class ExtractorLineAggregator<T> implements LineAggregator<T> {
private FieldExtractor<T> fieldExtractor = new PassThroughFieldExtractor<T>();
private FieldExtractor<T> fieldExtractor = new PassThroughFieldExtractor<>();
/**
* Public setter for the field extractor responsible for splitting an input

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

@@ -99,7 +99,7 @@ public class FixedLengthTokenizer extends AbstractLineTokenizer {
*/
@Override
protected List<String> doTokenize(String line) {
List<String> tokens = new ArrayList<String>(ranges.length);
List<String> tokens = new ArrayList<>(ranges.length);
int lineLength;
String token;

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

@@ -63,6 +63,6 @@ public class PatternMatchingCompositeLineTokenizer implements LineTokenizer, Ini
public void setTokenizers(Map<String, LineTokenizer> tokenizers) {
Assert.isTrue(!tokenizers.isEmpty(), "The 'tokenizers' property must be non-empty");
this.tokenizers = new PatternMatcher<LineTokenizer>(tokenizers);
this.tokenizers = new PatternMatcher<>(tokenizers);
}
}

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

@@ -58,7 +58,7 @@ public class RegexLineTokenizer extends AbstractLineTokenizer {
boolean matchFound = matcher.find();
if (matchFound) {
List<String> tokens = new ArrayList<String>(matcher.groupCount());
List<String> tokens = new ArrayList<>(matcher.groupCount());
for (int i = 1; i <= matcher.groupCount(); i++) {
tokens.add(matcher.group(i));
}

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

@@ -33,7 +33,7 @@ import org.springframework.classify.ClassifierSupport;
public class ClassifierCompositeItemProcessor<I,O> implements ItemProcessor<I, O> {
private Classifier<? super I, ItemProcessor<?, ? extends O>> classifier =
new ClassifierSupport<I, ItemProcessor<?, ? extends O>> (null);
new ClassifierSupport<> (null);
/**
* Establishes the classifier that will determine which {@link ItemProcessor} to use.

6
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ClassifierCompositeItemWriter.java
View File

@@ -38,7 +38,7 @@ import org.springframework.util.Assert;
*/
public class ClassifierCompositeItemWriter<T> implements ItemWriter<T> {
private Classifier<T, ItemWriter<? super T>> classifier = new ClassifierSupport<T, ItemWriter<? super T>>(null);
private Classifier<T, ItemWriter<? super T>> classifier = new ClassifierSupport<>(null);
/**
* @param classifier the classifier to set
@@ -55,12 +55,12 @@ public class ClassifierCompositeItemWriter<T> implements ItemWriter<T> {
@Override
public void write(List<? extends T> items) throws Exception {
Map<ItemWriter<? super T>, List<T>> map = new LinkedHashMap<ItemWriter<? super T>, List<T>>();
Map<ItemWriter<? super T>, List<T>> map = new LinkedHashMap<>();
for (T item : items) {
ItemWriter<? super T> key = classifier.classify(item);
if (!map.containsKey(key)) {
map.put(key, new ArrayList<T>());
map.put(key, new ArrayList<>());
}
map.get(key).add(item);
}

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

@@ -31,7 +31,7 @@ import org.springframework.batch.item.ItemStreamException;
*/
public class CompositeItemStream implements ItemStream {
private List<ItemStream> streams = new ArrayList<ItemStream>();
private List<ItemStream> streams = new ArrayList<>();
/**
* Public setter for the {@link ItemStream}s.

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

@@ -39,7 +39,7 @@ public class ListItemReader<T> implements ItemReader<T> {
this.list = list;
}
else {
this.list = new ArrayList<T>(list);
this.list = new ArrayList<>(list);
}
}

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

@@ -25,7 +25,7 @@ import java.util.List;
*/
public class ListItemWriter<T> implements ItemWriter<T> {
private List<T> writtenItems = new ArrayList<T>();
private List<T> writtenItems = new ArrayList<>();
@Override
public void write(List<? extends T> items) throws Exception {

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

@@ -56,7 +56,7 @@ public class ScriptItemProcessor<I, O> implements ItemProcessor<I, O>, Initializ
@Override
@SuppressWarnings("unchecked")
public O process(I item) throws Exception {
Map<String, Object> arguments = new HashMap<String, Object>();
Map<String, Object> arguments = new HashMap<>();
arguments.put(itemBindingVariableName, item);
return (O) scriptEvaluator.evaluate(getScriptSource(), arguments);

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java
View File

@@ -112,7 +112,7 @@ ResourceAwareItemReaderItemStream<T>, InitializingBean {
* @param fragmentRootElementNames list of the names of the root element of the fragment
*/
public void setFragmentRootElementNames(String[] fragmentRootElementNames) {
this.fragmentRootElementNames = new ArrayList<QName>();
this.fragmentRootElementNames = new ArrayList<>();
for (String fragmentRootElementName : fragmentRootElementNames) {
this.fragmentRootElementNames.add(parseFragmentRootElementName(fragmentRootElementName));
}

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/UnclosedElementCollectingEventWriter.java
View File

@@ -32,7 +32,7 @@ import javax.xml.stream.events.XMLEvent;
*/
public class UnclosedElementCollectingEventWriter extends AbstractEventWriterWrapper {
private LinkedList<QName> unclosedElements = new LinkedList<QName>();
private LinkedList<QName> unclosedElements = new LinkedList<>();
public UnclosedElementCollectingEventWriter(XMLEventWriter wrappedEventWriter) {
super(wrappedEventWriter);

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/UnopenedElementClosingEventWriter.java
View File

@@ -44,7 +44,7 @@ public class UnopenedElementClosingEventWriter extends AbstractEventWriterWrappe
public UnopenedElementClosingEventWriter(XMLEventWriter wrappedEventWriter, Writer ioWriter, List<QName> unopenedElements) {
super(wrappedEventWriter);
this.unopenedElements = new LinkedList<QName>(unopenedElements);
this.unopenedElements = new LinkedList<>(unopenedElements);
this.ioWriter = ioWriter;
}

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/poller/DirectPoller.java
View File

@@ -48,7 +48,7 @@ public class DirectPoller<S> implements Poller<S> {
*/
@Override
public Future<S> poll(Callable<S> callable) throws Exception {
return new DirectPollingFuture<S>(interval, callable);
return new DirectPollingFuture<>(interval, callable);
}
private static class DirectPollingFuture<S> implements Future<S> {

8
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/context/RepeatContextSupport.java
View File

@@ -35,7 +35,7 @@ public class RepeatContextSupport extends SynchronizedAttributeAccessor implemen
private volatile boolean terminateOnly;
private Map<String, Set<Runnable>> callbacks = new HashMap<String, Set<Runnable>>();
private Map<String, Set<Runnable>> callbacks = new HashMap<>();
/**
* Constructor for {@link RepeatContextSupport}. The parent can be null, but
@@ -128,7 +128,7 @@ public class RepeatContextSupport extends SynchronizedAttributeAccessor implemen
synchronized (callbacks) {
Set<Runnable> set = callbacks.get(name);
if (set == null) {
set = new HashSet<Runnable>();
set = new HashSet<>();
callbacks.put(name, set);
}
set.add(callback);
@@ -143,12 +143,12 @@ public class RepeatContextSupport extends SynchronizedAttributeAccessor implemen
@Override
public void close() {
List<RuntimeException> errors = new ArrayList<RuntimeException>();
List<RuntimeException> errors = new ArrayList<>();
Set<Map.Entry<String, Set<Runnable>>> copy;
synchronized (callbacks) {
copy = new HashSet<Map.Entry<String, Set<Runnable>>>(callbacks.entrySet());
copy = new HashSet<>(callbacks.entrySet());
}
for (Map.Entry<String, Set<Runnable>> entry : copy) {

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/LogOrRethrowExceptionHandler.java
View File

@@ -70,7 +70,7 @@ public class LogOrRethrowExceptionHandler implements ExceptionHandler {
protected final Log logger = LogFactory.getLog(LogOrRethrowExceptionHandler.class);
private Classifier<Throwable, Level> exceptionClassifier = new ClassifierSupport<Throwable, Level>(Level.RETHROW);
private Classifier<Throwable, Level> exceptionClassifier = new ClassifierSupport<>(Level.RETHROW);
/**
* Setter for the {@link Classifier} used by this handler. The default is to

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/RethrowOnThresholdExceptionHandler.java
View File

@@ -73,7 +73,7 @@ public class RethrowOnThresholdExceptionHandler implements ExceptionHandler {
* @param thresholds the threshold value map.
*/
public void setThresholds(Map<Class<? extends Throwable>, Integer> thresholds) {
Map<Class<? extends Throwable>, IntegerHolder> typeMap = new HashMap<Class<? extends Throwable>, IntegerHolder>();
Map<Class<? extends Throwable>, IntegerHolder> typeMap = new HashMap<>();
for (Entry<Class<? extends Throwable>, Integer> entry : thresholds.entrySet()) {
typeMap.put(entry.getKey(), new IntegerHolder(entry.getValue()));
}

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/SimpleLimitExceptionHandler.java
View File

@@ -57,7 +57,7 @@ public class SimpleLimitExceptionHandler implements ExceptionHandler, Initializi
if (limit <= 0) {
return;
}
Map<Class<? extends Throwable>, Integer> thresholds = new HashMap<Class<? extends Throwable>, Integer>();
Map<Class<? extends Throwable>, Integer> thresholds = new HashMap<>();
for (Class<? extends Throwable> type : exceptionClasses) {
thresholds.put(type, limit);
}

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/listener/CompositeRepeatListener.java
View File

@@ -31,7 +31,7 @@ import org.springframework.batch.repeat.RepeatListener;
*/
public class CompositeRepeatListener implements RepeatListener {
private List<RepeatListener> listeners = new ArrayList<RepeatListener>();
private List<RepeatListener> listeners = new ArrayList<>();
/**
* Public setter for the listeners.

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/CompositeCompletionPolicy.java
View File

@@ -88,7 +88,7 @@ public class CompositeCompletionPolicy implements CompletionPolicy {
*/
@Override
public RepeatContext start(RepeatContext context) {
List<RepeatContext> list = new ArrayList<RepeatContext>();
List<RepeatContext> list = new ArrayList<>();
for (int i = 0; i < policies.length; i++) {
list.add(policies[i].start(context));
}

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatInternalStateSupport.java
View File

@@ -23,7 +23,7 @@ import java.util.Set;
public class RepeatInternalStateSupport implements RepeatInternalState {
// Accumulation of failed results.
private final Set<Throwable> throwables = new HashSet<Throwable>();
private final Set<Throwable> throwables = new HashSet<>();
/* (non-Javadoc)
* @see org.springframework.batch.repeat.support.BatchInternalState#getThrowables()

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatSynchronizationManager.java
View File

@@ -35,7 +35,7 @@ import org.springframework.batch.repeat.RepeatOperations;
*/
public final class RepeatSynchronizationManager {
private static final ThreadLocal<RepeatContext> contextHolder = new ThreadLocal<RepeatContext>();
private static final ThreadLocal<RepeatContext> contextHolder = new ThreadLocal<>();
private RepeatSynchronizationManager() {
}

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/ResultHolderResultQueue.java
View File

@@ -47,7 +47,7 @@ public class ResultHolderResultQueue implements ResultQueue<ResultHolder> {
* at any given time.
*/
public ResultHolderResultQueue(int throttleLimit) {
results = new PriorityBlockingQueue<ResultHolder>(throttleLimit, new ResultHolderComparator());
results = new PriorityBlockingQueue<>(throttleLimit, new ResultHolderComparator());
waits = new Semaphore(throttleLimit);
}

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/ThrottleLimitResultQueue.java
View File

@@ -44,7 +44,7 @@ public class ThrottleLimitResultQueue<T> implements ResultQueue<T> {
* at any given time.
*/
public ThrottleLimitResultQueue(int throttleLimit) {
results = new LinkedBlockingQueue<T>();
results = new LinkedBlockingQueue<>();
waits = new Semaphore(throttleLimit);
}

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

@@ -91,7 +91,7 @@ public class AnnotationMethodResolver implements MethodResolver {
@Override
public Method findMethod(final Class<?> clazz) {
Assert.notNull(clazz, "class must not be null");
final AtomicReference<Method> annotatedMethod = new AtomicReference<Method>();
final AtomicReference<Method> annotatedMethod = new AtomicReference<>();
ReflectionUtils.doWithMethods(clazz, new ReflectionUtils.MethodCallback() {
@Override
public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException {

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

@@ -52,7 +52,7 @@ public enum DatabaseType {
private static final Map<String, DatabaseType> nameMap;
static{
nameMap = new HashMap<String, DatabaseType>();
nameMap = new HashMap<>();
for(DatabaseType type: values()){
nameMap.put(type.getProductName(), type);
}

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

@@ -63,7 +63,7 @@ public class DefaultPropertyEditorRegistrar implements PropertyEditorRegistrar {
* @see CustomEditorConfigurer#setCustomEditors(Map)
*/
public void setCustomEditors(Map<? extends Object, ? extends PropertyEditor> customEditors) {
this.customEditors = new HashMap<Class<?>, PropertyEditor>();
this.customEditors = new HashMap<>();
for (Entry<? extends Object, ? extends PropertyEditor> entry : customEditors.entrySet()) {
Object key = entry.getKey();
Class<?> requiredType = null;

6
spring-batch-infrastructure/src/main/java/org/springframework/batch/support/PatternMatcher.java
View File

@@ -30,8 +30,8 @@ import org.springframework.util.Assert;
*/
public class PatternMatcher<S> {
private Map<String, S> map = new HashMap<String, S>();
private List<String> sorted = new ArrayList<String>();
private Map<String, S> map = new HashMap<>();
private List<String> sorted = new ArrayList<>();
/**
* Initialize a new {@link PatternMatcher} with a map of patterns to values
@@ -41,7 +41,7 @@ public class PatternMatcher<S> {
super();
this.map = map;
// Sort keys to start with the most specific
sorted = new ArrayList<String>(map.keySet());
sorted = new ArrayList<>(map.keySet());
Collections.sort(sorted, new Comparator<String>() {
@Override
public int compare(String o1, String o2) {

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/ResourcelessTransactionManager.java
View File

@@ -45,7 +45,7 @@ public class ResourcelessTransactionManager extends AbstractPlatformTransactionM
Object transaction = new ResourcelessTransaction();
List<Object> resources;
if (!TransactionSynchronizationManager.hasResource(this)) {
resources = new ArrayList<Object>();
resources = new ArrayList<>();
TransactionSynchronizationManager.bindResource(this, resources);
}
else {

20
spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/TransactionAwareProxyFactory.java
View File

@@ -159,39 +159,39 @@ public class TransactionAwareProxyFactory<T> {
}
public static <K, V> Map<K, V> createTransactionalMap() {
return new TransactionAwareProxyFactory<ConcurrentHashMap<K, V>>(new ConcurrentHashMap<K, V>()).createInstance();
return new TransactionAwareProxyFactory<>(new ConcurrentHashMap<K, V>()).createInstance();
}
public static <K, V> Map<K, V> createTransactionalMap(Map<K, V> map) {
return new TransactionAwareProxyFactory<ConcurrentHashMap<K, V>>(new ConcurrentHashMap<K, V>(map)).createInstance();
return new TransactionAwareProxyFactory<>(new ConcurrentHashMap<>(map)).createInstance();
}
public static <K, V> ConcurrentMap<K, V> createAppendOnlyTransactionalMap() {
return new TransactionAwareProxyFactory<ConcurrentHashMap<K, V>>(new ConcurrentHashMap<K, V>(), true).createInstance();
return new TransactionAwareProxyFactory<>(new ConcurrentHashMap<K, V>(), true).createInstance();
}
public static <T> Set<T> createAppendOnlyTransactionalSet() {
return new TransactionAwareProxyFactory<CopyOnWriteArraySet<T>>(new CopyOnWriteArraySet<T>(), true).createInstance();
return new TransactionAwareProxyFactory<>(new CopyOnWriteArraySet<T>(), true).createInstance();
}
public static <T> Set<T> createTransactionalSet() {
return new TransactionAwareProxyFactory<CopyOnWriteArraySet<T>>(new CopyOnWriteArraySet<T>()).createInstance();
return new TransactionAwareProxyFactory<>(new CopyOnWriteArraySet<T>()).createInstance();
}
public static <T> Set<T> createTransactionalSet(Set<T> set) {
return new TransactionAwareProxyFactory<CopyOnWriteArraySet<T>>(new CopyOnWriteArraySet<T>(set)).createInstance();
return new TransactionAwareProxyFactory<>(new CopyOnWriteArraySet<>(set)).createInstance();
}
public static <T> List<T> createAppendOnlyTransactionalList() {
return new TransactionAwareProxyFactory<CopyOnWriteArrayList<T>>(new CopyOnWriteArrayList<T>(), true).createInstance();
return new TransactionAwareProxyFactory<>(new CopyOnWriteArrayList<T>(), true).createInstance();
}
public static <T> List<T> createTransactionalList() {
return new TransactionAwareProxyFactory<CopyOnWriteArrayList<T>>(new CopyOnWriteArrayList<T>()).createInstance();
return new TransactionAwareProxyFactory<>(new CopyOnWriteArrayList<T>()).createInstance();
}
public static <T> List<T> createTransactionalList(List<T> list) {
return new TransactionAwareProxyFactory<CopyOnWriteArrayList<T>>(new CopyOnWriteArrayList<T>(list)).createInstance();
return new TransactionAwareProxyFactory<>(new CopyOnWriteArrayList<>(list)).createInstance();
}
private class TargetSynchronization extends TransactionSynchronizationAdapter {
@@ -252,7 +252,7 @@ public class TransactionAwareProxyFactory<T> {
return invocation.proceed();
}
if (result instanceof Collection<?>) {
HashSet<Object> set = new HashSet<Object>((Collection<?>) result);
HashSet<Object> set = new HashSet<>((Collection<?>) result);
set.addAll((Collection<?>) invocation.proceed());
result = set;
}

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/AbstractDelegatorTests.java
View File

@@ -287,7 +287,7 @@ public class AbstractDelegatorTests {
private static class FooService {
private List<Foo> processedFooNameValuePairs = new ArrayList<Foo>();
private List<Foo> processedFooNameValuePairs = new ArrayList<>();
@SuppressWarnings("unused")
public void processNameValuePair(String name, int value) {

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/HippyMethodInvokerTests.java
View File

@@ -90,7 +90,7 @@ public class HippyMethodInvokerTests {
}
}
TreeSet<Object> arg = new TreeSet<Object>();
TreeSet<Object> arg = new TreeSet<>();
OverloadingPojo target = new OverloadingPojo();
assertEquals(target.foo(arg), Set.class);

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/ItemReaderAdapterTests.java
View File

@@ -48,7 +48,7 @@ public class ItemReaderAdapterTests {
*/
@Test
public void testNext() throws Exception {
List<Object> returnedItems = new ArrayList<Object>();
List<Object> returnedItems = new ArrayList<>();
Object item;
while ((item = provider.read()) != null) {
returnedItems.add(item);

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/ItemWriterAdapterTests.java
View File

@@ -52,7 +52,7 @@ public class ItemWriterAdapterTests {
@Test
public void testProcess() throws Exception {
Foo foo;
List<Foo> foos = new ArrayList<Foo>();
List<Foo> foos = new ArrayList<>();
while ((foo = fooService.generateFoo()) != null) {
foos.add(foo);
}

10
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/amqp/AmqpItemReaderTests.java
View File

@@ -46,7 +46,7 @@ public class AmqpItemReaderTests {
final AmqpTemplate amqpTemplate = mock(AmqpTemplate.class);
when(amqpTemplate.receiveAndConvert()).thenReturn("foo");
final AmqpItemReader<String> amqpItemReader = new AmqpItemReader<String>(amqpTemplate);
final AmqpItemReader<String> amqpItemReader = new AmqpItemReader<>(amqpTemplate);
assertEquals("foo", amqpItemReader.read());
}
@@ -55,7 +55,7 @@ public class AmqpItemReaderTests {
final AmqpTemplate amqpTemplate = mock(AmqpTemplate.class);
when(amqpTemplate.receiveAndConvert()).thenReturn("foo");
final AmqpItemReader<String> amqpItemReader = new AmqpItemReader<String>(amqpTemplate);
final AmqpItemReader<String> amqpItemReader = new AmqpItemReader<>(amqpTemplate);
amqpItemReader.setItemType(String.class);
assertEquals("foo", amqpItemReader.read());
@@ -69,7 +69,7 @@ public class AmqpItemReaderTests {
when(amqpTemplate.receive()).thenReturn(message);
final AmqpItemReader<Message> amqpItemReader = new AmqpItemReader<Message>(amqpTemplate);
final AmqpItemReader<Message> amqpItemReader = new AmqpItemReader<>(amqpTemplate);
amqpItemReader.setItemType(Message.class);
assertEquals(message, amqpItemReader.read());
@@ -82,7 +82,7 @@ public class AmqpItemReaderTests {
when(amqpTemplate.receiveAndConvert()).thenReturn("foo");
final AmqpItemReader<Integer> amqpItemReader = new AmqpItemReader<Integer>(amqpTemplate);
final AmqpItemReader<Integer> amqpItemReader = new AmqpItemReader<>(amqpTemplate);
amqpItemReader.setItemType(Integer.class);
try {
@@ -98,7 +98,7 @@ public class AmqpItemReaderTests {
public void testNullItemType() {
final AmqpTemplate amqpTemplate = mock(AmqpTemplate.class);
final AmqpItemReader<String> amqpItemReader = new AmqpItemReader<String>(amqpTemplate);
final AmqpItemReader<String> amqpItemReader = new AmqpItemReader<>(amqpTemplate);
amqpItemReader.setItemType(null);
}
}

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/amqp/AmqpItemWriterTests.java
View File

@@ -45,7 +45,7 @@ public class AmqpItemWriterTests {
amqpTemplate.convertAndSend("bar");
AmqpItemWriter<String> amqpItemWriter = new AmqpItemWriter<String>(amqpTemplate);
AmqpItemWriter<String> amqpItemWriter = new AmqpItemWriter<>(amqpTemplate);
amqpItemWriter.write(Arrays.asList("foo", "bar"));
}

10
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/GemfireItemWriterTests.java
View File

@@ -40,15 +40,15 @@ public class GemfireItemWriterTests {
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
writer = new GemfireItemWriter<String, Foo>();
writer = new GemfireItemWriter<>();
writer.setTemplate(template);
writer.setItemKeyMapper(new SpELItemKeyMapper<String, Foo>("bar.val"));
writer.setItemKeyMapper(new SpELItemKeyMapper<>("bar.val"));
writer.afterPropertiesSet();
}
@Test
public void testAfterPropertiesSet() throws Exception {
writer = new GemfireItemWriter<String, Foo>();
writer = new GemfireItemWriter<>();
try {
writer.afterPropertiesSet();
@@ -63,7 +63,7 @@ public class GemfireItemWriterTests {
} catch (IllegalArgumentException iae) {
}
writer.setItemKeyMapper(new SpELItemKeyMapper<String, Foo>("foo"));
writer.setItemKeyMapper(new SpELItemKeyMapper<>("foo"));
writer.afterPropertiesSet();
}
@@ -105,7 +105,7 @@ public class GemfireItemWriterTests {
add(new Foo(new Bar("val2")));
}
};
writer = new GemfireItemWriter<String, Foo>();
writer = new GemfireItemWriter<>();
writer.setTemplate(template);
writer.setItemKeyMapper(new Converter<Foo, String>() {

34
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/RepositoryItemReaderTests.java
View File

@@ -54,9 +54,9 @@ public class RepositoryItemReaderTests {
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
sorts = new HashMap<String, Sort.Direction>();
sorts = new HashMap<>();
sorts.put("id", Direction.ASC);
reader = new RepositoryItemReader<Object>();
reader = new RepositoryItemReader<>();
reader.setRepository(repository);
reader.setPageSize(1);
reader.setSort(sorts);
@@ -66,13 +66,13 @@ public class RepositoryItemReaderTests {
@Test
public void testAfterPropertiesSet() throws Exception {
try {
new RepositoryItemReader<Object>().afterPropertiesSet();
new RepositoryItemReader<>().afterPropertiesSet();
fail();
} catch (IllegalStateException e) {
}
try {
reader = new RepositoryItemReader<Object>();
reader = new RepositoryItemReader<>();
reader.setRepository(repository);
reader.afterPropertiesSet();
fail();
@@ -80,7 +80,7 @@ public class RepositoryItemReaderTests {
}
try {
reader = new RepositoryItemReader<Object>();
reader = new RepositoryItemReader<>();
reader.setRepository(repository);
reader.setPageSize(-1);
reader.afterPropertiesSet();
@@ -89,7 +89,7 @@ public class RepositoryItemReaderTests {
}
try {
reader = new RepositoryItemReader<Object>();
reader = new RepositoryItemReader<>();
reader.setRepository(repository);
reader.setPageSize(1);
reader.afterPropertiesSet();
@@ -97,7 +97,7 @@ public class RepositoryItemReaderTests {
} catch (IllegalStateException iae) {
}
reader = new RepositoryItemReader<Object>();
reader = new RepositoryItemReader<>();
reader.setRepository(repository);
reader.setPageSize(1);
reader.setSort(sorts);
@@ -108,7 +108,7 @@ public class RepositoryItemReaderTests {
public void testDoReadFirstReadNoResults() throws Exception {
ArgumentCaptor<PageRequest> pageRequestContainer = ArgumentCaptor.forClass(PageRequest.class);
when(repository.findAll(pageRequestContainer.capture())).thenReturn(new PageImpl<Object>(new ArrayList<Object>()));
when(repository.findAll(pageRequestContainer.capture())).thenReturn(new PageImpl<>(new ArrayList<>()));
assertNull(reader.doRead());
@@ -125,7 +125,7 @@ public class RepositoryItemReaderTests {
ArgumentCaptor<PageRequest> pageRequestContainer = ArgumentCaptor.forClass(PageRequest.class);
final Object result = new Object();
when(repository.findAll(pageRequestContainer.capture())).thenReturn(new PageImpl<Object>(new ArrayList<Object>(){{
when(repository.findAll(pageRequestContainer.capture())).thenReturn(new PageImpl<>(new ArrayList<Object>(){{
add(result);
}}));
@@ -143,9 +143,9 @@ public class RepositoryItemReaderTests {
public void testDoReadFirstReadSecondPage() throws Exception {
ArgumentCaptor<PageRequest> pageRequestContainer = ArgumentCaptor.forClass(PageRequest.class);
final Object result = new Object();
when(repository.findAll(pageRequestContainer.capture())).thenReturn(new PageImpl<Object>(new ArrayList<Object>() {{
when(repository.findAll(pageRequestContainer.capture())).thenReturn(new PageImpl<>(new ArrayList<Object>() {{
add(new Object());
}})).thenReturn(new PageImpl<Object>(new ArrayList<Object>(){{
}})).thenReturn(new PageImpl<>(new ArrayList<Object>(){{
add(result);
}}));
@@ -164,11 +164,11 @@ public class RepositoryItemReaderTests {
public void testDoReadFirstReadExhausted() throws Exception {
ArgumentCaptor<PageRequest> pageRequestContainer = ArgumentCaptor.forClass(PageRequest.class);
final Object result = new Object();
when(repository.findAll(pageRequestContainer.capture())).thenReturn(new PageImpl<Object>(new ArrayList<Object>() {{
when(repository.findAll(pageRequestContainer.capture())).thenReturn(new PageImpl<>(new ArrayList<Object>() {{
add(new Object());
}})).thenReturn(new PageImpl<Object>(new ArrayList<Object>(){{
}})).thenReturn(new PageImpl<>(new ArrayList<Object>(){{
add(result);
}})).thenReturn(new PageImpl<Object>(new ArrayList<Object>()));
}})).thenReturn(new PageImpl<>(new ArrayList<>()));
assertFalse(reader.doRead() == result);
assertEquals(result, reader.doRead());
@@ -186,7 +186,7 @@ public class RepositoryItemReaderTests {
public void testJumpToItem() throws Exception {
reader.setPageSize(100);
ArgumentCaptor<PageRequest> pageRequestContainer = ArgumentCaptor.forClass(PageRequest.class);
when(repository.findAll(pageRequestContainer.capture())).thenReturn(new PageImpl<Object>(new ArrayList<Object>() {{
when(repository.findAll(pageRequestContainer.capture())).thenReturn(new PageImpl<>(new ArrayList<Object>() {{
add(new Object());
}}));
@@ -214,7 +214,7 @@ public class RepositoryItemReaderTests {
@Test
public void testDifferentTypes() throws Exception {
TestRepository differentRepository = mock(TestRepository.class);
RepositoryItemReader<String> reader = new RepositoryItemReader<String>();
RepositoryItemReader<String> reader = new RepositoryItemReader<>();
sorts = new HashMap<>();
sorts.put("id", Direction.ASC);
reader.setRepository(differentRepository);
@@ -223,7 +223,7 @@ public class RepositoryItemReaderTests {
reader.setMethodName("findFirstNames");
ArgumentCaptor<PageRequest> pageRequestContainer = ArgumentCaptor.forClass(PageRequest.class);
when(differentRepository.findFirstNames(pageRequestContainer.capture())).thenReturn(new PageImpl<String>(new ArrayList<String>(){{
when(differentRepository.findFirstNames(pageRequestContainer.capture())).thenReturn(new PageImpl<>(new ArrayList<String>(){{
add("result");
}}));

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/RepositoryItemWriterTests.java
View File

@@ -40,7 +40,7 @@ public class RepositoryItemWriterTests {
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
writer = new RepositoryItemWriter<String>();
writer = new RepositoryItemWriter<>();
writer.setMethodName("save");
writer.setRepository(repository);
}
@@ -62,7 +62,7 @@ public class RepositoryItemWriterTests {
public void testWriteNoItems() throws Exception {
writer.write(null);
writer.write(new ArrayList<String>());
writer.write(new ArrayList<>());
verifyZeroInteractions(repository);
}

6
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorProjectionItemReaderIntegrationTests.java
View File

@@ -68,7 +68,7 @@ public class HibernateCursorProjectionItemReaderIntegrationTests {
@Test
public void testMultipleItemsInProjection() throws Exception {
HibernateCursorItemReader<Object[]> reader = new HibernateCursorItemReader<Object[]>();
HibernateCursorItemReader<Object[]> reader = new HibernateCursorItemReader<>();
initializeItemReader(reader, "select f.value, f.name from Foo f");
Object[] foo1 = reader.read();
assertEquals(1, foo1[0]);
@@ -76,7 +76,7 @@ public class HibernateCursorProjectionItemReaderIntegrationTests {
@Test
public void testSingleItemInProjection() throws Exception {
HibernateCursorItemReader<Object> reader = new HibernateCursorItemReader<Object>();
HibernateCursorItemReader<Object> reader = new HibernateCursorItemReader<>();
initializeItemReader(reader, "select f.value from Foo f");
Object foo1 = reader.read();
assertEquals(1, foo1);
@@ -84,7 +84,7 @@ public class HibernateCursorProjectionItemReaderIntegrationTests {
@Test
public void testSingleItemInProjectionWithArrayType() throws Exception {
HibernateCursorItemReader<Object[]> reader = new HibernateCursorItemReader<Object[]>();
HibernateCursorItemReader<Object[]> reader = new HibernateCursorItemReader<>();
initializeItemReader(reader, "select f.value from Foo f");
try {
Object[] foo1 = reader.read();

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateItemReaderHelperTests.java
View File

@@ -36,7 +36,7 @@ import org.springframework.test.util.ReflectionTestUtils;
*/
public class HibernateItemReaderHelperTests {
private HibernateItemReaderHelper<String> helper = new HibernateItemReaderHelper<String>();
private HibernateItemReaderHelper<String> helper = new HibernateItemReaderHelper<>();
private SessionFactory sessionFactory = mock(SessionFactory.class);

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernatePagingItemReaderIntegrationTests.java
View File

@@ -43,7 +43,7 @@ AbstractGenericDataSourceItemReaderIntegrationTests {
SessionFactory sessionFactory = factoryBean.getObject();
HibernatePagingItemReader<Foo> hibernateReader = new HibernatePagingItemReader<Foo>();
HibernatePagingItemReader<Foo> hibernateReader = new HibernatePagingItemReader<>();
setQuery(hibernateReader);
hibernateReader.setPageSize(2);
hibernateReader.setSessionFactory(sessionFactory);

6
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcBatchItemWriterClassicTests.java
View File

@@ -41,11 +41,11 @@ import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
*/
public class JdbcBatchItemWriterClassicTests {
private JdbcBatchItemWriter<String> writer = new JdbcBatchItemWriter<String>();
private JdbcBatchItemWriter<String> writer = new JdbcBatchItemWriter<>();
private JdbcTemplate jdbcTemplate;
protected List<Object> list = new ArrayList<Object>();
protected List<Object> list = new ArrayList<>();
private PreparedStatement ps;
@@ -83,7 +83,7 @@ public class JdbcBatchItemWriterClassicTests {
*/
@Test
public void testAfterPropertiesSet() throws Exception {
writer = new JdbcBatchItemWriter<String>();
writer = new JdbcBatchItemWriter<>();
try {
writer.afterPropertiesSet();
fail("Expected IllegalArgumentException");

6
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderConfigTests.java
View File

@@ -58,7 +58,7 @@ public class JdbcCursorItemReaderConfigTests {
con.commit();
PlatformTransactionManager tm = new DataSourceTransactionManager(ds);
TransactionTemplate tt = new TransactionTemplate(tm);
final JdbcCursorItemReader<String> reader = new JdbcCursorItemReader<String>();
final JdbcCursorItemReader<String> reader = new JdbcCursorItemReader<>();
reader.setDataSource(new ExtendedConnectionDataSourceProxy(ds));
reader.setUseSharedExtendedConnection(true);
reader.setSql("select foo from bar");
@@ -90,7 +90,7 @@ public class JdbcCursorItemReaderConfigTests {
con.commit();
PlatformTransactionManager tm = new DataSourceTransactionManager(ds);
TransactionTemplate tt = new TransactionTemplate(tm);
final JdbcCursorItemReader<String> reader = new JdbcCursorItemReader<String>();
final JdbcCursorItemReader<String> reader = new JdbcCursorItemReader<>();
reader.setDataSource(ds);
reader.setSql("select foo from bar");
final ExecutionContext ec = new ExecutionContext();
@@ -118,7 +118,7 @@ public class JdbcCursorItemReaderConfigTests {
ResultSet.CONCUR_READ_ONLY)).thenReturn(ps);
when(ds.getConnection()).thenReturn(con);
final JdbcCursorItemReader<String> reader = new JdbcCursorItemReader<String>();
final JdbcCursorItemReader<String> reader = new JdbcCursorItemReader<>();
reader.setDataSource(ds);
reader.setSql("select foo from bar");
reader.setConnectionAutoCommit(neededAutoCommit);

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderIntegrationTests.java
View File

@@ -30,7 +30,7 @@ public class JdbcCursorItemReaderIntegrationTests extends AbstractGenericDataSou
@Override
protected ItemReader<Foo> createItemReader() throws Exception {
JdbcCursorItemReader<Foo> result = new JdbcCursorItemReader<Foo>();
JdbcCursorItemReader<Foo> result = new JdbcCursorItemReader<>();
result.setDataSource(dataSource);
result.setSql("select ID, NAME, VALUE from T_FOOS");
result.setIgnoreWarnings(true);

12
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderAsyncTests.java
View File

@@ -95,7 +95,7 @@ public class JdbcPagingItemReaderAsyncTests {
@Test
public void testAsyncReader() throws Throwable {
List<Throwable> throwables = new ArrayList<Throwable>();
List<Throwable> throwables = new ArrayList<>();
int max = 10;
for (int i = 0; i < max; i++) {
try {
@@ -118,13 +118,13 @@ public class JdbcPagingItemReaderAsyncTests {
*/
private void doTest() throws Exception, InterruptedException, ExecutionException {
final ItemReader<Foo> reader = getItemReader();
CompletionService<List<Foo>> completionService = new ExecutorCompletionService<List<Foo>>(Executors
CompletionService<List<Foo>> completionService = new ExecutorCompletionService<>(Executors
.newFixedThreadPool(THREAD_COUNT));
for (int i = 0; i < THREAD_COUNT; i++) {
completionService.submit(new Callable<List<Foo>>() {
@Override
public List<Foo> call() throws Exception {
List<Foo> list = new ArrayList<Foo>();
List<Foo> list = new ArrayList<>();
Foo next = null;
do {
next = reader.read();
@@ -139,7 +139,7 @@ public class JdbcPagingItemReaderAsyncTests {
});
}
int count = 0;
Set<Foo> results = new HashSet<Foo>();
Set<Foo> results = new HashSet<>();
for (int i = 0; i < THREAD_COUNT; i++) {
List<Foo> items = completionService.take().get();
count += items.size();
@@ -154,12 +154,12 @@ public class JdbcPagingItemReaderAsyncTests {
protected ItemReader<Foo> getItemReader() throws Exception {
JdbcPagingItemReader<Foo> reader = new JdbcPagingItemReader<Foo>();
JdbcPagingItemReader<Foo> reader = new JdbcPagingItemReader<>();
reader.setDataSource(dataSource);
HsqlPagingQueryProvider queryProvider = new HsqlPagingQueryProvider();
queryProvider.setSelectClause("select ID, NAME, VALUE");
queryProvider.setFromClause("from T_FOOS");
Map<String, Order> sortKeys = new LinkedHashMap<String, Order>();
Map<String, Order> sortKeys = new LinkedHashMap<>();
sortKeys.put("ID", Order.ASCENDING);
queryProvider.setSortKeys(sortKeys);
reader.setQueryProvider(queryProvider);

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderClassicParameterTests.java
View File

@@ -60,7 +60,7 @@ public class JdbcPagingItemReaderClassicParameterTests extends AbstractJdbcPagin
queryProvider.setSelectClause("select ID, NAME, VALUE");
queryProvider.setFromClause("from T_FOOS");
queryProvider.setWhereClause("where VALUE >= ?");
Map<String, Order> sortKeys = new LinkedHashMap<String, Order>();
Map<String, Order> sortKeys = new LinkedHashMap<>();
sortKeys.put("ID", Order.ASCENDING);
queryProvider.setSortKeys(sortKeys);
reader.setParameterValues(Collections.<String, Object>singletonMap("limit", 2));

6
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderCommonTests.java
View File

@@ -49,12 +49,12 @@ public class JdbcPagingItemReaderCommonTests extends AbstractItemStreamItemReade
@Override
protected ItemReader<Foo> getItemReader() throws Exception {
JdbcPagingItemReader<Foo> reader = new JdbcPagingItemReader<Foo>();
JdbcPagingItemReader<Foo> reader = new JdbcPagingItemReader<>();
reader.setDataSource(dataSource);
HsqlPagingQueryProvider queryProvider = new HsqlPagingQueryProvider();
queryProvider.setSelectClause("select ID, NAME, VALUE");
queryProvider.setFromClause("from T_FOOS");
Map<String, Order> sortKeys = new LinkedHashMap<String, Order>();
Map<String, Order> sortKeys = new LinkedHashMap<>();
sortKeys.put("ID", Order.ASCENDING);
queryProvider.setSortKeys(sortKeys);
reader.setQueryProvider(queryProvider);
@@ -86,7 +86,7 @@ public class JdbcPagingItemReaderCommonTests extends AbstractItemStreamItemReade
queryProvider.setSelectClause("select ID, NAME, VALUE");
queryProvider.setFromClause("from T_FOOS");
queryProvider.setWhereClause("where ID = -1");
Map<String, Order> sortKeys = new LinkedHashMap<String, Order>();
Map<String, Order> sortKeys = new LinkedHashMap<>();
sortKeys.put("ID", Order.ASCENDING);
queryProvider.setSortKeys(sortKeys);
reader.setQueryProvider(queryProvider);

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderIntegrationTests.java
View File

@@ -36,12 +36,12 @@ public class JdbcPagingItemReaderIntegrationTests extends AbstractGenericDataSou
@Override
protected ItemReader<Foo> createItemReader() throws Exception {
JdbcPagingItemReader<Foo> inputSource = new JdbcPagingItemReader<Foo>();
JdbcPagingItemReader<Foo> inputSource = new JdbcPagingItemReader<>();
inputSource.setDataSource(dataSource);
HsqlPagingQueryProvider queryProvider = new HsqlPagingQueryProvider();
queryProvider.setSelectClause("select ID, NAME, VALUE");
queryProvider.setFromClause("from T_FOOS");
Map<String, Order> sortKeys = new LinkedHashMap<String, Order>();
Map<String, Order> sortKeys = new LinkedHashMap<>();
sortKeys.put("ID", Order.ASCENDING);
queryProvider.setSortKeys(sortKeys);
inputSource.setQueryProvider(queryProvider);

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderNamedParameterTests.java
View File

@@ -59,7 +59,7 @@ public class JdbcPagingItemReaderNamedParameterTests extends AbstractJdbcPagingI
queryProvider.setSelectClause("select ID, NAME, VALUE");
queryProvider.setFromClause("from T_FOOS");
queryProvider.setWhereClause("where VALUE >= :limit");
Map<String, Order> sortKeys = new LinkedHashMap<String, Order>();
Map<String, Order> sortKeys = new LinkedHashMap<>();
sortKeys.put("ID", Order.ASCENDING);
queryProvider.setSortKeys(sortKeys);
reader.setParameterValues(Collections.<String, Object>singletonMap("limit", 2));

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderOrderIntegrationTests.java
View File

@@ -36,12 +36,12 @@ public class JdbcPagingItemReaderOrderIntegrationTests extends AbstractGenericDa
@Override
protected ItemReader<Foo> createItemReader() throws Exception {
JdbcPagingItemReader<Foo> inputSource = new JdbcPagingItemReader<Foo>();
JdbcPagingItemReader<Foo> inputSource = new JdbcPagingItemReader<>();
inputSource.setDataSource(dataSource);
HsqlPagingQueryProvider queryProvider = new HsqlPagingQueryProvider();
queryProvider.setSelectClause("select ID, NAME, VALUE");
queryProvider.setFromClause("from T_FOOS");
Map<String, Order> sortKeys = new LinkedHashMap<String, Order>();
Map<String, Order> sortKeys = new LinkedHashMap<>();
sortKeys.put("VALUE", Order.ASCENDING);
sortKeys.put("NAME", Order.DESCENDING);
queryProvider.setSortKeys(sortKeys);

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcParameterUtilsTests.java
View File

@@ -53,7 +53,7 @@ public class JdbcParameterUtilsTests {
assertEquals(2, JdbcParameterUtils.countParameterPlaceholders("The big :parameter, &sameparameter, &sameparameter bad wolf", null));
assertEquals(2, JdbcParameterUtils.countParameterPlaceholders("The big :parameter, :sameparameter, :sameparameter bad wolf", null));
assertEquals(0, JdbcParameterUtils.countParameterPlaceholders("xxx & yyy", null));
List<String> l = new ArrayList<String>();
List<String> l = new ArrayList<>();
assertEquals(3, JdbcParameterUtils.countParameterPlaceholders("select :par1, :par2 :par3", l));
assertEquals(3, l.size());
}

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaItemWriterTests.java
View File

@@ -49,14 +49,14 @@ public class JpaItemWriterTests {
if (TransactionSynchronizationManager.isSynchronizationActive()) {
TransactionSynchronizationManager.clearSynchronization();
}
writer = new JpaItemWriter<Object>();
writer = new JpaItemWriter<>();
emf = mock(EntityManagerFactory.class,"emf");
writer.setEntityManagerFactory(emf);
}
@Test
public void testAfterPropertiesSet() throws Exception {
writer = new JpaItemWriter<Object>();
writer = new JpaItemWriter<>();
try {
writer.afterPropertiesSet();
fail("Expected IllegalArgumentException");

10
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderAsyncTests.java
View File

@@ -87,7 +87,7 @@ public class JpaPagingItemReaderAsyncTests {
@Test
public void testAsyncReader() throws Throwable {
List<Throwable> throwables = new ArrayList<Throwable>();
List<Throwable> throwables = new ArrayList<>();
int max = 10;
for (int i = 0; i < max; i++) {
try {
@@ -110,13 +110,13 @@ public class JpaPagingItemReaderAsyncTests {
*/
private void doTest() throws Exception, InterruptedException, ExecutionException {
final JpaPagingItemReader<Foo> reader = getItemReader();
CompletionService<List<Foo>> completionService = new ExecutorCompletionService<List<Foo>>(Executors
CompletionService<List<Foo>> completionService = new ExecutorCompletionService<>(Executors
.newFixedThreadPool(THREAD_COUNT));
for (int i = 0; i < THREAD_COUNT; i++) {
completionService.submit(new Callable<List<Foo>>() {
@Override
public List<Foo> call() throws Exception {
List<Foo> list = new ArrayList<Foo>();
List<Foo> list = new ArrayList<>();
Foo next = null;
do {
next = reader.read();
@@ -131,7 +131,7 @@ public class JpaPagingItemReaderAsyncTests {
});
}
int count = 0;
Set<Foo> results = new HashSet<Foo>();
Set<Foo> results = new HashSet<>();
for (int i = 0; i < THREAD_COUNT; i++) {
List<Foo> items = completionService.take().get();
count += items.size();
@@ -149,7 +149,7 @@ public class JpaPagingItemReaderAsyncTests {
String jpqlQuery = "select f from Foo f";
JpaPagingItemReader<Foo> reader = new JpaPagingItemReader<Foo>();
JpaPagingItemReader<Foo> reader = new JpaPagingItemReader<>();
reader.setQueryString(jpqlQuery);
reader.setEntityManagerFactory(entityManagerFactory);
reader.setPageSize(3);

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderCommonTests.java
View File

@@ -38,7 +38,7 @@ public class JpaPagingItemReaderCommonTests extends AbstractItemStreamItemReader
String jpqlQuery = "select f from Foo f";
JpaPagingItemReader<Foo> reader = new JpaPagingItemReader<Foo>();
JpaPagingItemReader<Foo> reader = new JpaPagingItemReader<>();
reader.setQueryString(jpqlQuery);
reader.setEntityManagerFactory(entityManagerFactory);
reader.setPageSize(3);

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderNativeQueryIntegrationTests.java
View File

@@ -42,10 +42,10 @@ public class JpaPagingItemReaderNativeQueryIntegrationTests extends AbstractPagi
String sqlQuery = "select * from T_FOOS where value >= :limit";
JpaPagingItemReader<Foo> reader = new JpaPagingItemReader<Foo>();
JpaPagingItemReader<Foo> reader = new JpaPagingItemReader<>();
//creating a native query provider as it would be created in configuration
JpaNativeQueryProvider<Foo> queryProvider= new JpaNativeQueryProvider<Foo>();
JpaNativeQueryProvider<Foo> queryProvider= new JpaNativeQueryProvider<>();
queryProvider.setSqlQuery(sqlQuery);
queryProvider.setEntityClass(Foo.class);
queryProvider.afterPropertiesSet();

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderParameterTests.java
View File

@@ -37,7 +37,7 @@ public class JpaPagingItemReaderParameterTests extends AbstractPagingItemReaderP
String jpqlQuery = "select f from Foo f where f.value >= :limit";
JpaPagingItemReader<Foo> reader = new JpaPagingItemReader<Foo>();
JpaPagingItemReader<Foo> reader = new JpaPagingItemReader<>();
reader.setQueryString(jpqlQuery);
reader.setParameterValues(Collections.<String, Object>singletonMap("limit", 2));
reader.setEntityManagerFactory(entityManagerFactory);

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/StoredProcedureItemReaderCommonTests.java
View File

@@ -35,7 +35,7 @@ public class StoredProcedureItemReaderCommonTests extends AbstractDatabaseItemSt
@Override
protected ItemReader<Foo> getItemReader() throws Exception {
StoredProcedureItemReader<Foo> result = new StoredProcedureItemReader<Foo>();
StoredProcedureItemReader<Foo> result = new StoredProcedureItemReader<>();
result.setDataSource(getDataSource());
result.setProcedureName("read_foos");
result.setRowMapper(new FooRowMapper());

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/StoredProcedureItemReaderIntegrationTests.java
View File

@@ -28,7 +28,7 @@ public class StoredProcedureItemReaderIntegrationTests
@Override
protected ItemReader<Foo> createItemReader() throws Exception {
StoredProcedureItemReader<Foo> reader = new StoredProcedureItemReader<Foo>();
StoredProcedureItemReader<Foo> reader = new StoredProcedureItemReader<>();
reader.setDataSource(dataSource);
reader.setProcedureName("read_foos");
reader.setRowMapper(new FooRowMapper());

6
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/StoredprocedureItemReaderConfigTests.java
View File

@@ -63,7 +63,7 @@ public class StoredprocedureItemReaderConfigTests {
con.commit();
PlatformTransactionManager tm = new DataSourceTransactionManager(ds);
TransactionTemplate tt = new TransactionTemplate(tm);
final StoredProcedureItemReader<String> reader = new StoredProcedureItemReader<String>();
final StoredProcedureItemReader<String> reader = new StoredProcedureItemReader<>();
reader.setDataSource(new ExtendedConnectionDataSourceProxy(ds));
reader.setUseSharedExtendedConnection(true);
reader.setProcedureName("foo_bar");
@@ -99,7 +99,7 @@ public class StoredprocedureItemReaderConfigTests {
con.commit();
PlatformTransactionManager tm = new DataSourceTransactionManager(ds);
TransactionTemplate tt = new TransactionTemplate(tm);
final StoredProcedureItemReader<String> reader = new StoredProcedureItemReader<String>();
final StoredProcedureItemReader<String> reader = new StoredProcedureItemReader<>();
reader.setDataSource(ds);
reader.setProcedureName("foo_bar");
final ExecutionContext ec = new ExecutionContext();
@@ -134,7 +134,7 @@ public class StoredprocedureItemReaderConfigTests {
con.commit();
PlatformTransactionManager tm = new DataSourceTransactionManager(ds);
TransactionTemplate tt = new TransactionTemplate(tm);
final StoredProcedureItemReader<String> reader = new StoredProcedureItemReader<String>();
final StoredProcedureItemReader<String> reader = new StoredProcedureItemReader<>();
reader.setDataSource(ds);
reader.setProcedureName("foo_bar");
reader.setParameters(new SqlParameter[] {

10
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/AbstractSqlPagingQueryProviderTests.java
View File

@@ -44,7 +44,7 @@ public abstract class AbstractSqlPagingQueryProviderTests {
pagingQueryProvider.setFromClause("foo");
pagingQueryProvider.setWhereClause("bar = 1");
Map<String, Order> sortKeys = new LinkedHashMap<String, Order>();
Map<String, Order> sortKeys = new LinkedHashMap<>();
sortKeys.put("id", Order.ASCENDING);
pagingQueryProvider.setSortKeys(sortKeys);
pageSize = 100;
@@ -66,7 +66,7 @@ public abstract class AbstractSqlPagingQueryProviderTests {
@Test
public void testGenerateFirstPageQueryWithMultipleSortKeys() {
Map<String, Order> sortKeys = new LinkedHashMap<String, Order>();
Map<String, Order> sortKeys = new LinkedHashMap<>();
sortKeys.put("name", Order.ASCENDING);
sortKeys.put("id", Order.DESCENDING);
pagingQueryProvider.setSortKeys(sortKeys);
@@ -76,7 +76,7 @@ public abstract class AbstractSqlPagingQueryProviderTests {
@Test
public void testGenerateRemainingPagesQueryWithMultipleSortKeys() {
Map<String, Order> sortKeys = new LinkedHashMap<String, Order>();
Map<String, Order> sortKeys = new LinkedHashMap<>();
sortKeys.put("name", Order.ASCENDING);
sortKeys.put("id", Order.DESCENDING);
pagingQueryProvider.setSortKeys(sortKeys);
@@ -86,7 +86,7 @@ public abstract class AbstractSqlPagingQueryProviderTests {
@Test
public void testGenerateJumpToItemQueryWithMultipleSortKeys() {
Map<String, Order> sortKeys = new LinkedHashMap<String, Order>();
Map<String, Order> sortKeys = new LinkedHashMap<>();
sortKeys.put("name", Order.ASCENDING);
sortKeys.put("id", Order.DESCENDING);
pagingQueryProvider.setSortKeys(sortKeys);
@@ -96,7 +96,7 @@ public abstract class AbstractSqlPagingQueryProviderTests {
@Test
public void testGenerateJumpToItemQueryForFirstPageWithMultipleSortKeys() {
Map<String, Order> sortKeys = new LinkedHashMap<String, Order>();
Map<String, Order> sortKeys = new LinkedHashMap<>();
sortKeys.put("name", Order.ASCENDING);
sortKeys.put("id", Order.DESCENDING);
pagingQueryProvider.setSortKeys(sortKeys);

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/ColumnMapExecutionContextRowMapperTests.java
View File

@@ -42,14 +42,14 @@ public class ColumnMapExecutionContextRowMapperTests extends TestCase {
ps = mock(PreparedStatement.class);
mapper = new ColumnMapItemPreparedStatementSetter();
key = new LinkedHashMap<String, Object>(2);
key = new LinkedHashMap<>(2);
key.put("1", Integer.valueOf(1));
key.put("2", Integer.valueOf(2));
}
public void testCreateExecutionContextFromEmptyKeys() throws Exception {
mapper.setValues(new HashMap<String, Object>(), ps);
mapper.setValues(new HashMap<>(), ps);
}
public void testCreateSetter() throws Exception {

6
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/JpaNativeQueryProviderIntegrationTests.java
View File

@@ -47,7 +47,7 @@ public class JpaNativeQueryProviderIntegrationTests {
private JpaNativeQueryProvider<Foo> jpaQueryProvider;
public JpaNativeQueryProviderIntegrationTests() {
jpaQueryProvider = new JpaNativeQueryProvider<Foo>();
jpaQueryProvider = new JpaNativeQueryProvider<>();
jpaQueryProvider.setEntityClass(Foo.class);
}
@@ -62,7 +62,7 @@ public class JpaNativeQueryProviderIntegrationTests {
Query query = jpaQueryProvider.createQuery();
List<Foo> expectedFoos = new ArrayList<Foo>();
List<Foo> expectedFoos = new ArrayList<>();
expectedFoos.add(new Foo(1, "bar1", 1));
expectedFoos.add(new Foo(2, "bar2", 2));
@@ -89,7 +89,7 @@ public class JpaNativeQueryProviderIntegrationTests {
Query query = jpaQueryProvider.createQuery();
query.setParameter("limit", 3);
List<Foo> expectedFoos = new ArrayList<Foo>();
List<Foo> expectedFoos = new ArrayList<>();
expectedFoos.add(new Foo(3, "bar3", 3));
expectedFoos.add(new Foo(4, "bar4", 4));

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SqlPagingQueryProviderFactoryBeanTests.java
View File

@@ -43,7 +43,7 @@ public class SqlPagingQueryProviderFactoryBeanTests {
factory.setSelectClause("id, name, age");
factory.setFromClause("foo");
factory.setWhereClause("bar = 1");
Map<String, Order> sortKeys = new LinkedHashMap<String, Order>();
Map<String, Order> sortKeys = new LinkedHashMap<>();
sortKeys.put("id", Order.ASCENDING);
factory.setSortKeys(sortKeys);
DataSource dataSource = DatabaseTypeTestUtils.getMockDataSource(DatabaseType.HSQL.getProductName(), "100.0.0");

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SqlPagingQueryUtilsTests.java
View File

@@ -39,7 +39,7 @@ public class SqlPagingQueryUtilsTests {
@Before
public void setUp() {
sortKeys = new LinkedHashMap<String, Order>();
sortKeys = new LinkedHashMap<>();
sortKeys.put("ID", Order.ASCENDING);
}

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SqlWindowingPagingQueryProviderTests.java
View File

@@ -107,7 +107,7 @@ public class SqlWindowingPagingQueryProviderTests extends AbstractSqlPagingQuery
pagingQueryProvider.setFromClause("foo_e E, foo_i I");
pagingQueryProvider.setWhereClause("E.id=I.id");
Map<String, Order> sortKeys = new HashMap<String, Order>();
Map<String, Order> sortKeys = new HashMap<>();
sortKeys.put("E.id", Order.DESCENDING);
pagingQueryProvider.setSortKeys(sortKeys);

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/AbstractMultiResourceItemWriterTests.java
View File

@@ -39,7 +39,7 @@ public class AbstractMultiResourceItemWriterTests {
protected ExecutionContext executionContext = new ExecutionContext();
protected void setUp(ResourceAwareItemWriterItemStream<String> delegate) throws Exception {
tested = new MultiResourceItemWriter<String>();
tested = new MultiResourceItemWriter<>();
tested.setResource(new FileSystemResource(file));
tested.setDelegate(delegate);
tested.setResourceSuffixCreator(suffixCreator);

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderCommonTests.java
View File

@@ -31,7 +31,7 @@ public class FlatFileItemReaderCommonTests extends AbstractItemStreamItemReaderT
@Override
protected ItemReader<Foo> getItemReader() throws Exception {
FlatFileItemReader<Foo> tested = new FlatFileItemReader<Foo>();
FlatFileItemReader<Foo> tested = new FlatFileItemReader<>();
Resource resource = new ByteArrayResource(FOOS.getBytes());
tested.setResource(resource);
tested.setLineMapper(new LineMapper<Foo>() {

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderTests.java
View File

@@ -52,9 +52,9 @@ public class FlatFileItemReaderTests {
// common value used for writing to a file
private String TEST_STRING = "FlatFileInputTemplate-TestData";
private FlatFileItemReader<String> reader = new FlatFileItemReader<String>();
private FlatFileItemReader<String> reader = new FlatFileItemReader<>();
private FlatFileItemReader<Item> itemReader = new FlatFileItemReader<Item>();
private FlatFileItemReader<Item> itemReader = new FlatFileItemReader<>();
private ExecutionContext executionContext = new ExecutionContext();

14
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java
View File

@@ -64,7 +64,7 @@ import static org.junit.Assert.fail;
public class FlatFileItemWriterTests {
// object under test
private FlatFileItemWriter<String> writer = new FlatFileItemWriter<String>();
private FlatFileItemWriter<String> writer = new FlatFileItemWriter<>();
// String to be written into file by the FlatFileInputTemplate
private static final String TEST_STRING = "FlatFileOutputTemplateTest-OutputData";
@@ -87,7 +87,7 @@ public class FlatFileItemWriterTests {
writer.setResource(new FileSystemResource(outputFile));
writer.setLineSeparator("\n");
writer.setLineAggregator(new PassThroughLineAggregator<String>());
writer.setLineAggregator(new PassThroughLineAggregator<>());
writer.afterPropertiesSet();
writer.setSaveState(true);
writer.setEncoding("UTF-8");
@@ -525,8 +525,8 @@ public class FlatFileItemWriterTests {
@Test
public void testOpenWithNonWritableFile() throws Exception {
writer = new FlatFileItemWriter<String>();
writer.setLineAggregator(new PassThroughLineAggregator<String>());
writer = new FlatFileItemWriter<>();
writer.setLineAggregator(new PassThroughLineAggregator<>());
FileSystemResource file = new FileSystemResource("build/no-such-file.foo");
writer.setResource(file);
new File(file.getFile().getParent()).mkdirs();
@@ -547,7 +547,7 @@ public class FlatFileItemWriterTests {
@Test
public void testAfterPropertiesSetChecksMandatory() throws Exception {
writer = new FlatFileItemWriter<String>();
writer = new FlatFileItemWriter<>();
try {
writer.afterPropertiesSet();
fail("Expected IllegalArgumentException");
@@ -559,9 +559,9 @@ public class FlatFileItemWriterTests {
@Test
public void testDefaultStreamContext() throws Exception {
writer = new FlatFileItemWriter<String>();
writer = new FlatFileItemWriter<>();
writer.setResource(new FileSystemResource(outputFile));
writer.setLineAggregator(new PassThroughLineAggregator<String>());
writer.setLineAggregator(new PassThroughLineAggregator<>());
writer.afterPropertiesSet();
writer.setSaveState(true);
writer.open(executionContext);

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderFlatFileTests.java
View File

@@ -33,8 +33,8 @@ public class MultiResourceItemReaderFlatFileTests extends
@Override
protected ItemReader<Foo> getItemReader() throws Exception {
MultiResourceItemReader<Foo> multiReader = new MultiResourceItemReader<Foo>();
FlatFileItemReader<Foo> fileReader = new FlatFileItemReader<Foo>();
MultiResourceItemReader<Foo> multiReader = new MultiResourceItemReader<>();
FlatFileItemReader<Foo> fileReader = new FlatFileItemReader<>();
fileReader.setLineMapper(new LineMapper<Foo>() {

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderIntegrationTests.java
View File

@@ -45,9 +45,9 @@ import org.springframework.test.util.ReflectionTestUtils;
*/
public class MultiResourceItemReaderIntegrationTests {
private MultiResourceItemReader<String> tested = new MultiResourceItemReader<String>();
private MultiResourceItemReader<String> tested = new MultiResourceItemReader<>();
private FlatFileItemReader<String> itemReader = new FlatFileItemReader<String>();
private FlatFileItemReader<String> itemReader = new FlatFileItemReader<>();
private ExecutionContext ctx = new ExecutionContext();

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderResourceAwareTests.java
View File

@@ -32,9 +32,9 @@ import static org.junit.Assert.*;
*/
public class MultiResourceItemReaderResourceAwareTests {
private MultiResourceItemReader<Foo> tested = new MultiResourceItemReader<Foo>();
private MultiResourceItemReader<Foo> tested = new MultiResourceItemReader<>();
private FlatFileItemReader<Foo> itemReader = new FlatFileItemReader<Foo>();
private FlatFileItemReader<Foo> itemReader = new FlatFileItemReader<>();
private ExecutionContext ctx = new ExecutionContext();

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderXmlTests.java
View File

@@ -43,9 +43,9 @@ public class MultiResourceItemReaderXmlTests extends AbstractItemStreamItemReade
@Override
protected ItemReader<Foo> getItemReader() throws Exception {
MultiResourceItemReader<Foo> multiReader = new MultiResourceItemReader<Foo>();
MultiResourceItemReader<Foo> multiReader = new MultiResourceItemReader<>();
StaxEventItemReader<Foo> reader = new StaxEventItemReader<Foo>();
StaxEventItemReader<Foo> reader = new StaxEventItemReader<>();
reader.setFragmentRootElementName("foo");
reader.setUnmarshaller(new Unmarshaller() {

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemWriterFlatFileTests.java
View File

@@ -67,8 +67,8 @@ public class MultiResourceItemWriterFlatFileTests extends AbstractMultiResourceI
@Before
public void setUp() throws Exception {
super.createFile();
delegate = new FlatFileItemWriter<String>();
delegate.setLineAggregator(new PassThroughLineAggregator<String>());
delegate = new FlatFileItemWriter<>();
delegate.setLineAggregator(new PassThroughLineAggregator<>());
}
@Test

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemWriterXmlTests.java
View File

@@ -48,7 +48,7 @@ public class MultiResourceItemWriterXmlTests extends AbstractMultiResourceItemWr
@Before
public void setUp() throws Exception {
super.createFile();
delegate = new StaxEventItemWriter<String>();
delegate = new StaxEventItemWriter<>();
delegate.setMarshaller(new SimpleMarshaller());
}

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapperConcurrentTests.java
View File

@@ -33,7 +33,7 @@ public class BeanWrapperFieldSetMapperConcurrentTests {
@Test
public void testConcurrentUsage() throws Exception {
final BeanWrapperFieldSetMapper<GreenBean> mapper = new BeanWrapperFieldSetMapper<GreenBean>();
final BeanWrapperFieldSetMapper<GreenBean> mapper = new BeanWrapperFieldSetMapper<>();
mapper.setStrict(true);
mapper.setTargetType(GreenBean.class);
// mapper.setDistanceLimit(0);
@@ -42,7 +42,7 @@ public class BeanWrapperFieldSetMapperConcurrentTests {
lineTokenizer.setNames(names);
ExecutorService executorService = Executors.newFixedThreadPool(5);
Collection<Future<Boolean>> results = new ArrayList<Future<Boolean>>();
Collection<Future<Boolean>> results = new ArrayList<>();
for (int i = 0; i < 10; i++) {
Future<Boolean> result = executorService.submit(new Callable<Boolean>() {
@Override

6
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapperFuzzyMatchingTest.java
View File

@@ -26,7 +26,7 @@ public class BeanWrapperFieldSetMapperFuzzyMatchingTest {
@Test(expected = NotWritablePropertyException.class)
public void testFuzzyMatchingWithKeyCandidateCollision() throws BindException {
BeanWrapperFieldSetMapper<GreenBean> mapper = new BeanWrapperFieldSetMapper<GreenBean>();
BeanWrapperFieldSetMapper<GreenBean> mapper = new BeanWrapperFieldSetMapper<>();
mapper.setStrict(true);
mapper.setTargetType(GreenBean.class);
DelimitedLineTokenizer lineTokenizer = new DelimitedLineTokenizer();
@@ -38,7 +38,7 @@ public class BeanWrapperFieldSetMapperFuzzyMatchingTest {
@Test
public void testFuzzyMatchingWithLowerLimit() throws BindException {
BeanWrapperFieldSetMapper<GreenBean> mapper = new BeanWrapperFieldSetMapper<GreenBean>();
BeanWrapperFieldSetMapper<GreenBean> mapper = new BeanWrapperFieldSetMapper<>();
mapper.setDistanceLimit(0);
mapper.setStrict(false);
mapper.setTargetType(GreenBean.class);
@@ -51,7 +51,7 @@ public class BeanWrapperFieldSetMapperFuzzyMatchingTest {
@Test
public void testFuzzyMatchingWithPropertyCollision() throws BindException {
BeanWrapperFieldSetMapper<BlueBean> mapper = new BeanWrapperFieldSetMapper<BlueBean>();
BeanWrapperFieldSetMapper<BlueBean> mapper = new BeanWrapperFieldSetMapper<>();
mapper.setStrict(true);
mapper.setTargetType(BlueBean.class);
DelimitedLineTokenizer lineTokenizer = new DelimitedLineTokenizer();

52
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapperTests.java
View File

@@ -74,7 +74,7 @@ public class BeanWrapperFieldSetMapperTests {
@Test
public void testNameAndTypeSpecified() throws Exception {
boolean errorCaught = false;
BeanWrapperFieldSetMapper<TestObject> mapper = new BeanWrapperFieldSetMapper<TestObject>();
BeanWrapperFieldSetMapper<TestObject> mapper = new BeanWrapperFieldSetMapper<>();
mapper.setTargetType(TestObject.class);
mapper.setPrototypeBeanName("foo");
try {
@@ -92,7 +92,7 @@ public class BeanWrapperFieldSetMapperTests {
@Test
public void testNameNorTypeSpecified() throws Exception {
boolean errorCaught = false;
BeanWrapperFieldSetMapper<TestObject> mapper = new BeanWrapperFieldSetMapper<TestObject>();
BeanWrapperFieldSetMapper<TestObject> mapper = new BeanWrapperFieldSetMapper<>();
try {
mapper.afterPropertiesSet();
}
@@ -108,7 +108,7 @@ public class BeanWrapperFieldSetMapperTests {
@Test
public void testVanillaBeanCreatedFromType() throws Exception {
BeanWrapperFieldSetMapper<TestObject> mapper = new BeanWrapperFieldSetMapper<TestObject>();
BeanWrapperFieldSetMapper<TestObject> mapper = new BeanWrapperFieldSetMapper<>();
mapper.setTargetType(TestObject.class);
mapper.afterPropertiesSet();
@@ -122,7 +122,7 @@ public class BeanWrapperFieldSetMapperTests {
@Test
public void testNullPropertyAutoCreated() throws Exception {
BeanWrapperFieldSetMapper<TestNestedA> mapper = new BeanWrapperFieldSetMapper<TestNestedA>();
BeanWrapperFieldSetMapper<TestNestedA> mapper = new BeanWrapperFieldSetMapper<>();
mapper.setTargetType(TestNestedA.class);
mapper.afterPropertiesSet();
@@ -134,7 +134,7 @@ public class BeanWrapperFieldSetMapperTests {
@Test
public void testMapperWithSingleton() throws Exception {
BeanWrapperFieldSetMapper<TestObject> mapper = new BeanWrapperFieldSetMapper<TestObject>();
BeanWrapperFieldSetMapper<TestObject> mapper = new BeanWrapperFieldSetMapper<>();
@SuppressWarnings("resource")
StaticApplicationContext context = new StaticApplicationContext();
mapper.setBeanFactory(context);
@@ -151,7 +151,7 @@ public class BeanWrapperFieldSetMapperTests {
@Test
public void testPropertyNameMatching() throws Exception {
BeanWrapperFieldSetMapper<TestObject> mapper = new BeanWrapperFieldSetMapper<TestObject>();
BeanWrapperFieldSetMapper<TestObject> mapper = new BeanWrapperFieldSetMapper<>();
@SuppressWarnings("resource")
StaticApplicationContext context = new StaticApplicationContext();
mapper.setBeanFactory(context);
@@ -191,7 +191,7 @@ public class BeanWrapperFieldSetMapperTests {
testNestedA.setTestObjectB(testNestedB);
testNestedB.setTestObjectC(new TestNestedC());
BeanWrapperFieldSetMapper<TestNestedA> mapper = new BeanWrapperFieldSetMapper<TestNestedA>();
BeanWrapperFieldSetMapper<TestNestedA> mapper = new BeanWrapperFieldSetMapper<>();
@SuppressWarnings("resource")
StaticApplicationContext context = new StaticApplicationContext();
mapper.setBeanFactory(context);
@@ -214,7 +214,7 @@ public class BeanWrapperFieldSetMapperTests {
public void testMapperWithSimilarNamePropertyMatches() throws Exception {
TestNestedA testNestedA = new TestNestedA();
BeanWrapperFieldSetMapper<TestNestedA> mapper = new BeanWrapperFieldSetMapper<TestNestedA>();
BeanWrapperFieldSetMapper<TestNestedA> mapper = new BeanWrapperFieldSetMapper<>();
@SuppressWarnings("resource")
StaticApplicationContext context = new StaticApplicationContext();
mapper.setBeanFactory(context);
@@ -235,7 +235,7 @@ public class BeanWrapperFieldSetMapperTests {
public void testMapperWithNotVerySimilarNamePropertyMatches() throws Exception {
TestNestedC testNestedC = new TestNestedC();
BeanWrapperFieldSetMapper<TestNestedC> mapper = new BeanWrapperFieldSetMapper<TestNestedC>();
BeanWrapperFieldSetMapper<TestNestedC> mapper = new BeanWrapperFieldSetMapper<>();
@SuppressWarnings("resource")
StaticApplicationContext context = new StaticApplicationContext();
mapper.setBeanFactory(context);
@@ -258,7 +258,7 @@ public class BeanWrapperFieldSetMapperTests {
testNestedA.setTestObjectB(testNestedB);
testNestedB.setTestObjectC(new TestNestedC());
BeanWrapperFieldSetMapper<TestNestedA> mapper = new BeanWrapperFieldSetMapper<TestNestedA>();
BeanWrapperFieldSetMapper<TestNestedA> mapper = new BeanWrapperFieldSetMapper<>();
@SuppressWarnings("resource")
StaticApplicationContext context = new StaticApplicationContext();
mapper.setBeanFactory(context);
@@ -281,7 +281,7 @@ public class BeanWrapperFieldSetMapperTests {
TestNestedB testNestedB = new TestNestedB();
testNestedA.setTestObjectB(testNestedB);
BeanWrapperFieldSetMapper<?> mapper = new BeanWrapperFieldSetMapper<Object>();
BeanWrapperFieldSetMapper<?> mapper = new BeanWrapperFieldSetMapper<>();
@SuppressWarnings("resource")
StaticApplicationContext context = new StaticApplicationContext();
mapper.setBeanFactory(context);
@@ -305,7 +305,7 @@ public class BeanWrapperFieldSetMapperTests {
TestNestedB testNestedB = new TestNestedB();
testNestedA.setTestObjectB(testNestedB);
BeanWrapperFieldSetMapper<?> mapper = new BeanWrapperFieldSetMapper<Object>();
BeanWrapperFieldSetMapper<?> mapper = new BeanWrapperFieldSetMapper<>();
@SuppressWarnings("resource")
StaticApplicationContext context = new StaticApplicationContext();
mapper.setBeanFactory(context);
@@ -340,13 +340,13 @@ public class BeanWrapperFieldSetMapperTests {
public void testNestedList() throws Exception {
TestNestedList nestedList = new TestNestedList();
List<TestNestedC> nestedC = new ArrayList<TestNestedC>();
List<TestNestedC> nestedC = new ArrayList<>();
nestedC.add(new TestNestedC());
nestedC.add(new TestNestedC());
nestedC.add(new TestNestedC());
nestedList.setNestedC(nestedC);
BeanWrapperFieldSetMapper<?> mapper = new BeanWrapperFieldSetMapper<Object>();
BeanWrapperFieldSetMapper<?> mapper = new BeanWrapperFieldSetMapper<>();
@SuppressWarnings("resource")
StaticApplicationContext context = new StaticApplicationContext();
mapper.setBeanFactory(context);
@@ -395,7 +395,7 @@ public class BeanWrapperFieldSetMapperTests {
@Test
public void testPaddedLongWithNoEditor() throws Exception {
BeanWrapperFieldSetMapper<TestObject> mapper = new BeanWrapperFieldSetMapper<TestObject>();
BeanWrapperFieldSetMapper<TestObject> mapper = new BeanWrapperFieldSetMapper<>();
mapper.setTargetType(TestObject.class);
FieldSet fieldSet = new DefaultFieldSet(new String[] { "00009" }, new String[] { "varLong" });
@@ -407,7 +407,7 @@ public class BeanWrapperFieldSetMapperTests {
@Test
public void testPaddedLongWithEditor() throws Exception {
BeanWrapperFieldSetMapper<TestObject> mapper = new BeanWrapperFieldSetMapper<TestObject>();
BeanWrapperFieldSetMapper<TestObject> mapper = new BeanWrapperFieldSetMapper<>();
mapper.setTargetType(TestObject.class);
FieldSet fieldSet = new DefaultFieldSet(new String[] { "00009" }, new String[] { "varLong" });
@@ -422,7 +422,7 @@ public class BeanWrapperFieldSetMapperTests {
@Test
public void testPaddedLongWithDefaultAndCustomEditor() throws Exception {
BeanWrapperFieldSetMapper<TestObject> mapper = new BeanWrapperFieldSetMapper<TestObject>();
BeanWrapperFieldSetMapper<TestObject> mapper = new BeanWrapperFieldSetMapper<>();
mapper.setTargetType(TestObject.class);
FieldSet fieldSet = new DefaultFieldSet(new String[] { "00009", "78" }, new String[] { "varLong", "varInt" });
@@ -438,13 +438,13 @@ public class BeanWrapperFieldSetMapperTests {
@Test
public void testNumberFormatWithDefaultAndCustomEditor() throws Exception {
BeanWrapperFieldSetMapper<TestObject> mapper = new BeanWrapperFieldSetMapper<TestObject>();
BeanWrapperFieldSetMapper<TestObject> mapper = new BeanWrapperFieldSetMapper<>();
mapper.setTargetType(TestObject.class);
FieldSet fieldSet = new DefaultFieldSet(new String[] { "9.876,1", "7,890.1" }, new String[] { "varDouble",
"varFloat" });
Map<Class<?>, PropertyEditor> editors = new HashMap<Class<?>, PropertyEditor>();
Map<Class<?>, PropertyEditor> editors = new HashMap<>();
editors.put(Double.TYPE, new CustomNumberEditor(Double.class, NumberFormat.getInstance(Locale.GERMAN), true));
editors.put(Float.TYPE, new CustomNumberEditor(Float.class, NumberFormat.getInstance(Locale.UK), true));
mapper.setCustomEditors(editors);
@@ -459,7 +459,7 @@ public class BeanWrapperFieldSetMapperTests {
@Test
public void testConversionWithTestConverter() throws Exception {
BeanWrapperFieldSetMapper<TestObject> mapper = new BeanWrapperFieldSetMapper<TestObject>();
BeanWrapperFieldSetMapper<TestObject> mapper = new BeanWrapperFieldSetMapper<>();
mapper.setTargetType(TestObject.class);
FieldSet fieldSet = new DefaultFieldSet(new String[] { "SHOULD BE CONVERTED" }, new String[] { "varString" });
@@ -474,7 +474,7 @@ public class BeanWrapperFieldSetMapperTests {
@Test
public void testDefaultConversion() throws Exception {
BeanWrapperFieldSetMapper<TestObject> mapper = new BeanWrapperFieldSetMapper<TestObject>();
BeanWrapperFieldSetMapper<TestObject> mapper = new BeanWrapperFieldSetMapper<>();
mapper.setTargetType(TestObject.class);
final String sampleString = "myString";
@@ -509,7 +509,7 @@ public class BeanWrapperFieldSetMapperTests {
public void testConversionAndCustomEditor() throws Exception {
boolean errorCaught = false;
BeanWrapperFieldSetMapper<TestObject> mapper = new BeanWrapperFieldSetMapper<TestObject>();
BeanWrapperFieldSetMapper<TestObject> mapper = new BeanWrapperFieldSetMapper<>();
mapper.setTargetType(TestObject.class);
mapper.setConversionService(new TestConversion());
@@ -530,7 +530,7 @@ public class BeanWrapperFieldSetMapperTests {
@Test
public void testBinderWithErrors() throws Exception {
BeanWrapperFieldSetMapper<TestObject> mapper = new BeanWrapperFieldSetMapper<TestObject>();
BeanWrapperFieldSetMapper<TestObject> mapper = new BeanWrapperFieldSetMapper<>();
mapper.setTargetType(TestObject.class);
FieldSet fieldSet = new DefaultFieldSet(new String[] { "foo", "7890.1" }, new String[] { "varDouble",
@@ -587,7 +587,7 @@ public class BeanWrapperFieldSetMapperTests {
@Test
public void testStrict() throws Exception {
BeanWrapperFieldSetMapper<TestObject> mapper = new BeanWrapperFieldSetMapper<TestObject>();
BeanWrapperFieldSetMapper<TestObject> mapper = new BeanWrapperFieldSetMapper<>();
mapper.setStrict(true);
mapper.setTargetType(TestObject.class);
mapper.afterPropertiesSet();
@@ -605,7 +605,7 @@ public class BeanWrapperFieldSetMapperTests {
@Test
public void testNotStrict() throws Exception {
BeanWrapperFieldSetMapper<TestObject> mapper = new BeanWrapperFieldSetMapper<TestObject>();
BeanWrapperFieldSetMapper<TestObject> mapper = new BeanWrapperFieldSetMapper<>();
mapper.setStrict(false);
mapper.setTargetType(TestObject.class);
mapper.afterPropertiesSet();
@@ -620,7 +620,7 @@ public class BeanWrapperFieldSetMapperTests {
private static class TestNestedList {
List<TestNestedC> nestedC = new ArrayList<TestNestedC>();
List<TestNestedC> nestedC = new ArrayList<>();
public List<TestNestedC> getNestedC() {
return nestedC;

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/DefaultLineMapperTests.java
View File

@@ -30,7 +30,7 @@ import org.springframework.batch.item.file.transform.LineTokenizer;
*/
public class DefaultLineMapperTests {
private DefaultLineMapper<String> tested = new DefaultLineMapper<String>();
private DefaultLineMapper<String> tested = new DefaultLineMapper<>();
@Test(expected=IllegalArgumentException.class)
public void testMandatoryTokenizer() throws Exception {

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

@@ -36,7 +36,7 @@ import org.springframework.batch.item.file.transform.Name;
*/
public class PatternMatchingCompositeLineMapperTests {
private PatternMatchingCompositeLineMapper<Name> mapper = new PatternMatchingCompositeLineMapper<Name>();
private PatternMatchingCompositeLineMapper<Name> mapper = new PatternMatchingCompositeLineMapper<>();
@Test(expected = IllegalArgumentException.class)
public void testNoMappers() throws Exception {
@@ -48,7 +48,7 @@ public class PatternMatchingCompositeLineMapperTests {
@Test
public void testKeyFound() throws Exception {
Map<String, LineTokenizer> tokenizers = new HashMap<String, LineTokenizer>();
Map<String, LineTokenizer> tokenizers = new HashMap<>();
tokenizers.put("foo*", new LineTokenizer() {
@Override
public FieldSet tokenize(String line) {
@@ -63,7 +63,7 @@ public class PatternMatchingCompositeLineMapperTests {
});
mapper.setTokenizers(tokenizers);
Map<String, FieldSetMapper<Name>> fieldSetMappers = new HashMap<String, FieldSetMapper<Name>>();
Map<String, FieldSetMapper<Name>> fieldSetMappers = new HashMap<>();
fieldSetMappers.put("foo*", new FieldSetMapper<Name>() {
@Override
public Name mapFieldSet(FieldSet fs) {
@@ -84,7 +84,7 @@ public class PatternMatchingCompositeLineMapperTests {
@Test(expected = IllegalStateException.class)
public void testMapperKeyNotFound() throws Exception {
Map<String, LineTokenizer> tokenizers = new HashMap<String, LineTokenizer>();
Map<String, LineTokenizer> tokenizers = new HashMap<>();
tokenizers.put("foo*", new LineTokenizer() {
@Override
public FieldSet tokenize(String line) {
@@ -99,7 +99,7 @@ public class PatternMatchingCompositeLineMapperTests {
});
mapper.setTokenizers(tokenizers);
Map<String, FieldSetMapper<Name>> fieldSetMappers = new HashMap<String, FieldSetMapper<Name>>();
Map<String, FieldSetMapper<Name>> fieldSetMappers = new HashMap<>();
fieldSetMappers.put("foo*", new FieldSetMapper<Name>() {
@Override
public Name mapFieldSet(FieldSet fs) {

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/BeanWrapperFieldExtractorTests.java
View File

@@ -29,7 +29,7 @@ import org.springframework.beans.NotReadablePropertyException;
*/
public class BeanWrapperFieldExtractorTests {
private BeanWrapperFieldExtractor<Name> extractor = new BeanWrapperFieldExtractor<Name>();
private BeanWrapperFieldExtractor<Name> extractor = new BeanWrapperFieldExtractor<>();
@Test
public void testExtract() throws Exception {

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DelimitedLineAggregatorTests.java
View File

@@ -37,7 +37,7 @@ public class DelimitedLineAggregatorTests {
@Before
public void setup() {
aggregator = new DelimitedLineAggregator<String[]>();
aggregator = new DelimitedLineAggregator<>();
aggregator.setFieldExtractor(defaultFieldExtractor);
}

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/FormatterLineAggregatorTests.java
View File

@@ -41,7 +41,7 @@ public class FormatterLineAggregatorTests {
@Before
public void setup() {
aggregator = new FormatterLineAggregator<String[]>();
aggregator = new FormatterLineAggregator<>();
aggregator.setFieldExtractor(defaultFieldExtractor);
}

12
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PassThroughFieldExtractorTests.java
View File

@@ -32,36 +32,36 @@ public class PassThroughFieldExtractorTests {
@Test
public void testExtractString() {
PassThroughFieldExtractor<String> extractor = new PassThroughFieldExtractor<String>();
PassThroughFieldExtractor<String> extractor = new PassThroughFieldExtractor<>();
Object[] result = extractor.extract("abc");
assertTrue(Arrays.equals(new Object[] { "abc" }, result));
}
@Test
public void testExtractArray() {
PassThroughFieldExtractor<String[]> extractor = new PassThroughFieldExtractor<String[]>();
PassThroughFieldExtractor<String[]> extractor = new PassThroughFieldExtractor<>();
Object[] result = extractor.extract(new String[] { "a", "b", null, "d" });
assertTrue(Arrays.equals(new Object[] { "a", "b", null, "d" }, result));
}
@Test
public void testExtractFieldSet() {
PassThroughFieldExtractor<FieldSet> extractor = new PassThroughFieldExtractor<FieldSet>();
PassThroughFieldExtractor<FieldSet> extractor = new PassThroughFieldExtractor<>();
Object[] result = extractor.extract(new DefaultFieldSet(new String[] { "a", "b", "", "d" }));
assertTrue(Arrays.equals(new Object[] { "a", "b", "", "d" }, result));
}
@Test
public void testExtractCollection() {
PassThroughFieldExtractor<List<String>> extractor = new PassThroughFieldExtractor<List<String>>();
PassThroughFieldExtractor<List<String>> extractor = new PassThroughFieldExtractor<>();
Object[] result = extractor.extract(Arrays.asList("a", "b", null, "d"));
assertTrue(Arrays.equals(new Object[] { "a", "b", null, "d" }, result));
}
@Test
public void testExtractMap() {
PassThroughFieldExtractor<Map<String, String>> extractor = new PassThroughFieldExtractor<Map<String, String>>();
Map<String, String> map = new LinkedHashMap<String, String>();
PassThroughFieldExtractor<Map<String, String>> extractor = new PassThroughFieldExtractor<>();
Map<String, String> map = new LinkedHashMap<>();
map.put("A", "a");
map.put("B", "b");
map.put("C", null);

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PassThroughLineAggregatorTests.java
View File

@@ -22,7 +22,7 @@ import org.springframework.batch.item.file.transform.PassThroughLineAggregator;
public class PassThroughLineAggregatorTests extends TestCase {
private LineAggregator<Object> mapper = new PassThroughLineAggregator<Object>();
private LineAggregator<Object> mapper = new PassThroughLineAggregator<>();
public void testUnmapItemAsFieldSet() throws Exception {
Object item = new Object();

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PatternMatchingCompositeLineTokenizerTests.java
View File

@@ -42,7 +42,7 @@ public class PatternMatchingCompositeLineTokenizerTests {
@Test
public void testEmptyKeyMatchesAnyLine() throws Exception {
Map<String, LineTokenizer> map = new HashMap<String, LineTokenizer>();
Map<String, LineTokenizer> map = new HashMap<>();
map.put("*", new DelimitedLineTokenizer());
map.put("foo", new LineTokenizer() {
@Override
@@ -59,7 +59,7 @@ public class PatternMatchingCompositeLineTokenizerTests {
@Test
public void testEmptyKeyDoesNotMatchWhenAlternativeAvailable() throws Exception {
Map<String, LineTokenizer> map = new LinkedHashMap<String, LineTokenizer>();
Map<String, LineTokenizer> map = new LinkedHashMap<>();
map.put("*", new LineTokenizer() {
@Override
public FieldSet tokenize(String line) {

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RecursiveCollectionItemTransformerTests.java
View File

@@ -30,7 +30,7 @@ public class RecursiveCollectionItemTransformerTests extends TestCase {
private static final String LINE_SEPARATOR = System.getProperty("line.separator");
private RecursiveCollectionLineAggregator<String> aggregator = new RecursiveCollectionLineAggregator<String>();
private RecursiveCollectionLineAggregator<String> aggregator = new RecursiveCollectionLineAggregator<>();
public void testSetDelegateAndPassInString() throws Exception {
aggregator.setDelegate(new LineAggregator<String>() {

Some files were not shown because too many files have changed in this diff Show More