This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch refactoring/325-Update-dependencies in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
from d7822ec9b Merge branch 'main' into refactoring/325-Update-dependencies add 666d95103 Issue #350: Clean up and modernize code add 10af8cc1a Merge branch 'main' into refactoring/350-Clean-up-and-modernize-code add 39e4307e8 Issue #337: Component description editor may not open in Eclipse add c2cd5be2e Merge pull request #338 from apache/refactoring/337-Component-description-editor-may-not-open-in-Eclipse add fa5246a14 Merge branch 'main' into merge/update-main-to-3.4.x add 265d01e1a Merge branch 'main' into merge/update-main-to-3.4.x add aecb63fc2 Merge pull request #344 from apache/merge/update-main-to-3.4.x add 009b75d79 Merge branch 'main' into refactoring/350-Clean-up-and-modernize-code add a40740ae7 Merge pull request #351 from apache/refactoring/350-Clean-up-and-modernize-code add d0218e0e8 Merge branch 'main' into refactoring/325-Update-dependencies No new revisions were added by this update. Summary of changes: .../uima/adapter/vinci/CASTransportable.java | 22 +- .../vinci/VinciAnalysisEngineServiceAdapter.java | 2 +- .../vinci/VinciAnalysisEngineServiceStub.java | 15 +- .../vinci/VinciAnalysisEngineService_impl.java | 4 +- .../VinciBinaryAnalysisEngineServiceStub.java | 19 +- .../VinciBinaryAnalysisEngineService_impl.java | 6 +- .../uima/adapter/vinci/util/NetworkUtil.java | 11 +- .../adapter/vinci/util/SaxVinciFrameBuilder.java | 9 +- .../main/java/org/apache/uima/I18nExceptionI.java | 2 +- .../main/java/org/apache/uima/UIMAException.java | 8 +- .../uima/analysis_engine/asb/impl/ASB_impl.java | 2 +- .../asb/impl/FlowControllerContainer.java | 2 +- .../impl/AggregateAnalysisEngine_impl.java | 10 +- .../impl/AnalysisEngineDescription_impl.java | 12 +- .../impl/AnalysisEngineImplBase.java | 4 +- .../impl/AnalysisEngineManagementImpl.java | 4 +- .../impl/MultiprocessingAnalysisEngine_impl.java | 2 +- .../impl/PearAnalysisEngineWrapper.java | 52 ++- .../impl/PrimitiveAnalysisEngine_impl.java | 12 +- .../impl/ResultSpecification_impl.java | 5 +- .../apache/uima/analysis_engine/impl/RsFeat.java | 4 +- .../apache/uima/analysis_engine/impl/RsLangs.java | 9 +- .../uima/analysis_engine/impl/RsTypesMap.java | 5 +- .../analysis_engine/impl/TypeOrFeature_impl.java | 7 +- .../impl/UimacppAnalysisEngineImpl.java | 8 +- .../src/main/java/org/apache/uima/cas/CAS.java | 14 +- .../main/java/org/apache/uima/cas/impl/AllFSs.java | 6 +- .../uima/cas/impl/AnnotationImplException.java | 24 +- .../apache/uima/cas/impl/AnnotationTreeImpl.java | 2 +- .../uima/cas/impl/AnnotationTreeNodeImpl.java | 24 +- .../org/apache/uima/cas/impl/BinaryCasSerDes.java | 53 +-- .../org/apache/uima/cas/impl/BinaryCasSerDes4.java | 129 +++--- .../org/apache/uima/cas/impl/BinaryCasSerDes6.java | 129 +++--- .../apache/uima/cas/impl/BooleanConstraint.java | 10 +- .../java/org/apache/uima/cas/impl/ByteHeap.java | 12 +- .../uima/cas/impl/CASCompleteSerializer.java | 8 +- .../java/org/apache/uima/cas/impl/CASImpl.java | 287 +++++++------ .../org/apache/uima/cas/impl/CASMgrSerializer.java | 110 ++--- .../org/apache/uima/cas/impl/CASSerializer.java | 63 ++- .../java/org/apache/uima/cas/impl/CasCompare.java | 26 +- .../org/apache/uima/cas/impl/CasSeqAddrMaps.java | 8 +- .../apache/uima/cas/impl/CasSerializerSupport.java | 52 +-- .../apache/uima/cas/impl/CasTypeSystemMapper.java | 4 +- .../org/apache/uima/cas/impl/CommonAuxHeap.java | 8 +- .../uima/cas/impl/CommonSerDesSequential.java | 2 +- .../uima/cas/impl/ConjunctiveConstraint.java | 4 +- .../uima/cas/impl/DisjunctiveConstraint.java | 4 +- .../apache/uima/cas/impl/EmbeddedConstraint.java | 8 +- .../uima/cas/impl/FSBooleanConstraintImpl.java | 6 +- .../org/apache/uima/cas/impl/FSClassRegistry.java | 7 +- .../uima/cas/impl/FSFloatConstraintImpl.java | 48 +-- .../uima/cas/impl/FSIndexComparatorImpl.java | 64 +-- .../uima/cas/impl/FSIndexRepositoryImpl.java | 215 +++++----- .../apache/uima/cas/impl/FSIntConstraintImpl.java | 50 +-- .../uima/cas/impl/FSStringConstraintImpl.java | 12 +- .../apache/uima/cas/impl/FSTypeConstraintImpl.java | 4 +- .../java/org/apache/uima/cas/impl/FeatureImpl.java | 58 ++- .../org/apache/uima/cas/impl/FeaturePathImpl.java | 90 ++-- .../uima/cas/impl/FeatureStructureImplC.java | 22 +- .../apache/uima/cas/impl/FeatureValuePathImpl.java | 452 ++++++++++----------- .../org/apache/uima/cas/impl/FilteredIterator.java | 26 +- .../org/apache/uima/cas/impl/FloatConstraint.java | 12 +- .../java/org/apache/uima/cas/impl/FsIndex_bag.java | 14 +- .../org/apache/uima/cas/impl/FsIndex_flat.java | 2 +- .../org/apache/uima/cas/impl/FsIndex_iicp.java | 16 +- .../apache/uima/cas/impl/FsIndex_set_sorted.java | 14 +- .../apache/uima/cas/impl/FsIndex_singletype.java | 38 +- .../org/apache/uima/cas/impl/FsIndex_snapshot.java | 2 +- .../apache/uima/cas/impl/FsIterator_backwards.java | 2 +- .../org/apache/uima/cas/impl/FsIterator_bag.java | 2 +- .../apache/uima/cas/impl/FsIterator_bag_pear.java | 2 +- .../apache/uima/cas/impl/FsIterator_limited.java | 6 +- .../uima/cas/impl/FsIterator_multiple_indexes.java | 6 +- .../uima/cas/impl/FsIterator_set_sorted_pear.java | 2 +- .../uima/cas/impl/FsIterator_singletype.java | 2 +- .../uima/cas/impl/FsIterator_subtypes_ordered.java | 102 ++--- .../cas/impl/FsIterator_subtypes_snapshot.java | 16 +- .../main/java/org/apache/uima/cas/impl/Heap.java | 84 ++-- .../main/java/org/apache/uima/cas/impl/Id2FS.java | 7 +- .../org/apache/uima/cas/impl/IntConstraint.java | 12 +- .../uima/cas/impl/LinearTypeOrderBuilderImpl.java | 74 ++-- .../java/org/apache/uima/cas/impl/LongHeap.java | 12 +- .../java/org/apache/uima/cas/impl/LongSet.java | 2 +- .../apache/uima/cas/impl/LowLevelException.java | 2 +- .../java/org/apache/uima/cas/impl/MarkerImpl.java | 4 +- .../org/apache/uima/cas/impl/PathConstraint.java | 6 +- .../org/apache/uima/cas/impl/SelectFSs_impl.java | 96 ++--- .../java/org/apache/uima/cas/impl/ShortHeap.java | 12 +- .../org/apache/uima/cas/impl/StringConstraint.java | 12 +- .../java/org/apache/uima/cas/impl/StringHeap.java | 32 +- .../java/org/apache/uima/cas/impl/StringSet.java | 2 +- .../java/org/apache/uima/cas/impl/Subiterator.java | 118 +++--- .../java/org/apache/uima/cas/impl/TypeImpl.java | 104 +++-- .../org/apache/uima/cas/impl/TypeImpl_array.java | 4 +- .../org/apache/uima/cas/impl/TypeImpl_string.java | 2 +- .../apache/uima/cas/impl/TypeNameSpaceImpl.java | 2 +- .../org/apache/uima/cas/impl/TypeSystemImpl.java | 55 ++- .../org/apache/uima/cas/impl/TypeSystemUtils.java | 25 +- .../org/apache/uima/cas/impl/XCASDeserializer.java | 134 +++--- .../apache/uima/cas/impl/XCASParsingException.java | 2 +- .../org/apache/uima/cas/impl/XCASSerializer.java | 8 +- .../apache/uima/cas/impl/XmiCasDeserializer.java | 158 +++---- .../org/apache/uima/cas/impl/XmiCasSerializer.java | 5 +- .../uima/cas/impl/XmiSerializationSharedData.java | 26 +- .../java/org/apache/uima/cas/text/Language.java | 24 +- .../apache/uima/cas_data/impl/CasDataToXCas.java | 4 +- .../cas_data/impl/XCasToCasDataSaxHandler.java | 86 ++-- .../uima/flow/impl/FlowControllerContext_impl.java | 2 +- .../org/apache/uima/internal/util/BinaryTree.java | 28 +- .../uima/internal/util/CharArraySpanMap.java | 40 +- .../apache/uima/internal/util/CharArrayString.java | 96 ++--- .../org/apache/uima/internal/util/Class_TCCL.java | 21 +- .../uima/internal/util/CommandLineParser.java | 36 +- .../uima/internal/util/Common_hash_support.java | 26 +- .../uima/internal/util/CopyOnWriteObjHashSet.java | 4 +- .../util/CopyOnWriteOrderedFsSet_array.java | 14 +- .../uima/internal/util/EncodedPrintStream.java | 1 + .../java/org/apache/uima/internal/util/Graph.java | 2 +- .../org/apache/uima/internal/util/GraphNode.java | 20 +- .../org/apache/uima/internal/util/I18nx_impl.java | 2 +- .../apache/uima/internal/util/Int2ObjHashMap.java | 10 +- .../org/apache/uima/internal/util/IntHashSet.java | 4 +- .../java/org/apache/uima/internal/util/IntSet.java | 28 +- .../org/apache/uima/internal/util/IntStack.java | 12 +- .../org/apache/uima/internal/util/IntVector.java | 155 ++++--- .../uima/internal/util/Obj2IntIdentityHashMap.java | 10 +- .../org/apache/uima/internal/util/ObjHashSet.java | 8 +- .../uima/internal/util/OrderedFsSet_array.java | 16 +- .../uima/internal/util/OrderedFsSet_array2.java | 55 ++- .../java/org/apache/uima/internal/util/Pair.java | 5 +- .../uima/internal/util/ReplaceStringInFiles.java | 4 +- .../uima/internal/util/SerializationUtils.java | 194 ++++++++- .../apache/uima/internal/util/SortedIntSet.java | 28 +- .../apache/uima/internal/util/StringToIntMap.java | 10 +- .../org/apache/uima/internal/util/SymbolTable.java | 32 +- .../uima/internal/util/TextStringTokenizer.java | 108 ++--- .../apache/uima/internal/util/TextTokenizer.java | 100 ++--- .../org/apache/uima/internal/util/TimeSpan.java | 118 +++--- .../java/org/apache/uima/internal/util/Timer.java | 28 +- .../uima/internal/util/UIMAStreamHandler.java | 2 +- .../org/apache/uima/internal/util/UtilError.java | 20 +- .../internal/util/rb_trees/CompIntArrayRBT.java | 2 +- .../uima/internal/util/rb_trees/Int2IntRBT.java | 94 ++--- .../uima/internal/util/rb_trees/IntArrayRBT.java | 86 ++-- .../internal/util/rb_trees/IntArrayRBTcommon.java | 140 +++---- .../uima/internal/util/rb_trees/IntRBTArray.java | 22 +- .../uima/internal/util/rb_trees/IntRBTNode.java | 64 +-- .../internal/util/rb_trees/IntRedBlackTree.java | 54 +-- .../internal/util/rb_trees/RBTKeyValuePair.java | 4 +- .../uima/internal/util/rb_trees/RBTNode.java | 74 ++-- .../uima/internal/util/rb_trees/RedBlackTree.java | 50 +-- .../src/main/java/org/apache/uima/jcas/JCas.java | 38 +- .../java/org/apache/uima/jcas/cas/CommonList.java | 6 +- .../java/org/apache/uima/jcas/cas/FSArrayList.java | 43 ++ .../org/apache/uima/jcas/cas/FSLinkedHashSet.java | 1 - .../main/java/org/apache/uima/jcas/cas/FSList.java | 4 +- .../java/org/apache/uima/jcas/cas/FloatList.java | 4 +- .../org/apache/uima/jcas/cas/IntegerArrayList.java | 3 + .../java/org/apache/uima/jcas/cas/IntegerList.java | 4 +- .../apache/uima/jcas/cas/NonEmptyFloatList.java | 2 +- .../java/org/apache/uima/jcas/cas/StringList.java | 6 +- .../java/org/apache/uima/jcas/cas/TOP_Type.java | 14 +- .../java/org/apache/uima/jcas/impl/JCasImpl.java | 14 +- .../uima/jcas/impl/JFSIndexRepositoryImpl.java | 4 +- .../java/org/apache/uima/jcas/tcas/Annotation.java | 6 +- .../uima/pear/tools/InstallationController.java | 14 +- .../apache/uima/pear/tools/InstallationTester.java | 32 +- .../org/apache/uima/pear/tools/PackageBrowser.java | 8 +- .../java/org/apache/uima/pear/util/FileUtil.java | 6 +- .../org/apache/uima/pear/util/ProcessUtil.java | 2 +- .../org/apache/uima/resource/CasDefinition.java | 20 +- .../impl/ConfigurableDataResource_impl.java | 9 +- .../impl/ConfigurationManagerImplBase.java | 4 +- .../uima/resource/impl/DataResource_impl.java | 7 +- .../apache/uima/resource/impl/Parameter_impl.java | 4 +- .../uima/resource/impl/PearSpecifier_impl.java | 16 +- .../resource/impl/RelativePathResolver_impl.java | 10 +- .../uima/resource/impl/ResourceManager_impl.java | 16 +- .../impl/ConfigurationParameterSettings_impl.java | 2 +- .../metadata/impl/ConfigurationParameter_impl.java | 2 +- .../resource/metadata/impl/ImportResolver.java | 5 +- .../uima/resource/metadata/impl/Import_impl.java | 2 +- .../metadata/impl/LanguagePrecondition_impl.java | 4 +- .../metadata/impl/MetaDataObject_impl.java | 15 +- .../impl/ResourceManagerConfiguration_impl.java | 16 +- .../uima/uimacpp/UimacppAnalysisComponent.java | 18 +- .../org/apache/uima/util/CasCreationUtils.java | 4 +- .../main/java/org/apache/uima/util/CasIOUtils.java | 80 ++-- .../java/org/apache/uima/util/CasLoadMode.java | 6 +- .../main/java/org/apache/uima/util/IntEntry.java | 8 +- .../src/main/java/org/apache/uima/util/Level.java | 4 +- .../java/org/apache/uima/util/NameClassPair.java | 8 +- .../java/org/apache/uima/util/XMLInputSource.java | 12 +- .../apache/uima/util/impl/JSR47Logger_impl.java | 4 +- .../apache/uima/util/impl/Log4jLogger_impl.java | 8 +- .../apache/uima/util/impl/Logger_common_impl.java | 12 +- .../org/apache/uima/util/impl/Logger_impl.java | 6 +- .../apache/uima/util/impl/Slf4jLogger_impl.java | 4 +- .../uima/ae/multiplier/SimpleCasGenerator.java | 12 +- .../impl/AnalysisEngineDescription_implTest.java | 265 ++++++------ .../analysis_engine/impl/AnnotationWriter.java | 20 +- .../impl/AnnotatorContext_implTest.java | 6 +- .../impl/PearAnalysisEngineWrapperTest.java | 34 +- .../impl/ResultSpecification_implTest.java | 4 +- .../impl/SegmentDroppingFlowController.java | 5 +- .../impl/TaeDescription_implTest.java | 41 +- .../impl/metadata/SofaMapping_implTest.java | 38 +- .../sequencer/SequencerCapabilityLanguageTest.java | 4 +- .../impl/sequencer/SequencerFixedTest.java | 16 +- .../impl/sequencer/SequencerTestAnnotator.java | 8 +- .../uima/cas/impl/AnnotationIteratorTest.java | 130 +++--- .../uima/cas/impl/CasTypeSystemMapperTest.java | 6 +- .../impl/ConcurrentBinarySerializationTest.java | 2 +- .../java/org/apache/uima/cas/impl/Id2FSTest.java | 6 +- .../org/apache/uima/cas/impl/SerDesForm4Test.java | 2 +- .../org/apache/uima/cas/impl/SerDesForm6Test.java | 2 +- .../apache/uima/cas/impl/XmiCasSerializerTest.java | 24 +- .../uima/cas/serdes/CasToComparableText.java | 16 +- .../uima/cas/serdes/PerformanceTestRunner.java | 16 +- .../uima/cas/serdes/SerDesCasIOTestUtils.java | 13 +- .../datasuites/MultiTypeRandomCasDataSuite.java | 6 +- .../generators/MultiTypeRandomCasGenerator.java | 14 +- .../cas/serdes/scenario/DesSerTestScenario.java | 16 +- .../cas/serdes/scenario/SerRefTestScenario.java | 14 +- .../transitions/CasSourceTargetConfiguration.java | 8 +- .../java/org/apache/uima/cas/test/ArrayFSTest.java | 50 +-- .../org/apache/uima/cas/test/ArrayIndexTest.java | 6 +- .../java/org/apache/uima/cas/test/CASTest.java | 22 +- .../java/org/apache/uima/cas/test/FeatureMap.java | 2 +- .../apache/uima/cas/test/FilteredIteratorTest.java | 74 ++-- .../org/apache/uima/cas/test/FloatArrayFSTest.java | 14 +- .../apache/uima/cas/test/GetAllIndexedTest.java | 66 +-- .../cas/test/GrowingTheCasNoJcasCacheTest.java | 24 +- .../apache/uima/cas/test/GrowingTheCasTest.java | 34 +- .../apache/uima/cas/test/IndexComparitorTest.java | 10 +- .../uima/cas/test/IndexRepositoryMergingTest.java | 6 +- .../apache/uima/cas/test/IndexRepositoryTest.java | 50 +-- .../org/apache/uima/cas/test/IntArrayFSTest.java | 14 +- .../org/apache/uima/cas/test/IteratorTest.java | 230 +++++------ .../java/org/apache/uima/cas/test/SofaTest.java | 162 ++++---- .../org/apache/uima/cas/test/StringArrayTest.java | 32 +- .../apache/uima/cas/test/StringSubtypeTest.java | 14 +- .../org/apache/uima/cas/test/TypeOrderTest.java | 64 +-- .../org/apache/uima/cas/test/TypeSystemTest.java | 110 ++--- .../apache/uima/cas/test/TypeSystemUtilsTest.java | 8 +- .../uima/cas/test/UimacppDeserializationTest.java | 84 ---- .../uima/cas_data/impl/CasDataToXCasTest.java | 8 +- .../impl/CasConsumerDescription_implTest.java | 258 +++++------- .../impl/CasInitializerDescription_implTest.java | 274 ++++++------- .../impl/CollectionReaderDescription_implTest.java | 263 +++++------- .../uima/internal/util/SerializationUtilsTest.java | 187 +++++++++ .../uima/internal/util/UIMAClassLoaderTest.java | 12 +- .../org/apache/uima/jcas/impl/JCasHashMapTest.java | 2 +- .../org/apache/uima/jcas/test/FSArrayListTest.java | 6 +- .../org/apache/uima/jcas/test/FSHashSetTest.java | 4 +- .../uima/jcas/test/IntegerArrayListTest.java | 6 +- .../java/org/apache/uima/jcas/test/JCasTest.java | 16 +- .../apache/uima/pear/util/PearInstallerTest.java | 12 +- .../org/apache/uima/pear/util/PearRuntimeTest.java | 14 +- .../uima/resource/impl/PearSpecifier_implTest.java | 104 +++-- .../uima/resource/impl/URISpecifier_implTest.java | 35 +- .../resource/metadata/impl/Import_implTest.java | 200 +++++---- .../metadata/impl/MetaDataObject_implTest.java | 132 +++--- .../java/org/apache/uima/util/CasIOUtilsTest.java | 228 +++++------ .../apache/uima/util/impl/XMLParser_implTest.java | 2 +- uimaj-cpe/pom.xml | 5 + .../apache/uima/collection/impl/CasConverter.java | 10 +- .../uima/collection/impl/cpm/BaseCPMImpl.java | 6 +- .../apache/uima/collection/impl/cpm/CPEConfig.java | 3 - .../apache/uima/collection/impl/cpm/CPMImpl.java | 7 +- .../uima/collection/impl/cpm/Checkpoint.java | 164 ++++---- .../uima/collection/impl/cpm/CheckpointConfig.java | 4 +- .../uima/collection/impl/cpm/CheckpointData.java | 3 - .../apache/uima/collection/impl/cpm/Constants.java | 3 - .../impl/cpm/StatusCallbackListenerImpl.java | 18 +- .../collection/impl/cpm/container/CPEContext.java | 5 +- .../collection/impl/cpm/container/CPEFactory.java | 23 +- .../CasProcessorConfigurationJAXBImpl.java | 98 ++--- .../cpm/container/NetworkCasProcessorImpl.java | 4 +- .../cpm/container/ProcessingContainer_Impl.java | 8 +- .../container/deployer/CPEDeployerDefaultImpl.java | 4 +- .../impl/cpm/container/deployer/VinciTAP.java | 4 +- .../deployer/vinci/VinciCasProcessorDeployer.java | 8 +- .../impl/cpm/container/deployer/vns/LocalVNS.java | 4 +- .../impl/cpm/container/deployer/vns/VNSQuery.java | 2 +- .../impl/cpm/engine/ArtifactProducer.java | 24 +- .../collection/impl/cpm/engine/CPECasPool.java | 2 +- .../uima/collection/impl/cpm/engine/CPMEngine.java | 10 +- .../impl/cpm/engine/DebugControlThread.java | 2 +- .../impl/cpm/engine/NonThreadedProcessingUnit.java | 42 +- .../collection/impl/cpm/engine/ProcessingUnit.java | 50 +-- .../collection/impl/cpm/engine/SequencedQueue.java | 2 +- .../uima/collection/impl/cpm/utils/CPMUtils.java | 2 +- .../uima/collection/impl/cpm/utils/Filter.java | 2 +- .../impl/metadata/cpe/CasProcessorCpeObject.java | 2 +- .../impl/metadata/cpe/CpeCasProcessorsImpl.java | 2 +- .../metadata/cpe/CpeLocalCasProcessorImpl.java | 2 +- .../uima/collection/impl/cpm/CheckpointTest.java | 114 ++++++ .../impl/cpm/CpeDescriptorSerialization_Test.java | 6 +- .../uima/collection/impl/cpm/CpmAE_ErrorTest.java | 2 +- .../impl/cpm/CpmCasConsumer_ErrorTest.java | 6 +- .../impl/cpm/CpmCollectionReader_ErrorTest.java | 8 +- .../uima/collection/impl/cpm/PearCasPoolTest.java | 4 +- .../impl/cpm/utils/ErrorTestAnnotator.java | 4 +- .../examples/cpm/sofa/SofaCollectionReader.java | 2 +- .../editors/MultiPageEditorContributor.java | 24 +- .../files/ContextForPartDialog.java | 8 +- 307 files changed, 5113 insertions(+), 5132 deletions(-) delete mode 100644 uimaj-core/src/test/java/org/apache/uima/cas/test/UimacppDeserializationTest.java create mode 100644 uimaj-core/src/test/java/org/apache/uima/internal/util/SerializationUtilsTest.java create mode 100644 uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CheckpointTest.java