Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/AnalysisEngineUtils.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/AnalysisEngineUtils.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/AnalysisEngineUtils.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/AnalysisEngineUtils.java Mon Dec 3 22:00:02 2018 @@ -48,7 +48,7 @@ public class AnalysisEngineUtils { */ public static FSMatchConstraint createOutputFilter(AnalysisEngineMetaData aMetaData) { // get a list of the AE's output type names - Set<String> outputTypes = new TreeSet<String>(); + Set<String> outputTypes = new TreeSet<>(); // outputTypes.add("Document"); //always output the document Capability[] capabilities = aMetaData.getCapabilities(); for (int i = 0; i < capabilities.length; i++) {
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java Mon Dec 3 22:00:02 2018 @@ -303,8 +303,8 @@ public class CasCopier { srcTsi = originalSrcCas.getTypeSystemImpl(); tgtTsi = originalTgtCas.getTypeSystemImpl(); - src2TgtType = (srcTsi == tgtTsi) ? null : new Int2ObjListMap<TypeImpl>(srcTsi.getTypeArraySize()); - src2TgtFeat = (srcTsi == tgtTsi) ? null : new Int2ObjListMap<FeatureImpl>(srcTsi.getNumberOfFeatures() + 1); + src2TgtType = (srcTsi == tgtTsi) ? null : new Int2ObjListMap<>(srcTsi.getTypeArraySize()); + src2TgtFeat = (srcTsi == tgtTsi) ? null : new Int2ObjListMap<>(srcTsi.getNumberOfFeatures() + 1); // tInfoArray = new TypeInfo[srcTsi.getLargestTypeCode() + 1]; Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java Mon Dec 3 22:00:02 2018 @@ -106,7 +106,7 @@ public class CasCreationUtils { */ public static CAS createCas(AnalysisEngineMetaData aMetaData) throws ResourceInitializationException { - List<AnalysisEngineMetaData> list = new ArrayList<AnalysisEngineMetaData>(); + List<AnalysisEngineMetaData> list = new ArrayList<>(); list.add(aMetaData); return createCas(list); } @@ -125,7 +125,7 @@ public class CasCreationUtils { */ public static CAS createCas(ProcessingResourceMetaData aMetaData) throws ResourceInitializationException { - List<ProcessingResourceMetaData> list = new ArrayList<ProcessingResourceMetaData>(); + List<ProcessingResourceMetaData> list = new ArrayList<>(); list.add(aMetaData); return createCas(list); } @@ -166,7 +166,7 @@ public class CasCreationUtils { */ public static CAS createCas(AnalysisEngineDescription aDescription, Properties aPerformanceTuningSettings) throws ResourceInitializationException { - List<AnalysisEngineDescription> list = new ArrayList<AnalysisEngineDescription>(); + List<AnalysisEngineDescription> list = new ArrayList<>(); list.add(aDescription); return createCas(list, aPerformanceTuningSettings); } @@ -270,9 +270,9 @@ public class CasCreationUtils { List<ProcessingResourceMetaData> mdList = getMetaDataList(aComponentDescriptionsOrMetaData, aResourceManager); // extract TypeSystems, TypePriorities, and FsIndexes from metadata - List<TypeSystemDescription> typeSystems = new ArrayList<TypeSystemDescription>(); - List<TypePriorities> typePriorities = new ArrayList<TypePriorities>(); - List<FsIndexCollection> fsIndexes = new ArrayList<FsIndexCollection>(); + List<TypeSystemDescription> typeSystems = new ArrayList<>(); + List<TypePriorities> typePriorities = new ArrayList<>(); + List<FsIndexCollection> fsIndexes = new ArrayList<>(); Iterator<ProcessingResourceMetaData> it = mdList.iterator(); while (it.hasNext()) { ProcessingResourceMetaData md = it.next(); @@ -439,9 +439,9 @@ public class CasCreationUtils { List<ProcessingResourceMetaData> mdList = getMetaDataList(aComponentDescriptionsOrMetaData, aResourceManager); // extract TypeSystems, TypePriorities, and FsIndexes from metadata - List<TypeSystemDescription> typeSystems = new ArrayList<TypeSystemDescription>(); - List<TypePriorities> typePriorities = new ArrayList<TypePriorities>(); - List<FsIndexCollection> fsIndexes = new ArrayList<FsIndexCollection>(); + List<TypeSystemDescription> typeSystems = new ArrayList<>(); + List<TypePriorities> typePriorities = new ArrayList<>(); + List<FsIndexCollection> fsIndexes = new ArrayList<>(); Iterator<ProcessingResourceMetaData> it = mdList.iterator(); while (it.hasNext()) { ProcessingResourceMetaData md = it.next(); @@ -556,7 +556,7 @@ public class CasCreationUtils { aTypeSystemDesc.resolveImports(aResourceManager); //even though there's only one Type System, we still need to do a merge, to handle the //case where this TypeSystem defines the same type more than once (or has imports that do) - List<TypeSystemDescription> tsList = new ArrayList<TypeSystemDescription>(); + List<TypeSystemDescription> tsList = new ArrayList<>(); tsList.add(aTypeSystemDesc); aTypeSystemDesc = mergeTypeSystems(tsList, aResourceManager, null); } @@ -722,11 +722,11 @@ public class CasCreationUtils { // over this, adding types to the CAS and removing them from the linked // list. We continue until the list is empty or we cannot make any // progress. - LinkedList<TypeDescription> typeList = new LinkedList<TypeDescription>(); + LinkedList<TypeDescription> typeList = new LinkedList<>(); typeList.addAll(Arrays.asList(types)); int numTypes = typeList.size(); int lastNumTypes; - List<TypeDescription> typesInOrderOfCreation = new LinkedList<TypeDescription>(); + List<TypeDescription> typesInOrderOfCreation = new LinkedList<>(); do { lastNumTypes = numTypes; Iterator<TypeDescription> it = typeList.iterator(); @@ -991,7 +991,7 @@ public class CasCreationUtils { TypeSystemDescription result = UIMAFramework.getResourceSpecifierFactory() .createTypeSystemDescription(); Iterator<FeatureStructure> iter = aCasData.getFeatureStructures(); - List<TypeDescription> typesArr = new ArrayList<TypeDescription>(); + List<TypeDescription> typesArr = new ArrayList<>(); while (iter.hasNext()) { FeatureStructure casFS = iter.next(); TypeDescription newType = UIMAFramework.getResourceSpecifierFactory().createTypeDescription(); @@ -1092,7 +1092,7 @@ public class CasCreationUtils { ResourceManager aResourceManager, Map<String, Set<String>> aOutputMergedTypes) throws ResourceInitializationException { // also build a Map from Type names to Types. Use a TreeMap so we get a consistent ordering of types. - Map<String, TypeDescription> typeNameMap = new TreeMap<String,TypeDescription>(); + Map<String, TypeDescription> typeNameMap = new TreeMap<>(); // Iterate through all type systems and add types to the merged TypeSystem. // If a type is defined more than once, we need to check if the superType @@ -1105,7 +1105,7 @@ public class CasCreationUtils { // over this, adding types to the merged type system when their supertypes // become defined. We continue until the list is empty or we cannot make any // progress. - LinkedList<TypeDescription> typeList = new LinkedList<TypeDescription>(); + LinkedList<TypeDescription> typeList = new LinkedList<>(); Iterator<? extends TypeSystemDescription> it = aTypeSystems.iterator(); while (it.hasNext()) { TypeSystemDescription ts = it.next(); @@ -1223,8 +1223,8 @@ public class CasCreationUtils { return false; } - Set<String> s1 = new HashSet<String>(av1.length); - Set<String> s2 = new HashSet<String>(av1.length); + Set<String> s1 = new HashSet<>(av1.length); + Set<String> s2 = new HashSet<>(av1.length); for (AllowedValue av : av1) { s1.add(av.getString()); @@ -1275,7 +1275,7 @@ public class CasCreationUtils { String typeName = currentType.getName(); Set<String> descriptorUrls = aOutputMergedTypes.get(typeName); if (descriptorUrls == null) { - descriptorUrls = new TreeSet<String>(); + descriptorUrls = new TreeSet<>(); descriptorUrls.add(existingType.getSourceUrlString()); descriptorUrls.add(currentType.getSourceUrlString()); aOutputMergedTypes.put(typeName, descriptorUrls); @@ -1361,12 +1361,12 @@ public class CasCreationUtils { AnalysisEngineDescription aAggregateDescription, ResourceManager aResourceManager, Map<String, Set<String>> aOutputMergedTypes) throws ResourceInitializationException { // expand the aggregate AE description into the individual delegates - List<AnalysisEngineDescription> l = new ArrayList<AnalysisEngineDescription>(); + List<AnalysisEngineDescription> l = new ArrayList<>(); l.add(aAggregateDescription); List<ProcessingResourceMetaData> mdList = getMetaDataList(l, aResourceManager); // extract type systems and merge - List<TypeSystemDescription> typeSystems = new ArrayList<TypeSystemDescription>(); + List<TypeSystemDescription> typeSystems = new ArrayList<>(); Iterator<ProcessingResourceMetaData> it = mdList.iterator(); while (it.hasNext()) { ProcessingResourceMetaData md = it.next(); @@ -1390,7 +1390,7 @@ public class CasCreationUtils { */ public static FsIndexCollection mergeFsIndexes(List<? extends FsIndexCollection> aFsIndexCollections, ResourceManager aResourceManager) throws ResourceInitializationException { - Map<String, FsIndexDescription> aggIndexes = new HashMap<String, FsIndexDescription>(); + Map<String, FsIndexDescription> aggIndexes = new HashMap<>(); Iterator<? extends FsIndexCollection> it = aFsIndexCollections.iterator(); while (it.hasNext()) { FsIndexCollection indexColl = it.next(); @@ -1468,12 +1468,12 @@ public class CasCreationUtils { AnalysisEngineDescription aAggregateDescription, ResourceManager aResourceManager) throws ResourceInitializationException { // expand the aggregate AE description into the individual delegates - List<AnalysisEngineDescription> l = new ArrayList<AnalysisEngineDescription>(); + List<AnalysisEngineDescription> l = new ArrayList<>(); l.add(aAggregateDescription); List<ProcessingResourceMetaData> mdList = getMetaDataList(l, aResourceManager); // extract FsIndexCollections and merge - List<FsIndexCollection> fsIndexes = new ArrayList<FsIndexCollection>(); + List<FsIndexCollection> fsIndexes = new ArrayList<>(); Iterator<ProcessingResourceMetaData> it = mdList.iterator(); while (it.hasNext()) { ProcessingResourceMetaData md = it.next(); @@ -1555,12 +1555,12 @@ public class CasCreationUtils { AnalysisEngineDescription aAggregateDescription, ResourceManager aResourceManager) throws ResourceInitializationException { // expand the aggregate AE description into the individual delegates - ArrayList<AnalysisEngineDescription> l = new ArrayList<AnalysisEngineDescription>(); + ArrayList<AnalysisEngineDescription> l = new ArrayList<>(); l.add(aAggregateDescription); List<ProcessingResourceMetaData> mdList = getMetaDataList(l, aResourceManager); // extract TypePriorities and merge - List<TypePriorities> typePriorities = new ArrayList<TypePriorities>(); + List<TypePriorities> typePriorities = new ArrayList<>(); Iterator<ProcessingResourceMetaData> it = mdList.iterator(); while (it.hasNext()) { ProcessingResourceMetaData md = it.next(); @@ -1608,7 +1608,7 @@ public class CasCreationUtils { AnalysisEngineDescription aAggregateDescription, ResourceManager aResourceManager, Map<String, Set<String>> aOutputMergedTypes, Map<String, ? super Exception> aOutputFailedRemotes) throws ResourceInitializationException { // expand the aggregate AE description into the individual delegates - ArrayList<AnalysisEngineDescription> l = new ArrayList<AnalysisEngineDescription>(); + ArrayList<AnalysisEngineDescription> l = new ArrayList<>(); l.add(aAggregateDescription); List<ProcessingResourceMetaData> mdList = getMetaDataList(l, aResourceManager, aOutputFailedRemotes); @@ -1616,7 +1616,7 @@ public class CasCreationUtils { .createProcessingResourceMetaData(); // extract type systems and merge - List<TypeSystemDescription> typeSystems = new ArrayList<TypeSystemDescription>(); + List<TypeSystemDescription> typeSystems = new ArrayList<>(); Iterator<ProcessingResourceMetaData> it = mdList.iterator(); while (it.hasNext()) { ProcessingResourceMetaData md = it.next(); @@ -1626,7 +1626,7 @@ public class CasCreationUtils { result.setTypeSystem(mergeTypeSystems(typeSystems, aResourceManager, aOutputMergedTypes)); // extract TypePriorities and merge - List<TypePriorities> typePriorities = new ArrayList<TypePriorities>(); + List<TypePriorities> typePriorities = new ArrayList<>(); it = mdList.iterator(); while (it.hasNext()) { ProcessingResourceMetaData md = it.next(); @@ -1636,7 +1636,7 @@ public class CasCreationUtils { result.setTypePriorities(mergeTypePriorities(typePriorities, aResourceManager)); // extract FsIndexCollections and merge - List<FsIndexCollection> fsIndexes = new ArrayList<FsIndexCollection>(); + List<FsIndexCollection> fsIndexes = new ArrayList<>(); it = mdList.iterator(); while (it.hasNext()) { ProcessingResourceMetaData md = it.next(); @@ -1828,7 +1828,7 @@ public class CasCreationUtils { * This is the cache. * All references to it are synchronized, using it as the object. */ - private static final transient Map<MetaDataCacheKey, MetaDataCacheEntry> metaDataCache = new HashMap<MetaDataCacheKey, MetaDataCacheEntry>(); + private static final transient Map<MetaDataCacheKey, MetaDataCacheEntry> metaDataCache = new HashMap<>(); /** This holds an instance of a Timer object * This object is nulled out and gets gc'd when it's timertask finishes, when the @@ -1948,7 +1948,7 @@ public class CasCreationUtils { ResourceManager aResourceManager, Map<String, ? super Exception> aOutputFailedRemotes, String aContextName) throws ResourceInitializationException { - List<ProcessingResourceMetaData> mdList = new ArrayList<ProcessingResourceMetaData>(); + List<ProcessingResourceMetaData> mdList = new ArrayList<>(); if (null == aComponentDescriptionOrMetaData) { return mdList; } @@ -1971,7 +1971,7 @@ public class CasCreationUtils { Iterator<Map.Entry<String, ResourceSpecifier>> delIter = delegateMap.entrySet().iterator(); while (delIter.hasNext()) { Map.Entry<String, ResourceSpecifier> delEntry = delIter.next(); - List<ResourceSpecifier> tempList = new ArrayList<ResourceSpecifier>(); + List<ResourceSpecifier> tempList = new ArrayList<>(); tempList.add(delEntry.getValue()); mdList.addAll(getMetaDataList(tempList, aResourceManager, aOutputFailedRemotes, aContextName + "/" + delEntry.getKey())); @@ -2017,7 +2017,7 @@ public class CasCreationUtils { // try to instantiate the resource Resource resource = null; - Map<String, Object> prParams = new HashMap<String, Object>(); + Map<String, Object> prParams = new HashMap<>(); if (aResourceManager != null) { prParams.put(Resource.PARAM_RESOURCE_MANAGER, aResourceManager); } Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasPool.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasPool.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasPool.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasPool.java Mon Dec 3 22:00:02 2018 @@ -352,7 +352,7 @@ public class CasPool { throws ResourceInitializationException { // create first CAS from metadata CAS c0 = CasCreationUtils.createCas(casDef, performanceTuningSettings); - Set<CAS> all = new HashSet<CAS>(aNumInstances); + Set<CAS> all = new HashSet<>(aNumInstances); // set owner so cas.release() can return it to the pool ((CASImpl) c0).setOwner(casDef.getCasManager()); all.add(c0); @@ -367,7 +367,7 @@ public class CasPool { private static Set<CAS> fillPool(int aNumInstances, CasManager casManager, Properties performanceTuningSettings) throws ResourceInitializationException { - Set<CAS> all = new HashSet<CAS>(aNumInstances); + Set<CAS> all = new HashSet<>(aNumInstances); // create additional CASes that share same type system for (int i = 0; i < aNumInstances; i++) { CAS c = casManager.createNewCas(performanceTuningSettings); @@ -380,12 +380,12 @@ public class CasPool { // no callers as of March 2014 // left as Vector protected Vector<CAS> getAllInstances() { - return new Vector<CAS>(mAllInstances); + return new Vector<>(mAllInstances); } // no callers as of March 2014 // left as Vector protected Vector<CAS> getFreeInstances() { - return new Vector<CAS>(mFreeInstances); + return new Vector<>(mFreeInstances); } } Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasToInlineXml.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasToInlineXml.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasToInlineXml.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasToInlineXml.java Mon Dec 3 22:00:02 2018 @@ -144,7 +144,7 @@ public class CasToInlineXml { // annotations, and if an annotation contains other annotations, we // push the parent annotation on the stack, process the children, and // then come back to the parent later. - List<AnnotationFS> stack = new ArrayList<AnnotationFS>(); + List<AnnotationFS> stack = new ArrayList<>(); int pos = 0; try { Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/FileUtils.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/FileUtils.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/FileUtils.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/FileUtils.java Mon Dec 3 22:00:02 2018 @@ -56,7 +56,7 @@ public class FileUtils { if (!directory.exists() || !directory.isDirectory()) { return null; } - ArrayList<File> fileList = new ArrayList<File>(); + ArrayList<File> fileList = new ArrayList<>(); for (File file : directory.listFiles()) { if (file.isDirectory()) { if (getRecursive) { @@ -93,7 +93,7 @@ public class FileUtils { if (!directory.exists() || !directory.isDirectory()) { return null; } - ArrayList<File> dirList = new ArrayList<File>(); + ArrayList<File> dirList = new ArrayList<>(); for (File file : directory.listFiles()) { if (file.isDirectory()) { Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/JCasPool.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/JCasPool.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/JCasPool.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/JCasPool.java Mon Dec 3 22:00:02 2018 @@ -48,9 +48,9 @@ import org.apache.uima.resource.metadata */ public class JCasPool { - private Vector<JCas> mAllInstances = new Vector<JCas>(); + private Vector<JCas> mAllInstances = new Vector<>(); - private Vector<JCas> mFreeInstances = new Vector<JCas>(); + private Vector<JCas> mFreeInstances = new Vector<>(); private int mNumInstances; @@ -211,7 +211,7 @@ public class JCasPool { protected void fillPool(ProcessingResourceMetaData aMetaData) throws ResourceInitializationException { // fill the pool - ArrayList<ProcessingResourceMetaData> mdList = new ArrayList<ProcessingResourceMetaData>(); + ArrayList<ProcessingResourceMetaData> mdList = new ArrayList<>(); mdList.add(aMetaData); for (int i = 0; i < mNumInstances; i++) { JCas c; Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/SimpleResourceFactory.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/SimpleResourceFactory.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/SimpleResourceFactory.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/SimpleResourceFactory.java Mon Dec 3 22:00:02 2018 @@ -64,7 +64,7 @@ public class SimpleResourceFactory imple * first. */ protected Map<Class<? extends ResourceSpecifier>, List<Class<? extends Resource>>> mClassMap = - Collections.synchronizedMap(new HashMap<Class<? extends ResourceSpecifier>, List<Class<? extends Resource>>>()); + Collections.synchronizedMap(new HashMap<>()); /** * Produces an appropriate <code>Resource</code> instance from a <code>ResourceSpecifier</code>. @@ -171,12 +171,8 @@ public class SimpleResourceFactory imple * specifiers of the given class. */ public void addMapping(Class<? extends ResourceSpecifier> aSpecifierInterface, Class<? extends Resource> aResourceClass) { - List<Class<? extends Resource>> mappingList = mClassMap.get(aSpecifierInterface); - if (mappingList == null) { - // No mapping exists. Create a new list and put it in the map. - mappingList = new ArrayList<Class<? extends Resource>>(); - mClassMap.put(aSpecifierInterface, mappingList); - } + List<Class<? extends Resource>> mappingList = mClassMap.computeIfAbsent(aSpecifierInterface, k -> new ArrayList<>()); + // No mapping exists. Create a new list and put it in the map. // add the new Resource Class to the end of the mapping list mappingList.add(aResourceClass); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/TCasToInlineXml.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/TCasToInlineXml.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/TCasToInlineXml.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/TCasToInlineXml.java Mon Dec 3 22:00:02 2018 @@ -116,7 +116,7 @@ public class TCasToInlineXml implements // annotations, and if an annotation contains other annotations, we // push the parent annotation on the stack, process the children, and // then come back to the parent later. - ArrayList<AnnotationFS> stack = new ArrayList<AnnotationFS>(); + ArrayList<AnnotationFS> stack = new ArrayList<>(); int pos = 0; try { Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/TypeSystemUtil.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/TypeSystemUtil.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/TypeSystemUtil.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/TypeSystemUtil.java Mon Dec 3 22:00:02 2018 @@ -21,6 +21,7 @@ package org.apache.uima.util; import java.util.ArrayList; import java.util.Iterator; +import java.util.List; import org.apache.uima.ResourceSpecifierFactory; import org.apache.uima.UIMAFramework; @@ -47,7 +48,7 @@ public class TypeSystemUtil { ResourceSpecifierFactory fact = UIMAFramework.getResourceSpecifierFactory(); TypeSystemDescription tsDesc = fact.createTypeSystemDescription(); Iterator<Type> typeIter = aTypeSystem.getTypeIterator(); - ArrayList<TypeDescription> typeDescs = new ArrayList<TypeDescription>(); + List<TypeDescription> typeDescs = new ArrayList<>(); while (typeIter.hasNext()) { Type type = typeIter.next(); if (!type.getName().startsWith("uima.cas") && !type.getName().equals("uima.tcas.Annotation") && @@ -88,7 +89,7 @@ public class TypeSystemUtil { } typeDesc.setAllowedValues(avObjs); } else { - ArrayList<FeatureDescription> featDescs = new ArrayList<FeatureDescription>(); + List<FeatureDescription> featDescs = new ArrayList<>(); for (Feature feat : aType.getFeatures()){ if (!superType.getFeatures().contains(feat)) { featDescs.add(feature2FeatureDescription(feat)); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/XMLSerializer.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/XMLSerializer.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/XMLSerializer.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/XMLSerializer.java Mon Dec 3 22:00:02 2018 @@ -232,7 +232,7 @@ public class XMLSerializer { this.indentDelta = indentDelta; } - private List<Node> mLastOutputNode = new ArrayList<Node>(); // the last output node for repeated subelement nodes + private List<Node> mLastOutputNode = new ArrayList<>(); // the last output node for repeated subelement nodes public void lastOutputNodeAddLevel() { mLastOutputNode.add(null); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/CasPoolManagementImpl.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/CasPoolManagementImpl.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/CasPoolManagementImpl.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/CasPoolManagementImpl.java Mon Dec 3 22:00:02 2018 @@ -32,7 +32,7 @@ public class CasPoolManagementImpl imple private String mUniqueMBeanName; public CasPoolManagementImpl(CasPool aCasPool, String aUniqueMBeanName) { - mCasPoolRef = new WeakReference<CasPool>(aCasPool); + mCasPoolRef = new WeakReference<>(aCasPool); mUniqueMBeanName = aUniqueMBeanName; } Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/DataIO.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/DataIO.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/DataIO.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/DataIO.java Mon Dec 3 22:00:02 2018 @@ -42,7 +42,7 @@ public class DataIO { private static final int MASK_LOW_7 = 0x7f; private static final long MASK_LOW_7_LONG = 0x7fL; - private static ThreadLocal<CharsetDecoder> DECODER = new ThreadLocal<CharsetDecoder>(); + private static ThreadLocal<CharsetDecoder> DECODER = new ThreadLocal<>(); public static String decodeUTF8(ByteBuffer in, final int length) { Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/OptimizeStrings.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/OptimizeStrings.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/OptimizeStrings.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/OptimizeStrings.java Mon Dec 3 22:00:02 2018 @@ -72,7 +72,7 @@ public class OptimizeStrings { // not final static for testing private int splitSize = Integer.MAX_VALUE - 2; // avoid boundary issues - private ArrayList<String> inStrings = new ArrayList<String>(); + private ArrayList<String> inStrings = new ArrayList<>(); /** * A two hop map from strings to offsets is used. @@ -100,7 +100,7 @@ public class OptimizeStrings { */ private int[] lastIndexInCommonStringsA; - private Map<String, String> returnedStrings = new HashMap<String, String>(); + private Map<String, String> returnedStrings = new HashMap<>(); private long savedCharsExact = 0; private long savedCharsSubstr = 0; @@ -262,7 +262,7 @@ public class OptimizeStrings { public void optimize() { String[] sa = inStrings.toArray(new String[inStrings.size()]); optimizeI(sa); - inStrings = new ArrayList<String>(); // release space + inStrings = new ArrayList<>(); // release space } private void optimizeI(String[] sortedStrings) { @@ -286,7 +286,7 @@ public class OptimizeStrings { int previousOffset = 0; offsets = new int[ssLength]; IntVector lastIndexInCommonStrings = new IntVector(); - List<String> commonStrings = new ArrayList<String>(); + List<String> commonStrings = new ArrayList<>(); for (int i = ssLength - 1; i >= 0; i--) { String s = sortedStrings[i]; @@ -321,7 +321,7 @@ public class OptimizeStrings { // prepare map from original string object to index in sorted arrays and offsets // index also used to find common string segment. - stringToIndexMap = new HashMap<String, Integer>(ssLength); + stringToIndexMap = new HashMap<>(ssLength); for (int i = ssLength - 1; i >= 0; i--) { stringToIndexMap.put(sortedStrings[i], i); } @@ -383,7 +383,7 @@ public class OptimizeStrings { // see https://issues.apache.org/jira/browse/UIMA-2515 // debug/test // System.out.println("hit stack overflow"); - Set<String> orderedSet = new TreeSet<String>(); + Set<String> orderedSet = new TreeSet<>(); for (String s : inStrings) { if (!orderedSet.add(s)) { savedCharsExact += s.length(); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/ProcessTraceEvent_impl.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/ProcessTraceEvent_impl.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/ProcessTraceEvent_impl.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/ProcessTraceEvent_impl.java Mon Dec 3 22:00:02 2018 @@ -187,7 +187,7 @@ public class ProcessTraceEvent_impl impl */ public void addSubEvent(ProcessTraceEvent aEvent) { if (mSubEvents == null) { - mSubEvents = new ArrayList<ProcessTraceEvent>(); + mSubEvents = new ArrayList<>(); } mSubEvents.add(aEvent); } Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/ProcessTrace_impl.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/ProcessTrace_impl.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/ProcessTrace_impl.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/ProcessTrace_impl.java Mon Dec 3 22:00:02 2018 @@ -43,12 +43,12 @@ public class ProcessTrace_impl implement /** * List of closed events. */ - private List<ProcessTraceEvent> mEventList = new ArrayList<ProcessTraceEvent>(); + private List<ProcessTraceEvent> mEventList = new ArrayList<>(); /** * Stack of open events. */ - private Stack<ProcessTraceEvent_impl> mOpenEvents = new Stack<ProcessTraceEvent_impl>(); + private Stack<ProcessTraceEvent_impl> mOpenEvents = new Stack<>(); /** * Timer class used to get timing information. @@ -142,7 +142,7 @@ public class ProcessTrace_impl implement // look for matching event on mOpenEvents stack. If found, close it and // all its open sub-events. If not found, throw exception. - ArrayList<ProcessTraceEvent_impl> eventsToClose = new ArrayList<ProcessTraceEvent_impl>(); + ArrayList<ProcessTraceEvent_impl> eventsToClose = new ArrayList<>(); boolean foundEvent = false; while (!mOpenEvents.isEmpty()) { ProcessTraceEvent_impl evt = mOpenEvents.pop(); @@ -240,7 +240,7 @@ public class ProcessTrace_impl implement * @see org.apache.uima.util.ProcessTrace#getEventsByComponentName(String, boolean) */ public List<ProcessTraceEvent> getEventsByComponentName(String aComponentName, boolean aRecurseAfterMatch) { - List<ProcessTraceEvent> result = new ArrayList<ProcessTraceEvent>(); + List<ProcessTraceEvent> result = new ArrayList<>(); for (ProcessTraceEvent event : getEvents()) { getEventsByComponentName(event, aComponentName, aRecurseAfterMatch, result); } @@ -251,7 +251,7 @@ public class ProcessTrace_impl implement * @see org.apache.uima.util.ProcessTrace#getEventsByType(String, boolean) */ public List<ProcessTraceEvent> getEventsByType(String aType, boolean aRecurseAfterMatch) { - List<ProcessTraceEvent> result = new ArrayList<ProcessTraceEvent>(); + List<ProcessTraceEvent> result = new ArrayList<>(); for (ProcessTraceEvent event : getEvents()) { getEventsByType(event, aType, aRecurseAfterMatch, result); } @@ -419,7 +419,7 @@ public class ProcessTrace_impl implement } else { // no corresponding event - add srcEvt to list of events to be added if (eventsToAdd == null) { - eventsToAdd = new ArrayList<ProcessTraceEvent>(); + eventsToAdd = new ArrayList<>(); } eventsToAdd.add(srcEvt); } Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Settings_impl.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Settings_impl.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Settings_impl.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Settings_impl.java Mon Dec 3 22:00:02 2018 @@ -63,7 +63,7 @@ public class Settings_impl implements Se // Thread-local map of properties being resolved +for detecting circular references. private ThreadLocal<HashMap<String, Integer>> tlResolving = new ThreadLocal<HashMap<String, Integer>>() { protected synchronized HashMap<String, Integer> initialValue() { - return new HashMap<String, Integer>(); + return new HashMap<>(); } }; @@ -74,7 +74,7 @@ public class Settings_impl implements Se private Pattern evalPattern = Pattern.compile("\\$\\{.*?\\}"); public Settings_impl() { - map = new HashMap<String, String>(); + map = new HashMap<>(); } /** Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java Mon Dec 3 22:00:02 2018 @@ -110,7 +110,7 @@ public class XMLParser_impl implements X * Map from XML element names to Class objects. */ protected Map<String, Class<? extends XMLizable>> mElementToClassMap = Collections.synchronizedMap( - new HashMap<String, Class<? extends XMLizable>>()); + new HashMap<>()); /** * Whether schema validation is enabled. Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java Mon Dec 3 22:00:02 2018 @@ -307,7 +307,7 @@ public class AnalysisEngineDescription_i UimaContext uimaContext = UIMAFramework.newUimaContext(logger, resourceManager, configManager); - final Map<String, Object> p = new HashMap<String, Object>(); + final Map<String, Object> p = new HashMap<>(); p.put(UIMAFramework.CAS_INITIAL_HEAP_SIZE, 200); p.put(Resource.PARAM_CONFIG_MANAGER, configManager); p.put(Resource.PARAM_RESOURCE_MANAGER, UIMAFramework.newDefaultResourceManager()); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java Mon Dec 3 22:00:02 2018 @@ -364,7 +364,7 @@ public class AnalysisEngine_implTest ext System.setProperty("UimaExternalOverrides", "missing file"); // Will fail if used in = new XMLInputSource(JUnitExtension.getFile("TextAnalysisEngineImplTest/AggregateWithExternalOverrides.xml")); desc = UIMAFramework.getXMLParser().parseAnalysisEngineDescription(in); - Map<String,Object> additionalParams = new HashMap<String,Object>(); + Map<String,Object> additionalParams = new HashMap<>(); Settings extSettings = UIMAFramework.getResourceSpecifierFactory().createSettings(); FileInputStream fis = new FileInputStream(new File(resDir,"testExternalOverride2.settings")); extSettings.load(fis); @@ -1123,7 +1123,7 @@ public class AnalysisEngine_implTest ext cas.reset(); cas.setDocumentText("One\tTwo\nThree\tFour"); iter = ae.processAndOutputNewCASes(cas); - Set<String> expectedOutputs = new HashSet<String>(); + Set<String> expectedOutputs = new HashSet<>(); expectedOutputs.add("One"); expectedOutputs.add("Two\nThree"); expectedOutputs.add("Four"); @@ -1144,7 +1144,7 @@ public class AnalysisEngine_implTest ext .getFile("TextAnalysisEngineImplTest/AggregateWithSegmenter.xml"))); ResourceManager rsrcMgr = UIMAFramework.newDefaultResourceManager(); - Map<String, Object> params = new HashMap<String, Object>(); + Map<String, Object> params = new HashMap<>(); AnalysisEngine ae1 = UIMAFramework.produceAnalysisEngine(aggregateSegDesc, rsrcMgr, params); AnalysisEngine ae2 = UIMAFramework.produceAnalysisEngine(aggregateSegDesc, rsrcMgr, params); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_implTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_implTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_implTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_implTest.java Mon Dec 3 22:00:02 2018 @@ -81,7 +81,7 @@ public class AnnotatorContext_implTest e AnalysisEngineDescription desc = UIMAFramework.getXMLParser().parseAnalysisEngineDescription(in); PrimitiveAnalysisEngine_impl tae = new PrimitiveAnalysisEngine_impl(); // set data path just to test that we can get it later - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<>(); ResourceManager rm = UIMAFramework.newDefaultResourceManager(); rm.setDataPath(TEST_DATAPATH); rm.setExtensionClassPath(TEST_EXTENSION_CLASSPATH, true); @@ -282,7 +282,7 @@ public class AnnotatorContext_implTest e public void testGetConfigurationGroupNames() { String[] names = mAC1.getConfigurationGroupNames(); Assert.assertEquals(5, names.length); - List<String> l = new ArrayList<String>(Arrays.asList(names)); + List<String> l = new ArrayList<>(Arrays.asList(names)); Assert.assertTrue(l.contains("en")); Assert.assertTrue(l.contains("en-US")); Assert.assertTrue(l.contains("de")); @@ -312,7 +312,7 @@ public class AnnotatorContext_implTest e public void testGetConfigParameterNamesString() { String[] names = mAC1.getConfigParameterNames("en"); Assert.assertEquals(4, names.length); - List<String> l = new ArrayList<String>(Arrays.asList(names)); + List<String> l = new ArrayList<>(Arrays.asList(names)); Assert.assertTrue(l.contains("StringParam")); Assert.assertTrue(l.contains("StringArrayParam")); Assert.assertTrue(l.contains("IntegerParam")); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/FlowControllerForErrorTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/FlowControllerForErrorTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/FlowControllerForErrorTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/FlowControllerForErrorTest.java Mon Dec 3 22:00:02 2018 @@ -45,8 +45,8 @@ public class FlowControllerForErrorTest private String[] mSequence; private boolean mContinueOnFailure; - public static List<String> abortedDocuments = new ArrayList<String>(); - public static List<String> failedAEs = new ArrayList<String>(); + public static List<String> abortedDocuments = new ArrayList<>(); + public static List<String> failedAEs = new ArrayList<>(); public void initialize(FlowControllerContext aContext) throws ResourceInitializationException { super.initialize(aContext); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java Mon Dec 3 22:00:02 2018 @@ -126,7 +126,7 @@ public class MultiprocessingAnalysisEngi Assert.assertNotNull(ex); // initialize a new TAE with parameters - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<>(); map.put(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS, Integer.valueOf(5)); map.put(AnalysisEngine.PARAM_TIMEOUT_PERIOD, Integer.valueOf(60000)); MultiprocessingAnalysisEngine_impl mtae2 = new MultiprocessingAnalysisEngine_impl(); @@ -218,7 +218,7 @@ public class MultiprocessingAnalysisEngi * */ MultiprocessingAnalysisEngine_impl ae = new MultiprocessingAnalysisEngine_impl(); - Map<String, Object> params = new HashMap<String, Object>(); + Map<String, Object> params = new HashMap<>(); params.put(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS, Integer.valueOf(8)); ae.initialize(mAggDesc, params); @@ -310,7 +310,7 @@ public class MultiprocessingAnalysisEngi // multiple threads! MultiprocessingAnalysisEngine_impl ae = new MultiprocessingAnalysisEngine_impl(); - Map<String, Object> params = new HashMap<String, Object>(); + Map<String, Object> params = new HashMap<>(); params.put(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS, NUM_INSTANCES); ae.initialize(specifier , params); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapperTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapperTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapperTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapperTest.java Mon Dec 3 22:00:02 2018 @@ -73,7 +73,7 @@ public class PearAnalysisEngineWrapperTe PearSpecifier pearSpecifier = this.createPearSpecifierWithParameters(); boolean initialized = this.pearAnalysisEngineWrapper.initialize(pearSpecifier, - new HashMap<String, Object>()); + new HashMap<>()); Assert.assertTrue("Pear was not initialized", initialized); @@ -101,7 +101,7 @@ public class PearAnalysisEngineWrapperTe PearSpecifier pearSpecifier = this.createPearSpecifierWithoutParameters(); boolean initialized = this.pearAnalysisEngineWrapper.initialize(pearSpecifier, - new HashMap<String, Object>()); + new HashMap<>()); Assert.assertTrue("Pear was not initialized", initialized); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecTest.java Mon Dec 3 22:00:02 2018 @@ -81,9 +81,9 @@ public class ResultSpecTest extends Test } private void checkl(String... args) { - List<String> rs1List = new ArrayList<String>(); - List<String> rs2List = new ArrayList<String>(); - List<String> expList = new ArrayList<String>(); + List<String> rs1List = new ArrayList<>(); + List<String> rs2List = new ArrayList<>(); + List<String> expList = new ArrayList<>(); List<String>[] tgts = new List[]{rs1List, rs2List, expList}; int tgtI = 0; Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecification_implTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecification_implTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecification_implTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecification_implTest.java Mon Dec 3 22:00:02 2018 @@ -117,7 +117,7 @@ public class ResultSpecification_implTes capabilities = new Capability[] { cap1, cap2, cap3 }; // make languages array - languages = new Vector<String[]>(3); + languages = new Vector<>(3); languages.add(0, languages1); languages.add(1, languages2); languages.add(2, languages3); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TestAnnotator2.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TestAnnotator2.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TestAnnotator2.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TestAnnotator2.java Mon Dec 3 22:00:02 2018 @@ -196,7 +196,7 @@ public class TestAnnotator2 extends CasA //XMLInputSource in = new XMLInputSource(JUnitExtension.getFile("TextAnalysisEngineImplTest/AnnotatorWithExternalOverrides.xml")); XMLInputSource in = new XMLInputSource(new File(resDir, "AnnotatorWithExternalOverrides.xml")); AnalysisEngineDescription desc = UIMAFramework.getXMLParser().parseAnalysisEngineDescription(in); - Map<String, Object> additionalParams = new HashMap<String, Object>(); + Map<String, Object> additionalParams = new HashMap<>(); Settings extSettings = UIMAFramework.getResourceSpecifierFactory().createSettings(); FileInputStream fis = new FileInputStream(new File(resDir, "testExternalOverride2.settings")); extSettings.load(fis); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/FSBagIndexTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/FSBagIndexTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/FSBagIndexTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/FSBagIndexTest.java Mon Dec 3 22:00:02 2018 @@ -22,9 +22,9 @@ package org.apache.uima.cas.impl; import java.io.File; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.List; +import junit.framework.TestCase; import org.apache.uima.UIMAFramework; import org.apache.uima.cas.FSIndex; import org.apache.uima.cas.FSIterator; @@ -39,8 +39,6 @@ import org.apache.uima.test.junit_extens import org.apache.uima.util.CasCreationUtils; import org.apache.uima.util.XMLInputSource; -import junit.framework.TestCase; - public class FSBagIndexTest extends TestCase { private TypeSystemDescription typeSystemDescription; @@ -72,7 +70,7 @@ public class FSBagIndexTest extends Test private FsIndex_bag<TOP> cbi() { FSIndexComparator comparatorForIndexSpecs = new FSIndexComparatorImpl(); comparatorForIndexSpecs.setType(ts.getTopType()); - return new FsIndex_bag<TOP>(cas, ts.getType("uima.cas.TOP"), 16, FSIndex.BAG_INDEX, comparatorForIndexSpecs); + return new FsIndex_bag<>(cas, ts.getType("uima.cas.TOP"), 16, FSIndex.BAG_INDEX, comparatorForIndexSpecs); } protected void tearDown() throws Exception { @@ -112,7 +110,7 @@ public class FSBagIndexTest extends Test r.add(it.get()); it.moveToNext(); } - Collections.sort(r, FeatureStructureImplC::compare); + r.sort(FeatureStructureImplC::compare); Arrays.sort(ns, FeatureStructureImplC::compare); assertTrue(Arrays.equals(ns, r.toArray())); assertFalse(it.isValid()); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/IndexCorruptionReportingTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/IndexCorruptionReportingTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/IndexCorruptionReportingTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/IndexCorruptionReportingTest.java Mon Dec 3 22:00:02 2018 @@ -68,7 +68,7 @@ public class IndexCorruptionReportingTes private FsIndex_bag<TOP> cbi() { FSIndexComparator comparatorForIndexSpecs = new FSIndexComparatorImpl(); - return new FsIndex_bag<TOP>(cas, ts.getTopType(), 16, FSIndex.BAG_INDEX, comparatorForIndexSpecs ); + return new FsIndex_bag<>(cas, ts.getTopType(), 16, FSIndex.BAG_INDEX, comparatorForIndexSpecs); } protected void tearDown() throws Exception { Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest4.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest4.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest4.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest4.java Mon Dec 3 22:00:02 2018 @@ -281,7 +281,7 @@ public class SerDesTest4 extends SerDesT this.cas2 = (CASImpl) CasCreationUtils.createCas(ts, null, null, null); deserCas = (CASImpl) CasCreationUtils.createCas(ts, null, null, null); deltaCas = (CASImpl) CasCreationUtils.createCas(ts, null, null, null); - lfs = new ArrayList<FeatureStructure>(); + lfs = new ArrayList<>(); lfs2 = new ArrayList<>(); } catch (Exception e) { assertTrue(false); @@ -533,7 +533,7 @@ public class SerDesTest4 extends SerDesT } public void testArrayAux() { - ArrayList<FeatureStructure> fsl = new ArrayList<FeatureStructure>(); + ArrayList<FeatureStructure> fsl = new ArrayList<>(); /** * Strings, non-array Long/Double: * Make equal items, @@ -862,7 +862,7 @@ public class SerDesTest4 extends SerDesT * @param r - */ private void makeRandomFss(int n, List<FeatureStructure> fss, Random r) { - List<FeatureStructure> lfss = new ArrayList<FeatureStructure>(); + List<FeatureStructure> lfss = new ArrayList<>(); for (int i = 0; i < n; i++) { FeatureStructure fs = makeAkof(r); lfss.add(fs); @@ -1420,4 +1420,4 @@ public class SerDesTest4 extends SerDesT // (new SerDesTest4()).captureGenerated(); // } -} \ No newline at end of file +} Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest6.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest6.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest6.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest6.java Mon Dec 3 22:00:02 2018 @@ -195,7 +195,7 @@ public class SerDesTest6 extends SerDesT /** table, by two types, then sparse table, each slot not empty is a feature indexed by corresponding featureNameRoots */ Feature[][] featureTable = new Feature[Types.values().length][featureNameRoots.size()]; /** short-name to types map: e.g. Aint -> array of int */ - Map<String, Type> mapString2Type = new HashMap<String, Type>(); + Map<String, Type> mapString2Type = new HashMap<>(); public TypeSystemImpl ts; public CASImpl cas; // the Cas setup as part of initialization // the private boolean isUpdateAfterCommit = false; // only needed for v3, ignored for v2 @@ -296,7 +296,7 @@ public class SerDesTest6 extends SerDesT for (int i = 0; i < nbrAltTs; i++) { alternateTTypeSystems[i] = setupTTypeSystem(tss[i]); } - lfs = new ArrayList<FeatureStructure>(); + lfs = new ArrayList<>(); // System.out.format("Debug SerDesTest6 setup time: %d micros%n", // (System.nanoTime() - startTime)/1000L); @@ -716,7 +716,7 @@ public class SerDesTest6 extends SerDesT ReuseInfo ri[] = serializeDeserialize(casSrc, remoteCas, null, null); MarkerImpl marker = (MarkerImpl) remoteCas.createMarker(); - lfs = new ArrayList<FeatureStructure>(); + lfs = new ArrayList<>(); loadCas(remoteCas, m); List<FeatureStructure> lfs2 = getIndexedFSs(remoteCas, m); @@ -833,7 +833,7 @@ public class SerDesTest6 extends SerDesT } public void testArrayAux() { - ArrayList<FeatureStructure> fsList = new ArrayList<FeatureStructure>(); + ArrayList<FeatureStructure> fsList = new ArrayList<>(); /** * Strings, non-array Long/Double: * Make equal items, @@ -1071,7 +1071,7 @@ public class SerDesTest6 extends SerDesT } private void makeRandomFss(CASImpl cas, TTypeSystem m, Types typeKind, int n) { - List<FeatureStructure> lfss = new ArrayList<FeatureStructure>(); + List<FeatureStructure> lfss = new ArrayList<>(); for (int i = 0; i < n; i++) { FeatureStructure fs = makeAkof(cas, m, typeKind); if (random.nextBoolean()) { @@ -1614,7 +1614,7 @@ public class SerDesTest6 extends SerDesT private List<FeatureStructure> getIndexedFSs(CASImpl cas, TTypeSystem m) { Collection<TOP> c = cas.getIndexRepository().getIndexedFSs(m.getType(Akof1)); - List<FeatureStructure> lfs = new ArrayList<FeatureStructure>(); + List<FeatureStructure> lfs = new ArrayList<>(); for (TOP fs : c) { lfs.add(fs); } Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationIteratorTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationIteratorTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationIteratorTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationIteratorTest.java Mon Dec 3 22:00:02 2018 @@ -92,7 +92,7 @@ public class AnnotationIteratorTest exte private List<Annotation> fss; - private List<Integer> fssStarts = new ArrayList<Integer>(); + private List<Integer> fssStarts = new ArrayList<>(); private int callCount = -1; Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/FilteredIteratorTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/FilteredIteratorTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/FilteredIteratorTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/FilteredIteratorTest.java Mon Dec 3 22:00:02 2018 @@ -422,7 +422,7 @@ public class FilteredIteratorTest extend FSIterator<AnnotationFS> it = cas.getAnnotationIndex(tokenType).iterator(); FSStringConstraint type1Constraint = cas.getConstraintFactory().createStringConstraint(); type1Constraint.equals(lemma); - ArrayList<String> path = new ArrayList<String>(); + ArrayList<String> path = new ArrayList<>(); path.add(lemmaFeat.getShortName()); FSMatchConstraint cons = cas.getConstraintFactory().embedConstraint(path, type1Constraint); it = cas.createFilteredIterator(it, cons); @@ -513,7 +513,7 @@ public class FilteredIteratorTest extend FSTypeConstraint tc = cf.createTypeConstraint(); tc.add(sepType); tc.add(eosType.getName()); - ArrayList<String> path = new ArrayList<String>(); + ArrayList<String> path = new ArrayList<>(); path.add(tokenTypeFeat.getShortName()); FSMatchConstraint cons = cf.embedConstraint(path, tc); it = this.cas.createFilteredIterator(it, cons); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/GrowingTheCasTestNoJcasCache.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/GrowingTheCasTestNoJcasCache.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/GrowingTheCasTestNoJcasCache.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/GrowingTheCasTestNoJcasCache.java Mon Dec 3 22:00:02 2018 @@ -75,7 +75,7 @@ public class GrowingTheCasTestNoJcasCach "false"); // Create a wrapper properties object that can // be passed to the framework. - Map<String, Object> additionalParams = new HashMap<String, Object>(); + Map<String, Object> additionalParams = new HashMap<>(); // Set the performance tuning properties as value to // the appropriate parameter. additionalParams.put( Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTest.java Mon Dec 3 22:00:02 2018 @@ -928,7 +928,7 @@ public class IteratorTest extends TestCa assertTrue(sortedIndex.size() == v.size()); // Test moveTo() - List<AnnotationFS> list = new ArrayList<AnnotationFS>(); + List<AnnotationFS> list = new ArrayList<>(); FSIterator<AnnotationFS> it2 = this.cas.getAnnotationIndex().iterator(); for (it2.moveToFirst(); it2.isValid(); it2.moveToNext()) { list.add(it2.get()); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationNoMDTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationNoMDTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationNoMDTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationNoMDTest.java Mon Dec 3 22:00:02 2018 @@ -409,7 +409,7 @@ public class SerializationNoMDTest exten String line; BufferedReader br = new BufferedReader(new StringReader(moby)); StringBuffer buf = new StringBuffer(); - List<String> docs = new ArrayList<String>(); + List<String> docs = new ArrayList<>(); while ((line = br.readLine()) != null) { if (line.startsWith(".. <p")) { docs.add(buf.toString()); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationReinitTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationReinitTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationReinitTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationReinitTest.java Mon Dec 3 22:00:02 2018 @@ -444,7 +444,7 @@ public class SerializationReinitTest ext String line; // BufferedReader br = new BufferedReader(new StringReader(moby)); StringBuffer buf = new StringBuffer(10000); - List<String> docs = new ArrayList<String>(); + List<String> docs = new ArrayList<>(); Matcher m = nlPattern.matcher(moby); while (m.find()) { line = m.group(); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SofaTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SofaTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SofaTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SofaTest.java Mon Dec 3 22:00:02 2018 @@ -710,7 +710,7 @@ public class SofaTest extends TestCase { UimaContextAdmin rootCtxt = UIMAFramework.newUimaContext( UIMAFramework.getLogger(), UIMAFramework.newDefaultResourceManager(), UIMAFramework.newConfigurationManager()); - Map<String, String> sofamap = new HashMap<String, String>(); + Map<String, String> sofamap = new HashMap<>(); sofamap.put("SourceDocument","EnglishDocument"); UimaContextAdmin childCtxt = rootCtxt.createChild("test", sofamap); cas.setCurrentComponentInfo(childCtxt.getComponentInfo()); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemReinitTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemReinitTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemReinitTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemReinitTest.java Mon Dec 3 22:00:02 2018 @@ -53,7 +53,7 @@ public class TypeSystemReinitTest extend TypeSystemDescription tsd = UIMAFramework.getXMLParser().parseTypeSystemDescription( new XMLInputSource(getClass().getResource("/org/apache/uima/examples/SourceDocumentInformation.xml"))); - List<MetaDataObject> l = new ArrayList<MetaDataObject>(); + List<MetaDataObject> l = new ArrayList<>(); l.add(aed); l.add(tsd); CAS cas1 = CasCreationUtils.createCas(l); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemTest.java Mon Dec 3 22:00:02 2018 @@ -369,7 +369,7 @@ public class TypeSystemTest extends Test public void testGetTypeIterator() { Iterator<Type> it = this.ts.getTypeIterator(); // Put the type names in a vector and do some spot checks. - ArrayList<String> v = new ArrayList<String>(); + List<String> v = new ArrayList<>(); while (it.hasNext()) { v.add(it.next().getName()); } @@ -383,7 +383,7 @@ public class TypeSystemTest extends Test public void testGetFeatures() { Iterator<Feature> it = this.ts.getFeatures(); // Put feature names in vector and test for some known features. - List<String> v = new ArrayList<String>(); + List<String> v = new ArrayList<>(); while (it.hasNext()) { v.add(it.next().getName()); } Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemUtilsTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemUtilsTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemUtilsTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemUtilsTest.java Mon Dec 3 22:00:02 2018 @@ -79,34 +79,34 @@ public class TypeSystemUtilsTest extends public void testPathValidation() { Type type1 = this.cas.getTypeSystem().getType("Type1"); // Type1, f0/begin, always - List<String> path = new ArrayList<String>(); + List<String> path = new ArrayList<>(); path.add("f0"); path.add("begin"); assertTrue(TypeSystemUtils.isPathValid(type1, path) == PathValid.ALWAYS); // Type1, f1, possible - path = new ArrayList<String>(); + path = new ArrayList<>(); path.add("f1"); assertTrue(TypeSystemUtils.isPathValid(type1, path) == PathValid.POSSIBLE); // Type1, f1/tail/tail, possible - path = new ArrayList<String>(); + path = new ArrayList<>(); path.add("f1"); path.add("tail"); path.add("tail"); assertTrue(TypeSystemUtils.isPathValid(type1, path) == PathValid.POSSIBLE); // Type1, f2, possible - path = new ArrayList<String>(); + path = new ArrayList<>(); path.add("f2"); assertTrue(TypeSystemUtils.isPathValid(type1, path) == PathValid.POSSIBLE); // Type1, nosuchfeature, never - path = new ArrayList<String>(); + path = new ArrayList<>(); path.add("nosuchfeature"); assertTrue(TypeSystemUtils.isPathValid(type1, path) == PathValid.NEVER); // Type1, <empty path>, always - path = new ArrayList<String>(); + path = new ArrayList<>(); assertTrue(TypeSystemUtils.isPathValid(type1, path) == PathValid.ALWAYS); // t1, f1/f2/f3, always Type t1 = this.cas.getTypeSystem().getType("t1"); - path = new ArrayList<String>(); + path = new ArrayList<>(); path.add("f1"); path.add("f2"); path.add("f3"); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasComparer.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasComparer.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasComparer.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasComparer.java Mon Dec 3 22:00:02 2018 @@ -134,8 +134,8 @@ public class CasComparer { Assert.assertEquals(list1.size(), list2.size()); isSortUse = true; // while sorting; i.e., for next two calls. Affects how visited is used - Collections.sort(list1, fsComparator); - Collections.sort(list2, fsComparator); + list1.sort(fsComparator); + list2.sort(fsComparator); isSortUse = false; // makes the compare1 throw exception if not equal int i = 0; @@ -372,7 +372,7 @@ public class CasComparer { * When populating, skip items already visted and compared in other views (but always include sofas) */ private static List<TOP> populate(Collection<TOP> items, Set<TOP> visited) { - List<TOP> s = new ArrayList<TOP>(); + List<TOP> s = new ArrayList<>(); for (TOP fs : items) { if (!(fs instanceof Sofa) && !visited.contains(fs)) { s.add(fs); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/flow/impl/FixedFlowControllerTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/flow/impl/FixedFlowControllerTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/flow/impl/FixedFlowControllerTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/flow/impl/FixedFlowControllerTest.java Mon Dec 3 22:00:02 2018 @@ -54,7 +54,7 @@ public class FixedFlowControllerTest ext */ protected void setUp() throws Exception { super.setUp(); - analysisEngineMetaDataMap = new HashMap<String, AnalysisEngineMetaData>(); + analysisEngineMetaDataMap = new HashMap<>(); AnalysisEngineMetaData delegateMd = new AnalysisEngineMetaData_impl(); delegateMd.setOperationalProperties(new OperationalProperties_impl()); analysisEngineMetaDataMap.put("key1", delegateMd); @@ -137,7 +137,7 @@ public class FixedFlowControllerTest ext analysisEngineMetaDataMap.put("key4", delegateMd); analysisEngineMetaDataMap.put("key5", delegateMd); //then notify FC - List<String> newAeKeys = new ArrayList<String>(); + List<String> newAeKeys = new ArrayList<>(); newAeKeys.add("key4"); newAeKeys.add("key5"); fixedFlowController.addAnalysisEngines(newAeKeys); @@ -186,7 +186,7 @@ public class FixedFlowControllerTest ext //remove "key2" analysisEngineMetaDataMap.remove("key2"); - List<String> removedKeys = new ArrayList<String>(); + List<String> removedKeys = new ArrayList<>(); removedKeys.add("key2"); fixedFlowController.removeAnalysisEngines(removedKeys); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/impl/SomeCustomResource.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/impl/SomeCustomResource.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/impl/SomeCustomResource.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/impl/SomeCustomResource.java Mon Dec 3 22:00:02 2018 @@ -32,7 +32,7 @@ import org.junit.Assert; public class SomeCustomResource extends Resource_ImplBase { - public Map<String, String> paramMap = new HashMap<String, String>(); + public Map<String, String> paramMap = new HashMap<>(); /* (non-Javadoc) * @see org.apache.uima.resource.Resource_ImplBase#initialize(org.apache.uima.resource.ResourceSpecifier, java.util.Map) Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/impl/UimaContext_implTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/impl/UimaContext_implTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/impl/UimaContext_implTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/impl/UimaContext_implTest.java Mon Dec 3 22:00:02 2018 @@ -255,7 +255,7 @@ public class UimaContext_implTest extend public void testGetConfigurationGroupNames() { String[] names = mContext2.getConfigurationGroupNames(); Assert.assertEquals(5, names.length); - ArrayList<String> l = new ArrayList<String>(Arrays.asList(names)); + ArrayList<String> l = new ArrayList<>(Arrays.asList(names)); Assert.assertTrue(l.contains("en")); Assert.assertTrue(l.contains("en-US")); Assert.assertTrue(l.contains("de")); @@ -265,7 +265,7 @@ public class UimaContext_implTest extend // try on something with both groups and groupless parameters names = mContext3.getConfigurationGroupNames(); Assert.assertEquals(5, names.length); - l = new ArrayList<String>(Arrays.asList(names)); + l = new ArrayList<>(Arrays.asList(names)); Assert.assertTrue(l.contains("en")); Assert.assertTrue(l.contains("en-US")); Assert.assertTrue(l.contains("de")); @@ -301,7 +301,7 @@ public class UimaContext_implTest extend public void testGetConfigParameterNamesString() { String[] names = mContext2.getConfigParameterNames("en"); Assert.assertEquals(4, names.length); - ArrayList<String> l = new ArrayList<String>(Arrays.asList(names)); + ArrayList<String> l = new ArrayList<>(Arrays.asList(names)); Assert.assertTrue(l.contains("StringParam")); Assert.assertTrue(l.contains("StringArrayParam")); Assert.assertTrue(l.contains("IntegerParam")); @@ -318,7 +318,7 @@ public class UimaContext_implTest extend // try on something with both groups and groupless params names = mContext3.getConfigParameterNames("en"); Assert.assertEquals(4, names.length); - l = new ArrayList<String>(Arrays.asList(names)); + l = new ArrayList<>(Arrays.asList(names)); Assert.assertTrue(l.contains("StringParam")); Assert.assertTrue(l.contains("StringArrayParam")); Assert.assertTrue(l.contains("IntegerParam")); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/IntBitSetTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/IntBitSetTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/IntBitSetTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/IntBitSetTest.java Mon Dec 3 22:00:02 2018 @@ -90,7 +90,7 @@ public class IntBitSetTest extends TestC ibs = new IntBitSet(64,1000); ibs.add(1064); IntListIterator it = ibs.iterator(); - List<Integer> ints = new ArrayList<Integer>(); + List<Integer> ints = new ArrayList<>(); while (it.hasNext()) { ints.add(it.nextNvc()); } Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/PositiveIntSetTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/PositiveIntSetTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/PositiveIntSetTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/PositiveIntSetTest.java Mon Dec 3 22:00:02 2018 @@ -43,7 +43,7 @@ public class PositiveIntSetTest extends } private R r = new R(); - private Set<Integer> cs = new HashSet<Integer>(); + private Set<Integer> cs = new HashSet<>(); private PositiveIntSet s; private int gi; @@ -309,7 +309,7 @@ public class PositiveIntSetTest extends */ private void runRandomTests() { s = r.useInitParms ? new PositiveIntSet_impl(r.initSize, r.estMin, r.estMax) : new PositiveIntSet_impl(); - cs = new HashSet<Integer>(); + cs = new HashSet<>(); dadd(r.firstValue); for (int i = 0; i < 10000; i++) { Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/Int2IntRBTtest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/Int2IntRBTtest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/Int2IntRBTtest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/Int2IntRBTtest.java Mon Dec 3 22:00:02 2018 @@ -92,7 +92,7 @@ public class Int2IntRBTtest extends Test public void testFastLookup() { Int2IntRBT ia = new Int2IntRBT(); Random r = new Random(); - Set<Integer> keys = new HashSet<Integer>(1000); + Set<Integer> keys = new HashSet<>(1000); for (int i = 0; i < 1000; i++) { int k = r.nextInt(1000); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/jcas/impl/JCasHashMapCompareTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/jcas/impl/JCasHashMapCompareTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/jcas/impl/JCasHashMapCompareTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/jcas/impl/JCasHashMapCompareTest.java Mon Dec 3 22:00:02 2018 @@ -71,7 +71,7 @@ public class JCasHashMapCompareTest exte // stats("custom", runCustom(numberOfThreads)); // not accurate, use yourkit retained size instead // stats("concur", runConCur(numberOfThreads)); - Set<Integer> ints = new HashSet<Integer>(); + Set<Integer> ints = new HashSet<>(); for (Entry<Integer, TOP> e : concurrentMap.entrySet()) { assertFalse(ints.contains(Integer.valueOf(e.getKey()))); assertEquals(e.getValue()._id(), (int)(e.getKey())); @@ -85,8 +85,8 @@ public class JCasHashMapCompareTest exte } private int runConCur(int numberOfThreads) throws Exception { - final ConcurrentMap<Integer, TOP> m = - new ConcurrentHashMap<Integer, TOP>(200, 0.75F, numberOfThreads); + final ConcurrentMap<Integer, TOP> m = + new ConcurrentHashMap<>(200, 0.75F, numberOfThreads); concurrentMap = m; final int numberOfWaiters = numberOfThreads*2; Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/jcas/impl/JCasHashMapTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/jcas/impl/JCasHashMapTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/jcas/impl/JCasHashMapTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/jcas/impl/JCasHashMapTest.java Mon Dec 3 22:00:02 2018 @@ -148,7 +148,7 @@ public class JCasHashMapTest extends Tes System.out.format("test JCasHashMap with compare with up to %d threads%n", numberOfThreads); final ConcurrentMap<Integer, TOP> check = // one check map, run on multiple threads - new ConcurrentHashMap<Integer, TOP>(SIZE, .5F, numberOfThreads * 2); + new ConcurrentHashMap<>(SIZE, .5F, numberOfThreads * 2); for (int th = 2; th <= numberOfThreads; th *= 2) { JCasHashMap.setDEFAULT_CONCURRENCY_LEVEL(th); Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/pear/util/PearRuntimeTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/pear/util/PearRuntimeTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/pear/util/PearRuntimeTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/pear/util/PearRuntimeTest.java Mon Dec 3 22:00:02 2018 @@ -123,7 +123,7 @@ public class PearRuntimeTest extends Tes } private Import [] installPears(String [] pears) throws IOException { - List<Import> result = new ArrayList<Import>(); + List<Import> result = new ArrayList<>(); for (String s : pears) { result.add(installPear(s)); } Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java Mon Dec 3 22:00:02 2018 @@ -119,9 +119,9 @@ public class MetaDataObject_implTest ext */ public void testGetAttributes() throws Exception { try { - HashSet<MetaDataAttr> apple1Attrs = new HashSet<MetaDataAttr>(Arrays.asList(apple1.getAttributes())); - HashSet<MetaDataAttr> orangeAttrs = new HashSet<MetaDataAttr>(Arrays.asList(orange.getAttributes())); - HashSet<MetaDataAttr> bagAttrs = new HashSet<MetaDataAttr>(Arrays.asList(fruitBag.getAttributes())); + HashSet<MetaDataAttr> apple1Attrs = new HashSet<>(Arrays.asList(apple1.getAttributes())); + HashSet<MetaDataAttr> orangeAttrs = new HashSet<>(Arrays.asList(orange.getAttributes())); + HashSet<MetaDataAttr> bagAttrs = new HashSet<>(Arrays.asList(fruitBag.getAttributes())); Set<MetaDataAttr> r = TestFruitObject.getMetaDataAttrSet(); for (MetaDataAttr r1 : r) { Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitBagObject.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitBagObject.java?rev=1848108&r1=1848107&r2=1848108&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitBagObject.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitBagObject.java Mon Dec 3 22:00:02 2018 @@ -55,7 +55,7 @@ public class TestFruitBagObject extends // } static public Set<MetaDataAttr> getMetaDataAttrSet() { - Set<MetaDataAttr> result = new HashSet<MetaDataAttr>(); + Set<MetaDataAttr> result = new HashSet<>(); try { result.add(new MetaDataAttr("fruits", TestFruitBagObject.class.getDeclaredMethod("getFruits"),