diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/SpELMappingGemfireItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/SpELMappingGemfireItemWriter.java index bd37b4be0..210fc7734 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/SpELMappingGemfireItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/SpELMappingGemfireItemWriter.java @@ -29,6 +29,6 @@ public class SpELMappingGemfireItemWriter extends GemfireItemWriter SpELMappingGemfireItemWriter(String keyExpression) { super(); Assert.hasText(keyExpression, "a valid keyExpression is required."); - setItemKeyMapper(new SpELItemKeyMapper(keyExpression)); + setItemKeyMapper(new SpELItemKeyMapper<>(keyExpression)); } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernatePagingItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernatePagingItemReader.java index b8c5517f8..a2a8fa145 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernatePagingItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernatePagingItemReader.java @@ -159,7 +159,7 @@ public class HibernatePagingItemReader extends AbstractPagingItemReader protected void doReadPage() { if (results == null) { - results = new CopyOnWriteArrayList(); + results = new CopyOnWriteArrayList<>(); } else { results.clear(); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcParameterUtils.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcParameterUtils.java index 1858db9e5..3279ef78a 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcParameterUtils.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcParameterUtils.java @@ -55,7 +55,7 @@ public class JdbcParameterUtils { char[] statement = sql.toCharArray(); boolean withinQuotes = false; - Map namedParameters = new HashMap(); + Map namedParameters = new HashMap<>(); char currentQuote = '-'; int parameterCount = 0; int i = 0; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/AbstractSqlPagingQueryProvider.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/AbstractSqlPagingQueryProvider.java index d33987570..fc70b9075 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/AbstractSqlPagingQueryProvider.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/AbstractSqlPagingQueryProvider.java @@ -60,7 +60,7 @@ public abstract class AbstractSqlPagingQueryProvider implements PagingQueryProvi private String whereClause; - private Map sortKeys = new LinkedHashMap(); + private Map 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 namedParameters = new ArrayList(); + List 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 getSortKeysWithoutAliases() { - Map sortKeysWithoutAliases = new LinkedHashMap(); + Map sortKeysWithoutAliases = new LinkedHashMap<>(); for (Map.Entry sortKeyEntry : sortKeys.entrySet()) { String key = sortKeyEntry.getKey(); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlPagingQueryProviderFactoryBean.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlPagingQueryProviderFactoryBean.java index 3f6f020e9..575fe2f04 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlPagingQueryProviderFactoryBean.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlPagingQueryProviderFactoryBean.java @@ -67,7 +67,7 @@ public class SqlPagingQueryProviderFactoryBean implements FactoryBean sortKeys; - private Map providers = new HashMap(); + private Map providers = new HashMap<>(); { @@ -138,7 +138,7 @@ public class SqlPagingQueryProviderFactoryBean implements FactoryBean keys = new LinkedHashMap(); + Map keys = new LinkedHashMap<>(); keys.put(key, Order.ASCENDING); this.sortKeys = keys; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlPagingQueryUtils.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlPagingQueryUtils.java index db6b33ccf..c62b925ab 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlPagingQueryUtils.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlPagingQueryUtils.java @@ -290,8 +290,8 @@ public class SqlPagingQueryUtils { */ public static void buildSortConditions( AbstractSqlPagingQueryProvider provider, StringBuilder sql) { - List> keys = new ArrayList>(provider.getSortKeys().entrySet()); - List clauses = new ArrayList(); + List> keys = new ArrayList<>(provider.getSortKeys().entrySet()); + List clauses = new ArrayList<>(); for(int i = 0; i < keys.size(); i++) { StringBuilder clause = new StringBuilder(); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlWindowingPagingQueryProvider.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlWindowingPagingQueryProvider.java index e884c456f..1aa7ad63d 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlWindowingPagingQueryProvider.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlWindowingPagingQueryProvider.java @@ -123,7 +123,7 @@ public class SqlWindowingPagingQueryProvider extends AbstractSqlPagingQueryProvi private Map getSortKeysReplaced(Object qualifierReplacement) { final String newQualifier = "" + qualifierReplacement; - final Map sortKeys = new LinkedHashMap(); + final Map sortKeys = new LinkedHashMap<>(); for (Map.Entry sortKey : getSortKeys().entrySet()) { sortKeys.put(sortKey.getKey().replaceFirst("^.*\\.", newQualifier), sortKey.getValue()); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java index c016ce5d0..a4919702b 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java @@ -102,7 +102,7 @@ public class BeanWrapperFieldSetMapper extends DefaultPropertyEditorRegistrar private BeanFactory beanFactory; - private ConcurrentMap> propertiesMatched = new ConcurrentHashMap>(); + private ConcurrentMap> propertiesMatched = new ConcurrentHashMap<>(); private int distanceLimit = 5; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PatternMatchingCompositeLineMapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PatternMatchingCompositeLineMapper.java index 29e1aa93d..bfde18c8a 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PatternMatchingCompositeLineMapper.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PatternMatchingCompositeLineMapper.java @@ -80,6 +80,6 @@ public class PatternMatchingCompositeLineMapper implements LineMapper, Ini public void setFieldSetMappers(Map> fieldSetMappers) { Assert.isTrue(!fieldSetMappers.isEmpty(), "The 'fieldSetMappers' property must be non-empty"); - this.patternMatcher = new PatternMatcher>(fieldSetMappers); + this.patternMatcher = new PatternMatcher<>(fieldSetMappers); } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PropertyMatches.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PropertyMatches.java index 0c232b8ba..ea743c4c9 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PropertyMatches.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PropertyMatches.java @@ -134,7 +134,7 @@ final class PropertyMatches { * @param maxDistance the maximum distance to accept */ private String[] calculateMatches(PropertyDescriptor[] propertyDescriptors, int maxDistance) { - List candidates = new ArrayList(); + List candidates = new ArrayList<>(); for (int i = 0; i < propertyDescriptors.length; i++) { if (propertyDescriptors[i].getWriteMethod() != null) { String possibleAlternative = propertyDescriptors[i].getName(); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/AbstractLineTokenizer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/AbstractLineTokenizer.java index feaaaea4f..2e3b227f6 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/AbstractLineTokenizer.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/AbstractLineTokenizer.java @@ -126,7 +126,7 @@ public abstract class AbstractLineTokenizer implements LineTokenizer { line = ""; } - List tokens = new ArrayList(doTokenize(line)); + List tokens = new ArrayList<>(doTokenize(line)); // if names are set and strict flag is false if ( ( names.length != 0 ) && ( ! strict ) ) { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/BeanWrapperFieldExtractor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/BeanWrapperFieldExtractor.java index 9151a5b5b..b4ffca5b2 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/BeanWrapperFieldExtractor.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/BeanWrapperFieldExtractor.java @@ -50,7 +50,7 @@ public class BeanWrapperFieldExtractor implements FieldExtractor, Initiali */ @Override public Object[] extract(T item) { - List values = new ArrayList(); + List values = new ArrayList<>(); BeanWrapper bw = new BeanWrapperImpl(item); for (String propertyName : this.names) { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/ExtractorLineAggregator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/ExtractorLineAggregator.java index 6fdd4d2a2..8e52381c2 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/ExtractorLineAggregator.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/ExtractorLineAggregator.java @@ -28,7 +28,7 @@ import org.springframework.util.Assert; */ public abstract class ExtractorLineAggregator implements LineAggregator { - private FieldExtractor fieldExtractor = new PassThroughFieldExtractor(); + private FieldExtractor fieldExtractor = new PassThroughFieldExtractor<>(); /** * Public setter for the field extractor responsible for splitting an input diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/FixedLengthTokenizer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/FixedLengthTokenizer.java index 3ca8949b3..8b313893a 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/FixedLengthTokenizer.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/FixedLengthTokenizer.java @@ -99,7 +99,7 @@ public class FixedLengthTokenizer extends AbstractLineTokenizer { */ @Override protected List doTokenize(String line) { - List tokens = new ArrayList(ranges.length); + List tokens = new ArrayList<>(ranges.length); int lineLength; String token; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PatternMatchingCompositeLineTokenizer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PatternMatchingCompositeLineTokenizer.java index 3c25fa575..eb06837ad 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PatternMatchingCompositeLineTokenizer.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PatternMatchingCompositeLineTokenizer.java @@ -63,6 +63,6 @@ public class PatternMatchingCompositeLineTokenizer implements LineTokenizer, Ini public void setTokenizers(Map tokenizers) { Assert.isTrue(!tokenizers.isEmpty(), "The 'tokenizers' property must be non-empty"); - this.tokenizers = new PatternMatcher(tokenizers); + this.tokenizers = new PatternMatcher<>(tokenizers); } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/RegexLineTokenizer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/RegexLineTokenizer.java index 29ca7e6d6..e3826392a 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/RegexLineTokenizer.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/RegexLineTokenizer.java @@ -58,7 +58,7 @@ public class RegexLineTokenizer extends AbstractLineTokenizer { boolean matchFound = matcher.find(); if (matchFound) { - List tokens = new ArrayList(matcher.groupCount()); + List tokens = new ArrayList<>(matcher.groupCount()); for (int i = 1; i <= matcher.groupCount(); i++) { tokens.add(matcher.group(i)); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ClassifierCompositeItemProcessor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ClassifierCompositeItemProcessor.java index 5b54bad99..eecdeaa85 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ClassifierCompositeItemProcessor.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ClassifierCompositeItemProcessor.java @@ -33,7 +33,7 @@ import org.springframework.classify.ClassifierSupport; public class ClassifierCompositeItemProcessor implements ItemProcessor { private Classifier> classifier = - new ClassifierSupport> (null); + new ClassifierSupport<> (null); /** * Establishes the classifier that will determine which {@link ItemProcessor} to use. diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ClassifierCompositeItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ClassifierCompositeItemWriter.java index ea6733fb5..b47f7564f 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ClassifierCompositeItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ClassifierCompositeItemWriter.java @@ -38,7 +38,7 @@ import org.springframework.util.Assert; */ public class ClassifierCompositeItemWriter implements ItemWriter { - private Classifier> classifier = new ClassifierSupport>(null); + private Classifier> classifier = new ClassifierSupport<>(null); /** * @param classifier the classifier to set @@ -55,12 +55,12 @@ public class ClassifierCompositeItemWriter implements ItemWriter { @Override public void write(List items) throws Exception { - Map, List> map = new LinkedHashMap, List>(); + Map, List> map = new LinkedHashMap<>(); for (T item : items) { ItemWriter key = classifier.classify(item); if (!map.containsKey(key)) { - map.put(key, new ArrayList()); + map.put(key, new ArrayList<>()); } map.get(key).add(item); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemStream.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemStream.java index 6d9ae2f6c..28f18c5bc 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemStream.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemStream.java @@ -31,7 +31,7 @@ import org.springframework.batch.item.ItemStreamException; */ public class CompositeItemStream implements ItemStream { - private List streams = new ArrayList(); + private List streams = new ArrayList<>(); /** * Public setter for the {@link ItemStream}s. diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ListItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ListItemReader.java index 108ff8ab8..94dd56097 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ListItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ListItemReader.java @@ -39,7 +39,7 @@ public class ListItemReader implements ItemReader { this.list = list; } else { - this.list = new ArrayList(list); + this.list = new ArrayList<>(list); } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ListItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ListItemWriter.java index cebc86c58..dcf3298b0 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ListItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ListItemWriter.java @@ -25,7 +25,7 @@ import java.util.List; */ public class ListItemWriter implements ItemWriter { - private List writtenItems = new ArrayList(); + private List writtenItems = new ArrayList<>(); @Override public void write(List items) throws Exception { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ScriptItemProcessor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ScriptItemProcessor.java index 7691180d5..e29b41622 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ScriptItemProcessor.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ScriptItemProcessor.java @@ -56,7 +56,7 @@ public class ScriptItemProcessor implements ItemProcessor, Initializ @Override @SuppressWarnings("unchecked") public O process(I item) throws Exception { - Map arguments = new HashMap(); + Map arguments = new HashMap<>(); arguments.put(itemBindingVariableName, item); return (O) scriptEvaluator.evaluate(getScriptSource(), arguments); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java index 52527b7e4..db225b9c4 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java @@ -112,7 +112,7 @@ ResourceAwareItemReaderItemStream, InitializingBean { * @param fragmentRootElementNames list of the names of the root element of the fragment */ public void setFragmentRootElementNames(String[] fragmentRootElementNames) { - this.fragmentRootElementNames = new ArrayList(); + this.fragmentRootElementNames = new ArrayList<>(); for (String fragmentRootElementName : fragmentRootElementNames) { this.fragmentRootElementNames.add(parseFragmentRootElementName(fragmentRootElementName)); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/UnclosedElementCollectingEventWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/UnclosedElementCollectingEventWriter.java index 6e1ff3e32..dd9ab08f6 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/UnclosedElementCollectingEventWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/UnclosedElementCollectingEventWriter.java @@ -32,7 +32,7 @@ import javax.xml.stream.events.XMLEvent; */ public class UnclosedElementCollectingEventWriter extends AbstractEventWriterWrapper { - private LinkedList unclosedElements = new LinkedList(); + private LinkedList unclosedElements = new LinkedList<>(); public UnclosedElementCollectingEventWriter(XMLEventWriter wrappedEventWriter) { super(wrappedEventWriter); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/UnopenedElementClosingEventWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/UnopenedElementClosingEventWriter.java index 384bbce1e..c3a396636 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/UnopenedElementClosingEventWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/UnopenedElementClosingEventWriter.java @@ -44,7 +44,7 @@ public class UnopenedElementClosingEventWriter extends AbstractEventWriterWrappe public UnopenedElementClosingEventWriter(XMLEventWriter wrappedEventWriter, Writer ioWriter, List unopenedElements) { super(wrappedEventWriter); - this.unopenedElements = new LinkedList(unopenedElements); + this.unopenedElements = new LinkedList<>(unopenedElements); this.ioWriter = ioWriter; } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/poller/DirectPoller.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/poller/DirectPoller.java index ee945fd69..c92b65060 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/poller/DirectPoller.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/poller/DirectPoller.java @@ -48,7 +48,7 @@ public class DirectPoller implements Poller { */ @Override public Future poll(Callable callable) throws Exception { - return new DirectPollingFuture(interval, callable); + return new DirectPollingFuture<>(interval, callable); } private static class DirectPollingFuture implements Future { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/context/RepeatContextSupport.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/context/RepeatContextSupport.java index b453261e4..29a251948 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/context/RepeatContextSupport.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/context/RepeatContextSupport.java @@ -35,7 +35,7 @@ public class RepeatContextSupport extends SynchronizedAttributeAccessor implemen private volatile boolean terminateOnly; - private Map> callbacks = new HashMap>(); + private Map> 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 set = callbacks.get(name); if (set == null) { - set = new HashSet(); + 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 errors = new ArrayList(); + List errors = new ArrayList<>(); Set>> copy; synchronized (callbacks) { - copy = new HashSet>>(callbacks.entrySet()); + copy = new HashSet<>(callbacks.entrySet()); } for (Map.Entry> entry : copy) { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/LogOrRethrowExceptionHandler.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/LogOrRethrowExceptionHandler.java index c54d11e24..1f417f6f3 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/LogOrRethrowExceptionHandler.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/LogOrRethrowExceptionHandler.java @@ -70,7 +70,7 @@ public class LogOrRethrowExceptionHandler implements ExceptionHandler { protected final Log logger = LogFactory.getLog(LogOrRethrowExceptionHandler.class); - private Classifier exceptionClassifier = new ClassifierSupport(Level.RETHROW); + private Classifier exceptionClassifier = new ClassifierSupport<>(Level.RETHROW); /** * Setter for the {@link Classifier} used by this handler. The default is to diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/RethrowOnThresholdExceptionHandler.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/RethrowOnThresholdExceptionHandler.java index 44c5b7eae..d1ee213f5 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/RethrowOnThresholdExceptionHandler.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/RethrowOnThresholdExceptionHandler.java @@ -73,7 +73,7 @@ public class RethrowOnThresholdExceptionHandler implements ExceptionHandler { * @param thresholds the threshold value map. */ public void setThresholds(Map, Integer> thresholds) { - Map, IntegerHolder> typeMap = new HashMap, IntegerHolder>(); + Map, IntegerHolder> typeMap = new HashMap<>(); for (Entry, Integer> entry : thresholds.entrySet()) { typeMap.put(entry.getKey(), new IntegerHolder(entry.getValue())); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/SimpleLimitExceptionHandler.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/SimpleLimitExceptionHandler.java index 4c9be2324..4ad9bd264 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/SimpleLimitExceptionHandler.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/SimpleLimitExceptionHandler.java @@ -57,7 +57,7 @@ public class SimpleLimitExceptionHandler implements ExceptionHandler, Initializi if (limit <= 0) { return; } - Map, Integer> thresholds = new HashMap, Integer>(); + Map, Integer> thresholds = new HashMap<>(); for (Class type : exceptionClasses) { thresholds.put(type, limit); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/listener/CompositeRepeatListener.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/listener/CompositeRepeatListener.java index b23e3cd08..66e28a0ca 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/listener/CompositeRepeatListener.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/listener/CompositeRepeatListener.java @@ -31,7 +31,7 @@ import org.springframework.batch.repeat.RepeatListener; */ public class CompositeRepeatListener implements RepeatListener { - private List listeners = new ArrayList(); + private List listeners = new ArrayList<>(); /** * Public setter for the listeners. diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/CompositeCompletionPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/CompositeCompletionPolicy.java index 3e5141559..d2ceae735 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/CompositeCompletionPolicy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/CompositeCompletionPolicy.java @@ -88,7 +88,7 @@ public class CompositeCompletionPolicy implements CompletionPolicy { */ @Override public RepeatContext start(RepeatContext context) { - List list = new ArrayList(); + List list = new ArrayList<>(); for (int i = 0; i < policies.length; i++) { list.add(policies[i].start(context)); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatInternalStateSupport.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatInternalStateSupport.java index cde8c00cf..d83a04786 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatInternalStateSupport.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatInternalStateSupport.java @@ -23,7 +23,7 @@ import java.util.Set; public class RepeatInternalStateSupport implements RepeatInternalState { // Accumulation of failed results. - private final Set throwables = new HashSet(); + private final Set throwables = new HashSet<>(); /* (non-Javadoc) * @see org.springframework.batch.repeat.support.BatchInternalState#getThrowables() diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatSynchronizationManager.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatSynchronizationManager.java index ab4ac1f59..ae25723d0 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatSynchronizationManager.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatSynchronizationManager.java @@ -35,7 +35,7 @@ import org.springframework.batch.repeat.RepeatOperations; */ public final class RepeatSynchronizationManager { - private static final ThreadLocal contextHolder = new ThreadLocal(); + private static final ThreadLocal contextHolder = new ThreadLocal<>(); private RepeatSynchronizationManager() { } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/ResultHolderResultQueue.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/ResultHolderResultQueue.java index 7e8c7faad..939dfd374 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/ResultHolderResultQueue.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/ResultHolderResultQueue.java @@ -47,7 +47,7 @@ public class ResultHolderResultQueue implements ResultQueue { * at any given time. */ public ResultHolderResultQueue(int throttleLimit) { - results = new PriorityBlockingQueue(throttleLimit, new ResultHolderComparator()); + results = new PriorityBlockingQueue<>(throttleLimit, new ResultHolderComparator()); waits = new Semaphore(throttleLimit); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/ThrottleLimitResultQueue.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/ThrottleLimitResultQueue.java index b469d111f..bd10f69af 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/ThrottleLimitResultQueue.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/ThrottleLimitResultQueue.java @@ -44,7 +44,7 @@ public class ThrottleLimitResultQueue implements ResultQueue { * at any given time. */ public ThrottleLimitResultQueue(int throttleLimit) { - results = new LinkedBlockingQueue(); + results = new LinkedBlockingQueue<>(); waits = new Semaphore(throttleLimit); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/AnnotationMethodResolver.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/AnnotationMethodResolver.java index 4db90e7ac..a9599c0c1 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/AnnotationMethodResolver.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/AnnotationMethodResolver.java @@ -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 annotatedMethod = new AtomicReference(); + final AtomicReference annotatedMethod = new AtomicReference<>(); ReflectionUtils.doWithMethods(clazz, new ReflectionUtils.MethodCallback() { @Override public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DatabaseType.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DatabaseType.java index d81d8cab8..6c6588114 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DatabaseType.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DatabaseType.java @@ -52,7 +52,7 @@ public enum DatabaseType { private static final Map nameMap; static{ - nameMap = new HashMap(); + nameMap = new HashMap<>(); for(DatabaseType type: values()){ nameMap.put(type.getProductName(), type); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DefaultPropertyEditorRegistrar.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DefaultPropertyEditorRegistrar.java index 6af96a98b..d48007aa0 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DefaultPropertyEditorRegistrar.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DefaultPropertyEditorRegistrar.java @@ -63,7 +63,7 @@ public class DefaultPropertyEditorRegistrar implements PropertyEditorRegistrar { * @see CustomEditorConfigurer#setCustomEditors(Map) */ public void setCustomEditors(Map customEditors) { - this.customEditors = new HashMap, PropertyEditor>(); + this.customEditors = new HashMap<>(); for (Entry entry : customEditors.entrySet()) { Object key = entry.getKey(); Class requiredType = null; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/PatternMatcher.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/PatternMatcher.java index 3fbfefbd7..17fe77bec 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/PatternMatcher.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/PatternMatcher.java @@ -30,8 +30,8 @@ import org.springframework.util.Assert; */ public class PatternMatcher { - private Map map = new HashMap(); - private List sorted = new ArrayList(); + private Map map = new HashMap<>(); + private List sorted = new ArrayList<>(); /** * Initialize a new {@link PatternMatcher} with a map of patterns to values @@ -41,7 +41,7 @@ public class PatternMatcher { super(); this.map = map; // Sort keys to start with the most specific - sorted = new ArrayList(map.keySet()); + sorted = new ArrayList<>(map.keySet()); Collections.sort(sorted, new Comparator() { @Override public int compare(String o1, String o2) { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/ResourcelessTransactionManager.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/ResourcelessTransactionManager.java index 19300b4a3..0335dd85f 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/ResourcelessTransactionManager.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/ResourcelessTransactionManager.java @@ -45,7 +45,7 @@ public class ResourcelessTransactionManager extends AbstractPlatformTransactionM Object transaction = new ResourcelessTransaction(); List resources; if (!TransactionSynchronizationManager.hasResource(this)) { - resources = new ArrayList(); + resources = new ArrayList<>(); TransactionSynchronizationManager.bindResource(this, resources); } else { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/TransactionAwareProxyFactory.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/TransactionAwareProxyFactory.java index f4d1f8b56..fa30385de 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/TransactionAwareProxyFactory.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/TransactionAwareProxyFactory.java @@ -159,39 +159,39 @@ public class TransactionAwareProxyFactory { } public static Map createTransactionalMap() { - return new TransactionAwareProxyFactory>(new ConcurrentHashMap()).createInstance(); + return new TransactionAwareProxyFactory<>(new ConcurrentHashMap()).createInstance(); } public static Map createTransactionalMap(Map map) { - return new TransactionAwareProxyFactory>(new ConcurrentHashMap(map)).createInstance(); + return new TransactionAwareProxyFactory<>(new ConcurrentHashMap<>(map)).createInstance(); } public static ConcurrentMap createAppendOnlyTransactionalMap() { - return new TransactionAwareProxyFactory>(new ConcurrentHashMap(), true).createInstance(); + return new TransactionAwareProxyFactory<>(new ConcurrentHashMap(), true).createInstance(); } public static Set createAppendOnlyTransactionalSet() { - return new TransactionAwareProxyFactory>(new CopyOnWriteArraySet(), true).createInstance(); + return new TransactionAwareProxyFactory<>(new CopyOnWriteArraySet(), true).createInstance(); } public static Set createTransactionalSet() { - return new TransactionAwareProxyFactory>(new CopyOnWriteArraySet()).createInstance(); + return new TransactionAwareProxyFactory<>(new CopyOnWriteArraySet()).createInstance(); } public static Set createTransactionalSet(Set set) { - return new TransactionAwareProxyFactory>(new CopyOnWriteArraySet(set)).createInstance(); + return new TransactionAwareProxyFactory<>(new CopyOnWriteArraySet<>(set)).createInstance(); } public static List createAppendOnlyTransactionalList() { - return new TransactionAwareProxyFactory>(new CopyOnWriteArrayList(), true).createInstance(); + return new TransactionAwareProxyFactory<>(new CopyOnWriteArrayList(), true).createInstance(); } public static List createTransactionalList() { - return new TransactionAwareProxyFactory>(new CopyOnWriteArrayList()).createInstance(); + return new TransactionAwareProxyFactory<>(new CopyOnWriteArrayList()).createInstance(); } public static List createTransactionalList(List list) { - return new TransactionAwareProxyFactory>(new CopyOnWriteArrayList(list)).createInstance(); + return new TransactionAwareProxyFactory<>(new CopyOnWriteArrayList<>(list)).createInstance(); } private class TargetSynchronization extends TransactionSynchronizationAdapter { @@ -252,7 +252,7 @@ public class TransactionAwareProxyFactory { return invocation.proceed(); } if (result instanceof Collection) { - HashSet set = new HashSet((Collection) result); + HashSet set = new HashSet<>((Collection) result); set.addAll((Collection) invocation.proceed()); result = set; } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/AbstractDelegatorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/AbstractDelegatorTests.java index e59bbaf46..fb6edef4e 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/AbstractDelegatorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/AbstractDelegatorTests.java @@ -287,7 +287,7 @@ public class AbstractDelegatorTests { private static class FooService { - private List processedFooNameValuePairs = new ArrayList(); + private List processedFooNameValuePairs = new ArrayList<>(); @SuppressWarnings("unused") public void processNameValuePair(String name, int value) { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/HippyMethodInvokerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/HippyMethodInvokerTests.java index 84ecd612f..ae1b09ca7 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/HippyMethodInvokerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/HippyMethodInvokerTests.java @@ -90,7 +90,7 @@ public class HippyMethodInvokerTests { } } - TreeSet arg = new TreeSet(); + TreeSet arg = new TreeSet<>(); OverloadingPojo target = new OverloadingPojo(); assertEquals(target.foo(arg), Set.class); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/ItemReaderAdapterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/ItemReaderAdapterTests.java index 189c95645..e2d2bb6af 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/ItemReaderAdapterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/ItemReaderAdapterTests.java @@ -48,7 +48,7 @@ public class ItemReaderAdapterTests { */ @Test public void testNext() throws Exception { - List returnedItems = new ArrayList(); + List returnedItems = new ArrayList<>(); Object item; while ((item = provider.read()) != null) { returnedItems.add(item); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/ItemWriterAdapterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/ItemWriterAdapterTests.java index 7a8df4c94..284d45207 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/ItemWriterAdapterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/ItemWriterAdapterTests.java @@ -52,7 +52,7 @@ public class ItemWriterAdapterTests { @Test public void testProcess() throws Exception { Foo foo; - List foos = new ArrayList(); + List foos = new ArrayList<>(); while ((foo = fooService.generateFoo()) != null) { foos.add(foo); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/amqp/AmqpItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/amqp/AmqpItemReaderTests.java index fbd493772..52e93bc31 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/amqp/AmqpItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/amqp/AmqpItemReaderTests.java @@ -46,7 +46,7 @@ public class AmqpItemReaderTests { final AmqpTemplate amqpTemplate = mock(AmqpTemplate.class); when(amqpTemplate.receiveAndConvert()).thenReturn("foo"); - final AmqpItemReader amqpItemReader = new AmqpItemReader(amqpTemplate); + final AmqpItemReader 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 amqpItemReader = new AmqpItemReader(amqpTemplate); + final AmqpItemReader 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 amqpItemReader = new AmqpItemReader(amqpTemplate); + final AmqpItemReader 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 amqpItemReader = new AmqpItemReader(amqpTemplate); + final AmqpItemReader 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 amqpItemReader = new AmqpItemReader(amqpTemplate); + final AmqpItemReader amqpItemReader = new AmqpItemReader<>(amqpTemplate); amqpItemReader.setItemType(null); } } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/amqp/AmqpItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/amqp/AmqpItemWriterTests.java index f80157e27..924136649 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/amqp/AmqpItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/amqp/AmqpItemWriterTests.java @@ -45,7 +45,7 @@ public class AmqpItemWriterTests { amqpTemplate.convertAndSend("bar"); - AmqpItemWriter amqpItemWriter = new AmqpItemWriter(amqpTemplate); + AmqpItemWriter amqpItemWriter = new AmqpItemWriter<>(amqpTemplate); amqpItemWriter.write(Arrays.asList("foo", "bar")); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/GemfireItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/GemfireItemWriterTests.java index b0c6777f8..b8d129d13 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/GemfireItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/GemfireItemWriterTests.java @@ -40,15 +40,15 @@ public class GemfireItemWriterTests { @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); - writer = new GemfireItemWriter(); + writer = new GemfireItemWriter<>(); writer.setTemplate(template); - writer.setItemKeyMapper(new SpELItemKeyMapper("bar.val")); + writer.setItemKeyMapper(new SpELItemKeyMapper<>("bar.val")); writer.afterPropertiesSet(); } @Test public void testAfterPropertiesSet() throws Exception { - writer = new GemfireItemWriter(); + writer = new GemfireItemWriter<>(); try { writer.afterPropertiesSet(); @@ -63,7 +63,7 @@ public class GemfireItemWriterTests { } catch (IllegalArgumentException iae) { } - writer.setItemKeyMapper(new SpELItemKeyMapper("foo")); + writer.setItemKeyMapper(new SpELItemKeyMapper<>("foo")); writer.afterPropertiesSet(); } @@ -105,7 +105,7 @@ public class GemfireItemWriterTests { add(new Foo(new Bar("val2"))); } }; - writer = new GemfireItemWriter(); + writer = new GemfireItemWriter<>(); writer.setTemplate(template); writer.setItemKeyMapper(new Converter() { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/RepositoryItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/RepositoryItemReaderTests.java index 984f1fd31..aa62d0f2b 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/RepositoryItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/RepositoryItemReaderTests.java @@ -54,9 +54,9 @@ public class RepositoryItemReaderTests { @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); - sorts = new HashMap(); + sorts = new HashMap<>(); sorts.put("id", Direction.ASC); - reader = new RepositoryItemReader(); + 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().afterPropertiesSet(); + new RepositoryItemReader<>().afterPropertiesSet(); fail(); } catch (IllegalStateException e) { } try { - reader = new RepositoryItemReader(); + reader = new RepositoryItemReader<>(); reader.setRepository(repository); reader.afterPropertiesSet(); fail(); @@ -80,7 +80,7 @@ public class RepositoryItemReaderTests { } try { - reader = new RepositoryItemReader(); + reader = new RepositoryItemReader<>(); reader.setRepository(repository); reader.setPageSize(-1); reader.afterPropertiesSet(); @@ -89,7 +89,7 @@ public class RepositoryItemReaderTests { } try { - reader = new RepositoryItemReader(); + reader = new RepositoryItemReader<>(); reader.setRepository(repository); reader.setPageSize(1); reader.afterPropertiesSet(); @@ -97,7 +97,7 @@ public class RepositoryItemReaderTests { } catch (IllegalStateException iae) { } - reader = new RepositoryItemReader(); + 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 pageRequestContainer = ArgumentCaptor.forClass(PageRequest.class); - when(repository.findAll(pageRequestContainer.capture())).thenReturn(new PageImpl(new ArrayList())); + when(repository.findAll(pageRequestContainer.capture())).thenReturn(new PageImpl<>(new ArrayList<>())); assertNull(reader.doRead()); @@ -125,7 +125,7 @@ public class RepositoryItemReaderTests { ArgumentCaptor pageRequestContainer = ArgumentCaptor.forClass(PageRequest.class); final Object result = new Object(); - when(repository.findAll(pageRequestContainer.capture())).thenReturn(new PageImpl(new ArrayList(){{ + when(repository.findAll(pageRequestContainer.capture())).thenReturn(new PageImpl<>(new ArrayList(){{ add(result); }})); @@ -143,9 +143,9 @@ public class RepositoryItemReaderTests { public void testDoReadFirstReadSecondPage() throws Exception { ArgumentCaptor pageRequestContainer = ArgumentCaptor.forClass(PageRequest.class); final Object result = new Object(); - when(repository.findAll(pageRequestContainer.capture())).thenReturn(new PageImpl(new ArrayList() {{ + when(repository.findAll(pageRequestContainer.capture())).thenReturn(new PageImpl<>(new ArrayList() {{ add(new Object()); - }})).thenReturn(new PageImpl(new ArrayList(){{ + }})).thenReturn(new PageImpl<>(new ArrayList(){{ add(result); }})); @@ -164,11 +164,11 @@ public class RepositoryItemReaderTests { public void testDoReadFirstReadExhausted() throws Exception { ArgumentCaptor pageRequestContainer = ArgumentCaptor.forClass(PageRequest.class); final Object result = new Object(); - when(repository.findAll(pageRequestContainer.capture())).thenReturn(new PageImpl(new ArrayList() {{ + when(repository.findAll(pageRequestContainer.capture())).thenReturn(new PageImpl<>(new ArrayList() {{ add(new Object()); - }})).thenReturn(new PageImpl(new ArrayList(){{ + }})).thenReturn(new PageImpl<>(new ArrayList(){{ add(result); - }})).thenReturn(new PageImpl(new ArrayList())); + }})).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 pageRequestContainer = ArgumentCaptor.forClass(PageRequest.class); - when(repository.findAll(pageRequestContainer.capture())).thenReturn(new PageImpl(new ArrayList() {{ + when(repository.findAll(pageRequestContainer.capture())).thenReturn(new PageImpl<>(new ArrayList() {{ add(new Object()); }})); @@ -214,7 +214,7 @@ public class RepositoryItemReaderTests { @Test public void testDifferentTypes() throws Exception { TestRepository differentRepository = mock(TestRepository.class); - RepositoryItemReader reader = new RepositoryItemReader(); + RepositoryItemReader 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 pageRequestContainer = ArgumentCaptor.forClass(PageRequest.class); - when(differentRepository.findFirstNames(pageRequestContainer.capture())).thenReturn(new PageImpl(new ArrayList(){{ + when(differentRepository.findFirstNames(pageRequestContainer.capture())).thenReturn(new PageImpl<>(new ArrayList(){{ add("result"); }})); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/RepositoryItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/RepositoryItemWriterTests.java index aacea66ee..970af3b73 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/RepositoryItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/RepositoryItemWriterTests.java @@ -40,7 +40,7 @@ public class RepositoryItemWriterTests { @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); - writer = new RepositoryItemWriter(); + 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()); + writer.write(new ArrayList<>()); verifyZeroInteractions(repository); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorProjectionItemReaderIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorProjectionItemReaderIntegrationTests.java index 1378b1c7c..1faa63664 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorProjectionItemReaderIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorProjectionItemReaderIntegrationTests.java @@ -68,7 +68,7 @@ public class HibernateCursorProjectionItemReaderIntegrationTests { @Test public void testMultipleItemsInProjection() throws Exception { - HibernateCursorItemReader reader = new HibernateCursorItemReader(); + HibernateCursorItemReader 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 reader = new HibernateCursorItemReader(); + HibernateCursorItemReader 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 reader = new HibernateCursorItemReader(); + HibernateCursorItemReader reader = new HibernateCursorItemReader<>(); initializeItemReader(reader, "select f.value from Foo f"); try { Object[] foo1 = reader.read(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateItemReaderHelperTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateItemReaderHelperTests.java index 94ce695ae..8450612e3 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateItemReaderHelperTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateItemReaderHelperTests.java @@ -36,7 +36,7 @@ import org.springframework.test.util.ReflectionTestUtils; */ public class HibernateItemReaderHelperTests { - private HibernateItemReaderHelper helper = new HibernateItemReaderHelper(); + private HibernateItemReaderHelper helper = new HibernateItemReaderHelper<>(); private SessionFactory sessionFactory = mock(SessionFactory.class); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernatePagingItemReaderIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernatePagingItemReaderIntegrationTests.java index 444ef1579..773478c97 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernatePagingItemReaderIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernatePagingItemReaderIntegrationTests.java @@ -43,7 +43,7 @@ AbstractGenericDataSourceItemReaderIntegrationTests { SessionFactory sessionFactory = factoryBean.getObject(); - HibernatePagingItemReader hibernateReader = new HibernatePagingItemReader(); + HibernatePagingItemReader hibernateReader = new HibernatePagingItemReader<>(); setQuery(hibernateReader); hibernateReader.setPageSize(2); hibernateReader.setSessionFactory(sessionFactory); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcBatchItemWriterClassicTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcBatchItemWriterClassicTests.java index fbde94643..9c39113eb 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcBatchItemWriterClassicTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcBatchItemWriterClassicTests.java @@ -41,11 +41,11 @@ import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; */ public class JdbcBatchItemWriterClassicTests { - private JdbcBatchItemWriter writer = new JdbcBatchItemWriter(); + private JdbcBatchItemWriter writer = new JdbcBatchItemWriter<>(); private JdbcTemplate jdbcTemplate; - protected List list = new ArrayList(); + protected List list = new ArrayList<>(); private PreparedStatement ps; @@ -83,7 +83,7 @@ public class JdbcBatchItemWriterClassicTests { */ @Test public void testAfterPropertiesSet() throws Exception { - writer = new JdbcBatchItemWriter(); + writer = new JdbcBatchItemWriter<>(); try { writer.afterPropertiesSet(); fail("Expected IllegalArgumentException"); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderConfigTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderConfigTests.java index 1aaf7a7fb..27a4c4f90 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderConfigTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderConfigTests.java @@ -58,7 +58,7 @@ public class JdbcCursorItemReaderConfigTests { con.commit(); PlatformTransactionManager tm = new DataSourceTransactionManager(ds); TransactionTemplate tt = new TransactionTemplate(tm); - final JdbcCursorItemReader reader = new JdbcCursorItemReader(); + final JdbcCursorItemReader 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 reader = new JdbcCursorItemReader(); + final JdbcCursorItemReader 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 reader = new JdbcCursorItemReader(); + final JdbcCursorItemReader reader = new JdbcCursorItemReader<>(); reader.setDataSource(ds); reader.setSql("select foo from bar"); reader.setConnectionAutoCommit(neededAutoCommit); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderIntegrationTests.java index e658be9bc..0828693d9 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderIntegrationTests.java @@ -30,7 +30,7 @@ public class JdbcCursorItemReaderIntegrationTests extends AbstractGenericDataSou @Override protected ItemReader createItemReader() throws Exception { - JdbcCursorItemReader result = new JdbcCursorItemReader(); + JdbcCursorItemReader result = new JdbcCursorItemReader<>(); result.setDataSource(dataSource); result.setSql("select ID, NAME, VALUE from T_FOOS"); result.setIgnoreWarnings(true); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderAsyncTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderAsyncTests.java index d23c8b895..406febb82 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderAsyncTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderAsyncTests.java @@ -95,7 +95,7 @@ public class JdbcPagingItemReaderAsyncTests { @Test public void testAsyncReader() throws Throwable { - List throwables = new ArrayList(); + List 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 reader = getItemReader(); - CompletionService> completionService = new ExecutorCompletionService>(Executors + CompletionService> completionService = new ExecutorCompletionService<>(Executors .newFixedThreadPool(THREAD_COUNT)); for (int i = 0; i < THREAD_COUNT; i++) { completionService.submit(new Callable>() { @Override public List call() throws Exception { - List list = new ArrayList(); + List list = new ArrayList<>(); Foo next = null; do { next = reader.read(); @@ -139,7 +139,7 @@ public class JdbcPagingItemReaderAsyncTests { }); } int count = 0; - Set results = new HashSet(); + Set results = new HashSet<>(); for (int i = 0; i < THREAD_COUNT; i++) { List items = completionService.take().get(); count += items.size(); @@ -154,12 +154,12 @@ public class JdbcPagingItemReaderAsyncTests { protected ItemReader getItemReader() throws Exception { - JdbcPagingItemReader reader = new JdbcPagingItemReader(); + JdbcPagingItemReader reader = new JdbcPagingItemReader<>(); reader.setDataSource(dataSource); HsqlPagingQueryProvider queryProvider = new HsqlPagingQueryProvider(); queryProvider.setSelectClause("select ID, NAME, VALUE"); queryProvider.setFromClause("from T_FOOS"); - Map sortKeys = new LinkedHashMap(); + Map sortKeys = new LinkedHashMap<>(); sortKeys.put("ID", Order.ASCENDING); queryProvider.setSortKeys(sortKeys); reader.setQueryProvider(queryProvider); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderClassicParameterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderClassicParameterTests.java index 240e9c9e3..c1ba0753b 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderClassicParameterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderClassicParameterTests.java @@ -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 sortKeys = new LinkedHashMap(); + Map sortKeys = new LinkedHashMap<>(); sortKeys.put("ID", Order.ASCENDING); queryProvider.setSortKeys(sortKeys); reader.setParameterValues(Collections.singletonMap("limit", 2)); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderCommonTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderCommonTests.java index 65669663a..0f36505ee 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderCommonTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderCommonTests.java @@ -49,12 +49,12 @@ public class JdbcPagingItemReaderCommonTests extends AbstractItemStreamItemReade @Override protected ItemReader getItemReader() throws Exception { - JdbcPagingItemReader reader = new JdbcPagingItemReader(); + JdbcPagingItemReader reader = new JdbcPagingItemReader<>(); reader.setDataSource(dataSource); HsqlPagingQueryProvider queryProvider = new HsqlPagingQueryProvider(); queryProvider.setSelectClause("select ID, NAME, VALUE"); queryProvider.setFromClause("from T_FOOS"); - Map sortKeys = new LinkedHashMap(); + Map 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 sortKeys = new LinkedHashMap(); + Map sortKeys = new LinkedHashMap<>(); sortKeys.put("ID", Order.ASCENDING); queryProvider.setSortKeys(sortKeys); reader.setQueryProvider(queryProvider); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderIntegrationTests.java index 3e159e10b..d6e9404fc 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderIntegrationTests.java @@ -36,12 +36,12 @@ public class JdbcPagingItemReaderIntegrationTests extends AbstractGenericDataSou @Override protected ItemReader createItemReader() throws Exception { - JdbcPagingItemReader inputSource = new JdbcPagingItemReader(); + JdbcPagingItemReader inputSource = new JdbcPagingItemReader<>(); inputSource.setDataSource(dataSource); HsqlPagingQueryProvider queryProvider = new HsqlPagingQueryProvider(); queryProvider.setSelectClause("select ID, NAME, VALUE"); queryProvider.setFromClause("from T_FOOS"); - Map sortKeys = new LinkedHashMap(); + Map sortKeys = new LinkedHashMap<>(); sortKeys.put("ID", Order.ASCENDING); queryProvider.setSortKeys(sortKeys); inputSource.setQueryProvider(queryProvider); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderNamedParameterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderNamedParameterTests.java index 601c3c3e4..ea2f153b9 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderNamedParameterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderNamedParameterTests.java @@ -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 sortKeys = new LinkedHashMap(); + Map sortKeys = new LinkedHashMap<>(); sortKeys.put("ID", Order.ASCENDING); queryProvider.setSortKeys(sortKeys); reader.setParameterValues(Collections.singletonMap("limit", 2)); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderOrderIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderOrderIntegrationTests.java index bc38300b5..d7fc617ff 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderOrderIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderOrderIntegrationTests.java @@ -36,12 +36,12 @@ public class JdbcPagingItemReaderOrderIntegrationTests extends AbstractGenericDa @Override protected ItemReader createItemReader() throws Exception { - JdbcPagingItemReader inputSource = new JdbcPagingItemReader(); + JdbcPagingItemReader inputSource = new JdbcPagingItemReader<>(); inputSource.setDataSource(dataSource); HsqlPagingQueryProvider queryProvider = new HsqlPagingQueryProvider(); queryProvider.setSelectClause("select ID, NAME, VALUE"); queryProvider.setFromClause("from T_FOOS"); - Map sortKeys = new LinkedHashMap(); + Map sortKeys = new LinkedHashMap<>(); sortKeys.put("VALUE", Order.ASCENDING); sortKeys.put("NAME", Order.DESCENDING); queryProvider.setSortKeys(sortKeys); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcParameterUtilsTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcParameterUtilsTests.java index ee30fc266..be398ad69 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcParameterUtilsTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcParameterUtilsTests.java @@ -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 l = new ArrayList(); + List l = new ArrayList<>(); assertEquals(3, JdbcParameterUtils.countParameterPlaceholders("select :par1, :par2 :par3", l)); assertEquals(3, l.size()); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaItemWriterTests.java index 00c4a788a..759d4365b 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaItemWriterTests.java @@ -49,14 +49,14 @@ public class JpaItemWriterTests { if (TransactionSynchronizationManager.isSynchronizationActive()) { TransactionSynchronizationManager.clearSynchronization(); } - writer = new JpaItemWriter(); + writer = new JpaItemWriter<>(); emf = mock(EntityManagerFactory.class,"emf"); writer.setEntityManagerFactory(emf); } @Test public void testAfterPropertiesSet() throws Exception { - writer = new JpaItemWriter(); + writer = new JpaItemWriter<>(); try { writer.afterPropertiesSet(); fail("Expected IllegalArgumentException"); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderAsyncTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderAsyncTests.java index cae8714c0..d4f9869ef 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderAsyncTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderAsyncTests.java @@ -87,7 +87,7 @@ public class JpaPagingItemReaderAsyncTests { @Test public void testAsyncReader() throws Throwable { - List throwables = new ArrayList(); + List 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 reader = getItemReader(); - CompletionService> completionService = new ExecutorCompletionService>(Executors + CompletionService> completionService = new ExecutorCompletionService<>(Executors .newFixedThreadPool(THREAD_COUNT)); for (int i = 0; i < THREAD_COUNT; i++) { completionService.submit(new Callable>() { @Override public List call() throws Exception { - List list = new ArrayList(); + List list = new ArrayList<>(); Foo next = null; do { next = reader.read(); @@ -131,7 +131,7 @@ public class JpaPagingItemReaderAsyncTests { }); } int count = 0; - Set results = new HashSet(); + Set results = new HashSet<>(); for (int i = 0; i < THREAD_COUNT; i++) { List items = completionService.take().get(); count += items.size(); @@ -149,7 +149,7 @@ public class JpaPagingItemReaderAsyncTests { String jpqlQuery = "select f from Foo f"; - JpaPagingItemReader reader = new JpaPagingItemReader(); + JpaPagingItemReader reader = new JpaPagingItemReader<>(); reader.setQueryString(jpqlQuery); reader.setEntityManagerFactory(entityManagerFactory); reader.setPageSize(3); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderCommonTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderCommonTests.java index fe892c7a7..52a6159f8 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderCommonTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderCommonTests.java @@ -38,7 +38,7 @@ public class JpaPagingItemReaderCommonTests extends AbstractItemStreamItemReader String jpqlQuery = "select f from Foo f"; - JpaPagingItemReader reader = new JpaPagingItemReader(); + JpaPagingItemReader reader = new JpaPagingItemReader<>(); reader.setQueryString(jpqlQuery); reader.setEntityManagerFactory(entityManagerFactory); reader.setPageSize(3); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderNativeQueryIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderNativeQueryIntegrationTests.java index 9049bb1a6..2e7f233a2 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderNativeQueryIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderNativeQueryIntegrationTests.java @@ -42,10 +42,10 @@ public class JpaPagingItemReaderNativeQueryIntegrationTests extends AbstractPagi String sqlQuery = "select * from T_FOOS where value >= :limit"; - JpaPagingItemReader reader = new JpaPagingItemReader(); + JpaPagingItemReader reader = new JpaPagingItemReader<>(); //creating a native query provider as it would be created in configuration - JpaNativeQueryProvider queryProvider= new JpaNativeQueryProvider(); + JpaNativeQueryProvider queryProvider= new JpaNativeQueryProvider<>(); queryProvider.setSqlQuery(sqlQuery); queryProvider.setEntityClass(Foo.class); queryProvider.afterPropertiesSet(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderParameterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderParameterTests.java index eb428c236..7863d391a 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderParameterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderParameterTests.java @@ -37,7 +37,7 @@ public class JpaPagingItemReaderParameterTests extends AbstractPagingItemReaderP String jpqlQuery = "select f from Foo f where f.value >= :limit"; - JpaPagingItemReader reader = new JpaPagingItemReader(); + JpaPagingItemReader reader = new JpaPagingItemReader<>(); reader.setQueryString(jpqlQuery); reader.setParameterValues(Collections.singletonMap("limit", 2)); reader.setEntityManagerFactory(entityManagerFactory); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/StoredProcedureItemReaderCommonTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/StoredProcedureItemReaderCommonTests.java index 92776b7ab..65349706c 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/StoredProcedureItemReaderCommonTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/StoredProcedureItemReaderCommonTests.java @@ -35,7 +35,7 @@ public class StoredProcedureItemReaderCommonTests extends AbstractDatabaseItemSt @Override protected ItemReader getItemReader() throws Exception { - StoredProcedureItemReader result = new StoredProcedureItemReader(); + StoredProcedureItemReader result = new StoredProcedureItemReader<>(); result.setDataSource(getDataSource()); result.setProcedureName("read_foos"); result.setRowMapper(new FooRowMapper()); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/StoredProcedureItemReaderIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/StoredProcedureItemReaderIntegrationTests.java index c00264f9b..4fc82ce08 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/StoredProcedureItemReaderIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/StoredProcedureItemReaderIntegrationTests.java @@ -28,7 +28,7 @@ public class StoredProcedureItemReaderIntegrationTests @Override protected ItemReader createItemReader() throws Exception { - StoredProcedureItemReader reader = new StoredProcedureItemReader(); + StoredProcedureItemReader reader = new StoredProcedureItemReader<>(); reader.setDataSource(dataSource); reader.setProcedureName("read_foos"); reader.setRowMapper(new FooRowMapper()); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/StoredprocedureItemReaderConfigTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/StoredprocedureItemReaderConfigTests.java index ec92461fc..51c3f21ac 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/StoredprocedureItemReaderConfigTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/StoredprocedureItemReaderConfigTests.java @@ -63,7 +63,7 @@ public class StoredprocedureItemReaderConfigTests { con.commit(); PlatformTransactionManager tm = new DataSourceTransactionManager(ds); TransactionTemplate tt = new TransactionTemplate(tm); - final StoredProcedureItemReader reader = new StoredProcedureItemReader(); + final StoredProcedureItemReader 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 reader = new StoredProcedureItemReader(); + final StoredProcedureItemReader 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 reader = new StoredProcedureItemReader(); + final StoredProcedureItemReader reader = new StoredProcedureItemReader<>(); reader.setDataSource(ds); reader.setProcedureName("foo_bar"); reader.setParameters(new SqlParameter[] { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/AbstractSqlPagingQueryProviderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/AbstractSqlPagingQueryProviderTests.java index a82e5354b..c020b5ba6 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/AbstractSqlPagingQueryProviderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/AbstractSqlPagingQueryProviderTests.java @@ -44,7 +44,7 @@ public abstract class AbstractSqlPagingQueryProviderTests { pagingQueryProvider.setFromClause("foo"); pagingQueryProvider.setWhereClause("bar = 1"); - Map sortKeys = new LinkedHashMap(); + Map 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 sortKeys = new LinkedHashMap(); + Map 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 sortKeys = new LinkedHashMap(); + Map 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 sortKeys = new LinkedHashMap(); + Map 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 sortKeys = new LinkedHashMap(); + Map sortKeys = new LinkedHashMap<>(); sortKeys.put("name", Order.ASCENDING); sortKeys.put("id", Order.DESCENDING); pagingQueryProvider.setSortKeys(sortKeys); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/ColumnMapExecutionContextRowMapperTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/ColumnMapExecutionContextRowMapperTests.java index 1166b386c..f162cb9b0 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/ColumnMapExecutionContextRowMapperTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/ColumnMapExecutionContextRowMapperTests.java @@ -42,14 +42,14 @@ public class ColumnMapExecutionContextRowMapperTests extends TestCase { ps = mock(PreparedStatement.class); mapper = new ColumnMapItemPreparedStatementSetter(); - key = new LinkedHashMap(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(), ps); + mapper.setValues(new HashMap<>(), ps); } public void testCreateSetter() throws Exception { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/JpaNativeQueryProviderIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/JpaNativeQueryProviderIntegrationTests.java index aec09a0f6..b3e8f780d 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/JpaNativeQueryProviderIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/JpaNativeQueryProviderIntegrationTests.java @@ -47,7 +47,7 @@ public class JpaNativeQueryProviderIntegrationTests { private JpaNativeQueryProvider jpaQueryProvider; public JpaNativeQueryProviderIntegrationTests() { - jpaQueryProvider = new JpaNativeQueryProvider(); + jpaQueryProvider = new JpaNativeQueryProvider<>(); jpaQueryProvider.setEntityClass(Foo.class); } @@ -62,7 +62,7 @@ public class JpaNativeQueryProviderIntegrationTests { Query query = jpaQueryProvider.createQuery(); - List expectedFoos = new ArrayList(); + List 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 expectedFoos = new ArrayList(); + List expectedFoos = new ArrayList<>(); expectedFoos.add(new Foo(3, "bar3", 3)); expectedFoos.add(new Foo(4, "bar4", 4)); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SqlPagingQueryProviderFactoryBeanTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SqlPagingQueryProviderFactoryBeanTests.java index 19325a964..f790ed89b 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SqlPagingQueryProviderFactoryBeanTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SqlPagingQueryProviderFactoryBeanTests.java @@ -43,7 +43,7 @@ public class SqlPagingQueryProviderFactoryBeanTests { factory.setSelectClause("id, name, age"); factory.setFromClause("foo"); factory.setWhereClause("bar = 1"); - Map sortKeys = new LinkedHashMap(); + Map sortKeys = new LinkedHashMap<>(); sortKeys.put("id", Order.ASCENDING); factory.setSortKeys(sortKeys); DataSource dataSource = DatabaseTypeTestUtils.getMockDataSource(DatabaseType.HSQL.getProductName(), "100.0.0"); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SqlPagingQueryUtilsTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SqlPagingQueryUtilsTests.java index cfe793b77..90c62179b 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SqlPagingQueryUtilsTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SqlPagingQueryUtilsTests.java @@ -39,7 +39,7 @@ public class SqlPagingQueryUtilsTests { @Before public void setUp() { - sortKeys = new LinkedHashMap(); + sortKeys = new LinkedHashMap<>(); sortKeys.put("ID", Order.ASCENDING); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SqlWindowingPagingQueryProviderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SqlWindowingPagingQueryProviderTests.java index e5ee28678..94e6809d7 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SqlWindowingPagingQueryProviderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SqlWindowingPagingQueryProviderTests.java @@ -107,7 +107,7 @@ public class SqlWindowingPagingQueryProviderTests extends AbstractSqlPagingQuery pagingQueryProvider.setFromClause("foo_e E, foo_i I"); pagingQueryProvider.setWhereClause("E.id=I.id"); - Map sortKeys = new HashMap(); + Map sortKeys = new HashMap<>(); sortKeys.put("E.id", Order.DESCENDING); pagingQueryProvider.setSortKeys(sortKeys); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/AbstractMultiResourceItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/AbstractMultiResourceItemWriterTests.java index 5fe6bdf06..033d966f4 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/AbstractMultiResourceItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/AbstractMultiResourceItemWriterTests.java @@ -39,7 +39,7 @@ public class AbstractMultiResourceItemWriterTests { protected ExecutionContext executionContext = new ExecutionContext(); protected void setUp(ResourceAwareItemWriterItemStream delegate) throws Exception { - tested = new MultiResourceItemWriter(); + tested = new MultiResourceItemWriter<>(); tested.setResource(new FileSystemResource(file)); tested.setDelegate(delegate); tested.setResourceSuffixCreator(suffixCreator); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderCommonTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderCommonTests.java index 28fc4b60d..9882b467b 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderCommonTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderCommonTests.java @@ -31,7 +31,7 @@ public class FlatFileItemReaderCommonTests extends AbstractItemStreamItemReaderT @Override protected ItemReader getItemReader() throws Exception { - FlatFileItemReader tested = new FlatFileItemReader(); + FlatFileItemReader tested = new FlatFileItemReader<>(); Resource resource = new ByteArrayResource(FOOS.getBytes()); tested.setResource(resource); tested.setLineMapper(new LineMapper() { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderTests.java index 4c1884e4c..a08707fe9 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderTests.java @@ -52,9 +52,9 @@ public class FlatFileItemReaderTests { // common value used for writing to a file private String TEST_STRING = "FlatFileInputTemplate-TestData"; - private FlatFileItemReader reader = new FlatFileItemReader(); + private FlatFileItemReader reader = new FlatFileItemReader<>(); - private FlatFileItemReader itemReader = new FlatFileItemReader(); + private FlatFileItemReader itemReader = new FlatFileItemReader<>(); private ExecutionContext executionContext = new ExecutionContext(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java index 66101326c..cfd7663a3 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java @@ -64,7 +64,7 @@ import static org.junit.Assert.fail; public class FlatFileItemWriterTests { // object under test - private FlatFileItemWriter writer = new FlatFileItemWriter(); + private FlatFileItemWriter 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()); + 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(); - writer.setLineAggregator(new PassThroughLineAggregator()); + 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(); + 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(); + writer = new FlatFileItemWriter<>(); writer.setResource(new FileSystemResource(outputFile)); - writer.setLineAggregator(new PassThroughLineAggregator()); + writer.setLineAggregator(new PassThroughLineAggregator<>()); writer.afterPropertiesSet(); writer.setSaveState(true); writer.open(executionContext); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderFlatFileTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderFlatFileTests.java index a793ca1e2..da525cdec 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderFlatFileTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderFlatFileTests.java @@ -33,8 +33,8 @@ public class MultiResourceItemReaderFlatFileTests extends @Override protected ItemReader getItemReader() throws Exception { - MultiResourceItemReader multiReader = new MultiResourceItemReader(); - FlatFileItemReader fileReader = new FlatFileItemReader(); + MultiResourceItemReader multiReader = new MultiResourceItemReader<>(); + FlatFileItemReader fileReader = new FlatFileItemReader<>(); fileReader.setLineMapper(new LineMapper() { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderIntegrationTests.java index 21dd28c2f..fd214f35c 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderIntegrationTests.java @@ -45,9 +45,9 @@ import org.springframework.test.util.ReflectionTestUtils; */ public class MultiResourceItemReaderIntegrationTests { - private MultiResourceItemReader tested = new MultiResourceItemReader(); + private MultiResourceItemReader tested = new MultiResourceItemReader<>(); - private FlatFileItemReader itemReader = new FlatFileItemReader(); + private FlatFileItemReader itemReader = new FlatFileItemReader<>(); private ExecutionContext ctx = new ExecutionContext(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderResourceAwareTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderResourceAwareTests.java index b247c558b..a75869de4 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderResourceAwareTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderResourceAwareTests.java @@ -32,9 +32,9 @@ import static org.junit.Assert.*; */ public class MultiResourceItemReaderResourceAwareTests { - private MultiResourceItemReader tested = new MultiResourceItemReader(); + private MultiResourceItemReader tested = new MultiResourceItemReader<>(); - private FlatFileItemReader itemReader = new FlatFileItemReader(); + private FlatFileItemReader itemReader = new FlatFileItemReader<>(); private ExecutionContext ctx = new ExecutionContext(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderXmlTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderXmlTests.java index 20dda9a4a..7ce1a7849 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderXmlTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderXmlTests.java @@ -43,9 +43,9 @@ public class MultiResourceItemReaderXmlTests extends AbstractItemStreamItemReade @Override protected ItemReader getItemReader() throws Exception { - MultiResourceItemReader multiReader = new MultiResourceItemReader(); + MultiResourceItemReader multiReader = new MultiResourceItemReader<>(); - StaxEventItemReader reader = new StaxEventItemReader(); + StaxEventItemReader reader = new StaxEventItemReader<>(); reader.setFragmentRootElementName("foo"); reader.setUnmarshaller(new Unmarshaller() { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemWriterFlatFileTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemWriterFlatFileTests.java index a2e0bf61a..070b0fa8e 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemWriterFlatFileTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemWriterFlatFileTests.java @@ -67,8 +67,8 @@ public class MultiResourceItemWriterFlatFileTests extends AbstractMultiResourceI @Before public void setUp() throws Exception { super.createFile(); - delegate = new FlatFileItemWriter(); - delegate.setLineAggregator(new PassThroughLineAggregator()); + delegate = new FlatFileItemWriter<>(); + delegate.setLineAggregator(new PassThroughLineAggregator<>()); } @Test diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemWriterXmlTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemWriterXmlTests.java index d25889b5e..09e387bb8 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemWriterXmlTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemWriterXmlTests.java @@ -48,7 +48,7 @@ public class MultiResourceItemWriterXmlTests extends AbstractMultiResourceItemWr @Before public void setUp() throws Exception { super.createFile(); - delegate = new StaxEventItemWriter(); + delegate = new StaxEventItemWriter<>(); delegate.setMarshaller(new SimpleMarshaller()); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapperConcurrentTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapperConcurrentTests.java index d8b10d434..9a9a91ac1 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapperConcurrentTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapperConcurrentTests.java @@ -33,7 +33,7 @@ public class BeanWrapperFieldSetMapperConcurrentTests { @Test public void testConcurrentUsage() throws Exception { - final BeanWrapperFieldSetMapper mapper = new BeanWrapperFieldSetMapper(); + final BeanWrapperFieldSetMapper 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> results = new ArrayList>(); + Collection> results = new ArrayList<>(); for (int i = 0; i < 10; i++) { Future result = executorService.submit(new Callable() { @Override diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapperFuzzyMatchingTest.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapperFuzzyMatchingTest.java index 4dbf70c76..7a3cb6fde 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapperFuzzyMatchingTest.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapperFuzzyMatchingTest.java @@ -26,7 +26,7 @@ public class BeanWrapperFieldSetMapperFuzzyMatchingTest { @Test(expected = NotWritablePropertyException.class) public void testFuzzyMatchingWithKeyCandidateCollision() throws BindException { - BeanWrapperFieldSetMapper mapper = new BeanWrapperFieldSetMapper(); + BeanWrapperFieldSetMapper 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 mapper = new BeanWrapperFieldSetMapper(); + BeanWrapperFieldSetMapper 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 mapper = new BeanWrapperFieldSetMapper(); + BeanWrapperFieldSetMapper mapper = new BeanWrapperFieldSetMapper<>(); mapper.setStrict(true); mapper.setTargetType(BlueBean.class); DelimitedLineTokenizer lineTokenizer = new DelimitedLineTokenizer(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapperTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapperTests.java index 081f45f41..04b761975 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapperTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapperTests.java @@ -74,7 +74,7 @@ public class BeanWrapperFieldSetMapperTests { @Test public void testNameAndTypeSpecified() throws Exception { boolean errorCaught = false; - BeanWrapperFieldSetMapper mapper = new BeanWrapperFieldSetMapper(); + BeanWrapperFieldSetMapper 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 mapper = new BeanWrapperFieldSetMapper(); + BeanWrapperFieldSetMapper mapper = new BeanWrapperFieldSetMapper<>(); try { mapper.afterPropertiesSet(); } @@ -108,7 +108,7 @@ public class BeanWrapperFieldSetMapperTests { @Test public void testVanillaBeanCreatedFromType() throws Exception { - BeanWrapperFieldSetMapper mapper = new BeanWrapperFieldSetMapper(); + BeanWrapperFieldSetMapper mapper = new BeanWrapperFieldSetMapper<>(); mapper.setTargetType(TestObject.class); mapper.afterPropertiesSet(); @@ -122,7 +122,7 @@ public class BeanWrapperFieldSetMapperTests { @Test public void testNullPropertyAutoCreated() throws Exception { - BeanWrapperFieldSetMapper mapper = new BeanWrapperFieldSetMapper(); + BeanWrapperFieldSetMapper mapper = new BeanWrapperFieldSetMapper<>(); mapper.setTargetType(TestNestedA.class); mapper.afterPropertiesSet(); @@ -134,7 +134,7 @@ public class BeanWrapperFieldSetMapperTests { @Test public void testMapperWithSingleton() throws Exception { - BeanWrapperFieldSetMapper mapper = new BeanWrapperFieldSetMapper(); + BeanWrapperFieldSetMapper 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 mapper = new BeanWrapperFieldSetMapper(); + BeanWrapperFieldSetMapper 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 mapper = new BeanWrapperFieldSetMapper(); + BeanWrapperFieldSetMapper 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 mapper = new BeanWrapperFieldSetMapper(); + BeanWrapperFieldSetMapper 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 mapper = new BeanWrapperFieldSetMapper(); + BeanWrapperFieldSetMapper 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 mapper = new BeanWrapperFieldSetMapper(); + BeanWrapperFieldSetMapper 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(); + 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(); + 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 nestedC = new ArrayList(); + List nestedC = new ArrayList<>(); nestedC.add(new TestNestedC()); nestedC.add(new TestNestedC()); nestedC.add(new TestNestedC()); nestedList.setNestedC(nestedC); - BeanWrapperFieldSetMapper mapper = new BeanWrapperFieldSetMapper(); + 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 mapper = new BeanWrapperFieldSetMapper(); + BeanWrapperFieldSetMapper 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 mapper = new BeanWrapperFieldSetMapper(); + BeanWrapperFieldSetMapper 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 mapper = new BeanWrapperFieldSetMapper(); + BeanWrapperFieldSetMapper 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 mapper = new BeanWrapperFieldSetMapper(); + BeanWrapperFieldSetMapper mapper = new BeanWrapperFieldSetMapper<>(); mapper.setTargetType(TestObject.class); FieldSet fieldSet = new DefaultFieldSet(new String[] { "9.876,1", "7,890.1" }, new String[] { "varDouble", "varFloat" }); - Map, PropertyEditor> editors = new HashMap, PropertyEditor>(); + Map, 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 mapper = new BeanWrapperFieldSetMapper(); + BeanWrapperFieldSetMapper 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 mapper = new BeanWrapperFieldSetMapper(); + BeanWrapperFieldSetMapper 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 mapper = new BeanWrapperFieldSetMapper(); + BeanWrapperFieldSetMapper 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 mapper = new BeanWrapperFieldSetMapper(); + BeanWrapperFieldSetMapper 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 mapper = new BeanWrapperFieldSetMapper(); + BeanWrapperFieldSetMapper 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 mapper = new BeanWrapperFieldSetMapper(); + BeanWrapperFieldSetMapper mapper = new BeanWrapperFieldSetMapper<>(); mapper.setStrict(false); mapper.setTargetType(TestObject.class); mapper.afterPropertiesSet(); @@ -620,7 +620,7 @@ public class BeanWrapperFieldSetMapperTests { private static class TestNestedList { - List nestedC = new ArrayList(); + List nestedC = new ArrayList<>(); public List getNestedC() { return nestedC; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/DefaultLineMapperTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/DefaultLineMapperTests.java index e61d66dad..8534dfb67 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/DefaultLineMapperTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/DefaultLineMapperTests.java @@ -30,7 +30,7 @@ import org.springframework.batch.item.file.transform.LineTokenizer; */ public class DefaultLineMapperTests { - private DefaultLineMapper tested = new DefaultLineMapper(); + private DefaultLineMapper tested = new DefaultLineMapper<>(); @Test(expected=IllegalArgumentException.class) public void testMandatoryTokenizer() throws Exception { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/PatternMatchingCompositeLineMapperTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/PatternMatchingCompositeLineMapperTests.java index b6ae1ac4a..68e9e4409 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/PatternMatchingCompositeLineMapperTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/PatternMatchingCompositeLineMapperTests.java @@ -36,7 +36,7 @@ import org.springframework.batch.item.file.transform.Name; */ public class PatternMatchingCompositeLineMapperTests { - private PatternMatchingCompositeLineMapper mapper = new PatternMatchingCompositeLineMapper(); + private PatternMatchingCompositeLineMapper 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 tokenizers = new HashMap(); + Map 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> fieldSetMappers = new HashMap>(); + Map> fieldSetMappers = new HashMap<>(); fieldSetMappers.put("foo*", new FieldSetMapper() { @Override public Name mapFieldSet(FieldSet fs) { @@ -84,7 +84,7 @@ public class PatternMatchingCompositeLineMapperTests { @Test(expected = IllegalStateException.class) public void testMapperKeyNotFound() throws Exception { - Map tokenizers = new HashMap(); + Map 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> fieldSetMappers = new HashMap>(); + Map> fieldSetMappers = new HashMap<>(); fieldSetMappers.put("foo*", new FieldSetMapper() { @Override public Name mapFieldSet(FieldSet fs) { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/BeanWrapperFieldExtractorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/BeanWrapperFieldExtractorTests.java index 2938b6ed7..ffaebd78d 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/BeanWrapperFieldExtractorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/BeanWrapperFieldExtractorTests.java @@ -29,7 +29,7 @@ import org.springframework.beans.NotReadablePropertyException; */ public class BeanWrapperFieldExtractorTests { - private BeanWrapperFieldExtractor extractor = new BeanWrapperFieldExtractor(); + private BeanWrapperFieldExtractor extractor = new BeanWrapperFieldExtractor<>(); @Test public void testExtract() throws Exception { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DelimitedLineAggregatorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DelimitedLineAggregatorTests.java index 47b975196..99c572b35 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DelimitedLineAggregatorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DelimitedLineAggregatorTests.java @@ -37,7 +37,7 @@ public class DelimitedLineAggregatorTests { @Before public void setup() { - aggregator = new DelimitedLineAggregator(); + aggregator = new DelimitedLineAggregator<>(); aggregator.setFieldExtractor(defaultFieldExtractor); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/FormatterLineAggregatorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/FormatterLineAggregatorTests.java index a7acaf9e0..2d883b4ef 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/FormatterLineAggregatorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/FormatterLineAggregatorTests.java @@ -41,7 +41,7 @@ public class FormatterLineAggregatorTests { @Before public void setup() { - aggregator = new FormatterLineAggregator(); + aggregator = new FormatterLineAggregator<>(); aggregator.setFieldExtractor(defaultFieldExtractor); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PassThroughFieldExtractorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PassThroughFieldExtractorTests.java index 87eff8b92..99daa237c 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PassThroughFieldExtractorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PassThroughFieldExtractorTests.java @@ -32,36 +32,36 @@ public class PassThroughFieldExtractorTests { @Test public void testExtractString() { - PassThroughFieldExtractor extractor = new PassThroughFieldExtractor(); + PassThroughFieldExtractor extractor = new PassThroughFieldExtractor<>(); Object[] result = extractor.extract("abc"); assertTrue(Arrays.equals(new Object[] { "abc" }, result)); } @Test public void testExtractArray() { - PassThroughFieldExtractor extractor = new PassThroughFieldExtractor(); + PassThroughFieldExtractor 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
extractor = new PassThroughFieldExtractor
(); + PassThroughFieldExtractor
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> extractor = new PassThroughFieldExtractor>(); + PassThroughFieldExtractor> 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> extractor = new PassThroughFieldExtractor>(); - Map map = new LinkedHashMap(); + PassThroughFieldExtractor> extractor = new PassThroughFieldExtractor<>(); + Map map = new LinkedHashMap<>(); map.put("A", "a"); map.put("B", "b"); map.put("C", null); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PassThroughLineAggregatorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PassThroughLineAggregatorTests.java index 7d7cac469..80f80a947 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PassThroughLineAggregatorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PassThroughLineAggregatorTests.java @@ -22,7 +22,7 @@ import org.springframework.batch.item.file.transform.PassThroughLineAggregator; public class PassThroughLineAggregatorTests extends TestCase { - private LineAggregator mapper = new PassThroughLineAggregator(); + private LineAggregator mapper = new PassThroughLineAggregator<>(); public void testUnmapItemAsFieldSet() throws Exception { Object item = new Object(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PatternMatchingCompositeLineTokenizerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PatternMatchingCompositeLineTokenizerTests.java index 2fadb5333..8b7794201 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PatternMatchingCompositeLineTokenizerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PatternMatchingCompositeLineTokenizerTests.java @@ -42,7 +42,7 @@ public class PatternMatchingCompositeLineTokenizerTests { @Test public void testEmptyKeyMatchesAnyLine() throws Exception { - Map map = new HashMap(); + Map 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 map = new LinkedHashMap(); + Map map = new LinkedHashMap<>(); map.put("*", new LineTokenizer() { @Override public FieldSet tokenize(String line) { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RecursiveCollectionItemTransformerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RecursiveCollectionItemTransformerTests.java index dd8a4a088..76755be0e 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RecursiveCollectionItemTransformerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RecursiveCollectionItemTransformerTests.java @@ -30,7 +30,7 @@ public class RecursiveCollectionItemTransformerTests extends TestCase { private static final String LINE_SEPARATOR = System.getProperty("line.separator"); - private RecursiveCollectionLineAggregator aggregator = new RecursiveCollectionLineAggregator(); + private RecursiveCollectionLineAggregator aggregator = new RecursiveCollectionLineAggregator<>(); public void testSetDelegateAndPassInString() throws Exception { aggregator.setDelegate(new LineAggregator() { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/jms/JmsItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/jms/JmsItemReaderTests.java index ae0531bf9..8cccd30bd 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/jms/JmsItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/jms/JmsItemReaderTests.java @@ -33,7 +33,7 @@ import org.springframework.jms.core.JmsTemplate; public class JmsItemReaderTests { - JmsItemReader itemReader = new JmsItemReader(); + JmsItemReader itemReader = new JmsItemReader<>(); @Test public void testNoItemTypeSunnyDay() { @@ -61,7 +61,7 @@ public class JmsItemReaderTests { Date date = new java.sql.Date(0L); when(jmsTemplate.receiveAndConvert()).thenReturn(date); - JmsItemReader itemReader = new JmsItemReader(); + JmsItemReader itemReader = new JmsItemReader<>(); itemReader.setJmsTemplate(jmsTemplate); itemReader.setItemType(Date.class); assertEquals(date, itemReader.read()); @@ -73,7 +73,7 @@ public class JmsItemReaderTests { JmsOperations jmsTemplate = mock(JmsOperations.class); when(jmsTemplate.receiveAndConvert()).thenReturn("foo"); - JmsItemReader itemReader = new JmsItemReader(); + JmsItemReader itemReader = new JmsItemReader<>(); itemReader.setJmsTemplate(jmsTemplate); itemReader.setItemType(Date.class); try { @@ -92,7 +92,7 @@ public class JmsItemReaderTests { Message message = mock(Message.class); when(jmsTemplate.receive()).thenReturn(message); - JmsItemReader itemReader = new JmsItemReader(); + JmsItemReader itemReader = new JmsItemReader<>(); itemReader.setJmsTemplate(jmsTemplate); itemReader.setItemType(Message.class); assertEquals(message, itemReader.read()); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/jms/JmsItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/jms/JmsItemWriterTests.java index 2f462f12c..208d34358 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/jms/JmsItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/jms/JmsItemWriterTests.java @@ -26,7 +26,7 @@ import org.springframework.jms.core.JmsTemplate; public class JmsItemWriterTests { - JmsItemWriter itemWriter = new JmsItemWriter(); + JmsItemWriter itemWriter = new JmsItemWriter<>(); @Test public void testNoItemTypeSunnyDay() throws Exception { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/jms/JmsMethodArgumentsKeyGeneratorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/jms/JmsMethodArgumentsKeyGeneratorTests.java index 2335ad594..a26989f83 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/jms/JmsMethodArgumentsKeyGeneratorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/jms/JmsMethodArgumentsKeyGeneratorTests.java @@ -38,7 +38,7 @@ public class JmsMethodArgumentsKeyGeneratorTests { Message message = mock(Message.class); when(message.getJMSMessageID()).thenReturn("foo"); - JmsItemReader itemReader = new JmsItemReader(); + JmsItemReader itemReader = new JmsItemReader<>(); itemReader.setItemType(Message.class); assertEquals("foo", methodArgumentsKeyGenerator.getKey(new Object[]{message})); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/jms/JmsMethodInvocationRecovererTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/jms/JmsMethodInvocationRecovererTests.java index ed438e971..78844ca88 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/jms/JmsMethodInvocationRecovererTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/jms/JmsMethodInvocationRecovererTests.java @@ -27,7 +27,7 @@ import org.springframework.jms.core.JmsOperations; */ public class JmsMethodInvocationRecovererTests { - private JmsMethodInvocationRecoverer itemReader = new JmsMethodInvocationRecoverer(); + private JmsMethodInvocationRecoverer itemReader = new JmsMethodInvocationRecoverer<>(); @Test public void testRecoverWithNoDestination() throws Exception { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/jms/JmsNewMethodArgumentsIdentifierTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/jms/JmsNewMethodArgumentsIdentifierTests.java index 486623a2c..71c05aa3f 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/jms/JmsNewMethodArgumentsIdentifierTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/jms/JmsNewMethodArgumentsIdentifierTests.java @@ -31,7 +31,7 @@ import org.junit.Test; */ public class JmsNewMethodArgumentsIdentifierTests { - private JmsNewMethodArgumentsIdentifier newMethodArgumentsIdentifier = new JmsNewMethodArgumentsIdentifier(); + private JmsNewMethodArgumentsIdentifier newMethodArgumentsIdentifier = new JmsNewMethodArgumentsIdentifier<>(); @Test public void testIsNewForMessage() throws Exception { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/SimpleMailMessageItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/SimpleMailMessageItemWriterTests.java index 6900457a7..985e1371e 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/SimpleMailMessageItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/SimpleMailMessageItemWriterTests.java @@ -96,7 +96,7 @@ public class SimpleMailMessageItemWriterTests { @Test public void testCustomErrorHandler() throws Exception { - final AtomicReference content = new AtomicReference(); + final AtomicReference content = new AtomicReference<>(); writer.setMailErrorHandler(new MailErrorHandler() { @Override public void handle(MailMessage message, Exception exception) throws MailException { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/builder/SimpleMailMessageItemWriterBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/builder/SimpleMailMessageItemWriterBuilderTests.java index d04a82962..5e88323c0 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/builder/SimpleMailMessageItemWriterBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/builder/SimpleMailMessageItemWriterBuilderTests.java @@ -93,7 +93,7 @@ public class SimpleMailMessageItemWriterBuilderTests { @Test public void testCustomErrorHandler() throws Exception { - final AtomicReference content = new AtomicReference(); + final AtomicReference content = new AtomicReference<>(); SimpleMailMessageItemWriter writer = new SimpleMailMessageItemWriterBuilder() .mailErrorHandler(new MailErrorHandler() { @Override diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/javamail/MimeMessageItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/javamail/MimeMessageItemWriterTests.java index d2e05a5f6..408b1861f 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/javamail/MimeMessageItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/javamail/MimeMessageItemWriterTests.java @@ -96,7 +96,7 @@ public class MimeMessageItemWriterTests { @Test public void testCustomErrorHandler() throws Exception { - final AtomicReference content = new AtomicReference(); + final AtomicReference content = new AtomicReference<>(); writer.setMailErrorHandler(new MailErrorHandler() { @Override public void handle(MailMessage message, Exception exception) throws MailException { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/FooService.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/FooService.java index 023a3ab88..5b707aa17 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/FooService.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/FooService.java @@ -31,9 +31,9 @@ public class FooService { public static final int GENERATION_LIMIT = 10; private int counter = 0; - private List generatedFoos = new ArrayList(GENERATION_LIMIT); - private List processedFoos = new ArrayList(GENERATION_LIMIT); - private List processedFooNameValuePairs = new ArrayList(GENERATION_LIMIT); + private List generatedFoos = new ArrayList<>(GENERATION_LIMIT); + private List processedFoos = new ArrayList<>(GENERATION_LIMIT); + private List processedFooNameValuePairs = new ArrayList<>(GENERATION_LIMIT); public Foo generateFoo() { if (counter++ >= GENERATION_LIMIT) return null; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ClassifierCompositeItemProcessorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ClassifierCompositeItemProcessorTests.java index 3a7f3751f..90b535aac 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ClassifierCompositeItemProcessorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ClassifierCompositeItemProcessorTests.java @@ -32,7 +32,7 @@ public class ClassifierCompositeItemProcessorTests { @Test public void testBasicClassifierCompositeItemProcessor() throws Exception { - ClassifierCompositeItemProcessor processor = new ClassifierCompositeItemProcessor(); + ClassifierCompositeItemProcessor processor = new ClassifierCompositeItemProcessor<>(); ItemProcessor fooProcessor = new ItemProcessor() { @Override @@ -48,10 +48,10 @@ public class ClassifierCompositeItemProcessorTests { }; Map> routingConfiguration = - new HashMap>(); + new HashMap<>(); routingConfiguration.put("foo", fooProcessor); routingConfiguration.put("*", defaultProcessor); - processor.setClassifier(new PatternMatchingClassifier>(routingConfiguration)); + processor.setClassifier(new PatternMatchingClassifier<>(routingConfiguration)); assertEquals("bar", processor.process("bar")); assertEquals("foo: foo", processor.process("foo")); @@ -63,7 +63,7 @@ public class ClassifierCompositeItemProcessorTests { */ @Test public void testGenericsClassifierCompositeItemProcessor() throws Exception { - ClassifierCompositeItemProcessor processor = new ClassifierCompositeItemProcessor(); + ClassifierCompositeItemProcessor processor = new ClassifierCompositeItemProcessor<>(); ItemProcessor intProcessor = new ItemProcessor() { @Override @@ -85,9 +85,9 @@ public class ClassifierCompositeItemProcessorTests { }; SubclassClassifier> classifier = - new SubclassClassifier>(); + new SubclassClassifier<>(); Map, ItemProcessor> typeMap = - new HashMap, ItemProcessor>(); + new HashMap<>(); typeMap.put(Integer.class, intProcessor); typeMap.put(Long.class, longProcessor); typeMap.put(Number.class, defaultProcessor); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ClassifierCompositeItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ClassifierCompositeItemWriterTests.java index 665719141..ba992630e 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ClassifierCompositeItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ClassifierCompositeItemWriterTests.java @@ -36,13 +36,13 @@ import static org.junit.Assert.assertEquals; */ public class ClassifierCompositeItemWriterTests { - private ClassifierCompositeItemWriter writer = new ClassifierCompositeItemWriter(); - private List defaults = new ArrayList(); - private List foos = new ArrayList(); + private ClassifierCompositeItemWriter writer = new ClassifierCompositeItemWriter<>(); + private List defaults = new ArrayList<>(); + private List foos = new ArrayList<>(); @Test public void testWrite() throws Exception { - Map> map = new HashMap>(); + Map> map = new HashMap<>(); ItemWriter fooWriter = new ItemWriter() { @Override public void write(List items) throws Exception { @@ -57,7 +57,7 @@ public class ClassifierCompositeItemWriterTests { }; map.put("foo", fooWriter ); map.put("*", defaultWriter); - writer.setClassifier(new PatternMatchingClassifier>(map)); + writer.setClassifier(new PatternMatchingClassifier<>(map)); writer.write(Arrays.asList("foo", "foo", "one", "two", "three")); assertEquals("[foo, foo]", foos.toString()); assertEquals("[one, two, three]", defaults.toString()); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemProcessorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemProcessorTests.java index e42ba1daf..b71a9725b 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemProcessorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemProcessorTests.java @@ -36,7 +36,7 @@ import org.springframework.batch.item.ItemProcessor; */ public class CompositeItemProcessorTests { - private CompositeItemProcessor composite = new CompositeItemProcessor(); + private CompositeItemProcessor composite = new CompositeItemProcessor<>(); private ItemProcessor processor1; private ItemProcessor processor2; @@ -78,7 +78,7 @@ public class CompositeItemProcessorTests { @Test @SuppressWarnings({"unchecked", "serial"}) public void testItemProcessorGenerics() throws Exception { - CompositeItemProcessor composite = new CompositeItemProcessor(); + CompositeItemProcessor composite = new CompositeItemProcessor<>(); final ItemProcessor processor1 = mock(ItemProcessor.class); final ItemProcessor processor2 = mock(ItemProcessor.class); composite.setDelegates(new ArrayList>() {{ diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemStreamTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemStreamTests.java index bc222a525..9cee48d94 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemStreamTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemStreamTests.java @@ -33,7 +33,7 @@ public class CompositeItemStreamTests extends TestCase { private CompositeItemStream manager = new CompositeItemStream(); - private List list = new ArrayList(); + private List list = new ArrayList<>(); public void testRegisterAndOpen() { ItemStreamSupport stream = new ItemStreamSupport() { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemWriterTests.java index ff89af68e..4c24f7bc3 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemWriterTests.java @@ -34,7 +34,7 @@ import org.springframework.batch.item.ItemWriter; public class CompositeItemWriterTests { // object under test - private CompositeItemWriter itemWriter = new CompositeItemWriter(); + private CompositeItemWriter itemWriter = new CompositeItemWriter<>(); /** * Regular usage scenario. All injected processors should be called. @@ -45,7 +45,7 @@ public class CompositeItemWriterTests { final int NUMBER_OF_WRITERS = 10; List data = Collections.singletonList(new Object()); - List> writers = new ArrayList>(); + List> writers = new ArrayList<>(); for (int i = 0; i < NUMBER_OF_WRITERS; i++) { @SuppressWarnings("unchecked") @@ -82,7 +82,7 @@ public class CompositeItemWriterTests { } writer.write(data); - List> writers = new ArrayList>(); + List> writers = new ArrayList<>(); writers.add(writer); itemWriter.setDelegates(writers); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/IteratorItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/IteratorItemReaderTests.java index 50ce249ea..ccf64efdf 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/IteratorItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/IteratorItemReaderTests.java @@ -23,7 +23,7 @@ import junit.framework.TestCase; public class IteratorItemReaderTests extends TestCase{ public void testIterable() throws Exception { - IteratorItemReader reader = new IteratorItemReader(Arrays.asList(new String[] { "a", "b", "c" })); + IteratorItemReader reader = new IteratorItemReader<>(Arrays.asList(new String[]{"a", "b", "c"})); assertEquals("a", reader.read()); assertEquals("b", reader.read()); assertEquals("c", reader.read()); @@ -31,7 +31,7 @@ public class IteratorItemReaderTests extends TestCase{ } public void testIterator() throws Exception { - IteratorItemReader reader = new IteratorItemReader(Arrays.asList(new String[] { "a", "b", "c" }).iterator()); + IteratorItemReader reader = new IteratorItemReader<>(Arrays.asList(new String[] { "a", "b", "c" }).iterator()); assertEquals("a", reader.read()); assertEquals("b", reader.read()); assertEquals("c", reader.read()); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ListItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ListItemReaderTests.java index 60ca0aa2d..b258bb30e 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ListItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ListItemReaderTests.java @@ -26,7 +26,7 @@ import junit.framework.TestCase; public class ListItemReaderTests extends TestCase { - ListItemReader reader = new ListItemReader(Arrays.asList(new String[] { "a", "b", "c" })); + ListItemReader reader = new ListItemReader<>(Arrays.asList(new String[]{"a", "b", "c"})); public void testNext() throws Exception { assertEquals("a", reader.read()); @@ -36,8 +36,8 @@ public class ListItemReaderTests extends TestCase { } public void testChangeList() throws Exception { - List list = new ArrayList(Arrays.asList(new String[] { "a", "b", "c" })); - reader = new ListItemReader(list); + List list = new ArrayList<>(Arrays.asList(new String[]{"a", "b", "c"})); + reader = new ListItemReader<>(list); assertEquals("a", reader.read()); list.clear(); assertEquals(0, list.size()); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ScriptItemProcessorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ScriptItemProcessorTests.java index 165456b2c..20d2d2a81 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ScriptItemProcessorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ScriptItemProcessorTests.java @@ -38,7 +38,7 @@ import static org.junit.Assume.assumeTrue; * @since 3.1 */ public class ScriptItemProcessorTests { - private static List availableLanguages = new ArrayList(); + private static List availableLanguages = new ArrayList<>(); @BeforeClass public static void populateAvailableEngines() { @@ -53,7 +53,7 @@ public class ScriptItemProcessorTests { public void testJavascriptScriptSourceSimple() throws Exception { assumeTrue(languageExists("javascript")); - ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor(); + ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor<>(); scriptItemProcessor.setScriptSource("item.toUpperCase();", "javascript"); scriptItemProcessor.afterPropertiesSet(); @@ -64,7 +64,7 @@ public class ScriptItemProcessorTests { public void testJavascriptScriptSourceFunction() throws Exception { assumeTrue(languageExists("javascript")); - ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor(); + ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor<>(); scriptItemProcessor.setScriptSource("function process(item) { return item.toUpperCase(); } process(item);", "javascript"); scriptItemProcessor.afterPropertiesSet(); @@ -75,7 +75,7 @@ public class ScriptItemProcessorTests { public void testJRubyScriptSourceSimple() throws Exception { assumeTrue(languageExists("jruby")); - ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor(); + ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor<>(); scriptItemProcessor.setScriptSource("$item.upcase", "jruby"); scriptItemProcessor.afterPropertiesSet(); @@ -86,7 +86,7 @@ public class ScriptItemProcessorTests { public void testJRubyScriptSourceMethod() throws Exception { assumeTrue(languageExists("jruby")); - ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor(); + ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor<>(); scriptItemProcessor.setScriptSource("def process(item) $item.upcase end \n process($item)", "jruby"); scriptItemProcessor.afterPropertiesSet(); @@ -97,7 +97,7 @@ public class ScriptItemProcessorTests { public void testBeanShellScriptSourceSimple() throws Exception { assumeTrue(languageExists("bsh")); - ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor(); + ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor<>(); scriptItemProcessor.setScriptSource("item.toUpperCase();", "bsh"); scriptItemProcessor.afterPropertiesSet(); @@ -108,7 +108,7 @@ public class ScriptItemProcessorTests { public void testBeanShellScriptSourceFunction() throws Exception { assumeTrue(languageExists("bsh")); - ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor(); + ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor<>(); scriptItemProcessor.setScriptSource("String process(String item) { return item.toUpperCase(); } process(item);", "bsh"); scriptItemProcessor.afterPropertiesSet(); @@ -119,7 +119,7 @@ public class ScriptItemProcessorTests { public void testGroovyScriptSourceSimple() throws Exception { assumeTrue(languageExists("groovy")); - ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor(); + ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor<>(); scriptItemProcessor.setScriptSource("item.toUpperCase();", "groovy"); scriptItemProcessor.afterPropertiesSet(); @@ -130,7 +130,7 @@ public class ScriptItemProcessorTests { public void testGroovyScriptSourceMethod() throws Exception { assumeTrue(languageExists("groovy")); - ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor(); + ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor<>(); scriptItemProcessor.setScriptSource("def process(item) { return item.toUpperCase() } \n process(item)", "groovy"); scriptItemProcessor.afterPropertiesSet(); @@ -143,7 +143,7 @@ public class ScriptItemProcessorTests { Resource resource = new ClassPathResource("org/springframework/batch/item/support/processor-test-simple.js"); - ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor(); + ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor<>(); scriptItemProcessor.setScript(resource); scriptItemProcessor.afterPropertiesSet(); @@ -152,7 +152,7 @@ public class ScriptItemProcessorTests { @Test public void testItemBinding() throws Exception { - ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor(); + ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor<>(); scriptItemProcessor.setScriptSource("foo.contains('World');", "javascript"); scriptItemProcessor.setItemBindingVariableName("foo"); @@ -163,13 +163,13 @@ public class ScriptItemProcessorTests { @Test(expected = IllegalStateException.class) public void testNoScriptSet() throws Exception { - ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor(); + ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor<>(); scriptItemProcessor.afterPropertiesSet(); } @Test(expected = IllegalStateException.class) public void testScriptSourceAndScriptResourceSet() throws Exception { - ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor(); + ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor<>(); scriptItemProcessor.setScriptSource("blah", "blah"); scriptItemProcessor.setScript(new ClassPathResource("blah")); scriptItemProcessor.afterPropertiesSet(); @@ -177,13 +177,13 @@ public class ScriptItemProcessorTests { @Test(expected = IllegalStateException.class) public void testNoScriptSetWithoutInitBean() throws Exception { - ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor(); + ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor<>(); scriptItemProcessor.process("blah"); } @Test(expected = IllegalArgumentException.class) public void testScriptSourceWithNoLanguage() throws Exception { - ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor(); + ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor<>(); scriptItemProcessor.setScriptSource("function process(item) { return item.toUpperCase(); } process(item);", null); scriptItemProcessor.afterPropertiesSet(); } @@ -192,7 +192,7 @@ public class ScriptItemProcessorTests { public void testItemBindingNameChange() throws Exception { assumeTrue(languageExists("javascript")); - ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor(); + ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor<>(); scriptItemProcessor.setItemBindingVariableName("someOtherVarName"); scriptItemProcessor.setScriptSource("function process(param) { return param.toUpperCase(); } process(someOtherVarName);", "javascript"); scriptItemProcessor.afterPropertiesSet(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/SingleItemPeekableItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/SingleItemPeekableItemReaderTests.java index 496bb08bb..e32d5d712 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/SingleItemPeekableItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/SingleItemPeekableItemReaderTests.java @@ -29,14 +29,14 @@ import org.springframework.batch.item.ExecutionContext; */ public class SingleItemPeekableItemReaderTests { - private SingleItemPeekableItemReader reader = new SingleItemPeekableItemReader(); + private SingleItemPeekableItemReader reader = new SingleItemPeekableItemReader<>(); /** * Test method for {@link org.springframework.batch.item.support.SingleItemPeekableItemReader#read()}. */ @Test public void testRead() throws Exception { - reader.setDelegate(new CountingListItemReader(Arrays.asList("a", "b"))); + reader.setDelegate(new CountingListItemReader<>(Arrays.asList("a", "b"))); assertEquals("a", reader.read()); assertEquals("b", reader.read()); assertEquals(null, reader.read()); @@ -47,7 +47,7 @@ public class SingleItemPeekableItemReaderTests { */ @Test public void testPeek() throws Exception { - reader.setDelegate(new CountingListItemReader(Arrays.asList("a", "b"))); + reader.setDelegate(new CountingListItemReader<>(Arrays.asList("a", "b"))); assertEquals("a", reader.peek()); assertEquals("a", reader.read()); assertEquals("b", reader.read()); @@ -60,7 +60,7 @@ public class SingleItemPeekableItemReaderTests { */ @Test public void testCloseAndOpenNoPeek() throws Exception { - reader.setDelegate(new CountingListItemReader(Arrays.asList("a", "b"))); + reader.setDelegate(new CountingListItemReader<>(Arrays.asList("a", "b"))); assertEquals("a", reader.read()); ExecutionContext executionContext = new ExecutionContext(); reader.update(executionContext); @@ -74,7 +74,7 @@ public class SingleItemPeekableItemReaderTests { */ @Test public void testCloseAndOpenWithPeek() throws Exception { - reader.setDelegate(new CountingListItemReader(Arrays.asList("a", "b", "c"))); + reader.setDelegate(new CountingListItemReader<>(Arrays.asList("a", "b", "c"))); assertEquals("a", reader.read()); assertEquals("b", reader.peek()); ExecutionContext executionContext = new ExecutionContext(); @@ -87,7 +87,7 @@ public class SingleItemPeekableItemReaderTests { @Test public void testCloseAndOpenWithPeekAndRead() throws Exception { ExecutionContext executionContext = new ExecutionContext(); - reader.setDelegate(new CountingListItemReader(Arrays.asList("a", "b", "c"))); + reader.setDelegate(new CountingListItemReader<>(Arrays.asList("a", "b", "c"))); assertEquals("a", reader.read()); assertEquals("b", reader.peek()); reader.update(executionContext); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/SynchronizedItemStreamReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/SynchronizedItemStreamReaderTests.java index 1aee9e64f..26970b644 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/SynchronizedItemStreamReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/SynchronizedItemStreamReaderTests.java @@ -90,7 +90,7 @@ public class SynchronizedItemStreamReaderTests { final ExecutionContext executionContext = new ExecutionContext(); final TestItemReader testItemReader = new TestItemReader(); - final SynchronizedItemStreamReader synchronizedItemStreamReader = new SynchronizedItemStreamReader(); + final SynchronizedItemStreamReader synchronizedItemStreamReader = new SynchronizedItemStreamReader<>(); synchronizedItemStreamReader.setDelegate(testItemReader); // Open the ItemReader and make sure it's initialized properly. @@ -101,7 +101,7 @@ public class SynchronizedItemStreamReaderTests { /* Set up SIZE threads that read from the reader and updates the execution * context. */ - final Set ecSet = new HashSet(); + final Set ecSet = new HashSet<>(); final int SIZE = 20; Thread[] threads = new Thread[SIZE]; for (int i = 0; i < SIZE; i++) { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/TransactionAwareListItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/TransactionAwareListItemReaderTests.java index d7e658e0a..93a68363d 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/TransactionAwareListItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/TransactionAwareListItemReaderTests.java @@ -37,7 +37,7 @@ public class TransactionAwareListItemReaderTests extends TestCase { @Override protected void setUp() throws Exception { super.setUp(); - reader = new ListItemReader(TransactionAwareProxyFactory.createTransactionalList(Arrays.asList("a", "b", "c"))); + reader = new ListItemReader<>(TransactionAwareProxyFactory.createTransactionalList(Arrays.asList("a", "b", "c"))); } public void testNext() throws Exception { @@ -49,7 +49,7 @@ public class TransactionAwareListItemReaderTests extends TestCase { public void testCommit() throws Exception { PlatformTransactionManager transactionManager = new ResourcelessTransactionManager(); - final List taken = new ArrayList(); + final List taken = new ArrayList<>(); try { new TransactionTemplate(transactionManager).execute(new TransactionCallback() { @Override @@ -77,7 +77,7 @@ public class TransactionAwareListItemReaderTests extends TestCase { public void testTransactionalExhausted() throws Exception { PlatformTransactionManager transactionManager = new ResourcelessTransactionManager(); - final List taken = new ArrayList(); + final List taken = new ArrayList<>(); new TransactionTemplate(transactionManager).execute(new TransactionCallback() { @Override public Void doInTransaction(TransactionStatus status) { @@ -95,7 +95,7 @@ public class TransactionAwareListItemReaderTests extends TestCase { public void testRollback() throws Exception { PlatformTransactionManager transactionManager = new ResourcelessTransactionManager(); - final List taken = new ArrayList(); + final List taken = new ArrayList<>(); try { new TransactionTemplate(transactionManager).execute(new TransactionCallback() { @Override diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/SingleItemPeekableItemReaderBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/SingleItemPeekableItemReaderBuilderTests.java index 31fd147f6..dfeca1c94 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/SingleItemPeekableItemReaderBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/SingleItemPeekableItemReaderBuilderTests.java @@ -41,7 +41,7 @@ public class SingleItemPeekableItemReaderBuilderTests { public void testPeek() throws Exception { SingleItemPeekableItemReader reader = new SingleItemPeekableItemReaderBuilder() .delegate( - new ListItemReader(Arrays.asList("a", "b"))) + new ListItemReader<>(Arrays.asList("a", "b"))) .build(); assertEquals("a", reader.peek()); assertEquals("a", reader.read()); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/SynchronizedItemStreamReaderBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/SynchronizedItemStreamReaderBuilderTests.java index cb3281f59..5356667ee 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/SynchronizedItemStreamReaderBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/SynchronizedItemStreamReaderBuilderTests.java @@ -57,7 +57,7 @@ public class SynchronizedItemStreamReaderBuilderTests { * Set up SIZE threads that read from the reader and updates the execution * context. */ - final Set ecSet = new HashSet(); + final Set ecSet = new HashSet<>(); final int SIZE = 20; Thread[] threads = new Thread[SIZE]; for (int i = 0; i < SIZE; i++) { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/SpringValidatorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/SpringValidatorTests.java index 4430c0424..dc462c65f 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/SpringValidatorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/SpringValidatorTests.java @@ -30,7 +30,7 @@ import org.springframework.validation.Validator; */ public class SpringValidatorTests { - private SpringValidator validator = new SpringValidator(); + private SpringValidator validator = new SpringValidator<>(); private Validator mockValidator; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/ValidatingItemProcessorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/ValidatingItemProcessorTests.java index 0a1ea4ff4..a839261ce 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/ValidatingItemProcessorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/ValidatingItemProcessorTests.java @@ -35,7 +35,7 @@ public class ValidatingItemProcessorTests { @Test public void testSuccessfulValidation() throws Exception { - ValidatingItemProcessor tested = new ValidatingItemProcessor(validator); + ValidatingItemProcessor tested = new ValidatingItemProcessor<>(validator); validator.validate(ITEM); @@ -45,7 +45,7 @@ public class ValidatingItemProcessorTests { @Test(expected = ValidationException.class) public void testFailedValidation() throws Exception { - ValidatingItemProcessor tested = new ValidatingItemProcessor(validator); + ValidatingItemProcessor tested = new ValidatingItemProcessor<>(validator); processFailedValidation(tested); } @@ -53,7 +53,7 @@ public class ValidatingItemProcessorTests { @Test public void testFailedValidation_Filter() throws Exception { - ValidatingItemProcessor tested = new ValidatingItemProcessor(validator); + ValidatingItemProcessor tested = new ValidatingItemProcessor<>(validator); tested.setFilter(true); assertNull(processFailedValidation(tested)); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderCommonTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderCommonTests.java index 2979cef99..5298047ad 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderCommonTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderCommonTests.java @@ -37,7 +37,7 @@ public class StaxEventItemReaderCommonTests extends AbstractItemStreamItemReader @Override protected ItemReader getItemReader() throws Exception { - StaxEventItemReader reader = new StaxEventItemReader(); + StaxEventItemReader reader = new StaxEventItemReader<>(); reader.setResource(new ByteArrayResource(FOOS.getBytes())); reader.setFragmentRootElementName("foo"); reader.setUnmarshaller(new Unmarshaller() { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java index daf1346ca..a33905ebf 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java @@ -599,7 +599,7 @@ public class StaxEventItemReaderTests { private StaxEventItemReader> createNewInputSource() { Resource resource = new ByteArrayResource(xml.getBytes()); - StaxEventItemReader> newSource = new StaxEventItemReader>(); + StaxEventItemReader> newSource = new StaxEventItemReader<>(); newSource.setResource(resource); newSource.setFragmentRootElementName(FRAGMENT_ROOT_ELEMENT); @@ -612,7 +612,7 @@ public class StaxEventItemReaderTests { private StaxEventItemReader createNewItemCountAwareInputSource() { Resource resource = new ByteArrayResource(xml.getBytes()); - StaxEventItemReader newSource = new StaxEventItemReader(); + StaxEventItemReader newSource = new StaxEventItemReader<>(); newSource.setResource(resource); newSource.setFragmentRootElementName(FRAGMENT_ROOT_ELEMENT); @@ -633,7 +633,7 @@ public class StaxEventItemReaderTests { */ private List readRecordsInsideFragment(XMLEventReader eventReader, QName fragmentName) throws XMLStreamException { XMLEvent eventInsideFragment; - List events = new ArrayList(); + List events = new ArrayList<>(); do { eventInsideFragment = eventReader.peek(); if (eventInsideFragment instanceof EndElement diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemWriterTests.java index 39d3628d0..8dfdf69bc 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemWriterTests.java @@ -992,7 +992,7 @@ public class StaxEventItemWriterTests { * @return new instance of fully configured writer */ private StaxEventItemWriter createItemWriter() throws Exception { - StaxEventItemWriter source = new StaxEventItemWriter(); + StaxEventItemWriter source = new StaxEventItemWriter<>(); source.setResource(resource); marshaller = new SimpleMarshaller(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/TransactionalStaxEventItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/TransactionalStaxEventItemWriterTests.java index 67bee745d..ea414e863 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/TransactionalStaxEventItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/TransactionalStaxEventItemWriterTests.java @@ -255,7 +255,7 @@ public class TransactionalStaxEventItemWriterTests { * @return new instance of fully configured writer */ private StaxEventItemWriter createItemWriter() throws Exception { - StaxEventItemWriter source = new StaxEventItemWriter(); + StaxEventItemWriter source = new StaxEventItemWriter<>(); source.setResource(resource); Marshaller marshaller = new SimpleMarshaller(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/UnopenedElementClosingEventWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/UnopenedElementClosingEventWriterTests.java index 05305c917..f1a149949 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/UnopenedElementClosingEventWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/UnopenedElementClosingEventWriterTests.java @@ -51,7 +51,7 @@ public class UnopenedElementClosingEventWriterTests { private XMLEventFactory eventFactory = XMLEventFactory.newInstance(); - private List unopenedElements = new LinkedList(); + private List unopenedElements = new LinkedList<>(); private QName unopenedA = new QName("http://test", "unopened-a", "t"); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/jsr/item/ItemProcessorAdapterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/jsr/item/ItemProcessorAdapterTests.java index 66eeb5ff6..486ff35de 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/jsr/item/ItemProcessorAdapterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/jsr/item/ItemProcessorAdapterTests.java @@ -35,12 +35,12 @@ public class ItemProcessorAdapterTests { public void setUp() throws Exception { MockitoAnnotations.initMocks(this); - adapter = new ItemProcessorAdapter(delegate); + adapter = new ItemProcessorAdapter<>(delegate); } @Test(expected=IllegalArgumentException.class) public void testCreateWithNull() { - adapter = new ItemProcessorAdapter(null); + adapter = new ItemProcessorAdapter<>(null); } @Test diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/jsr/item/ItemReaderAdapterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/jsr/item/ItemReaderAdapterTests.java index 30ce4e22d..859ed4613 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/jsr/item/ItemReaderAdapterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/jsr/item/ItemReaderAdapterTests.java @@ -112,7 +112,7 @@ public class ItemReaderAdapterTests { @Test @SuppressWarnings("serial") public void testCheckpointChange() throws Exception { - ItemReaderAdapter adapter = new ItemReaderAdapter(new ItemReader() { + ItemReaderAdapter adapter = new ItemReaderAdapter<>(new ItemReader() { private CheckpointContainer container = null; private List items = new ArrayList() {{ diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/jsr/item/ItemWriterAdapterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/jsr/item/ItemWriterAdapterTests.java index 7e70ce139..89c43e77b 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/jsr/item/ItemWriterAdapterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/jsr/item/ItemWriterAdapterTests.java @@ -117,7 +117,7 @@ public class ItemWriterAdapterTests { @Test public void testCheckpointChange() throws Exception { - ItemWriterAdapter adapter = new ItemWriterAdapter(new ItemWriter() { + ItemWriterAdapter adapter = new ItemWriterAdapter<>(new ItemWriter() { private CheckpointContainer container = null; @@ -143,7 +143,7 @@ public class ItemWriterAdapterTests { ExecutionContext context = new ExecutionContext(); - List items = new ArrayList(); + List items = new ArrayList<>(); items.add("foo"); items.add("bar"); items.add("baz"); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/poller/DirectPollerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/poller/DirectPollerTests.java index 27f451d8f..bf1ce920b 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/poller/DirectPollerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/poller/DirectPollerTests.java @@ -33,7 +33,7 @@ import org.junit.Test; */ public class DirectPollerTests { - private Set repository = new HashSet(); + private Set repository = new HashSet<>(); @Test public void testSimpleSingleThreaded() throws Exception { @@ -42,7 +42,7 @@ public class DirectPollerTests { @Override public String call() throws Exception { - Set executions = new HashSet(repository); + Set executions = new HashSet<>(repository); if (executions.isEmpty()) { return null; } @@ -67,7 +67,7 @@ public class DirectPollerTests { @Override public String call() throws Exception { - Set executions = new HashSet(repository); + Set executions = new HashSet<>(repository); if (executions.isEmpty()) { return null; } @@ -92,7 +92,7 @@ public class DirectPollerTests { @Override public String call() throws Exception { - Set executions = new HashSet(repository); + Set executions = new HashSet<>(repository); if (executions.isEmpty()) { return null; } @@ -101,7 +101,7 @@ public class DirectPollerTests { }; - Poller poller = new DirectPoller(100L); + Poller poller = new DirectPoller<>(100L); sleepAndCreateStringInBackground(500L); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/RepeatContextSupportTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/RepeatContextSupportTests.java index e5db94291..30b605dfc 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/RepeatContextSupportTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/RepeatContextSupportTests.java @@ -26,7 +26,7 @@ import junit.framework.TestCase; */ public class RepeatContextSupportTests extends TestCase { - private List list = new ArrayList(); + private List list = new ArrayList<>(); /** * Test method for {@link org.springframework.batch.repeat.context.RepeatContextSupport#registerDestructionCallback(java.lang.String, java.lang.Runnable)}. diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/CompositeExceptionHandlerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/CompositeExceptionHandlerTests.java index 7a1946989..14db5f1dd 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/CompositeExceptionHandlerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/CompositeExceptionHandlerTests.java @@ -39,7 +39,7 @@ public class CompositeExceptionHandlerTests extends TestCase { } public void testDelegation() throws Throwable { - final List list = new ArrayList(); + final List list = new ArrayList<>(); handler.setHandlers(new ExceptionHandler[] { new ExceptionHandler() { @Override diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/interceptor/RepeatOperationsInterceptorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/interceptor/RepeatOperationsInterceptorTests.java index 1d5966803..6430d4d31 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/interceptor/RepeatOperationsInterceptorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/interceptor/RepeatOperationsInterceptorTests.java @@ -67,7 +67,7 @@ public class RepeatOperationsInterceptorTests extends TestCase { } public void testSetTemplate() throws Exception { - final List calls = new ArrayList(); + final List calls = new ArrayList<>(); interceptor.setRepeatOperations(new RepeatOperations() { @Override public RepeatStatus iterate(RepeatCallback callback) { @@ -87,7 +87,7 @@ public class RepeatOperationsInterceptorTests extends TestCase { } public void testCallbackNotExecuted() throws Exception { - final List calls = new ArrayList(); + final List calls = new ArrayList<>(); interceptor.setRepeatOperations(new RepeatOperations() { @Override public RepeatStatus iterate(RepeatCallback callback) { @@ -160,7 +160,7 @@ public class RepeatOperationsInterceptorTests extends TestCase { public void testInterceptorChainWithRetry() throws Exception { ((Advised) service).addAdvice(interceptor); - final List list = new ArrayList(); + final List list = new ArrayList<>(); ((Advised) service).addAdvice(new MethodInterceptor() { @Override public Object invoke(MethodInvocation invocation) throws Throwable { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/CompositeRepeatListenerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/CompositeRepeatListenerTests.java index a2f1fce13..c9d913d4b 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/CompositeRepeatListenerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/CompositeRepeatListenerTests.java @@ -33,7 +33,7 @@ public class CompositeRepeatListenerTests extends TestCase { private CompositeRepeatListener listener = new CompositeRepeatListener(); private RepeatContext context = new RepeatContextSupport(null); - private List list = new ArrayList(); + private List list = new ArrayList<>(); /** * Test method for {@link CompositeRepeatListener#setListeners(RepeatListener[])}. diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/RepeatListenerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/RepeatListenerTests.java index 7b5275a77..25ccc29ff 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/RepeatListenerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/RepeatListenerTests.java @@ -35,7 +35,7 @@ public class RepeatListenerTests extends TestCase { public void testBeforeInterceptors() throws Exception { RepeatTemplate template = new RepeatTemplate(); - final List calls = new ArrayList(); + final List calls = new ArrayList<>(); template.setListeners(new RepeatListener[] { new RepeatListenerSupport() { @Override public void before(RepeatContext context) { @@ -64,7 +64,7 @@ public class RepeatListenerTests extends TestCase { public void testBeforeInterceptorCanVeto() throws Exception { RepeatTemplate template = new RepeatTemplate(); - final List calls = new ArrayList(); + final List calls = new ArrayList<>(); template.registerListener(new RepeatListenerSupport() { @Override public void before(RepeatContext context) { @@ -86,7 +86,7 @@ public class RepeatListenerTests extends TestCase { public void testAfterInterceptors() throws Exception { RepeatTemplate template = new RepeatTemplate(); - final List calls = new ArrayList(); + final List calls = new ArrayList<>(); template.setListeners(new RepeatListener[] { new RepeatListenerSupport() { @Override public void after(RepeatContext context, RepeatStatus result) { @@ -113,7 +113,7 @@ public class RepeatListenerTests extends TestCase { public void testOpenInterceptors() throws Exception { RepeatTemplate template = new RepeatTemplate(); - final List calls = new ArrayList(); + final List calls = new ArrayList<>(); template.setListeners(new RepeatListener[] { new RepeatListenerSupport() { @Override public void open(RepeatContext context) { @@ -139,7 +139,7 @@ public class RepeatListenerTests extends TestCase { public void testSingleOpenInterceptor() throws Exception { RepeatTemplate template = new RepeatTemplate(); - final List calls = new ArrayList(); + final List calls = new ArrayList<>(); template.registerListener(new RepeatListenerSupport() { @Override public void open(RepeatContext context) { @@ -160,7 +160,7 @@ public class RepeatListenerTests extends TestCase { public void testCloseInterceptors() throws Exception { RepeatTemplate template = new RepeatTemplate(); - final List calls = new ArrayList(); + final List calls = new ArrayList<>(); template.setListeners(new RepeatListener[] { new RepeatListenerSupport() { @Override public void close(RepeatContext context) { @@ -188,7 +188,7 @@ public class RepeatListenerTests extends TestCase { public void testOnErrorInterceptors() throws Exception { RepeatTemplate template = new RepeatTemplate(); - final List calls = new ArrayList(); + final List calls = new ArrayList<>(); template.setListeners(new RepeatListener[] { new RepeatListenerSupport() { @Override public void onError(RepeatContext context, Throwable t) { @@ -218,7 +218,7 @@ public class RepeatListenerTests extends TestCase { public void testOnErrorInterceptorsPrecedence() throws Exception { RepeatTemplate template = new RepeatTemplate(); - final List calls = new ArrayList(); + final List calls = new ArrayList<>(); template.setListeners(new RepeatListener[] { new RepeatListenerSupport() { @Override public void after(RepeatContext context, RepeatStatus result) { @@ -250,8 +250,8 @@ public class RepeatListenerTests extends TestCase { public void testAsynchronousOnErrorInterceptorsPrecedence() throws Exception { TaskExecutorRepeatTemplate template = new TaskExecutorRepeatTemplate(); template.setTaskExecutor(new SimpleAsyncTaskExecutor()); - final List calls = new ArrayList(); - final List fails = new ArrayList(); + final List calls = new ArrayList<>(); + final List fails = new ArrayList<>(); template.setListeners(new RepeatListener[] { new RepeatListenerSupport() { @Override public void after(RepeatContext context, RepeatStatus result) { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java index 13e28883c..c8b119d4d 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java @@ -56,7 +56,7 @@ public abstract class AbstractTradeBatchTests { protected TradeItemReader(Resource resource) throws Exception { super(); setResource(resource); - DefaultLineMapper mapper = new DefaultLineMapper(); + DefaultLineMapper mapper = new DefaultLineMapper<>(); mapper.setLineTokenizer(new DelimitedLineTokenizer()); mapper.setFieldSetMapper(new TradeMapper()); setLineMapper(mapper); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ChunkedRepeatTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ChunkedRepeatTests.java index df8d9e6df..51ff3324c 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ChunkedRepeatTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ChunkedRepeatTests.java @@ -49,7 +49,7 @@ public class ChunkedRepeatTests extends AbstractTradeBatchTests { public void testChunkedBatchWithTerminationPolicy() throws Exception { RepeatTemplate repeatTemplate = new RepeatTemplate(); - final RepeatCallback callback = new ItemReaderRepeatCallback(provider, processor); + final RepeatCallback callback = new ItemReaderRepeatCallback<>(provider, processor); final RepeatTemplate chunkTemplate = new RepeatTemplate(); // The policy is resettable so we only have to resolve this dependency @@ -83,7 +83,7 @@ public class ChunkedRepeatTests extends AbstractTradeBatchTests { public void testAsynchronousChunkedBatchWithCompletionPolicy() throws Exception { RepeatTemplate repeatTemplate = new RepeatTemplate(); - final RepeatCallback callback = new ItemReaderRepeatCallback(provider, processor); + final RepeatCallback callback = new ItemReaderRepeatCallback<>(provider, processor); final TaskExecutorRepeatTemplate chunkTemplate = new TaskExecutorRepeatTemplate(); // The policy is resettable so we only have to resolve this dependency diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/SimpleRepeatTemplateTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/SimpleRepeatTemplateTests.java index 46d91d6fd..77e9961d3 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/SimpleRepeatTemplateTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/SimpleRepeatTemplateTests.java @@ -58,7 +58,7 @@ public class SimpleRepeatTemplateTests extends AbstractTradeBatchTests { @Test public void testExecute() throws Exception { - template.iterate(new ItemReaderRepeatCallback(provider, processor)); + template.iterate(new ItemReaderRepeatCallback<>(provider, processor)); assertEquals(NUMBER_OF_ITEMS, processor.count); } @@ -72,7 +72,7 @@ public class SimpleRepeatTemplateTests extends AbstractTradeBatchTests { template.setCompletionPolicy(new SimpleCompletionPolicy(2)); - template.iterate(new ItemReaderRepeatCallback(provider, processor)); + template.iterate(new ItemReaderRepeatCallback<>(provider, processor)); assertEquals(2, processor.count); @@ -113,7 +113,7 @@ public class SimpleRepeatTemplateTests extends AbstractTradeBatchTests { @Test public void testContextClosedOnNormalCompletion() throws Exception { - final List list = new ArrayList(); + final List list = new ArrayList<>(); final RepeatContext context = new RepeatContextSupport(null) { @Override @@ -149,7 +149,7 @@ public class SimpleRepeatTemplateTests extends AbstractTradeBatchTests { @Test public void testContextClosedOnAbnormalCompletion() throws Exception { - final List list = new ArrayList(); + final List list = new ArrayList<>(); final RepeatContext context = new RepeatContextSupport(null) { @Override @@ -191,7 +191,7 @@ public class SimpleRepeatTemplateTests extends AbstractTradeBatchTests { @Test public void testExceptionHandlerCalledOnAbnormalCompletion() throws Exception { - final List list = new ArrayList(); + final List list = new ArrayList<>(); template.setExceptionHandler(new ExceptionHandler() { @Override @@ -358,7 +358,7 @@ public class SimpleRepeatTemplateTests extends AbstractTradeBatchTests { */ @Test public void testResult() throws Exception { - RepeatStatus result = template.iterate(new ItemReaderRepeatCallback(provider, processor)); + RepeatStatus result = template.iterate(new ItemReaderRepeatCallback<>(provider, processor)); assertEquals(NUMBER_OF_ITEMS, processor.count); // We are complete - do not expect to be called again assertFalse(result.isContinuable()); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplateAsynchronousTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplateAsynchronousTests.java index 1547e2ca1..a702bd0eb 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplateAsynchronousTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplateAsynchronousTests.java @@ -149,7 +149,7 @@ public class TaskExecutorRepeatTemplateAsynchronousTests extends AbstractTradeBa public void testMultiThreadAsynchronousExecution() throws Exception { final String threadName = Thread.currentThread().getName(); - final Set threadNames = new HashSet(); + final Set threadNames = new HashSet<>(); final RepeatCallback callback = new RepeatCallback() { @Override @@ -184,8 +184,8 @@ public class TaskExecutorRepeatTemplateAsynchronousTests extends AbstractTradeBa template.setThrottleLimit(throttleLimit); final String threadName = Thread.currentThread().getName(); - final Set threadNames = new HashSet(); - final List items = new ArrayList(); + final Set threadNames = new HashSet<>(); + final List items = new ArrayList<>(); final RepeatCallback callback = new RepeatCallback() { @Override @@ -234,7 +234,7 @@ public class TaskExecutorRepeatTemplateAsynchronousTests extends AbstractTradeBa jobTemplate.setTaskExecutor(taskExecutor); final String threadName = Thread.currentThread().getName(); - final Set threadNames = new HashSet(); + final Set threadNames = new HashSet<>(); final RepeatCallback stepCallback = new ItemReaderRepeatCallback(provider, processor) { @Override diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ThrottleLimitResultQueueTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ThrottleLimitResultQueueTests.java index 527063a12..1d6bd9f1f 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ThrottleLimitResultQueueTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ThrottleLimitResultQueueTests.java @@ -31,7 +31,7 @@ import org.junit.Test; */ public class ThrottleLimitResultQueueTests { - private ThrottleLimitResultQueue queue = new ThrottleLimitResultQueue(1); + private ThrottleLimitResultQueue queue = new ThrottleLimitResultQueue<>(1); @Test public void testPutTake() throws Exception { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/PatternMatcherTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/PatternMatcherTests.java index 83586fe16..19ca26fc3 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/PatternMatcherTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/PatternMatcherTests.java @@ -30,14 +30,14 @@ import org.junit.Test; */ public class PatternMatcherTests { - private static Map map = new HashMap(); + private static Map map = new HashMap<>(); static { map.put("an*", 3); map.put("a*", 2); map.put("big*", 4); } - private static Map defaultMap = new HashMap(); + private static Map defaultMap = new HashMap<>(); static { defaultMap.put("an", 3); defaultMap.put("a", 2); @@ -103,36 +103,36 @@ public class PatternMatcherTests { @Test public void testMatchPrefixSubsumed() { - assertEquals(2, new PatternMatcher(map).match("apple").intValue()); + assertEquals(2, new PatternMatcher<>(map).match("apple").intValue()); } @Test public void testMatchPrefixSubsuming() { - assertEquals(3, new PatternMatcher(map).match("animal").intValue()); + assertEquals(3, new PatternMatcher<>(map).match("animal").intValue()); } @Test public void testMatchPrefixUnrelated() { - assertEquals(4, new PatternMatcher(map).match("biggest").intValue()); + assertEquals(4, new PatternMatcher<>(map).match("biggest").intValue()); } @Test(expected = IllegalStateException.class) public void testMatchPrefixNoMatch() { - new PatternMatcher(map).match("bat"); + new PatternMatcher<>(map).match("bat"); } @Test public void testMatchPrefixDefaultValueUnrelated() { - assertEquals(5, new PatternMatcher(defaultMap).match("biggest").intValue()); + assertEquals(5, new PatternMatcher<>(defaultMap).match("biggest").intValue()); } @Test public void testMatchPrefixDefaultValueEmptyString() { - assertEquals(1, new PatternMatcher(defaultMap).match("").intValue()); + assertEquals(1, new PatternMatcher<>(defaultMap).match("").intValue()); } @Test public void testMatchPrefixDefaultValueNoMatch() { - assertEquals(1, new PatternMatcher(defaultMap).match("bat").intValue()); + assertEquals(1, new PatternMatcher<>(defaultMap).match("bat").intValue()); } } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/ConcurrentTransactionAwareProxyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/ConcurrentTransactionAwareProxyTests.java index 992e4b066..48a8effa1 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/ConcurrentTransactionAwareProxyTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/ConcurrentTransactionAwareProxyTests.java @@ -66,7 +66,7 @@ public class ConcurrentTransactionAwareProxyTests { @Before public void init() { executor = Executors.newFixedThreadPool(outerMax); - completionService = new ExecutorCompletionService>(executor); + completionService = new ExecutorCompletionService<>(executor); } @After @@ -142,7 +142,7 @@ public class ConcurrentTransactionAwareProxyTests { completionService.submit(new Callable>() { @Override public List call() throws Exception { - List list = new ArrayList(); + List list = new ArrayList<>(); for (int i = 0; i < innerMax; i++) { String value = count + "bar" + i; saveInSetAndAssert(set, value); @@ -170,7 +170,7 @@ public class ConcurrentTransactionAwareProxyTests { completionService.submit(new Callable>() { @Override public List call() throws Exception { - List result = new ArrayList(); + List result = new ArrayList<>(); for (int i = 0; i < innerMax; i++) { String value = "bar" + i; saveInListAndAssert(list, value); @@ -210,7 +210,7 @@ public class ConcurrentTransactionAwareProxyTests { completionService.submit(new Callable>() { @Override public List call() throws Exception { - List list = new ArrayList(); + List list = new ArrayList<>(); for (int i = 0; i < innerMax; i++) { String value = "bar" + i; list.add(saveInMapAndAssert(map, id, value).get("foo")); @@ -267,7 +267,7 @@ public class ConcurrentTransactionAwareProxyTests { @Override public Void doInTransaction(TransactionStatus status) { if (!map.containsKey(id)) { - map.put(id, new HashMap()); + map.put(id, new HashMap<>()); } map.get(id).put("foo", value); return null; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareMapFactoryTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareMapFactoryTests.java index 57acadc6c..380658877 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareMapFactoryTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareMapFactoryTests.java @@ -33,7 +33,7 @@ public class TransactionAwareMapFactoryTests extends TestCase { @Override protected void setUp() throws Exception { - Map seed = new HashMap(); + Map seed = new HashMap<>(); seed.put("foo", "oof"); seed.put("bar", "bar"); seed.put("spam", "maps"); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareSetFactoryTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareSetFactoryTests.java index c7366fc9b..6f6360957 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareSetFactoryTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareSetFactoryTests.java @@ -39,7 +39,7 @@ public class TransactionAwareSetFactoryTests { @Before public void setUp() throws Exception { - set = TransactionAwareProxyFactory.createTransactionalSet(new HashSet(Arrays.asList("foo", "bar", "spam"))); + set = TransactionAwareProxyFactory.createTransactionalSet(new HashSet<>(Arrays.asList("foo", "bar", "spam"))); } @Test