You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2018/12/03 22:00:05 UTC
svn commit: r1848108 [1/5] - in /uima/uv3/uimaj-v3/trunk:
PearPackagingMavenPlugin/src/main/java/org/apache/uima/pear/tools/
jcasgen-maven-plugin/src/main/java/org/apache/uima/tools/jcasgen/maven/
jcasgen-maven-plugin/src/test/java/org/apache/uima/tool...
Author: schor
Date: Mon Dec 3 22:00:02 2018
New Revision: 1848108
URL: http://svn.apache.org/viewvc?rev=1848108&view=rev
Log:
[UIMA-5921] refactor cleanups for Java 8 - mostly type inference, plus some others. Manually reviewed, plus ran all test cases
Modified:
uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin/src/main/java/org/apache/uima/pear/tools/PearPackagingMojo.java
uima/uv3/uimaj-v3/trunk/jcasgen-maven-plugin/src/main/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojo.java
uima/uv3/uimaj-v3/trunk/jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojoTest.java
uima/uv3/uimaj-v3/trunk/uimaj-bootstrap/src/main/java/org/apache/uima/bootstrap/UimaBootstrap.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/UimaContextHolder.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/ASB_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AggregateAnalysisEngine_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImpl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/ResultSpecification_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsFeats.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsFullFeatNames.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsLang.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsLangs.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsType.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsTypesMap.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/AnnotatorAdapter.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/CasConsumerAdapter.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/CollectionReaderAdapter.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/AnalysisEngineService_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/AllFSs.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationTreeNodeImpl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BuiltinTypeKinds.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASSerializer.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasCompare.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSerializerSupport.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasTypeSystemMapper.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonSerDesSequential.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/ConstraintFactoryImpl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/DebugFSLogicalStructure.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexComparatorImpl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexRepositoryImpl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSTypeConstraintImpl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSsTobeAddedback.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeaturePathImpl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImplC.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FilteredIterator.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_annotation.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_bag.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_flat.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_iicp.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_set_sorted.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_snapshot.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_aggregation_common.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_backwards.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_bag.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_bag_pear.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_limited.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_set_sorted_pear.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_subtypes_ordered.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_subtypes_snapshot.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LLUnambiguousIteratorImpl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LinearTypeOrderBuilderImpl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIterator.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/OutOfTypeSystemData.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/SelectFSs_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringHeap.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystem2Xml.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/CasDataImpl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/CasDataUtils.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/FeatureStructureImpl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasConsumerDescription_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasInitializerDescription_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CollectionReaderDescription_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowController.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/FixedFlowController.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/impl/CompositeResourceFactory_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UimaContext_ImplBase.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/AnalysisEnginePool.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/CharArraySpanMap.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/CharacterUtils.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/CommandLineParser.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/CopyOnWriteOrderedFsSet_array.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/GraphNode.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/Misc.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/OrderedFsSet_array2.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/ResourcePool.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/StringToIntMap.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/SymbolTable.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMAClassLoader.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRBTNode.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RedBlackTree.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCasRegistry.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/CommonList.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArray.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArrayList.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSList.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Int2FS.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationController.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptor.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationProcessor.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageBrowser.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/FileUtil.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/MessageRouter.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/ProcessUtil.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/UIMAUtil.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasDefinition.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManagerImplBase.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManager_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileLanguageResource_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceCreationSpecifier_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/Session_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/Capability_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationGroup_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterDeclarations_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterSettings_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameter_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexCollection_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObject_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceManagerConfiguration_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypePriorities_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypePriorityList_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/AnalysisEnginePerformanceReports.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/AnalysisEngineUtils.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasPool.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasToInlineXml.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/FileUtils.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/JCasPool.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/SimpleResourceFactory.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/TCasToInlineXml.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/TypeSystemUtil.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/XMLSerializer.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/CasPoolManagementImpl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/DataIO.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/OptimizeStrings.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/ProcessTraceEvent_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/ProcessTrace_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Settings_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_implTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/FlowControllerForErrorTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapperTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecification_implTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TestAnnotator2.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/FSBagIndexTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/IndexCorruptionReportingTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest4.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest6.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationIteratorTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/FilteredIteratorTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/GrowingTheCasTestNoJcasCache.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationNoMDTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationReinitTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SofaTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemReinitTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemUtilsTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasComparer.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/flow/impl/FixedFlowControllerTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/impl/SomeCustomResource.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/impl/UimaContext_implTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/IntBitSetTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/PositiveIntSetTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/Int2IntRBTtest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/jcas/impl/JCasHashMapCompareTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/jcas/impl/JCasHashMapTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/pear/util/PearRuntimeTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitBagObject.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitObject.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasCopierTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasCreationUtilsTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/JSR47Logger_implTest.java
uima/uv3/uimaj-v3/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/RunnableApplication.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditor.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/AbstractSectionParm.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/files/MultiResourceSelectionDialog.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/files/PickOverrideKeysAndParmName.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/AnalysisEngineLaunchConfigurationDelegate.java
uima/uv3/uimaj-v3/trunk/uimaj-ep-launcher/src/main/java/org/apache/uima/ep_launcher/ui/AnalysisEngineMainTab.java
uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/FileSystemCollectionReader.java
uima/uv3/uimaj-v3/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/flow/AdvancedFixedFlowController.java
uima/uv3/uimaj-v3/trunk/uimaj-json/src/main/java/org/apache/uima/json/JsonCasSerializer.java
uima/uv3/uimaj-v3/trunk/uimaj-json/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitBagObject.java
uima/uv3/uimaj-v3/trunk/uimaj-json/src/test/java/org/apache/uima/resource/metadata/impl/TestFruitObject.java
uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSNode.java
uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSTreeModel.java
uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSTreeNode.java
uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MainFrame.java
uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MultiMarkup.java
uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/RecentFilesList.java
uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/AnnotationViewerDialog.java
uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/DocumentAnalyzer.java
uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Jg.java
uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasAnnotationViewer.java
uima/uv3/uimaj-v3/trunk/uimaj-v3migration-jcas/src/main/java/org/apache/uima/migratev3/jcas/MigrateJCas.java
Modified: uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin/src/main/java/org/apache/uima/pear/tools/PearPackagingMojo.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin/src/main/java/org/apache/uima/pear/tools/PearPackagingMojo.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin/src/main/java/org/apache/uima/pear/tools/PearPackagingMojo.java (original)
+++ uima/uv3/uimaj-v3/trunk/PearPackagingMavenPlugin/src/main/java/org/apache/uima/pear/tools/PearPackagingMojo.java Mon Dec 3 22:00:02 2018
@@ -180,8 +180,8 @@ public class PearPackagingMojo extends A
// 2) remove duplicates
// 3) paths that are generated are in form $main_root/lib/jar-name
- classpathsInOrder = new ArrayList<String>();
- classpathsDefined = new HashSet<String>();
+ classpathsInOrder = new ArrayList<>();
+ classpathsDefined = new HashSet<>();
String pathToLib = String.format("$main_root/%s", InstallationController.PACKAGE_LIB_DIR);
log.debug("pear pathToLib = " + pathToLib);
Modified: uima/uv3/uimaj-v3/trunk/jcasgen-maven-plugin/src/main/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojo.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/jcasgen-maven-plugin/src/main/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojo.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/jcasgen-maven-plugin/src/main/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojo.java (original)
+++ uima/uv3/uimaj-v3/trunk/jcasgen-maven-plugin/src/main/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojo.java Mon Dec 3 22:00:02 2018
@@ -157,7 +157,7 @@ public class JCasGenMojo extends Abstrac
// Create a merged type system and check if any of the files has a delta
TypeSystemDescription typeSystem = new TypeSystemDescription_impl();
- List<Import> imports = new ArrayList<Import>();
+ List<Import> imports = new ArrayList<>();
boolean contextDelta = false;
for (String descriptorLocation : ds.getIncludedFiles()) {
File descriptorFile = new File(ds.getBasedir(), descriptorLocation);
@@ -204,7 +204,7 @@ public class JCasGenMojo extends Abstrac
return;
}
- List<String> args = new ArrayList<String>();
+ List<String> args = new ArrayList<>();
if (limitToProject) {
File limitToDirectory = project.getBasedir().getAbsoluteFile();
getLog().info("JCasGen: Limiting generation to descriptors in '" + limitToDirectory + "'");
@@ -302,7 +302,7 @@ public class JCasGenMojo extends Abstrac
File buildOutputDirectory = new File(this.project.getBuild().getOutputDirectory());
// map each resource from its target location to its source location
- Map<File, File> targetToSource = new HashMap<File, File>();
+ Map<File, File> targetToSource = new HashMap<>();
for (Resource resource : this.project.getResources()) {
File resourceDir = new File(resource.getDirectory());
if (resourceDir.exists()) {
Modified: uima/uv3/uimaj-v3/trunk/jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojoTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojoTest.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojoTest.java (original)
+++ uima/uv3/uimaj-v3/trunk/jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojoTest.java Mon Dec 3 22:00:02 2018
@@ -105,7 +105,7 @@ public class JCasGenMojoTest extends Abs
ds.setBasedir(jCasGenDirectory);
ds.setIncludes(new String[] { "**/*.java" });
ds.scan();
- List<File> files = new ArrayList<File>();
+ List<File> files = new ArrayList<>();
for (String scannedFile : ds.getIncludedFiles()) {
files.add(new File(ds.getBasedir(), scannedFile));
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-bootstrap/src/main/java/org/apache/uima/bootstrap/UimaBootstrap.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-bootstrap/src/main/java/org/apache/uima/bootstrap/UimaBootstrap.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-bootstrap/src/main/java/org/apache/uima/bootstrap/UimaBootstrap.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-bootstrap/src/main/java/org/apache/uima/bootstrap/UimaBootstrap.java Mon Dec 3 22:00:02 2018
@@ -96,7 +96,7 @@ public class UimaBootstrap {
if (!suppressClassPathDisplay) {
System.out.println("UimaBootstrap ClassPath:");
}
- List<URL> urls = new ArrayList<URL>();
+ List<URL> urls = new ArrayList<>();
String[] jpaths = jps.split(File.pathSeparator);
for (String p : jpaths) {
addUrlsFromPath(p, urls);
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java Mon Dec 3 22:00:02 2018
@@ -331,9 +331,9 @@ public abstract class UIMAFramework {
// add ResourceManager to aAdditionalParams map
if (aResourceManager != null) {
if (aAdditionalParams == null) {
- aAdditionalParams = new HashMap<String, Object>();
+ aAdditionalParams = new HashMap<>();
} else { // copy to avoid modifying the original which might be immutable
- aAdditionalParams = new HashMap<String, Object>(aAdditionalParams);
+ aAdditionalParams = new HashMap<>(aAdditionalParams);
}
aAdditionalParams.put(Resource.PARAM_RESOURCE_MANAGER, aResourceManager);
}
@@ -495,7 +495,7 @@ public abstract class UIMAFramework {
public static AnalysisEngine produceAnalysisEngine(ResourceSpecifier aSpecifier,
int aMaxSimultaneousRequests, int aTimeoutPeriod) throws ResourceInitializationException {
// add parameters to the aAdditionalParams map
- Map<String, Object> aAdditionalParams = new HashMap<String, Object>();
+ Map<String, Object> aAdditionalParams = new HashMap<>();
aAdditionalParams.put(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS, Integer.valueOf(
aMaxSimultaneousRequests));
@@ -648,7 +648,7 @@ public abstract class UIMAFramework {
public static TextAnalysisEngine produceTAE(ResourceSpecifier aSpecifier,
int aMaxSimultaneousRequests, int aTimeoutPeriod) throws ResourceInitializationException {
// add parameters to the aAdditionalParams map
- Map<String, Object> aAdditionalParams = new HashMap<String, Object>();
+ Map<String, Object> aAdditionalParams = new HashMap<>();
aAdditionalParams.put(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS, Integer.valueOf(
aMaxSimultaneousRequests));
@@ -987,10 +987,10 @@ public abstract class UIMAFramework {
throws ResourceInitializationException {
if (aResourceManager != null) {
if (aAdditionalParams == null) {
- aAdditionalParams = new HashMap<String, Object>();
+ aAdditionalParams = new HashMap<>();
} else {
// copy to avoid modifying original, which might be immutable, etc.
- aAdditionalParams = new HashMap<String, Object>(aAdditionalParams);
+ aAdditionalParams = new HashMap<>(aAdditionalParams);
}
aAdditionalParams.put(Resource.PARAM_RESOURCE_MANAGER, aResourceManager);
}
@@ -1088,8 +1088,8 @@ public abstract class UIMAFramework {
// ugly way to pass vars to 0-arg constructors
// for root uima context
- public static final ThreadLocal<ResourceManager> newContextResourceManager = new ThreadLocal<ResourceManager>();
- public static final ThreadLocal<ConfigurationManager> newContextConfigManager = new ThreadLocal<ConfigurationManager>();
+ public static final ThreadLocal<ResourceManager> newContextResourceManager = new ThreadLocal<>();
+ public static final ThreadLocal<ConfigurationManager> newContextConfigManager = new ThreadLocal<>();
/**
* Gets a new instance of a {@link UimaContext}. Applications do not generally need to call this
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/UimaContextHolder.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/UimaContextHolder.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/UimaContextHolder.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/UimaContextHolder.java Mon Dec 3 22:00:02 2018
@@ -29,7 +29,7 @@ package org.apache.uima;
*/
public class UimaContextHolder {
- private static InheritableThreadLocal<UimaContext> threadLocalContext = new InheritableThreadLocal<UimaContext>();
+ private static InheritableThreadLocal<UimaContext> threadLocalContext = new InheritableThreadLocal<>();
/**
* Get the UimaContext for this thread
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/ASB_impl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/ASB_impl.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/ASB_impl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/ASB_impl.java Mon Dec 3 22:00:02 2018
@@ -90,19 +90,19 @@ public class ASB_impl extends Resource_I
* Map from String key to delegate AnalysisEngine for all component AnalysisEngines within this
* ASB.
*/
- private Map<String, AnalysisEngine> mComponentAnalysisEngineMap = new LinkedHashMap<String, AnalysisEngine>();
+ private Map<String, AnalysisEngine> mComponentAnalysisEngineMap = new LinkedHashMap<>();
/**
* Map from String key to delegate AnalysisEngineMetaData for all component AnalysisEngines within
* this ASB.
*/
private Map<String, AnalysisEngineMetaData> mComponentAnalysisEngineMetaDataMap =
- new HashMap<String, AnalysisEngineMetaData>();
+ new HashMap<>();
/**
* Map from String key to component (AnalysisEngine or FlowController) metadata.
*/
- private Map<String, ProcessingResourceMetaData> mAllComponentMetaDataMap = new LinkedHashMap<String, ProcessingResourceMetaData>();
+ private Map<String, ProcessingResourceMetaData> mAllComponentMetaDataMap = new LinkedHashMap<>();
/**
* Initialization parameters passed to this ASB's initialize method. They will be passed along to
@@ -147,7 +147,7 @@ public class ASB_impl extends Resource_I
}
// copy the additional parameters, since this method will modify them
- super.initialize(aSpecifier, aAdditionalParams = new HashMap<String, Object>(aAdditionalParams));
+ super.initialize(aSpecifier, aAdditionalParams = new HashMap<>(aAdditionalParams));
// save parameters for later
mInitParams = aAdditionalParams;
@@ -216,7 +216,7 @@ public class ASB_impl extends Resource_I
String key =entry.getKey();
ResourceSpecifier spec = entry.getValue();
- Map<String, String> sofamap = new TreeMap<String, String>();
+ Map<String, String> sofamap = new TreeMap<>();
// retrieve the sofa mappings for input/output sofas of this analysis engine
if (mSofaMappings != null && mSofaMappings.length > 0) {
@@ -239,7 +239,7 @@ public class ASB_impl extends Resource_I
// preceeding call to initialize().
if (mInitParams == null)
- mInitParams = new HashMap<String, Object>();
+ mInitParams = new HashMap<>();
UimaContextAdmin childContext = aParentContext.createChild(key, sofamap);
mInitParams.put(Resource.PARAM_UIMA_CONTEXT, childContext);
@@ -274,7 +274,7 @@ public class ASB_impl extends Resource_I
initFlowController(aFlowControllerDeclaration, aParentContext, aAggregateMetadata);
// initialize the AllComponentMetaData map to include AEs plus the FlowController
- mAllComponentMetaDataMap = new LinkedHashMap<String, ProcessingResourceMetaData>(mComponentAnalysisEngineMetaDataMap);
+ mAllComponentMetaDataMap = new LinkedHashMap<>(mComponentAnalysisEngineMetaDataMap);
mAllComponentMetaDataMap.put(aFlowControllerDeclaration.getKey(), mFlowControllerContainer
.getProcessingResourceMetaData());
mAllComponentMetaDataMap = Collections.unmodifiableMap(mAllComponentMetaDataMap);
@@ -291,10 +291,10 @@ public class ASB_impl extends Resource_I
key = "_FlowController"; // default key
}
- Map<String, Object> flowControllerParams = new HashMap<String, Object>(mInitParams);
+ Map<String, Object> flowControllerParams = new HashMap<>(mInitParams);
// retrieve the sofa mappings for the FlowControler
- Map<String, String> sofamap = new TreeMap<String, String>();
+ Map<String, String> sofamap = new TreeMap<>();
if (mSofaMappings != null && mSofaMappings.length > 0) {
for (int s = 0; s < mSofaMappings.length; s++) {
// the mapping is for this analysis engine
@@ -373,14 +373,14 @@ public class ASB_impl extends Resource_I
* and start processing the output CASes instead. Since CasMultipliers can be nested, we need a
* stack.
*/
- Stack<StackFrame> casIteratorStack = new Stack<StackFrame>();
+ Stack<StackFrame> casIteratorStack = new Stack<>();
/**
* Set of CASes that are in circulation (that is, they have been passed to FlowController and
* the FlowController hasn't yet returned a FinalStep for them). Needed so we can clean up on
* error.
*/
- Set<CAS> activeCASes = new HashSet<CAS>();
+ Set<CAS> activeCASes = new HashSet<>();
/** Holds the next CAS to be returned, if it is known. */
CAS nextCas = null;
@@ -607,7 +607,7 @@ public class ASB_impl extends Resource_I
//ParallelStep (TODO: refactor out common parts with SimpleStep?)
else if (nextStep instanceof ParallelStep) {
//create modifiable list of destinations
- List<String> destinations = new LinkedList<String>(((ParallelStep)nextStep).getAnalysisEngineKeys());
+ List<String> destinations = new LinkedList<>(((ParallelStep) nextStep).getAnalysisEngineKeys());
//iterate over all destinations, removing them from the list as we go
while (!destinations.isEmpty()) {
String nextAeKey = destinations.get(0);
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AggregateAnalysisEngine_impl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AggregateAnalysisEngine_impl.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AggregateAnalysisEngine_impl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AggregateAnalysisEngine_impl.java Mon Dec 3 22:00:02 2018
@@ -175,9 +175,9 @@ public class AggregateAnalysisEngine_imp
// (First copy it so we can modify it and send the parameters on to
// out delegate analysis engines.)
if (aAdditionalParams == null) {
- aAdditionalParams = new HashMap<String, Object>();
+ aAdditionalParams = new HashMap<>();
} else {
- aAdditionalParams = new HashMap<String, Object>(aAdditionalParams);
+ aAdditionalParams = new HashMap<>(aAdditionalParams);
}
// put configuration parameter settings into the aAdditionalParams map to be
@@ -236,7 +236,7 @@ public class AggregateAnalysisEngine_imp
* @return all capabilities of all components of this aggregate
*/
private Capability[] getAllComponentCapabilities() {
- ArrayList<Capability> capabilityList = new ArrayList<Capability>();
+ ArrayList<Capability> capabilityList = new ArrayList<>();
Iterator<ProcessingResourceMetaData> iter = _getComponentMetaData().values().iterator();
while (iter.hasNext()) {
ProcessingResourceMetaData md = iter.next();
@@ -324,7 +324,7 @@ public class AggregateAnalysisEngine_imp
// at the end in arbitrary order. If there's no standard flow type
// (a custom FlowController must be in use), the entire order is arbitrary.
String[] orderedNodes = null;
- Map<String, AnalysisEngine> components = new HashMap<String, AnalysisEngine>(this._getASB().getComponentAnalysisEngines());
+ Map<String, AnalysisEngine> components = new HashMap<>(this._getASB().getComponentAnalysisEngines());
FlowConstraints flow = getAnalysisEngineMetaData().getFlowConstraints();
if (flow != null) {
if (flow instanceof FixedFlow) {
@@ -403,7 +403,7 @@ public class AggregateAnalysisEngine_imp
protected void initASB(AnalysisEngineDescription aAnalysisEngineDescription, Map<String, Object> aAdditionalParams)
throws ResourceInitializationException {
// add this analysis engine's name to the parameters sent to the ASB
- Map<String, Object> asbParams = new HashMap<String, Object>(aAdditionalParams);
+ Map<String, Object> asbParams = new HashMap<>(aAdditionalParams);
asbParams.put(ASB.PARAM_AGGREGATE_ANALYSIS_ENGINE_NAME, this.getMetaData().getName()); // not used 9/2013 scan
asbParams.put(Resource.PARAM_RESOURCE_MANAGER, getResourceManager());
@@ -455,9 +455,9 @@ public class AggregateAnalysisEngine_imp
// priorities but NOT its own types.)
// first, create Collections of TypeSystems, TypePriorities, and Index Descriptions
- List<TypeSystemDescription> typeSystems = new ArrayList<TypeSystemDescription>();
- List<TypePriorities> typePriorities = new ArrayList<TypePriorities>();
- List<FsIndexCollection> fsIndexCollections = new ArrayList<FsIndexCollection>();
+ List<TypeSystemDescription> typeSystems = new ArrayList<>();
+ List<TypePriorities> typePriorities = new ArrayList<>();
+ List<FsIndexCollection> fsIndexCollections = new ArrayList<>();
TypePriorities thisAEsTypePriorities = getAnalysisEngineMetaData().getTypePriorities();
if (thisAEsTypePriorities != null) {
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java Mon Dec 3 22:00:02 2018
@@ -115,12 +115,12 @@ public class AnalysisEngineDescription_i
private FlowControllerDeclaration mFlowControllerDeclaration;
// This holds delegates after imports have been resolved (merged from xmlComments 1187355)
- private Map<String, ResourceSpecifier> mDelegateAnalysisEngineSpecifiers = new LinkedHashMap<String, ResourceSpecifier>();
+ private Map<String, ResourceSpecifier> mDelegateAnalysisEngineSpecifiers = new LinkedHashMap<>();
// This holds delegates as they come from reading the descriptor, may have import elements (unresolved) (merged from xmlComments 1187355)
- private Map<String, MetaDataObject> mDelegateAnalysisEngineSpecifiersWithImports = new LinkedHashMap<String, MetaDataObject>();
+ private Map<String, MetaDataObject> mDelegateAnalysisEngineSpecifiersWithImports = new LinkedHashMap<>();
- private Map<String, Import> mProcessedImports = new HashMap<String, Import>();
+ private Map<String, Import> mProcessedImports = new HashMap<>();
private SofaMapping[] mSofaMappings;
@@ -232,7 +232,7 @@ public class AnalysisEngineDescription_i
aResourceManager = UIMAFramework.newDefaultResourceManager();
}
resolveImports(aResourceManager);
- Map<String, ResourceSpecifier> map = new LinkedHashMap<String, ResourceSpecifier>(mDelegateAnalysisEngineSpecifiers);
+ Map<String, ResourceSpecifier> map = new LinkedHashMap<>(mDelegateAnalysisEngineSpecifiers);
if (getFlowControllerDeclaration() != null) {
map.put(getFlowControllerDeclaration().getKey(), getFlowControllerDeclaration()
.getSpecifier());
@@ -272,7 +272,7 @@ public class AnalysisEngineDescription_i
*/
public void doFullValidation() throws ResourceInitializationException {
// attempt to instantiate AE in "verification mode"
- Map<String, Object> m = new HashMap<String, Object>();
+ Map<String, Object> m = new HashMap<>();
m.put(AnalysisEngineImplBase.PARAM_VERIFICATION_MODE, Boolean.TRUE);
AnalysisEngine ae = UIMAFramework.produceAnalysisEngine(this, m);
validateSofaMappings();
@@ -287,7 +287,7 @@ public class AnalysisEngineDescription_i
public void doFullValidation(ResourceManager aResourceManager)
throws ResourceInitializationException {
// attempt to instantiate AE in "verification mode"
- Map<String, Object> m = new HashMap<String, Object>();
+ Map<String, Object> m = new HashMap<>();
m.put(AnalysisEngineImplBase.PARAM_VERIFICATION_MODE, Boolean.TRUE);
AnalysisEngine ae = UIMAFramework.produceAnalysisEngine(this, aResourceManager, m);
validateSofaMappings();
@@ -463,7 +463,7 @@ public class AnalysisEngineDescription_i
String aggName = this.getAnalysisEngineMetaData().getName();
// build an actual Map (key: componentKey@/@componentSofa) from the sofa mappings
// along the way check that all component keys and component sofa names exist
- Map<String, String> sofamap = new TreeMap<String, String>();
+ Map<String, String> sofamap = new TreeMap<>();
SofaMapping[] sofaMappings = this.getSofaMappings();
if (sofaMappings != null) {
for (int s = 0; s < sofaMappings.length; s++) {
@@ -519,8 +519,8 @@ public class AnalysisEngineDescription_i
// component's input or output sofas, so rules (2) and (4) cannot be checked.
boolean containsRemote = false;
- Set<String> correctlyMappedAggregateOutputs = new HashSet<String>();
- Set<String> correctlyMappedAggregateInputs = new HashSet<String>();
+ Set<String> correctlyMappedAggregateOutputs = new HashSet<>();
+ Set<String> correctlyMappedAggregateInputs = new HashSet<>();
Iterator<Map.Entry<String, ResourceSpecifier>> iter;
try {
@@ -733,7 +733,7 @@ public class AnalysisEngineDescription_i
* @see org.apache.uima.analysis_engine.AnalysisEngineDescription#resolveImports(org.apache.uima.resource.ResourceManager)
*/
public void resolveImports(ResourceManager aResourceManager) throws InvalidXMLException {
- resolveImports(new HashSet<String>(), aResourceManager);
+ resolveImports(new HashSet<>(), aResourceManager);
}
/*
@@ -779,7 +779,7 @@ public class AnalysisEngineDescription_i
protected void resolveDelegateAnalysisEngineImports(ResourceManager aResourceManager, boolean aRecursive)
throws InvalidXMLException {
// add our own URL, if known, to the collection of enclosing aggregate URLs
- Set<String> urls = new HashSet<String>();
+ Set<String> urls = new HashSet<>();
if (getSourceUrl() != null) {
urls.add(getSourceUrl().toString());
}
@@ -801,7 +801,7 @@ public class AnalysisEngineDescription_i
ResourceManager aResourceManager, boolean aRecursive) throws InvalidXMLException {
Set<String> keys = null;
if (getDelegateAnalysisEngineSpecifiersWithImports().size() > 0) {
- keys = new HashSet<String>(); // keep track of keys we've encountered
+ keys = new HashSet<>(); // keep track of keys we've encountered
// so we can remove stale entries
for (Map.Entry<String, MetaDataObject> entry :
getDelegateAnalysisEngineSpecifiersWithImports().entrySet()) {
@@ -847,7 +847,7 @@ public class AnalysisEngineDescription_i
// now resolve imports in ths delegate
if (spec instanceof AnalysisEngineDescription) {
- Set<String> alreadyImportedUrls = new HashSet<String>(aEnclosingAggregateAeUrls);
+ Set<String> alreadyImportedUrls = new HashSet<>(aEnclosingAggregateAeUrls);
alreadyImportedUrls.add(url.toString());
((AnalysisEngineDescription) spec).resolveImports(alreadyImportedUrls, aResourceManager);
}
@@ -866,7 +866,7 @@ public class AnalysisEngineDescription_i
if (mDelegateAnalysisEngineSpecifiers.size() > 0) {
final Set<Map.Entry<String, ResourceSpecifier>> staleEntries = mDelegateAnalysisEngineSpecifiers.entrySet();
- List<String> staleKeys = new ArrayList<String>();
+ List<String> staleKeys = new ArrayList<>();
for (Map.Entry<String, ResourceSpecifier> entry : staleEntries) {
String key = entry.getKey();
if (null == keys || !keys.contains(key)) {
@@ -978,4 +978,4 @@ public class AnalysisEngineDescription_i
new PropertyXmlInfo("externalResourceDependencies"),
new PropertyXmlInfo("resourceManagerConfiguration", null),
new PropertyXmlInfo("sofaMappings") });
-}
\ No newline at end of file
+}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImpl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImpl.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImpl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImpl.java Mon Dec 3 22:00:02 2018
@@ -49,7 +49,7 @@ public class AnalysisEngineManagementImp
* This static set is needed to keep track of what names we've already used for "root" MBeans
* (those representing top-level AEs and CPEs).
*/
- private final static ConcurrentHashMapWithProducer<String, AtomicInteger> usedRootNames = new ConcurrentHashMapWithProducer<String, AtomicInteger>();
+ private final static ConcurrentHashMapWithProducer<String, AtomicInteger> usedRootNames = new ConcurrentHashMapWithProducer<>();
private String name;
@@ -71,7 +71,7 @@ public class AnalysisEngineManagementImp
private final AtomicLong serviceCallTime = new AtomicLong(0);
- private final Map<String, AnalysisEngineManagement> components = Collections.synchronizedMap(new LinkedHashMap<String, AnalysisEngineManagement>());
+ private final Map<String, AnalysisEngineManagement> components = Collections.synchronizedMap(new LinkedHashMap<>());
private String uniqueMBeanName;
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_impl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_impl.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_impl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_impl.java Mon Dec 3 22:00:02 2018
@@ -74,9 +74,9 @@ public class MultiprocessingAnalysisEngi
// (First copy it so we can modify it and send the parameters on to
// each Analysis Engine in the pool.)
if (aAdditionalParams == null) {
- aAdditionalParams = new HashMap<String, Object>();
+ aAdditionalParams = new HashMap<>();
} else {
- aAdditionalParams = new HashMap<String, Object>(aAdditionalParams);
+ aAdditionalParams = new HashMap<>(aAdditionalParams);
}
// get or create ResourceManager
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java Mon Dec 3 22:00:02 2018
@@ -91,12 +91,12 @@ public class PearAnalysisEngineWrapper e
// note: all accesses to this are synchronized
static private Map<ResourceManager, Map<StringPair, ResourceManager>> cachedResourceManagers =
- new WeakHashMap<ResourceManager, Map<StringPair, ResourceManager>>(4);
+ new WeakHashMap<>(4);
private AnalysisEngine ae = null;
private Map<StringPair, ResourceManager> createRMmap(StringPair sp, ResourceManager rm) {
- Map<StringPair, ResourceManager> result = new HashMap<StringPair, ResourceManager>(4);
+ Map<StringPair, ResourceManager> result = new HashMap<>(4);
result.put(sp, rm);
UIMAFramework.getLogger(this.getClass()).logrb(Level.CONFIG,
this.getClass().getName(), "createRMmap", LOG_RESOURCE_BUNDLE,
@@ -288,8 +288,8 @@ public class PearAnalysisEngineWrapper e
// modified, and the aAdditionalParameters original object
// is re-used by the ASB_impl - a caller of this method,
// for other delegates.
- Map<String, Object> clonedAdditionalParameters = (aAdditionalParams == null) ?
- new HashMap<String, Object>() : new HashMap<String, Object>(aAdditionalParams);
+ Map<String, Object> clonedAdditionalParameters = (aAdditionalParams == null) ?
+ new HashMap<>() : new HashMap<>(aAdditionalParams);
// clonedAdditionalParameters.remove(Resource.PARAM_UIMA_CONTEXT);
clonedAdditionalParameters.remove(Resource.PARAM_RESOURCE_MANAGER);
this.ae = UIMAFramework.produceAnalysisEngine(specifier, innerRM, clonedAdditionalParameters);
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/ResultSpecification_impl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/ResultSpecification_impl.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/ResultSpecification_impl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/ResultSpecification_impl.java Mon Dec 3 22:00:02 2018
@@ -145,7 +145,7 @@ public final class ResultSpecification_i
/**
* used for empty type subsumption lists in subtype iterator
*/
- public static final List<Type> EMPTY_TYPE_LIST = new ArrayList<Type>(0);
+ public static final List<Type> EMPTY_TYPE_LIST = new ArrayList<>(0);
/**
* For this Result-specification, the collection of language-sets
@@ -164,7 +164,7 @@ public final class ResultSpecification_i
public ResultSpecification_impl() {
rsTypesMap = new RsTypesMap();
- rsCompiled = new HashMap<String, RsLangs>();
+ rsCompiled = new HashMap<>();
}
/**
@@ -189,7 +189,7 @@ public final class ResultSpecification_i
mTypeSystem = original.mTypeSystem; // not cloned
rsTypesMap = new RsTypesMap(original.rsTypesMap);
needsCompilation = original.needsCompilation;
- rsCompiled = new HashMap<String, RsLangs>(original.rsCompiled);
+ rsCompiled = new HashMap<>(original.rsCompiled);
for (Map.Entry<String, RsLangs> e : rsCompiled.entrySet()) {
e.getValue().setShared();
}
@@ -212,7 +212,7 @@ public final class ResultSpecification_i
}
private TypeOrFeature[] getResultTypesAndFeatures(boolean skipLanguageFilter, String language) {
- List<TypeOrFeature> r = new ArrayList<TypeOrFeature>();
+ List<TypeOrFeature> r = new ArrayList<>();
if (rsTypesMap.nbrOfTypes() == 0 && !needsCompilation) {
// being called on results of intersection
// probably by a test case, not a normal call
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsFeats.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsFeats.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsFeats.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsFeats.java Mon Dec 3 22:00:02 2018
@@ -41,7 +41,7 @@ public class RsFeats implements Iterable
features = null;
return;
}
- features = new ArrayList<RsFeat>(other.features.size());
+ features = new ArrayList<>(other.features.size());
for (RsFeat f : other.features){
features.add(new RsFeat(f));
}
@@ -68,7 +68,7 @@ public class RsFeats implements Iterable
feat = new RsFeat(shortFeatName, rsLangs);
}
if (null == features) {
- features = new ArrayList<RsFeat>(1);
+ features = new ArrayList<>(1);
}
features.add(feat);
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsFullFeatNames.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsFullFeatNames.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsFullFeatNames.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsFullFeatNames.java Mon Dec 3 22:00:02 2018
@@ -36,14 +36,14 @@ import org.apache.uima.cas.TypeSystem;
*/
public class RsFullFeatNames {
- private static final ConcurrentHashMap<String, ConcurrentHashMap<String, String>> typeName2TypeFeats =
- new ConcurrentHashMap<String, ConcurrentHashMap<String, String>>();
+ private static final ConcurrentHashMap<String, ConcurrentHashMap<String, String>> typeName2TypeFeats =
+ new ConcurrentHashMap<>();
public static String getFullFeatName(String typeName, String shortFeatName) {
ConcurrentHashMap<String, String> tf = typeName2TypeFeats.get(typeName), tfOther;
if (null == tf) {
- tfOther = typeName2TypeFeats.putIfAbsent(typeName, tf = new ConcurrentHashMap<String, String>());
+ tfOther = typeName2TypeFeats.putIfAbsent(typeName, tf = new ConcurrentHashMap<>());
tf = (tfOther != null) ? tfOther : tf;
}
String s = tf.get(shortFeatName), otherString;
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsLang.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsLang.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsLang.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsLang.java Mon Dec 3 22:00:02 2018
@@ -31,7 +31,7 @@ public class RsLang {
/**
* global set for canonical language strings
*/
- private static final ConcurrentMap<String, String> canonicalLanguageStrings = new ConcurrentHashMap<String, String>();
+ private static final ConcurrentMap<String, String> canonicalLanguageStrings = new ConcurrentHashMap<>();
/**
*
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsLangs.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsLangs.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsLangs.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsLangs.java Mon Dec 3 22:00:02 2018
@@ -20,7 +20,6 @@
package org.apache.uima.analysis_engine.impl;
import java.util.ArrayList;
-import java.util.Iterator;
import org.apache.uima.cas.text.Language;
@@ -99,7 +98,7 @@ public class RsLangs {
// make a copy when needed
private RsLangs(RsLangs original) {
- languages = (null == original.languages) ? null : new ArrayList<String>(original.languages);
+ languages = (null == original.languages) ? null : new ArrayList<>(original.languages);
}
static boolean isEmpty(RsLangs rsl) {
@@ -187,7 +186,7 @@ public class RsLangs {
if (rsl == null || rsl.isShared) {
rsl = new RsLangs();
}
- rsl.languages = new ArrayList<String>(0); // special form means empty, not x-unspec
+ rsl.languages = new ArrayList<>(0); // special form means empty, not x-unspec
}
return addAll(rsl, langs);
}
@@ -244,11 +243,7 @@ public class RsLangs {
* @param canonicalLang
*/
private void removeSubsumedLanguages(String canonicalLang, String baseLang) {
- for (Iterator<String> it = languages.iterator(); it.hasNext();) {
- if (subsumesCanonical(it.next(), canonicalLang, baseLang)) {
- it.remove();
- }
- }
+ languages.removeIf(s -> subsumesCanonical(s, canonicalLang, baseLang));
}
/**
@@ -269,7 +264,7 @@ public class RsLangs {
}
RsLangs r = new RsLangs();
- r.languages = new ArrayList<String>(0); // creates an empty, not null arraylist
+ r.languages = new ArrayList<>(0); // creates an empty, not null arraylist
for (String lang : this.languages) {
if (subsumesCanonical(other, lang)) {
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsType.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsType.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsType.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsType.java Mon Dec 3 22:00:02 2018
@@ -37,7 +37,7 @@ import org.apache.uima.cas.TypeSystem;
public class RsType {
- public final static List<Feature> EMPTY_FEATURE_LIST = new ArrayList<Feature>(0);
+ public final static List<Feature> EMPTY_FEATURE_LIST = new ArrayList<>(0);
final String typeName;
boolean isAllFeatures = false;
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsTypesMap.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsTypesMap.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsTypesMap.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsTypesMap.java Mon Dec 3 22:00:02 2018
@@ -32,7 +32,7 @@ public class RsTypesMap implements Itera
private final Map<String, RsType> types;
RsTypesMap() {
- types = new HashMap<String, RsType>();
+ types = new HashMap<>();
}
/**
@@ -40,7 +40,7 @@ public class RsTypesMap implements Itera
* @param src
*/
RsTypesMap(RsTypesMap src) {
- types = new HashMap<String, RsType>(src.types);
+ types = new HashMap<>(src.types);
for (Map.Entry<String, RsType> e : types.entrySet()) {
e.setValue(new RsType(e.getValue())); // copy
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/AnnotatorAdapter.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/AnnotatorAdapter.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/AnnotatorAdapter.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/AnnotatorAdapter.java Mon Dec 3 22:00:02 2018
@@ -59,7 +59,7 @@ public class AnnotatorAdapter implements
private ResultSpecification mDefaultResultSpecification;
- private Map<String, ResultSpecification> mLanguageToResultSpecMap = new HashMap<String, ResultSpecification>();
+ private Map<String, ResultSpecification> mLanguageToResultSpecMap = new HashMap<>();
/**
* Create a new annotator adapter.
@@ -116,7 +116,7 @@ public class AnnotatorAdapter implements
public void setResultSpecification(ResultSpecification aResultSpec) {
mDefaultResultSpecification = aResultSpec;
- mLanguageToResultSpecMap = new HashMap<String, ResultSpecification>();
+ mLanguageToResultSpecMap = new HashMap<>();
}
/*
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/CasConsumerAdapter.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/CasConsumerAdapter.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/CasConsumerAdapter.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/CasConsumerAdapter.java Mon Dec 3 22:00:02 2018
@@ -75,7 +75,7 @@ public class CasConsumerAdapter implemen
AnalysisEngineDescription_impl desc = new AnalysisEngineDescription_impl();
desc.setMetaData(mMetaData);
- Map<String, Object> paramsMap = new HashMap<String, Object>();
+ Map<String, Object> paramsMap = new HashMap<>();
paramsMap.put(Resource.PARAM_UIMA_CONTEXT, aContext);
mCasConsumer.initialize(desc, paramsMap);
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/CollectionReaderAdapter.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/CollectionReaderAdapter.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/CollectionReaderAdapter.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/CollectionReaderAdapter.java Mon Dec 3 22:00:02 2018
@@ -82,7 +82,7 @@ public class CollectionReaderAdapter imp
// Primitive AnalysisEngine.
AnalysisEngineDescription_impl desc = new AnalysisEngineDescription_impl();
- Map<String, Object> paramsMap = new HashMap<String, Object>();
+ Map<String, Object> paramsMap = new HashMap<>();
paramsMap.put(Resource.PARAM_UIMA_CONTEXT, aContext);
mCollectionReader.initialize(desc, paramsMap);
mUimaContext = aContext;
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/AnalysisEngineService_impl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/AnalysisEngineService_impl.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/AnalysisEngineService_impl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/AnalysisEngineService_impl.java Mon Dec 3 22:00:02 2018
@@ -87,7 +87,7 @@ public class AnalysisEngineService_impl
*/
public void initialize(ResourceSpecifier aResourceSpecifier, int aNumSimultaneousRequests,
int aTimeout) throws ResourceInitializationException {
- Map<String, Object> initParams = new HashMap<String, Object>();
+ Map<String, Object> initParams = new HashMap<>();
initParams.put(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS, Integer.valueOf(
aNumSimultaneousRequests));
initParams.put(AnalysisEngine.PARAM_TIMEOUT_PERIOD, Integer.valueOf(aTimeout));
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/AllFSs.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/AllFSs.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/AllFSs.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/AllFSs.java Mon Dec 3 22:00:02 2018
@@ -21,7 +21,6 @@ package org.apache.uima.cas.impl;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.function.Predicate;
import org.apache.uima.UimaSerializableFSs;
@@ -43,7 +42,7 @@ class AllFSs {
final private MarkerImpl mark;
final private PositiveIntSet foundFSs = new PositiveIntSet_impl(4096, 1, 4096);
final private PositiveIntSet foundFSsBelowMark;
- final private ArrayList<TOP> toBeScanned = new ArrayList<TOP>();
+ final private ArrayList<TOP> toBeScanned = new ArrayList<>();
final private Predicate<TOP> includeFilter;
final private CasTypeSystemMapper typeMapper;
@@ -68,7 +67,7 @@ class AllFSs {
}
ArrayList<TOP> getAllFSsSorted() {
- Collections.sort(toBeScanned, FeatureStructureImplC::compare);
+ toBeScanned.sort(FeatureStructureImplC::compare);
return toBeScanned;
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationTreeNodeImpl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationTreeNodeImpl.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationTreeNodeImpl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationTreeNodeImpl.java Mon Dec 3 22:00:02 2018
@@ -38,7 +38,7 @@ public class AnnotationTreeNodeImpl<T ex
AnnotationTreeNodeImpl() {
super();
- this.dtrs = new ArrayList<AnnotationTreeNode<T>>();
+ this.dtrs = new ArrayList<>();
}
public AnnotationTreeNode<T> getParent() {
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java Mon Dec 3 22:00:02 2018
@@ -362,7 +362,7 @@ public class BinaryCasSerDes4 implements
*
* Contrast with fs2addr and addr2fs in csds - these use the pseudo v2 addresses as the int
*/
- private final Obj2IntIdentityHashMap<TOP> fs2seq = new Obj2IntIdentityHashMap<TOP>(TOP.class, TOP._singleton);
+ private final Obj2IntIdentityHashMap<TOP> fs2seq = new Obj2IntIdentityHashMap<>(TOP.class, TOP._singleton);
// private final Int2ObjHashMap<TOP, TOP> seq2fs = new Int2ObjHashMap<>(TOP.class);
/**
*
@@ -907,7 +907,7 @@ public class BinaryCasSerDes4 implements
deflater.setStrategy(compressStrategy.strat);
int nbrEntries = 0;
- List<Integer> idxAndLen = new ArrayList<Integer>();
+ List<Integer> idxAndLen = new ArrayList<>();
for (int i = 0; i < baosZipSources.length; i++) {
ByteArrayOutputStream baos = baosZipSources[i];
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java Mon Dec 3 22:00:02 2018
@@ -391,7 +391,7 @@ public class BinaryCasSerDes6 implements
/**
* FSs being processed, including below-the-line deltas.
*/
- final private List<TOP> toBeScanned = new ArrayList<TOP>();
+ final private List<TOP> toBeScanned = new ArrayList<>();
// private HashSetInt ffssBelowMark; // sorted fss's found below the mark
// final private int[] typeCodeHisto = new int[ts.getTypeArraySize()];
@@ -1115,7 +1115,7 @@ public class BinaryCasSerDes6 implements
deflater.setStrategy(compressStrategy.strat);
int nbrEntries = 0;
- List<Integer> idxAndLen = new ArrayList<Integer>();
+ List<Integer> idxAndLen = new ArrayList<>();
for (int i = 0; i < baosZipSources.length; i++) {
ByteArrayOutputStream baos = baosZipSources[i];
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BuiltinTypeKinds.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BuiltinTypeKinds.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BuiltinTypeKinds.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BuiltinTypeKinds.java Mon Dec 3 22:00:02 2018
@@ -64,9 +64,9 @@ import org.apache.uima.jcas.tcas.Annotat
*/
public class BuiltinTypeKinds {
- private static final Set<String> primitiveTypeNames = new HashSet<String>();
+ private static final Set<String> primitiveTypeNames = new HashSet<>();
- public static final Set<String> creatableArrays = new HashSet<String>();
+ public static final Set<String> creatableArrays = new HashSet<>();
public static final Set<String> nonCreatablePrimitives = primitiveTypeNames;
@@ -74,7 +74,7 @@ public class BuiltinTypeKinds {
* These types can not be created with CAS.createFS().
* Arrays can be created using CAS.create<XYZ>Array XYZ = Boolean, Byte, etc.
*/
- public static final Set<String> nonCreatableTypesAndBuiltinArrays = new HashSet<String>();
+ public static final Set<String> nonCreatableTypesAndBuiltinArrays = new HashSet<>();
public static final Set<String> creatableBuiltinJCasClassNames = new HashSet<>();
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java Mon Dec 3 22:00:02 2018
@@ -453,7 +453,7 @@ public class CASImpl extends AbstractCas
/**
* This stack corresponds to nested protectIndexes contexts. Normally should be very shallow.
*/
- private final ArrayList<FSsTobeAddedback> fssTobeAddedback = new ArrayList<FSsTobeAddedback>();
+ private final ArrayList<FSsTobeAddedback> fssTobeAddedback = new ArrayList<>();
/**
* This version is for single fs use, by binary deserializers and by automatic mode
@@ -1105,7 +1105,7 @@ public class CASImpl extends AbstractCas
this.svd.sofa2indexMap = new ArrayList<>();
this.svd.sofaNbr2ViewMap = new ArrayList<>();
- this.svd.sofaNameSet = new HashSet<String>();
+ this.svd.sofaNameSet = new HashSet<>();
this.svd.initialSofaCreated = false;
this.svd.viewCount = 0;
@@ -1746,7 +1746,7 @@ public class CASImpl extends AbstractCas
@Override
public<T extends FeatureStructure> FSIterator<T> createFilteredIterator(FSIterator<T> it, FSMatchConstraint cons) {
- return new FilteredIterator<T>(it, cons);
+ return new FilteredIterator<>(it, cons);
}
public TypeSystemImpl commitTypeSystem(boolean skip_loading_user_jcas) {
@@ -4233,7 +4233,7 @@ public JCasImpl getJCasImpl() {
final TypeSystemImpl ts = getTypeSystemImpl();
// Remove any existing document annotations.
FSIterator<T> it = this.<T>getAnnotationIndex(ts.docType).iterator();
- List<T> list = new ArrayList<T>();
+ List<T> list = new ArrayList<>();
while (it.isValid()) {
list.add(it.get());
it.moveToNext();
@@ -4717,7 +4717,7 @@ public JCasImpl getJCasImpl() {
}
// find Sofas with this prefix
- List<CAS> viewList = new ArrayList<CAS>();
+ List<CAS> viewList = new ArrayList<>();
FSIterator<Sofa> sofaIter = getSofaIterator();
while (sofaIter.hasNext()) {
SofaFS sofa = sofaIter.next();
@@ -4830,7 +4830,7 @@ public JCasImpl getJCasImpl() {
}
if (this.svd.trackingMarkList == null) {
- this.svd.trackingMarkList = new ArrayList<MarkerImpl>();
+ this.svd.trackingMarkList = new ArrayList<>();
} else {errorMultipleMarkers();}
this.svd.trackingMarkList.add(this.svd.trackingMark);
return this.svd.trackingMark;
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java Mon Dec 3 22:00:02 2018
@@ -198,7 +198,7 @@ public class CASMgrSerializer implements
this.typeOrder = ir.getDefaultTypeOrder().getOrder();
// Collect the index labels in a list, as we don't know how many there
// are.
- final List<String> names = new ArrayList<String>();
+ final List<String> names = new ArrayList<>();
// Create an iterator over the names.
final Iterator<String> namesIt = ir.getLabels();
// Add the names to the list, filtering out auto-indexes.
@@ -222,7 +222,7 @@ public class CASMgrSerializer implements
}
// Create a vector of the indexes, and build the name-to-index map.
this.nameToIndexMap = new int[numNames];
- Vector<FSIndex<FeatureStructure>> indexVector = new Vector<FSIndex<FeatureStructure>>();
+ Vector<FSIndex<FeatureStructure>> indexVector = new Vector<>();
FSIndex<FeatureStructure> index;
int pos;
for (int i = 0; i < numNames; i++) {
@@ -306,7 +306,7 @@ public class CASMgrSerializer implements
final int size = list.size();
this.stringSubtypes = new int[size];
this.stringSubtypeValuePos = new int[size];
- List<String> strVals = new ArrayList<String>();
+ List<String> strVals = new ArrayList<>();
TypeImpl_string type;
int pos = 0, typeCode;
String[] stringSet;
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASSerializer.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASSerializer.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASSerializer.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASSerializer.java Mon Dec 3 22:00:02 2018
@@ -464,7 +464,7 @@ public class CASSerializer implements Se
// if (csds.getHeapEnd() == 0) {
// System.out.println("debug");
//}
- final Obj2IntIdentityHashMap<TOP> fs2auxOffset = new Obj2IntIdentityHashMap<TOP>(TOP.class, TOP._singleton);
+ final Obj2IntIdentityHashMap<TOP> fs2auxOffset = new Obj2IntIdentityHashMap<>(TOP.class, TOP._singleton);
int byteOffset = 1;
int shortOffset = 1;
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasCompare.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasCompare.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasCompare.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasCompare.java Mon Dec 3 22:00:02 2018
@@ -347,7 +347,7 @@ public class CasCompare {
/* ****************************************************
* Data Structures for converting lists to arrays
* ****************************************************/
- private static final CommonList removed_list_marker = new NonEmptyFSList<TOP>();
+ private static final CommonList removed_list_marker = new NonEmptyFSList<>();
/**
* key = _id, value = arraylist holding well-formed list with this node in it
@@ -364,8 +364,8 @@ public class CasCompare {
* a map from list nodes which might be removed, to their place in the fss array list
* The index is 1 more, to avoid colliding with the 0 value, used for missing value
*/
- final private Obj2IntIdentityHashMap<CommonList> node_indexes =
- new Obj2IntIdentityHashMap<CommonList>(CommonList.class, removed_list_marker);
+ final private Obj2IntIdentityHashMap<CommonList> node_indexes =
+ new Obj2IntIdentityHashMap<>(CommonList.class, removed_list_marker);
final private PositiveIntSet list_successor_seen = new PositiveIntSet_impl();
@@ -1283,7 +1283,7 @@ public class CasCompare {
// both are not null
// do a recursive check
- Pair<TOP, TOP> refs = new Pair<TOP, TOP>(rfs1, rfs2);
+ Pair<TOP, TOP> refs = new Pair<>(rfs1, rfs2);
Integer prevComp = prevCompare.get(refs);
if (prevComp != null) {
int v = prevComp.intValue();
@@ -1510,8 +1510,7 @@ public class CasCompare {
clearPrevFss();
try {
- Collections.sort(fss,
- (afs1, afs2) -> sortCompare(afs1, afs2));
+ fss.sort((afs1, afs2) -> sortCompare(afs1, afs2));
// (afs1, afs2) -> Integer.compare(afs1._id, afs2._id));
} finally {
inSortContext = false;
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSerializerSupport.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSerializerSupport.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSerializerSupport.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSerializerSupport.java Mon Dec 3 22:00:02 2018
@@ -383,13 +383,13 @@ public class CasSerializerSupport {
* map from a namespace expanded form to the namespace prefix, to identify potential collisions when
* generating a namespace string
*/
- public final Map<String, String> nsUriToPrefixMap = new HashMap<String, String>();
+ public final Map<String, String> nsUriToPrefixMap = new HashMap<>();
/**
* the set of all namespace prefixes used, to disallow some if they are
* in use already in set-aside data (xmi serialization) being merged back in
*/
- public final Set<String> nsPrefixesUsed = new HashSet<String>();
+ public final Set<String> nsPrefixesUsed = new HashSet<>();
/**
* Used to tell if a FS was created before or after mark.
@@ -423,7 +423,7 @@ public class CasSerializerSupport {
public TypeSystemImpl filterTypeSystem_inner;
// map to reduce string usage by reusing equal string representations; lives just for one serialize call
- private final Map<String, String> uniqueStrings = new HashMap<String, String>();
+ private final Map<String, String> uniqueStrings = new HashMap<>();
public final boolean isFormattedOutput_inner;
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasTypeSystemMapper.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasTypeSystemMapper.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasTypeSystemMapper.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasTypeSystemMapper.java Mon Dec 3 22:00:02 2018
@@ -101,7 +101,7 @@ public class CasTypeSystemMapper {
throw new CASRuntimeException(CASRuntimeException.TYPESYSTEMS_NOT_COMMITTED);
}
this.tsSrc = tsSrc;
- this.tsTgt = new WeakReference<TypeSystemImpl>(tsTgt);
+ this.tsTgt = new WeakReference<>(tsTgt);
boolean tss = true;
if (tsSrc != tsTgt) {
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonSerDesSequential.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonSerDesSequential.java?rev=1848108&r1=1848107&r2=1848108&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonSerDesSequential.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonSerDesSequential.java Mon Dec 3 22:00:02 2018
@@ -20,7 +20,6 @@
package org.apache.uima.cas.impl;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import org.apache.uima.internal.util.Int2ObjHashMap;
@@ -203,10 +202,10 @@ public class CommonSerDesSequential {
}
private void merge() {
- Collections.sort(pending, FeatureStructureImplC::compare);
+ pending.sort(FeatureStructureImplC::compare);
sortedFSs.addAll(pending);
pending.clear();
- Collections.sort(sortedFSs, FeatureStructureImplC::compare);
+ sortedFSs.sort(FeatureStructureImplC::compare);
}
}