java-packages/uimaj
SHA256
6
0
Fork 0
forked from pool/uimaj
Code Pull Requests Activity
Files
main
uimaj/0001-Revert-Issue-350-Clean-up-and-modernize-code.patch
Fridrich Strba 2c0dc7fc06 Accepting request 1129455 from home:gkenion:branches:Java:packages 
Update to 3.5.0 and revert issue 350 (bsc#1217005, CVE-2023-39913)
 - Update to upstream release 3.5.0
    * Mostly feature and bug fixes.
    * Full list of changes can be found in README.md, archived in uimaj-3.5.0-source-release.zip
    
    
 - Revert upstream issue 350 (gh#apache/uima-uimaj#351):
    * Revert refactoring of data members to local variables.

OBS-URL: https://build.opensuse.org/request/show/1129455
OBS-URL: https://build.opensuse.org/package/show/Java:packages/uimaj?expand=0&rev=13
2023-11-28 08:40:37 +00:00

26893 lines
1.1 MiB
Raw Permalink Blame History

From 6f2b6936af4778697468bc18ed98e23bab318e97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Fri, 10 Nov 2023 08:01:47 +0100
Subject: [PATCH] Revert "Issue #350: Clean up and modernize code"
This reverts commit 666d95103e1d87943b48c20ee3d77f679047602e. The upstream change moved many data members to local variables. Reverting this change improves readability and extensibility of the code base without affecting functionality.
---
.../uima/adapter/vinci/CASTransportable.java | 22 +-
.../VinciAnalysisEngineServiceAdapter.java | 2 +-
.../vinci/VinciAnalysisEngineServiceStub.java | 15 +-
.../VinciAnalysisEngineService_impl.java | 4 +-
.../VinciBinaryAnalysisEngineServiceStub.java | 19 +-
...VinciBinaryAnalysisEngineService_impl.java | 6 +-
.../uima/adapter/vinci/util/NetworkUtil.java | 11 +-
.../vinci/util/SaxVinciFrameBuilder.java | 9 +-
.../java/org/apache/uima/I18nExceptionI.java | 2 +-
.../java/org/apache/uima/UIMAException.java | 8 +-
.../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 +-
.../MultiprocessingAnalysisEngine_impl.java | 2 +-
.../impl/PearAnalysisEngineWrapper.java | 52 +-
.../impl/PrimitiveAnalysisEngine_impl.java | 12 +-
.../impl/ResultSpecification_impl.java | 5 +-
.../uima/analysis_engine/impl/RsFeat.java | 4 +-
.../uima/analysis_engine/impl/RsLangs.java | 9 +-
.../uima/analysis_engine/impl/RsTypesMap.java | 5 +-
.../impl/TypeOrFeature_impl.java | 7 +-
.../impl/UimacppAnalysisEngineImpl.java | 8 +-
.../main/java/org/apache/uima/cas/CAS.java | 14 +-
.../java/org/apache/uima/cas/impl/AllFSs.java | 6 +-
.../cas/impl/AnnotationImplException.java | 24 +-
.../uima/cas/impl/AnnotationTreeImpl.java | 2 +-
.../uima/cas/impl/AnnotationTreeNodeImpl.java | 24 +-
.../apache/uima/cas/impl/BinaryCasSerDes.java | 53 +-
.../uima/cas/impl/BinaryCasSerDes4.java | 129 ++---
.../uima/cas/impl/BinaryCasSerDes6.java | 129 +++--
.../uima/cas/impl/BooleanConstraint.java | 10 +-
.../org/apache/uima/cas/impl/ByteHeap.java | 12 +-
.../uima/cas/impl/CASCompleteSerializer.java | 8 +-
.../org/apache/uima/cas/impl/CASImpl.java | 294 ++++++------
.../uima/cas/impl/CASMgrSerializer.java | 110 ++---
.../apache/uima/cas/impl/CASSerializer.java | 63 +--
.../org/apache/uima/cas/impl/CasCompare.java | 26 +-
.../apache/uima/cas/impl/CasSeqAddrMaps.java | 8 +-
.../uima/cas/impl/CasSerializerSupport.java | 52 +-
.../uima/cas/impl/CasTypeSystemMapper.java | 4 +-
.../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 +-
.../uima/cas/impl/EmbeddedConstraint.java | 8 +-
.../cas/impl/FSBooleanConstraintImpl.java | 6 +-
.../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 +++++----
.../uima/cas/impl/FSIntConstraintImpl.java | 50 +-
.../uima/cas/impl/FSStringConstraintImpl.java | 12 +-
.../uima/cas/impl/FSTypeConstraintImpl.java | 4 +-
.../org/apache/uima/cas/impl/FeatureImpl.java | 58 +--
.../apache/uima/cas/impl/FeaturePathImpl.java | 90 ++--
.../uima/cas/impl/FeatureStructureImplC.java | 22 +-
.../uima/cas/impl/FeatureValuePathImpl.java | 452 +++++++++---------
.../uima/cas/impl/FilteredIterator.java | 26 +-
.../apache/uima/cas/impl/FloatConstraint.java | 12 +-
.../org/apache/uima/cas/impl/FsIndex_bag.java | 14 +-
.../apache/uima/cas/impl/FsIndex_flat.java | 2 +-
.../apache/uima/cas/impl/FsIndex_iicp.java | 16 +-
.../uima/cas/impl/FsIndex_set_sorted.java | 14 +-
.../uima/cas/impl/FsIndex_singletype.java | 38 +-
.../uima/cas/impl/FsIndex_snapshot.java | 2 +-
.../uima/cas/impl/FsIterator_backwards.java | 2 +-
.../apache/uima/cas/impl/FsIterator_bag.java | 2 +-
.../uima/cas/impl/FsIterator_bag_pear.java | 2 +-
.../uima/cas/impl/FsIterator_limited.java | 6 +-
.../cas/impl/FsIterator_multiple_indexes.java | 6 +-
.../cas/impl/FsIterator_set_sorted_pear.java | 2 +-
.../uima/cas/impl/FsIterator_singletype.java | 2 +-
.../cas/impl/FsIterator_subtypes_ordered.java | 102 ++--
.../impl/FsIterator_subtypes_snapshot.java | 16 +-
.../java/org/apache/uima/cas/impl/Heap.java | 84 ++--
.../java/org/apache/uima/cas/impl/Id2FS.java | 7 +-
.../apache/uima/cas/impl/IntConstraint.java | 12 +-
.../cas/impl/LinearTypeOrderBuilderImpl.java | 74 +--
.../org/apache/uima/cas/impl/LongHeap.java | 12 +-
.../org/apache/uima/cas/impl/LongSet.java | 2 +-
.../uima/cas/impl/LowLevelException.java | 2 +-
.../org/apache/uima/cas/impl/MarkerImpl.java | 4 +-
.../apache/uima/cas/impl/PathConstraint.java | 6 +-
.../apache/uima/cas/impl/SelectFSs_impl.java | 96 ++--
.../org/apache/uima/cas/impl/ShortHeap.java | 12 +-
.../uima/cas/impl/StringConstraint.java | 12 +-
.../org/apache/uima/cas/impl/StringHeap.java | 32 +-
.../org/apache/uima/cas/impl/StringSet.java | 2 +-
.../org/apache/uima/cas/impl/Subiterator.java | 118 ++---
.../org/apache/uima/cas/impl/TypeImpl.java | 104 ++--
.../apache/uima/cas/impl/TypeImpl_array.java | 4 +-
.../apache/uima/cas/impl/TypeImpl_string.java | 2 +-
.../uima/cas/impl/TypeNameSpaceImpl.java | 2 +-
.../apache/uima/cas/impl/TypeSystemImpl.java | 55 ++-
.../apache/uima/cas/impl/TypeSystemUtils.java | 25 +-
.../uima/cas/impl/XCASDeserializer.java | 134 +++---
.../uima/cas/impl/XCASParsingException.java | 2 +-
.../apache/uima/cas/impl/XCASSerializer.java | 8 +-
.../uima/cas/impl/XmiCasDeserializer.java | 158 +++---
.../uima/cas/impl/XmiCasSerializer.java | 5 +-
.../cas/impl/XmiSerializationSharedData.java | 26 +-
.../org/apache/uima/cas/text/Language.java | 24 +-
.../uima/cas_data/impl/CasDataToXCas.java | 4 +-
.../impl/XCasToCasDataSaxHandler.java | 86 ++--
.../flow/impl/FlowControllerContext_impl.java | 2 +-
.../apache/uima/internal/util/BinaryTree.java | 28 +-
.../uima/internal/util/CharArraySpanMap.java | 40 +-
.../uima/internal/util/CharArrayString.java | 96 ++--
.../apache/uima/internal/util/Class_TCCL.java | 21 +-
.../uima/internal/util/CommandLineParser.java | 36 +-
.../internal/util/Common_hash_support.java | 26 +-
.../internal/util/CopyOnWriteObjHashSet.java | 4 +-
.../util/CopyOnWriteOrderedFsSet_array.java | 14 +-
.../internal/util/EncodedPrintStream.java | 1 -
.../org/apache/uima/internal/util/Graph.java | 2 +-
.../apache/uima/internal/util/GraphNode.java | 20 +-
.../apache/uima/internal/util/I18nx_impl.java | 2 +-
.../uima/internal/util/Int2ObjHashMap.java | 10 +-
.../apache/uima/internal/util/IntHashSet.java | 4 +-
.../org/apache/uima/internal/util/IntSet.java | 28 +-
.../apache/uima/internal/util/IntStack.java | 12 +-
.../apache/uima/internal/util/IntVector.java | 155 +++---
.../internal/util/Obj2IntIdentityHashMap.java | 10 +-
.../apache/uima/internal/util/ObjHashSet.java | 8 +-
.../internal/util/OrderedFsSet_array.java | 16 +-
.../internal/util/OrderedFsSet_array2.java | 55 ++-
.../org/apache/uima/internal/util/Pair.java | 5 +-
.../internal/util/ReplaceStringInFiles.java | 4 +-
.../internal/util/SerializationUtils.java | 194 +-------
.../uima/internal/util/SortedIntSet.java | 28 +-
.../uima/internal/util/StringToIntMap.java | 10 +-
.../uima/internal/util/SymbolTable.java | 32 +-
.../internal/util/TextStringTokenizer.java | 108 ++---
.../uima/internal/util/TextTokenizer.java | 100 ++--
.../apache/uima/internal/util/TimeSpan.java | 118 ++---
.../org/apache/uima/internal/util/Timer.java | 28 +-
.../uima/internal/util/UIMAStreamHandler.java | 2 +-
.../apache/uima/internal/util/UtilError.java | 20 +-
.../util/rb_trees/CompIntArrayRBT.java | 2 +-
.../internal/util/rb_trees/Int2IntRBT.java | 94 ++--
.../internal/util/rb_trees/IntArrayRBT.java | 86 ++--
.../util/rb_trees/IntArrayRBTcommon.java | 140 +++---
.../internal/util/rb_trees/IntRBTArray.java | 22 +-
.../internal/util/rb_trees/IntRBTNode.java | 64 +--
.../util/rb_trees/IntRedBlackTree.java | 54 +--
.../util/rb_trees/RBTKeyValuePair.java | 4 +-
.../uima/internal/util/rb_trees/RBTNode.java | 74 +--
.../internal/util/rb_trees/RedBlackTree.java | 50 +-
.../main/java/org/apache/uima/jcas/JCas.java | 38 +-
.../org/apache/uima/jcas/cas/CommonList.java | 6 +-
.../org/apache/uima/jcas/cas/FSArrayList.java | 43 --
.../apache/uima/jcas/cas/FSLinkedHashSet.java | 1 +
.../java/org/apache/uima/jcas/cas/FSList.java | 4 +-
.../org/apache/uima/jcas/cas/FloatList.java | 4 +-
.../uima/jcas/cas/IntegerArrayList.java | 3 -
.../org/apache/uima/jcas/cas/IntegerList.java | 4 +-
.../uima/jcas/cas/NonEmptyFloatList.java | 2 +-
.../org/apache/uima/jcas/cas/StringList.java | 6 +-
.../org/apache/uima/jcas/cas/TOP_Type.java | 14 +-
.../org/apache/uima/jcas/impl/JCasImpl.java | 14 +-
.../jcas/impl/JFSIndexRepositoryImpl.java | 4 +-
.../org/apache/uima/jcas/tcas/Annotation.java | 6 +-
.../pear/tools/InstallationController.java | 14 +-
.../uima/pear/tools/InstallationTester.java | 32 +-
.../uima/pear/tools/PackageBrowser.java | 8 +-
.../org/apache/uima/pear/util/FileUtil.java | 6 +-
.../apache/uima/pear/util/ProcessUtil.java | 2 +-
.../apache/uima/resource/CasDefinition.java | 20 +-
.../impl/ConfigurableDataResource_impl.java | 9 +-
.../impl/ConfigurationManagerImplBase.java | 4 +-
.../uima/resource/impl/DataResource_impl.java | 7 +-
.../uima/resource/impl/Parameter_impl.java | 4 +-
.../resource/impl/PearSpecifier_impl.java | 16 +-
.../impl/RelativePathResolver_impl.java | 10 +-
.../resource/impl/ResourceManager_impl.java | 16 +-
.../ConfigurationParameterSettings_impl.java | 2 +-
.../impl/ConfigurationParameter_impl.java | 2 +-
.../metadata/impl/ImportResolver.java | 5 +-
.../resource/metadata/impl/Import_impl.java | 2 +-
.../impl/LanguagePrecondition_impl.java | 4 +-
.../metadata/impl/MetaDataObject_impl.java | 15 +-
.../ResourceManagerConfiguration_impl.java | 16 +-
.../uimacpp/UimacppAnalysisComponent.java | 18 +-
.../apache/uima/util/CasCreationUtils.java | 4 +-
.../java/org/apache/uima/util/CasIOUtils.java | 80 ++--
.../org/apache/uima/util/CasLoadMode.java | 6 +-
.../java/org/apache/uima/util/IntEntry.java | 8 +-
.../main/java/org/apache/uima/util/Level.java | 4 +-
.../org/apache/uima/util/NameClassPair.java | 8 +-
.../org/apache/uima/util/XMLInputSource.java | 12 +-
.../uima/util/impl/JSR47Logger_impl.java | 4 +-
.../uima/util/impl/Log4jLogger_impl.java | 8 +-
.../uima/util/impl/Logger_common_impl.java | 12 +-
.../apache/uima/util/impl/Logger_impl.java | 6 +-
.../uima/util/impl/Slf4jLogger_impl.java | 4 +-
.../ae/multiplier/SimpleCasGenerator.java | 12 +-
.../AnalysisEngineDescription_implTest.java | 265 +++++-----
.../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 +-
.../SequencerCapabilityLanguageTest.java | 4 +-
.../impl/sequencer/SequencerFixedTest.java | 16 +-
.../sequencer/SequencerTestAnnotator.java | 8 +-
.../uima/cas/impl/AnnotationIteratorTest.java | 130 ++---
.../cas/impl/CasTypeSystemMapperTest.java | 6 +-
.../ConcurrentBinarySerializationTest.java | 2 +-
.../org/apache/uima/cas/impl/Id2FSTest.java | 6 +-
.../apache/uima/cas/impl/SerDesForm4Test.java | 2 +-
.../apache/uima/cas/impl/SerDesForm6Test.java | 2 +-
.../uima/cas/impl/XmiCasSerializerTest.java | 24 +-
.../uima/cas/serdes/CasToComparableText.java | 16 +-
.../cas/serdes/PerformanceTestRunner.java | 16 +-
.../uima/cas/serdes/SerDesCasIOTestUtils.java | 13 +-
.../MultiTypeRandomCasDataSuite.java | 6 +-
.../MultiTypeRandomCasGenerator.java | 14 +-
.../serdes/scenario/DesSerTestScenario.java | 16 +-
.../serdes/scenario/SerRefTestScenario.java | 14 +-
.../CasSourceTargetConfiguration.java | 8 +-
.../org/apache/uima/cas/test/ArrayFSTest.java | 50 +-
.../apache/uima/cas/test/ArrayIndexTest.java | 6 +-
.../org/apache/uima/cas/test/CASTest.java | 22 +-
.../org/apache/uima/cas/test/FeatureMap.java | 2 +-
.../uima/cas/test/FilteredIteratorTest.java | 74 +--
.../uima/cas/test/FloatArrayFSTest.java | 14 +-
.../uima/cas/test/GetAllIndexedTest.java | 66 +--
.../test/GrowingTheCasNoJcasCacheTest.java | 24 +-
.../uima/cas/test/GrowingTheCasTest.java | 34 +-
.../uima/cas/test/IndexComparitorTest.java | 10 +-
.../cas/test/IndexRepositoryMergingTest.java | 6 +-
.../uima/cas/test/IndexRepositoryTest.java | 50 +-
.../apache/uima/cas/test/IntArrayFSTest.java | 14 +-
.../apache/uima/cas/test/IteratorTest.java | 230 ++++-----
.../org/apache/uima/cas/test/SofaTest.java | 162 +++----
.../apache/uima/cas/test/StringArrayTest.java | 32 +-
.../uima/cas/test/StringSubtypeTest.java | 14 +-
.../apache/uima/cas/test/TypeOrderTest.java | 64 +--
.../apache/uima/cas/test/TypeSystemTest.java | 110 ++---
.../uima/cas/test/TypeSystemUtilsTest.java | 8 +-
.../cas/test/UimacppDeserializationTest.java | 84 ++++
.../uima/cas_data/impl/CasDataToXCasTest.java | 8 +-
.../impl/CasConsumerDescription_implTest.java | 258 +++++-----
.../CasInitializerDescription_implTest.java | 274 ++++++-----
.../CollectionReaderDescription_implTest.java | 263 +++++-----
.../internal/util/SerializationUtilsTest.java | 187 --------
.../internal/util/UIMAClassLoaderTest.java | 12 +-
.../uima/jcas/impl/JCasHashMapTest.java | 2 +-
.../uima/jcas/test/FSArrayListTest.java | 6 +-
.../apache/uima/jcas/test/FSHashSetTest.java | 4 +-
.../uima/jcas/test/IntegerArrayListTest.java | 6 +-
.../org/apache/uima/jcas/test/JCasTest.java | 16 +-
.../uima/pear/util/PearInstallerTest.java | 12 +-
.../uima/pear/util/PearRuntimeTest.java | 14 +-
.../resource/impl/PearSpecifier_implTest.java | 104 ++--
.../resource/impl/URISpecifier_implTest.java | 35 +-
.../metadata/impl/Import_implTest.java | 200 ++++----
.../impl/MetaDataObject_implTest.java | 132 ++---
.../org/apache/uima/util/CasIOUtilsTest.java | 228 ++++-----
.../uima/util/impl/XMLParser_implTest.java | 2 +-
uimaj-cpe/pom.xml | 5 -
.../uima/collection/impl/CasConverter.java | 10 +-
.../uima/collection/impl/cpm/BaseCPMImpl.java | 6 +-
.../uima/collection/impl/cpm/CPEConfig.java | 3 +
.../uima/collection/impl/cpm/CPMImpl.java | 7 +-
.../uima/collection/impl/cpm/Checkpoint.java | 164 +++----
.../collection/impl/cpm/CheckpointConfig.java | 4 +-
.../collection/impl/cpm/CheckpointData.java | 3 +
.../uima/collection/impl/cpm/Constants.java | 3 +
.../impl/cpm/StatusCallbackListenerImpl.java | 18 +-
.../impl/cpm/container/CPEContext.java | 5 +-
.../impl/cpm/container/CPEFactory.java | 23 +-
.../CasProcessorConfigurationJAXBImpl.java | 98 ++--
.../container/NetworkCasProcessorImpl.java | 4 +-
.../container/ProcessingContainer_Impl.java | 8 +-
.../deployer/CPEDeployerDefaultImpl.java | 4 +-
.../impl/cpm/container/deployer/VinciTAP.java | 4 +-
.../vinci/VinciCasProcessorDeployer.java | 8 +-
.../cpm/container/deployer/vns/LocalVNS.java | 4 +-
.../cpm/container/deployer/vns/VNSQuery.java | 2 +-
.../impl/cpm/engine/ArtifactProducer.java | 24 +-
.../impl/cpm/engine/CPECasPool.java | 2 +-
.../collection/impl/cpm/engine/CPMEngine.java | 10 +-
.../impl/cpm/engine/DebugControlThread.java | 2 +-
.../cpm/engine/NonThreadedProcessingUnit.java | 42 +-
.../impl/cpm/engine/ProcessingUnit.java | 50 +-
.../impl/cpm/engine/SequencedQueue.java | 2 +-
.../collection/impl/cpm/utils/CPMUtils.java | 2 +-
.../collection/impl/cpm/utils/Filter.java | 2 +-
.../metadata/cpe/CasProcessorCpeObject.java | 2 +-
.../metadata/cpe/CpeCasProcessorsImpl.java | 2 +-
.../cpe/CpeLocalCasProcessorImpl.java | 2 +-
.../collection/impl/cpm/CheckpointTest.java | 114 -----
.../cpm/CpeDescriptorSerialization_Test.java | 6 +-
.../collection/impl/cpm/CpmAE_ErrorTest.java | 2 +-
.../impl/cpm/CpmCasConsumer_ErrorTest.java | 6 +-
.../cpm/CpmCollectionReader_ErrorTest.java | 8 +-
.../collection/impl/cpm/PearCasPoolTest.java | 4 +-
.../impl/cpm/utils/ErrorTestAnnotator.java | 4 +-
.../cpm/sofa/SofaCollectionReader.java | 2 +-
305 files changed, 5119 insertions(+), 5101 deletions(-)
create mode 100644 uimaj-core/src/test/java/org/apache/uima/cas/test/UimacppDeserializationTest.java
delete mode 100644 uimaj-core/src/test/java/org/apache/uima/internal/util/SerializationUtilsTest.java
delete mode 100644 uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CheckpointTest.java
diff --git a/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/CASTransportable.java b/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/CASTransportable.java
index 3f44191cc..d965c4767 100644
--- a/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/CASTransportable.java
+++ b/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/CASTransportable.java
@@ -89,11 +89,11 @@ public class CASTransportable extends DefaultHandler implements Transportable {
public CASTransportable(CasPool casPool, OutOfTypeSystemData outOfTypeSystemData,
UimaContext uimaContext, boolean includeDocText) {
// Debug.p("Creating new CASTransportable.");
- myCasPool = casPool;
- myCas = null;
+ this.myCasPool = casPool;
+ this.myCas = null;
this.outOfTypeSystemData = outOfTypeSystemData;
this.uimaContext = uimaContext;
- extraDataFrame = new VinciFrame();
+ this.extraDataFrame = new VinciFrame();
this.includeDocText = includeDocText;
}
@@ -113,11 +113,11 @@ public class CASTransportable extends DefaultHandler implements Transportable {
public CASTransportable(CAS cas, OutOfTypeSystemData outOfTypeSystemData, UimaContext uimaContext,
boolean includeDocText) {
// Debug.p("Creating new CASTransportable.");
- myCas = cas;
- myCasPool = null;
+ this.myCas = cas;
+ this.myCasPool = null;
this.outOfTypeSystemData = outOfTypeSystemData;
this.uimaContext = uimaContext;
- extraDataFrame = new VinciFrame();
+ this.extraDataFrame = new VinciFrame();
this.includeDocText = includeDocText;
}
@@ -136,7 +136,7 @@ public class CASTransportable extends DefaultHandler implements Transportable {
* @return the out of type system data
*/
public OutOfTypeSystemData getOutOfTypeSystemData() {
- return outOfTypeSystemData;
+ return this.outOfTypeSystemData;
}
/**
@@ -190,7 +190,7 @@ public class CASTransportable extends DefaultHandler implements Transportable {
*/
XTalkSerializer(OutputStream os, XCASSerializer s) {
this.os = os;
- serializer = s;
+ this.serializer = s;
}
/*
@@ -359,7 +359,7 @@ public class CASTransportable extends DefaultHandler implements Transportable {
public void toStream(OutputStream os) throws IOException {
try {
UIMAFramework.getLogger().log(Level.FINEST, "Serializing CAS.");
- XCASSerializer xcasSerializer = new XCASSerializer(myCas.getTypeSystem(), uimaContext);
+ XCASSerializer xcasSerializer = new XCASSerializer(myCas.getTypeSystem(), this.uimaContext);
// Not sure why we need to do the next two lines:
xcasSerializer.setDocumentTypeName(Constants.VINCI_DETAG);
xcasSerializer.setDocumentTextFeature(null);
@@ -442,7 +442,7 @@ public class CASTransportable extends DefaultHandler implements Transportable {
myCas = myCasPool.getCas(0);
}
myCas.reset();
- XCASDeserializer deser = new XCASDeserializer(myCas.getTypeSystem(), uimaContext);
+ XCASDeserializer deser = new XCASDeserializer(myCas.getTypeSystem(), this.uimaContext);
deser.setDocumentTypeName("Detag:DetagContent");
if (!ignoreResponse) {
handler = deser.getXCASHandler(myCas, outOfTypeSystemData);
@@ -506,7 +506,7 @@ public class CASTransportable extends DefaultHandler implements Transportable {
*/
@Override
public void startDocument() throws SAXException {
- ready = 0;
+ this.ready = 0;
}
/*
diff --git a/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceAdapter.java b/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceAdapter.java
index 52c0b8dfe..39bb6c990 100644
--- a/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceAdapter.java
+++ b/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceAdapter.java
@@ -48,7 +48,7 @@ public class VinciAnalysisEngineServiceAdapter extends AnalysisEngineServiceAdap
* @see org.apache.uima.resource.Resource#initialize(ResourceSpecifier, Map)
*/
@Override
- public boolean initialize(ResourceSpecifier aSpecifier, Map<String, Object> aAdditionalParams)
+ public boolean initialize(ResourceSpecifier aSpecifier, Map aAdditionalParams)
throws ResourceInitializationException {
// aSpecifier must be a URISpecifier
if (!(aSpecifier instanceof URISpecifier)) {
diff --git a/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceStub.java b/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceStub.java
index 4bb0a4c81..387a70410 100644
--- a/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceStub.java
+++ b/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceStub.java
@@ -19,9 +19,6 @@
package org.apache.uima.adapter.vinci;
-import static java.util.Arrays.asList;
-import static java.util.Collections.unmodifiableList;
-
import java.net.InetAddress;
import java.util.Arrays;
import java.util.Collections;
@@ -57,8 +54,11 @@ import org.apache.vinci.transport.document.AFrame;
*/
public class VinciAnalysisEngineServiceStub implements AnalysisEngineServiceStub {
- private final VinciClient mVinciClient;
- private final Resource mOwner;
+ /** The m vinci client. */
+ private VinciClient mVinciClient;
+
+ /** The m owner. */
+ private Resource mOwner;
/**
* Timeout to use for process and collectionProcessComplete calls.
@@ -77,7 +77,8 @@ public class VinciAnalysisEngineServiceStub implements AnalysisEngineServiceStub
* Value to return from callGetSupportedXCasVersions method for older services that don't actually
* implement this method.
*/
- private static final List<String> SUPPORT_XCAS_V1 = unmodifiableList(asList("1"));
+ private static final List SUPPORT_XCAS_V1 = Collections
+ .unmodifiableList(Arrays.asList(new String[] { "1" }));
/**
* Instantiates a new vinci analysis engine service stub.
@@ -400,7 +401,7 @@ public class VinciAnalysisEngineServiceStub implements AnalysisEngineServiceStub
* @throws ResourceServiceException
* the resource service exception
*/
- public List<String> callGetSupportedXCasVersions() throws ResourceServiceException {
+ public List callGetSupportedXCasVersions() throws ResourceServiceException {
try {
// create Vinci Frame ( Data Cargo)
AFrame queryFrame = new AFrame();
diff --git a/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineService_impl.java b/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineService_impl.java
index e8c0af7f5..3e90d0cd2 100644
--- a/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineService_impl.java
+++ b/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineService_impl.java
@@ -210,7 +210,7 @@ public class VinciAnalysisEngineService_impl extends VinciServableAdapter {
// cas.getAnnotationIndex().size());
int totalAnnots = 0;
SofaFS sofa;
- FSIterator<SofaFS> sItr = cas.getSofaIterator();
+ FSIterator sItr = cas.getSofaIterator();
while (sItr.isValid()) {
sofa = (SofaFS) sItr.get();
totalAnnots += cas.getView(sofa).getAnnotationIndex().size();
@@ -246,7 +246,7 @@ public class VinciAnalysisEngineService_impl extends VinciServableAdapter {
String op = ct.getCommand();
if (Constants.GETMETA.equals(op)) {
ct.cleanup();
- return getMetaData();
+ return this.getMetaData();
} else if (Constants.PROCESS_CAS.equals(op) || Constants.ANNOTATE.equals(op)) {
return analyze(ct);
} else if (Constants.BATCH_PROCESS_COMPLETE.equals(op)) {
diff --git a/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciBinaryAnalysisEngineServiceStub.java b/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciBinaryAnalysisEngineServiceStub.java
index 50cdd6ace..6e6e43389 100644
--- a/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciBinaryAnalysisEngineServiceStub.java
+++ b/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciBinaryAnalysisEngineServiceStub.java
@@ -53,10 +53,14 @@ import org.apache.vinci.transport.document.AFrame;
*/
public class VinciBinaryAnalysisEngineServiceStub implements AnalysisEngineServiceStub {
+ /** The Constant debug. */
private static final boolean debug = false;
- private final VinciClient mVinciClient;
- private final AnalysisEngineServiceAdapter mOwner;
+ /** The m vinci client. */
+ private VinciClient mVinciClient;
+
+ /** The m owner. */
+ private AnalysisEngineServiceAdapter mOwner;
/**
* Timeout to use for process and collectionProcessComplete calls.
@@ -105,7 +109,6 @@ public class VinciBinaryAnalysisEngineServiceStub implements AnalysisEngineServi
// open Vinci connection
try {
VinciContext vctx = new VinciContext(InetAddress.getLocalHost().getCanonicalHostName(), 0);
-
// Override vinci default VNS settings
String vnsHost = null;
String vnsPort = null;
@@ -118,15 +121,13 @@ public class VinciBinaryAnalysisEngineServiceStub implements AnalysisEngineServi
}
if (vnsHost == null) {
vnsHost = System.getProperty("VNS_HOST");
- if (vnsHost == null) {
+ if (vnsHost == null)
vnsHost = Constants.DEFAULT_VNS_HOST;
- }
}
if (vnsPort == null) {
vnsPort = System.getProperty("VNS_PORT");
- if (vnsPort == null) {
+ if (vnsPort == null)
vnsPort = "9000";
- }
}
vctx.setVNSHost(vnsHost);
vctx.setVNSPort(Integer.parseInt(vnsPort));
@@ -263,8 +264,8 @@ public class VinciBinaryAnalysisEngineServiceStub implements AnalysisEngineServi
// deserialize CAS from response frame
byte[] responseCasBytes = responseFrame.fgetTrueBinary("BinaryCAS");
- CASSerializer responseSerializer = SerializationUtils
- .deserializeCASSerializer(responseCasBytes);
+ CASSerializer responseSerializer = (CASSerializer) SerializationUtils
+ .deserialize(responseCasBytes);
((CASImpl) cas).getBinaryCasSerDes().reinit(responseSerializer);
// also read annotation time and enter into AnalysisEngineManagementMBean
diff --git a/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciBinaryAnalysisEngineService_impl.java b/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciBinaryAnalysisEngineService_impl.java
index 0535e59ab..4f8045682 100644
--- a/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciBinaryAnalysisEngineService_impl.java
+++ b/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/VinciBinaryAnalysisEngineService_impl.java
@@ -206,8 +206,8 @@ public class VinciBinaryAnalysisEngineService_impl extends VinciServableAdapter
// deserialize into CAS object
byte[] casBytes = aRequestFrame.fgetTrueBinary("BinaryCAS");
- CASCompleteSerializer serializer = SerializationUtils
- .deserializeCASCompleteSerializer(casBytes);
+ CASCompleteSerializer serializer = (CASCompleteSerializer) SerializationUtils
+ .deserialize(casBytes);
Serialization.deserializeCASComplete(serializer, (CASMgr) cas);
long annotStartTime = System.currentTimeMillis();
@@ -272,7 +272,7 @@ public class VinciBinaryAnalysisEngineService_impl extends VinciServableAdapter
UIMAFramework.getLogger().log(Level.FINEST, "Command::" + op);
if (Constants.GETMETA.equals(op)) {
try {
- return getMetaData();
+ return this.getMetaData();
} catch (Exception ex) {
throw new ServiceException("getMetaData() threw exception: " + ex);
}
diff --git a/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/NetworkUtil.java b/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/NetworkUtil.java
index 42b3af3cf..be9fdc7c7 100644
--- a/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/NetworkUtil.java
+++ b/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/NetworkUtil.java
@@ -24,6 +24,7 @@ import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.SocketException;
import java.net.UnknownHostException;
+import java.util.Enumeration;
// TODO: Auto-generated Javadoc
/**
@@ -43,19 +44,19 @@ public class NetworkUtil {
*/
public static InetAddress getLocalHostAddress() throws UnknownHostException {
// try the straightforward call first
- var localhost = InetAddress.getLocalHost();
+ InetAddress localhost = InetAddress.getLocalHost();
if (!localhost.isLoopbackAddress()) {
return localhost;
}
// the above often fails on Linux. Try enumerating all NetworkInterfaces.
try {
- var networkInterfaces = NetworkInterface.getNetworkInterfaces();
+ Enumeration networkInterfaces = NetworkInterface.getNetworkInterfaces();
while (networkInterfaces.hasMoreElements()) {
- var networkInterface = (NetworkInterface) networkInterfaces.nextElement();
- var addresses = networkInterface.getInetAddresses();
+ NetworkInterface networkInterface = (NetworkInterface) networkInterfaces.nextElement();
+ Enumeration addresses = networkInterface.getInetAddresses();
while (addresses.hasMoreElements()) {
- var address = (InetAddress) addresses.nextElement();
+ InetAddress address = (InetAddress) addresses.nextElement();
if (address instanceof Inet4Address && !address.isLoopbackAddress()) {
return address;
}
diff --git a/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/SaxVinciFrameBuilder.java b/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/SaxVinciFrameBuilder.java
index 2dbc6728f..09dffab4b 100644
--- a/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/SaxVinciFrameBuilder.java
+++ b/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/SaxVinciFrameBuilder.java
@@ -36,7 +36,7 @@ import org.xml.sax.helpers.DefaultHandler;
public class SaxVinciFrameBuilder extends DefaultHandler implements ContentHandler {
/** The m open frames. */
- private Stack<AFrame> mOpenFrames;
+ private Stack mOpenFrames;
/** The m current frame name. */
private String mCurrentFrameName;
@@ -55,7 +55,7 @@ public class SaxVinciFrameBuilder extends DefaultHandler implements ContentHandl
* the parent frame
*/
public void setParentFrame(AFrame aParentFrame) {
- mOpenFrames = new Stack<AFrame>();
+ mOpenFrames = new Stack();
mOpenFrames.push(aParentFrame);
}
@@ -219,10 +219,9 @@ public class SaxVinciFrameBuilder extends DefaultHandler implements ContentHandl
* @return s1 if it isn't empty, else s2.
*/
protected String getName(String s1, String s2) {
- if (s1 == null || "".equals(s1)) {
+ if (s1 == null || "".equals(s1))
return s2;
- } else {
+ else
return s1;
- }
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/I18nExceptionI.java b/uimaj-core/src/main/java/org/apache/uima/I18nExceptionI.java
index 1c947f7db..a7668b946 100644
--- a/uimaj-core/src/main/java/org/apache/uima/I18nExceptionI.java
+++ b/uimaj-core/src/main/java/org/apache/uima/I18nExceptionI.java
@@ -81,7 +81,7 @@ public interface I18nExceptionI {
* @return true if this exception or any of its root causes has a particular UIMA message key.
*/
default boolean hasMessageKey(String messageKey) {
- if (messageKey.equals(getMessageKey())) {
+ if (messageKey.equals(this.getMessageKey())) {
return true;
}
Throwable cause = getCause();
diff --git a/uimaj-core/src/main/java/org/apache/uima/UIMAException.java b/uimaj-core/src/main/java/org/apache/uima/UIMAException.java
index 513aeb4da..9240ad943 100644
--- a/uimaj-core/src/main/java/org/apache/uima/UIMAException.java
+++ b/uimaj-core/src/main/java/org/apache/uima/UIMAException.java
@@ -128,10 +128,10 @@ public class UIMAException extends Exception implements I18nExceptionI {
public UIMAException(String aResourceBundleName, String aMessageKey, Object[] aArguments,
Throwable aCause) {
super(aCause);
- mResourceBundleName = aResourceBundleName;
- mMessageKey = aMessageKey;
- mArguments = aArguments;
- mCause = aCause;
+ this.mResourceBundleName = aResourceBundleName;
+ this.mMessageKey = aMessageKey;
+ this.mArguments = aArguments;
+ this.mCause = aCause;
}
/**
diff --git a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/ASB_impl.java b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/ASB_impl.java
index 33d8a0b8d..7fb7dc0ad 100644
--- a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/ASB_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/ASB_impl.java
@@ -742,7 +742,7 @@ public class ASB_impl extends Resource_ImplBase implements ASB {
this.casIterator = casIterator;
this.originalCas = originalCas;
this.originalCasFlow = originalCasFlow;
- casMultiplierAeKey = lastAeKey;
+ this.casMultiplierAeKey = lastAeKey;
this.incompleteParallelStep = incompleteParallelStep;
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowControllerContainer.java b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowControllerContainer.java
index aad24f710..c7e0f7db7 100644
--- a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowControllerContainer.java
+++ b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowControllerContainer.java
@@ -226,7 +226,7 @@ public class FlowControllerContainer extends ConfigurableResource_ImplBase {
Class<? extends AbstractCas> requiredInterface = mFlowController.getRequiredCasInterface();
AbstractCas casToPass = getCasManager().getCasInterface(view, requiredInterface);
((CASImpl) view)
- .switchClassLoaderLockCasCL(getResourceManager().getExtensionClassLoader());
+ .switchClassLoaderLockCasCL(this.getResourceManager().getExtensionClassLoader());
Flow flow = mFlowController.computeFlow(casToPass);
if (flow instanceof CasFlow_ImplBase) {
((CasFlow_ImplBase) flow).setCas(view);
diff --git a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AggregateAnalysisEngine_impl.java b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AggregateAnalysisEngine_impl.java
index b10d08488..dc51c11ba 100644
--- a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AggregateAnalysisEngine_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AggregateAnalysisEngine_impl.java
@@ -299,7 +299,7 @@ public class AggregateAnalysisEngine_impl extends AnalysisEngineImplBase impleme
super.reconfigure();
// call this method recursively on each component
- Map<String, AnalysisEngine> components = _getASB().getComponentAnalysisEngines();
+ Map<String, AnalysisEngine> components = this._getASB().getComponentAnalysisEngines();
Iterator<AnalysisEngine> it = components.values().iterator();
while (it.hasNext()) {
ConfigurableResource component = it.next();
@@ -315,7 +315,7 @@ public class AggregateAnalysisEngine_impl extends AnalysisEngineImplBase impleme
enterBatchProcessComplete();
try {
// pass call down to components, which might be (or contain) CAS Consumers
- Iterator<AnalysisEngine> iter = _getASB().getComponentAnalysisEngines().values()
+ Iterator<AnalysisEngine> iter = this._getASB().getComponentAnalysisEngines().values()
.iterator();
while (iter.hasNext()) {
iter.next().batchProcessComplete();
@@ -335,7 +335,7 @@ public class AggregateAnalysisEngine_impl extends AnalysisEngineImplBase impleme
// (a custom FlowController must be in use), the entire order is arbitrary.
String[] orderedNodes = null;
Map<String, AnalysisEngine> components = new HashMap<>(
- _getASB().getComponentAnalysisEngines());
+ this._getASB().getComponentAnalysisEngines());
FlowConstraints flow = getAnalysisEngineMetaData().getFlowConstraints();
if (flow != null) {
if (flow instanceof FixedFlow) {
@@ -414,7 +414,7 @@ public class AggregateAnalysisEngine_impl extends AnalysisEngineImplBase impleme
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<>(aAdditionalParams);
- asbParams.put(ASB.PARAM_AGGREGATE_ANALYSIS_ENGINE_NAME, getMetaData().getName()); // not
+ asbParams.put(ASB.PARAM_AGGREGATE_ANALYSIS_ENGINE_NAME, this.getMetaData().getName()); // not
// used
// 9/2013
// scan
@@ -506,7 +506,7 @@ public class AggregateAnalysisEngine_impl extends AnalysisEngineImplBase impleme
getResourceManager());
// assign results of merge to this aggregate AE's metadata
- AnalysisEngineMetaData aggregateMD = getAnalysisEngineMetaData();
+ AnalysisEngineMetaData aggregateMD = this.getAnalysisEngineMetaData();
aggregateMD.setTypeSystem(aggTypeDesc);
aggregateMD.setTypePriorities(aggTypePriorities);
aggregateMD.setFsIndexCollection(aggIndexColl);
diff --git a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java
index 3a4a659ae..ba5088836 100644
--- a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java
@@ -494,14 +494,14 @@ public class AnalysisEngineDescription_impl extends ResourceCreationSpecifier_im
* -
*/
protected void validateSofaMappings() throws ResourceInitializationException {
- if (isPrimitive()) {
+ if (this.isPrimitive()) {
return;
}
- String aggName = getAnalysisEngineMetaData().getName();
+ 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<>();
- SofaMapping[] sofaMappings = getSofaMappings();
+ SofaMapping[] sofaMappings = this.getSofaMappings();
if (sofaMappings != null) {
for (int s = 0; s < sofaMappings.length; s++) {
String componentKey = sofaMappings[s].getComponentKey();
@@ -627,7 +627,7 @@ public class AnalysisEngineDescription_impl extends ResourceCreationSpecifier_im
if (!containsRemote) {
// check that all aggregate outputs and inputs were mapped correclty to
// component inputs/outputs
- Capability[] caps = getAnalysisEngineMetaData().getCapabilities();
+ Capability[] caps = this.getAnalysisEngineMetaData().getCapabilities();
for (int i = 0; i < caps.length; i++) {
String[] sofas = caps[i].getOutputSofas();
for (int j = 0; j < sofas.length; j++) {
@@ -669,7 +669,7 @@ public class AnalysisEngineDescription_impl extends ResourceCreationSpecifier_im
}
protected boolean capabilitiesContainSofa(String aSofaName, boolean aOutput) {
- Capability[] caps = getAnalysisEngineMetaData().getCapabilities();
+ Capability[] caps = this.getAnalysisEngineMetaData().getCapabilities();
for (int i = 0; i < caps.length; i++) {
String[] sofas = aOutput ? caps[i].getOutputSofas() : caps[i].getInputSofas();
for (int j = 0; j < sofas.length; j++) {
@@ -870,7 +870,7 @@ public class AnalysisEngineDescription_impl extends ResourceCreationSpecifier_im
// users who create
// new import objects
if (aeImport instanceof Import_impl) {
- ((Import_impl) aeImport).setSourceUrlIfNull(getSourceUrl());
+ ((Import_impl) aeImport).setSourceUrlIfNull(this.getSourceUrl());
}
// locate import target
URL url = aeImport.findAbsoluteUrl(aResourceManager);
diff --git a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineImplBase.java b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineImplBase.java
index b76806f52..a6e948e7b 100644
--- a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineImplBase.java
+++ b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineImplBase.java
@@ -398,7 +398,7 @@ public abstract class AnalysisEngineImplBase extends ConfigurableResource_ImplBa
public synchronized String[] getFeatureNamesForType(String aTypeName) {
// build CAS and populate mFirstTypeSystem
CASImpl cas = (CASImpl) getCasManager()
- .getCas(getUimaContextAdmin().getQualifiedContextName());
+ .getCas(this.getUimaContextAdmin().getQualifiedContextName());
TypeSystemImpl ts = cas.getTypeSystemImpl();
getCasManager().releaseCas(cas);
@@ -465,7 +465,7 @@ public abstract class AnalysisEngineImplBase extends ConfigurableResource_ImplBa
public void resetResultSpecificationToDefault() {
ResultSpecification resultSpec = new ResultSpecification_impl();
- resultSpec.addCapabilities(getAnalysisEngineMetaData().getCapabilities());
+ resultSpec.addCapabilities(this.getAnalysisEngineMetaData().getCapabilities());
setResultSpecification(resultSpec);
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImpl.java b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImpl.java
index 642fdbaa2..faa77b69e 100644
--- a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImpl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImpl.java
@@ -97,11 +97,11 @@ public class AnalysisEngineManagementImpl
@Override
public String getState() {
- return status.toString();
+ return this.status.toString();
}
public void setState(State state) {
- status = state;
+ this.status = state;
}
public void reportAnalysisTime(long time) {
diff --git a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_impl.java b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_impl.java
index 52f2b5170..cab96f508 100644
--- a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_impl.java
@@ -118,7 +118,7 @@ public class MultiprocessingAnalysisEngine_impl extends AnalysisEngineImplBase
mPool = new AnalysisEnginePool("", poolSize, aSpecifier, aAdditionalParams);
// update metadata from pool (this gets the merged type system for aggregates)
- setMetaData(mPool.getMetaData());
+ this.setMetaData(mPool.getMetaData());
return true;
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java
index e6426a273..f10f68f5b 100644
--- a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java
+++ b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java
@@ -294,7 +294,7 @@ public class PearAnalysisEngineWrapper extends AnalysisEngineImplBase {
: new HashMap<>(aAdditionalParams);
// clonedAdditionalParameters.remove(Resource.PARAM_UIMA_CONTEXT);
clonedAdditionalParameters.remove(Resource.PARAM_RESOURCE_MANAGER);
- ae = UIMAFramework.produceAnalysisEngine(specifier, innerRM, clonedAdditionalParameters);
+ this.ae = UIMAFramework.produceAnalysisEngine(specifier, innerRM, clonedAdditionalParameters);
} catch (IOException ex) {
throw new ResourceInitializationException(ex);
} catch (InvalidXMLException ex) {
@@ -306,7 +306,7 @@ public class PearAnalysisEngineWrapper extends AnalysisEngineImplBase {
UIMAFramework.getLogger(this.getClass()).logrb(Level.CONFIG, this.getClass().getName(),
"initialize", LOG_RESOURCE_BUNDLE, "UIMA_analysis_engine_init_successful__CONFIG",
- new Object[] { ae.getAnalysisEngineMetaData().getName() });
+ new Object[] { this.ae.getAnalysisEngineMetaData().getName() });
return true;
}
@@ -326,7 +326,7 @@ public class PearAnalysisEngineWrapper extends AnalysisEngineImplBase {
*/
@Override
public ResourceMetaData getMetaData() {
- return ae.getMetaData();
+ return this.ae.getMetaData();
}
/*
@@ -336,7 +336,7 @@ public class PearAnalysisEngineWrapper extends AnalysisEngineImplBase {
*/
@Override
public void batchProcessComplete() throws AnalysisEngineProcessException {
- ae.batchProcessComplete();
+ this.ae.batchProcessComplete();
}
/*
@@ -346,7 +346,7 @@ public class PearAnalysisEngineWrapper extends AnalysisEngineImplBase {
*/
@Override
public void collectionProcessComplete() throws AnalysisEngineProcessException {
- ae.collectionProcessComplete();
+ this.ae.collectionProcessComplete();
}
/*
@@ -364,15 +364,15 @@ public class PearAnalysisEngineWrapper extends AnalysisEngineImplBase {
UIMAFramework.getLogger(this.getClass()).logrb(Level.FINE, this.getClass().getName(),
"processAndOutputNewCASes", LOG_RESOURCE_BUNDLE,
"UIMA_analysis_engine_process_begin__FINE",
- new Object[] { ae.getAnalysisEngineMetaData().getName() });
+ new Object[] { this.ae.getAnalysisEngineMetaData().getName() });
}
- CasIterator result = ae.processAndOutputNewCASes(aCAS);
+ CasIterator result = this.ae.processAndOutputNewCASes(aCAS);
if (logger.isLoggable(Level.FINE)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.FINE, this.getClass().getName(),
"processAndOutputNewCASes", LOG_RESOURCE_BUNDLE,
"UIMA_analysis_engine_process_end__FINE",
- new Object[] { ae.getAnalysisEngineMetaData().getName() });
+ new Object[] { this.ae.getAnalysisEngineMetaData().getName() });
}
return result;
}
@@ -385,9 +385,9 @@ public class PearAnalysisEngineWrapper extends AnalysisEngineImplBase {
UIMAFramework.getLogger(this.getClass()).logrb(Level.CONFIG, this.getClass().getName(),
"destroy", LOG_RESOURCE_BUNDLE, "UIMA_analysis_engine_destroyed__CONFIG",
- new Object[] { ae.getAnalysisEngineMetaData().getName() });
+ new Object[] { this.ae.getAnalysisEngineMetaData().getName() });
- ae.destroy();
+ this.ae.destroy();
}
/*
@@ -576,7 +576,7 @@ public class PearAnalysisEngineWrapper extends AnalysisEngineImplBase {
*/
@Override
public void setResultSpecification(ResultSpecification resultSpec) {
- ae.setResultSpecification(resultSpec);
+ this.ae.setResultSpecification(resultSpec);
}
/*
@@ -589,7 +589,7 @@ public class PearAnalysisEngineWrapper extends AnalysisEngineImplBase {
@Override
public void batchProcessComplete(ProcessTrace trace)
throws ResourceProcessException, IOException {
- ae.batchProcessComplete(trace);
+ this.ae.batchProcessComplete(trace);
}
/*
@@ -601,7 +601,7 @@ public class PearAnalysisEngineWrapper extends AnalysisEngineImplBase {
@Override
public void collectionProcessComplete(ProcessTrace trace)
throws ResourceProcessException, IOException {
- ae.collectionProcessComplete(trace);
+ this.ae.collectionProcessComplete(trace);
}
/*
@@ -611,7 +611,7 @@ public class PearAnalysisEngineWrapper extends AnalysisEngineImplBase {
*/
@Override
public ResultSpecification createResultSpecification() {
- return ae.createResultSpecification();
+ return this.ae.createResultSpecification();
}
/*
@@ -622,7 +622,7 @@ public class PearAnalysisEngineWrapper extends AnalysisEngineImplBase {
*/
@Override
public ResultSpecification createResultSpecification(TypeSystem typeSystem) {
- return ae.createResultSpecification(typeSystem);
+ return this.ae.createResultSpecification(typeSystem);
}
/*
@@ -633,7 +633,7 @@ public class PearAnalysisEngineWrapper extends AnalysisEngineImplBase {
*/
@Override
public ProcessingResourceMetaData getProcessingResourceMetaData() {
- return ae.getProcessingResourceMetaData();
+ return this.ae.getProcessingResourceMetaData();
}
/*
@@ -643,7 +643,7 @@ public class PearAnalysisEngineWrapper extends AnalysisEngineImplBase {
*/
@Override
public synchronized CAS newCAS() throws ResourceInitializationException {
- return ae.newCAS();
+ return this.ae.newCAS();
}
/*
@@ -655,7 +655,7 @@ public class PearAnalysisEngineWrapper extends AnalysisEngineImplBase {
*/
@Override
public void typeSystemInit(TypeSystem typeSystem) throws ResourceInitializationException {
- ae.typeSystemInit(typeSystem);
+ this.ae.typeSystemInit(typeSystem);
}
/**
@@ -677,8 +677,8 @@ public class PearAnalysisEngineWrapper extends AnalysisEngineImplBase {
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + ((classPath == null) ? 0 : classPath.hashCode());
- result = prime * result + ((dataPath == null) ? 0 : dataPath.hashCode());
+ result = prime * result + ((this.classPath == null) ? 0 : this.classPath.hashCode());
+ result = prime * result + ((this.dataPath == null) ? 0 : this.dataPath.hashCode());
return result;
}
@@ -686,18 +686,20 @@ public class PearAnalysisEngineWrapper extends AnalysisEngineImplBase {
public boolean equals(Object obj) {
if (this == obj)
return true;
- if ((obj == null) || (getClass() != obj.getClass()))
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
return false;
final StringPair other = (StringPair) obj;
- if (classPath == null) {
+ if (this.classPath == null) {
if (other.classPath != null)
return false;
- } else if (!classPath.equals(other.classPath))
+ } else if (!this.classPath.equals(other.classPath))
return false;
- if (dataPath == null) {
+ if (this.dataPath == null) {
if (other.dataPath != null)
return false;
- } else if (!dataPath.equals(other.dataPath))
+ } else if (!this.dataPath.equals(other.dataPath))
return false;
return true;
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PrimitiveAnalysisEngine_impl.java b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PrimitiveAnalysisEngine_impl.java
index 4e879b5fc..22fca8562 100644
--- a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PrimitiveAnalysisEngine_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PrimitiveAnalysisEngine_impl.java
@@ -111,9 +111,13 @@ public class PrimitiveAnalysisEngine_impl extends AnalysisEngineImplBase impleme
// this includes CollectionReader, and CasConsumer descriptors
// as well as AnalysisEngine descriptors.
+ if (!(aSpecifier instanceof ResourceCreationSpecifier)) {
+ return false;
+ }
+
// BUT, for AnalysisEngineDescriptions, must not be an aggregate
- if (!(aSpecifier instanceof ResourceCreationSpecifier) || (aSpecifier instanceof AnalysisEngineDescription
- && !((AnalysisEngineDescription) aSpecifier).isPrimitive())) {
+ if (aSpecifier instanceof AnalysisEngineDescription
+ && !((AnalysisEngineDescription) aSpecifier).isPrimitive()) {
return false;
}
@@ -364,7 +368,7 @@ public class PrimitiveAnalysisEngine_impl extends AnalysisEngineImplBase impleme
mCurrentResultSpecification.setTypeSystem(mLastTypeSystem);
rsFromOutputCapabilities = new ResultSpecification_impl(mLastTypeSystem);
rsFromOutputCapabilities
- .addCapabilities(getAnalysisEngineMetaData().getCapabilities());
+ .addCapabilities(this.getAnalysisEngineMetaData().getCapabilities());
}
// the actual ResultSpec we send to the component is formed by
// looking at this primitive AE's declared output types and eliminating
@@ -378,7 +382,7 @@ public class PrimitiveAnalysisEngine_impl extends AnalysisEngineImplBase impleme
// insure view is passed to switch / restore class loader
// https://issues.apache.org/jira/browse/UIMA-2211
((CASImpl) view)
- .switchClassLoaderLockCasCL(getResourceManager().getExtensionClassLoader());
+ .switchClassLoaderLockCasCL(this.getResourceManager().getExtensionClassLoader());
callProcessMethod(mAnalysisComponent, casToPass);
// // call the process method
diff --git a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/ResultSpecification_impl.java b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/ResultSpecification_impl.java
index 645a33ef5..16b2e39cb 100644
--- a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/ResultSpecification_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/ResultSpecification_impl.java
@@ -791,7 +791,10 @@ public final class ResultSpecification_impl extends MetaDataObject_impl
}
static boolean equalsOrBothNull(Object x, Object y) {
- if ((null == x && null == y) || (null != x && x.equals(y))) {
+ if (null == x && null == y) {
+ return true;
+ }
+ if (null != x && x.equals(y)) {
return true;
}
return false;
diff --git a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsFeat.java b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsFeat.java
index 3b9785b9f..d8755ae77 100644
--- a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsFeat.java
+++ b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsFeat.java
@@ -26,12 +26,12 @@ public class RsFeat {
RsLangs languages = null;
RsFeat(String shortName, String[] languages) {
- shortFeatName = shortName;
+ this.shortFeatName = shortName;
this.languages = RsLangs.createOrNull(languages);
}
RsFeat(String shortName, RsLangs languages) {
- shortFeatName = shortName;
+ this.shortFeatName = shortName;
if (null != languages) {
languages.setShared();
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsLangs.java b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsLangs.java
index c43e044f2..f41957726 100644
--- a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsLangs.java
+++ b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsLangs.java
@@ -271,7 +271,7 @@ public class RsLangs {
return null;
}
- if (null == languages) { // means x-unspecified, so return the other
+ if (null == this.languages) { // means x-unspecified, so return the other
return other;
}
if (null == other.languages) { // means x-unspecified, so return the first
@@ -281,7 +281,7 @@ public class RsLangs {
RsLangs r = new RsLangs();
r.languages = new ArrayList<>(0); // creates an empty, not null arraylist
- for (String lang : languages) {
+ for (String lang : this.languages) {
if (subsumesCanonical(other, lang)) {
r = add(r, lang); // add langs in other that are subsumed by this
}
@@ -322,7 +322,10 @@ public class RsLangs {
if (this == obj) {
return true;
}
- if ((obj == null) || (getClass() != obj.getClass())) {
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
return false;
}
RsLangs other = (RsLangs) obj;
diff --git a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsTypesMap.java b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsTypesMap.java
index ef9596d8b..164a580ca 100644
--- a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsTypesMap.java
+++ b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsTypesMap.java
@@ -258,7 +258,10 @@ public class RsTypesMap implements Iterable<RsType> {
if (this == obj) {
return true;
}
- if ((obj == null) || (getClass() != obj.getClass())) {
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
return false;
}
RsTypesMap other = (RsTypesMap) obj;
diff --git a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/TypeOrFeature_impl.java b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/TypeOrFeature_impl.java
index fe80c3f81..d2ac652bb 100644
--- a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/TypeOrFeature_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/TypeOrFeature_impl.java
@@ -186,7 +186,7 @@ public class TypeOrFeature_impl extends MetaDataObject_impl implements TypeOrFea
// cast object
TypeOrFeature_impl tof = (TypeOrFeature_impl) obj;
- return getName().compareTo(tof.getName());
+ return this.getName().compareTo(tof.getName());
}
/**
@@ -213,7 +213,10 @@ public class TypeOrFeature_impl extends MetaDataObject_impl implements TypeOrFea
if (this == obj) {
return true;
}
- if (!super.equals(obj) || (getClass() != obj.getClass())) {
+ if (!super.equals(obj)) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
return false;
}
TypeOrFeature_impl other = (TypeOrFeature_impl) obj;
diff --git a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/UimacppAnalysisEngineImpl.java b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/UimacppAnalysisEngineImpl.java
index f42f02efd..3199c462c 100644
--- a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/UimacppAnalysisEngineImpl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/UimacppAnalysisEngineImpl.java
@@ -101,9 +101,13 @@ public class UimacppAnalysisEngineImpl extends AnalysisEngineImplBase implements
throws ResourceInitializationException {
// AnalysisEngine can be build from any ResourceCreationSpecifier-
// CasConsumer descriptors as well as AnalysisEngine descriptors.
+ if (!(aSpecifier instanceof ResourceCreationSpecifier)) {
+ return false;
+ }
+
// aSpecifier must be a AnalysisEngineDescription or a CasConsumerDescription
- if (!(aSpecifier instanceof ResourceCreationSpecifier) || (!(aSpecifier instanceof AnalysisEngineDescription)
- && !(aSpecifier instanceof CasConsumerDescription))) {
+ if (!(aSpecifier instanceof AnalysisEngineDescription)
+ && !(aSpecifier instanceof CasConsumerDescription)) {
return false;
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java b/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java
index 4096a95d1..536b91b84 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java
@@ -627,7 +627,7 @@ public interface CAS extends AbstractCas {
* @return the JCasImpl view for this CAS view
*/
default JCasImpl getJCasImpl() {
- return ((CASImpl) getLowLevelCAS()).getJCasImpl();
+ return ((CASImpl) this.getLowLevelCAS()).getJCasImpl();
}
/**
@@ -1263,7 +1263,7 @@ public interface CAS extends AbstractCas {
* @return a lazily created shared (for this CAS) empty list
*/
default <T extends TOP> EmptyList emptyList(Class<T> clazz) {
- return ((CASImpl) getLowLevelCAS())
+ return ((CASImpl) this.getLowLevelCAS())
.emptyListFromTypeCode(((TypeImpl) getCasType(clazz)).getCode());
}
@@ -1393,7 +1393,7 @@ public interface CAS extends AbstractCas {
* @return the corresponding Type, for this CAS
*/
default <T extends TOP> Type getCasType(Class<T> clazz) {
- return getJCasImpl().getCasType(clazz);
+ return this.getJCasImpl().getCasType(clazz);
}
/**
@@ -1427,7 +1427,7 @@ public interface CAS extends AbstractCas {
* corresponding to the JCas clazz, in no particular order.
*/
default <T extends TOP> FSIterator<T> getAllIndexedFS(Type type) {
- return getIndexRepository().getAllIndexedFS(type);
+ return this.getIndexRepository().getAllIndexedFS(type);
}
/**
@@ -1442,7 +1442,7 @@ public interface CAS extends AbstractCas {
* of the specified type (including subtypes)
*/
default <T extends TOP> Collection<T> getIndexedFSs(Type type) {
- return getIndexRepository().getIndexedFSs(type);
+ return this.getIndexRepository().getIndexedFSs(type);
}
/**
@@ -1453,7 +1453,7 @@ public interface CAS extends AbstractCas {
* of the specified type (including subtypes)
*/
default Collection<TOP> getIndexedFSs() {
- return getIndexRepository().getIndexedFSs();
+ return this.getIndexRepository().getIndexedFSs();
}
/**
@@ -1468,6 +1468,6 @@ public interface CAS extends AbstractCas {
* of the specified type (including subtypes)
*/
default <T extends TOP> Collection<T> getIndexedFSs(Class<T> clazz) {
- return getIndexRepository().getIndexedFSs(clazz);
+ return this.getIndexRepository().getIndexedFSs(clazz);
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/AllFSs.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/AllFSs.java
index 799bca96b..e3d5b4e10 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/AllFSs.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/AllFSs.java
@@ -82,10 +82,10 @@ class AllFSs {
*/
AllFSs(CASImpl cas) {
this.cas = cas;
- mark = null;
+ this.mark = null;
foundFSsBelowMark = null;
- includeFilter = null;
- typeMapper = null;
+ this.includeFilter = null;
+ this.typeMapper = null;
}
private AllFSs getAllFSsAllViews_sofas() {
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationImplException.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationImplException.java
index 292034db6..f5c6bbcf0 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationImplException.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationImplException.java
@@ -96,7 +96,7 @@ public class AnnotationImplException extends Exception {
* file. Unfortunately, the error parameters get lost that way.
*/
public int getError() {
- return error;
+ return this.error;
}
/**
@@ -104,18 +104,18 @@ public class AnnotationImplException extends Exception {
*/
@Override
public String getMessage() {
- if (resource == null) {
+ if (this.resource == null) {
try {
- resource = ResourceBundle.getBundle(resource_file);
+ this.resource = ResourceBundle.getBundle(resource_file);
} catch (MissingResourceException e) {
- error = MESSAGES_NOT_FOUND;
+ this.error = MESSAGES_NOT_FOUND;
return missing_resource_error;
}
}
// Retrieve message from resource bundle, format using arguments,
// and return resulting string.
- return (new MessageFormat(resource.getString(identifiers[error])))
- .format(arguments);
+ return (new MessageFormat(this.resource.getString(identifiers[this.error])))
+ .format(this.arguments);
}
/**
@@ -123,7 +123,7 @@ public class AnnotationImplException extends Exception {
*/
@Override
public String toString() {
- return this.getClass().getSimpleName() + ": " + getMessage();
+ return this.getClass().getSimpleName() + ": " + this.getMessage();
}
/**
@@ -140,9 +140,9 @@ public class AnnotationImplException extends Exception {
*/
public boolean addArgument(String s) {
int i = 0;
- while (i < arguments.length) {
- if (arguments[i] == null) {
- arguments[i] = s;
+ while (i < this.arguments.length) {
+ if (this.arguments[i] == null) {
+ this.arguments[i] = s;
return true;
}
i++;
@@ -156,7 +156,7 @@ public class AnnotationImplException extends Exception {
* @return The internal message key.
*/
public String getMessageCode() {
- return identifiers[error];
+ return identifiers[this.error];
}
/**
@@ -165,7 +165,7 @@ public class AnnotationImplException extends Exception {
* @return The arguments to the exception.
*/
public String[] getArguments() {
- return arguments;
+ return this.arguments;
}
/**
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationTreeImpl.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationTreeImpl.java
index 3a15670e8..ae57c71eb 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationTreeImpl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationTreeImpl.java
@@ -35,7 +35,7 @@ public class AnnotationTreeImpl<T extends AnnotationFS> implements AnnotationTre
@Override
public AnnotationTreeNode<T> getRoot() {
- return root;
+ return this.root;
}
void setRoot(AnnotationTreeNodeImpl<T> root) {
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationTreeNodeImpl.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationTreeNodeImpl.java
index e2f0e879e..71ae4bbd1 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationTreeNodeImpl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationTreeNodeImpl.java
@@ -36,23 +36,23 @@ public class AnnotationTreeNodeImpl<T extends AnnotationFS> implements Annotatio
private int pos;
AnnotationTreeNodeImpl() {
- dtrs = new ArrayList<>();
+ this.dtrs = new ArrayList<>();
}
@Override
public AnnotationTreeNode<T> getParent() {
- return parent;
+ return this.parent;
}
@Override
public int getChildCount() {
- return dtrs.size();
+ return this.dtrs.size();
}
@Override
public AnnotationTreeNode<T> getChild(int i) throws CASRuntimeException {
try {
- return dtrs.get(i);
+ return this.dtrs.get(i);
} catch (IndexOutOfBoundsException e) {
throw new CASRuntimeException(CASRuntimeException.CHILD_INDEX_OOB);
}
@@ -60,11 +60,11 @@ public class AnnotationTreeNodeImpl<T extends AnnotationFS> implements Annotatio
@Override
public AnnotationTreeNode<T> getNextSibling() {
- if (parent == null) {
+ if (this.parent == null) {
return null;
}
try {
- return parent.getChild(pos + 1);
+ return this.parent.getChild(this.pos + 1);
} catch (CASRuntimeException e) {
return null;
}
@@ -72,11 +72,11 @@ public class AnnotationTreeNodeImpl<T extends AnnotationFS> implements Annotatio
@Override
public AnnotationTreeNode<T> getPreviousSibling() {
- if (parent == null) {
+ if (this.parent == null) {
return null;
}
try {
- return parent.getChild(pos - 1);
+ return this.parent.getChild(this.pos - 1);
} catch (CASRuntimeException e) {
return null;
}
@@ -89,7 +89,7 @@ public class AnnotationTreeNodeImpl<T extends AnnotationFS> implements Annotatio
*/
@Override
public ArrayList<AnnotationTreeNode<T>> getChildren() {
- return dtrs;
+ return this.dtrs;
}
/*
@@ -99,7 +99,7 @@ public class AnnotationTreeNodeImpl<T extends AnnotationFS> implements Annotatio
*/
@Override
public T get() {
- return annot;
+ return this.annot;
}
// ////////////////////////////////////////////////////////////////////////////
@@ -110,9 +110,9 @@ public class AnnotationTreeNodeImpl<T extends AnnotationFS> implements Annotatio
}
void addChild(AnnotationTreeNodeImpl<T> child) {
- child.pos = dtrs.size();
+ child.pos = this.dtrs.size();
child.parent = this;
- dtrs.add(child);
+ this.dtrs.add(child);
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes.java
index 1a14ac191..a1580c736 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes.java
@@ -22,6 +22,7 @@ package org.apache.uima.cas.impl;
import java.io.DataInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.ObjectInputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -44,7 +45,6 @@ import org.apache.uima.internal.util.IntListIterator;
import org.apache.uima.internal.util.IntVector;
import org.apache.uima.internal.util.Misc;
import org.apache.uima.internal.util.Obj2IntIdentityHashMap;
-import org.apache.uima.internal.util.SerializationUtils;
import org.apache.uima.internal.util.function.Consumer_T_int_withIOException;
import org.apache.uima.jcas.cas.BooleanArray;
import org.apache.uima.jcas.cas.ByteArray;
@@ -209,7 +209,7 @@ public class BinaryCasSerDes {
boolean isBeforeV3 = false;
public BinaryCasSerDes(CASImpl baseCAS) {
- baseCas = baseCAS;
+ this.baseCas = baseCAS;
}
// *********************************
@@ -251,12 +251,11 @@ public class BinaryCasSerDes {
*/
void reinit(int[] heapMetadata, int[] heapArray, String[] stringTable, int[] fsIndex,
byte[] byteHeapArray, short[] shortHeapArray, long[] longHeapArray) {
-
- // for non Delta case, not held on to compare with compress form 4, which does cas.getCsds() or
- // cas.newCsds() which saves it in cas.svd
- CommonSerDesSequential csds = new CommonSerDesSequential(baseCas);
+ CommonSerDesSequential csds = new CommonSerDesSequential(baseCas); // for non Delta case, not
+ // held on to
+ // compare with compress form 4, which does cas.getCsds() or cas.newCsds() which saves it in
+ // cas.svd
csds.setup(null, 1);
-
heap = new Heap();
byteHeap = new ByteHeap();
shortHeap = new ShortHeap();
@@ -284,6 +283,7 @@ public class BinaryCasSerDes {
public CASImpl setupCasFromCasMgrSerializer(CASMgrSerializer casMgrSerializer) {
if (null != casMgrSerializer) {
+
TypeSystemImpl ts = casMgrSerializer.getTypeSystem();
baseCas.svd.clear(); // does all clearing except index repositories which will be wiped out
baseCas.installTypeSystemInAllViews(ts);
@@ -307,7 +307,6 @@ public class BinaryCasSerDes {
baseCas.svd.setViewForSofaNbr(1, initialView);
baseCas.svd.viewCount = 1;
}
-
return baseCas;
}
@@ -379,6 +378,9 @@ public class BinaryCasSerDes {
/**
* if not an array (array values can't be keys) remove if the feature being updated is in an
* index key
+ *
+ * @param heapAddr
+ * -
*/
private void maybeRemove(int heapAddr) {
TypeImpl type = fs._getTypeImpl();
@@ -395,6 +397,8 @@ public class BinaryCasSerDes {
* for Deserialization of Delta, when updating existing FSs, If the heap addr is for the next
* FS, re-add the previous one to those indexes where it was removed, and then maybe remove the
* new one (and remember which views to re-add to).
+ *
+ * @param heapAddr
*/
private void maybeAddBackAndRemoveFs(int heapAddr, Int2ObjHashMap<TOP, TOP> addr2fs) {
if (fsStartAddr == -1) {
@@ -417,6 +421,11 @@ public class BinaryCasSerDes {
* things in the bds. Special cases: if the addr is in the middle of an already setup FS, just
* return The search is done using a binary search, with an exception to check the next item
* (optimization)
+ *
+ * @param heapAddr
+ * - the heap addr
+ * @param bds
+ * -
*/
private void findCorrespondingFs(int heapAddr, Int2ObjHashMap<TOP, TOP> addr2fs) {
if (fsStartAddr < heapAddr && heapAddr < fsEndAddr) {
@@ -608,8 +617,9 @@ public class BinaryCasSerDes {
static CASMgrSerializer maybeReadEmbeddedTSI(Header h, DataInputStream dis) {
if (h.isTypeSystemIncluded() || h.isTypeSystemIndexDefIncluded()) { // Load TS from CAS stream
try {
- return SerializationUtils.deserializeCASMgrSerializer(dis);
- } catch (IOException e) {
+ ObjectInputStream ois = new ObjectInputStream(dis);
+ return (CASMgrSerializer) ois.readObject();
+ } catch (ClassNotFoundException | IOException e) {
/** Unrecognized serialized CAS format */
throw new CASRuntimeException(CASRuntimeException.UNRECOGNIZED_SERIALIZED_CAS_FORMAT, null,
e);
@@ -1017,6 +1027,9 @@ public class BinaryCasSerDes {
/**
* Called 3 times to process non-compressed binary deserialization of aux array modifications -
* once for byte/boolean, short, and long/double
+ *
+ * @return heapsz (used by caller to do word alignment)
+ * @throws IOException
*/
int updateAuxArrayMods(Reading r, Int2ObjHashMap<TOP, TOP> auxAddr2fsa,
Consumer_T_int_withIOException<TOP> setter) throws IOException {
@@ -1210,9 +1223,9 @@ public class BinaryCasSerDes {
*
* @param ir
* index repository
- * @param fsindexes
+ * @param fss
* the list having the fss
- * @param idx
+ * @param fsIdx
* the starting index
* @param length
* the length
@@ -1436,6 +1449,7 @@ public class BinaryCasSerDes {
*
* The results must be retained for the use case of subsequently receiving back a delta cas.
*
+ * @param cs the CASSerializer instance used to record the results of the scan
* @param mark null or the mark to use for separating the new from from the previously existing
* used by delta cas.
* @return null or for delta, all the found FSs
@@ -1503,7 +1517,7 @@ public class BinaryCasSerDes {
if (type.isArray()) {
// next slot is the length
- final int length = ((CommonArrayFS<?>) fs).size();
+ final int length = ((CommonArrayFS) fs).size();
heap.heap[pos + arrayLengthFeatOffset] = length;
// next slot are the values
int i = pos + arrayContentOffset;
@@ -1570,7 +1584,7 @@ public class BinaryCasSerDes {
break;
}
case Slot_HeapRef:
- for (TOP fsitem : ((FSArray<?>) fs)._getTheArray()) {
+ for (TOP fsitem : ((FSArray) fs)._getTheArray()) {
heap.heap[i++] = fs2addr.get(fsitem);
}
break;
@@ -1666,7 +1680,7 @@ public class BinaryCasSerDes {
List<Runnable> fixups4UimaSerialization = new ArrayList<>();
for (int heapIndex = startPos; heapIndex < heapsz; heapIndex += getFsSpaceReq(fs, type)) {
- // int typecode = heap.heap[heapIndex];
+ int typecode = heap.heap[heapIndex];
// if (isBeforeV3 && typecode > TypeSystemConstants.lastBuiltinV2TypeCode) {
// typecode = typecode + TypeSystemConstants.numberOfNewBuiltInsSinceV2;
// }
@@ -1736,7 +1750,7 @@ public class BinaryCasSerDes {
}
case Slot_HeapRef: {
- TOP[] fsa = ((FSArray<?>) fs)._getTheArray();
+ TOP[] fsa = ((FSArray) fs)._getTheArray();
for (int ai = 0; ai < len; ai++) {
int a = heap.heap[hhi + ai];
if (a == 0) {
@@ -1964,12 +1978,14 @@ public class BinaryCasSerDes {
case Slot_Float:
((FloatArray) fs).set(hsai, CASImpl.int2float(slotValue));
break;
+
case Slot_StrRef:
((StringArray) fs).set(hsai, stringHeap.getStringForCode(slotValue));
break;
case Slot_HeapRef:
((FSArray) fs).set(hsai, addr2fs.get(slotValue));
break;
+
default:
Misc.internalError();
} // end of switch for component type of arrays
@@ -2012,6 +2028,11 @@ public class BinaryCasSerDes {
}
/**
+ *
+ * @param fs
+ * @param feat
+ * @param s
+ * @param fixups4forwardFsRefs
* @return true if caller needs to do an appropriate fs._setStringValue...
*/
private boolean updateStringFeature(TOP fs, FeatureImpl feat, String s,
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java
index 1d65147e0..bd5faf4a7 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java
@@ -236,7 +236,7 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
public BinaryCasSerDes4(TypeSystemImpl ts, boolean doMeasurements) {
this.ts = ts;
this.doMeasurements = doMeasurements;
- fsArrayType = ts.fsArrayType;
+ this.fsArrayType = ts.fsArrayType;
}
/**
@@ -416,9 +416,9 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
private Serializer(CASImpl cas, DataOutputStream serializedOut, MarkerImpl mark,
SerializationMeasures sm, CompressLevel compressLevel, CompressStrat compressStrategy,
boolean isTsi) {
- baseCas = cas.getBaseCAS();
- bcsd = cas.getBinaryCasSerDes();
- isDelta = (mark != null);
+ this.baseCas = cas.getBaseCAS();
+ this.bcsd = cas.getBinaryCasSerDes();
+ this.isDelta = (mark != null);
// this.csds = getCsds(baseCas, isDelta);
// this.ccs = new CommonCompressedSerialization(
// new CommonSerDesTypeMap(cas.getTypeSystemImpl(), cas.getTypeSystemImpl()), // no type
@@ -466,7 +466,7 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
strSeg_dos = dosZipSources[strSeg_i];
uimaSerializableSavedToCas = new PositiveIntSet_impl(1024, 1, 1024);
- prevFsByType = new TOP[ts.getTypeArraySize()];
+ this.prevFsByType = new TOP[ts.getTypeArraySize()];
csds = getCsds(baseCas, isDelta);
// getCsds() internally already causes _save_to_cas_data() to be called (via AllFSs), so we
// have to add all the FSes that are returned here to the uimaSerializableSavedToCas tracking
@@ -485,6 +485,8 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
* the source id's if some FSs were GC'd.
*
* To determine for delta what new strings and new
+ *
+ * @throws IOException
*/
private void serialize() throws IOException {
@@ -508,9 +510,8 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
CasIOUtils.writeTypeSystem(baseCas, serializedOut, true);
}
- if (TRACE_SER) {
+ if (TRACE_SER)
System.out.println("Form4Ser start, delta: " + (isDelta ? "true" : "false"));
- }
/*******************************************************************************
* Setup tables that map to v2 "addresses" - needed for backwards compatibility fs2addr -
* feature structure to address addr2fs - address to feature structure sortedFSs - sorted by
@@ -599,15 +600,13 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
// heapEnd);
// }
- if (TRACE_SER) {
+ if (TRACE_SER)
System.out.println("Form4Ser heapstart: " + heapStart + " heapEnd: " + heapEnd);
- }
writeVnumber(control_dos, heapEnd - heapStart); // used for delta heap size to grow the CAS
// and ending condition on deser loop
- if (TRACE_SER) {
+ if (TRACE_SER)
System.out.println("Form4Ser heapstart: " + heapStart + " heapEnd: " + heapEnd);
- }
Arrays.fill(prevFsByType, null);
// if (heapStart == 0) {
@@ -625,15 +624,13 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
writeFs(fs);
}
- if (TRACE_SER) {
+ if (TRACE_SER)
System.out.println("Form4Ser writing index info");
- }
serializeIndexedFeatureStructures(csds);
if (isDelta) {
- if (TRACE_SER) {
+ if (TRACE_SER)
System.out.println("Form4Ser writing modified FSs");
- }
(new SerializeModifiedFSs(csds)).serializeModifiedFSs();
}
@@ -647,6 +644,8 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
/**
* Write the compressed string table(s)
+ *
+ * @throws IOException
*/
private void writeStringInfo() throws IOException {
String[] commonStrings = os.getCommonStrings();
@@ -719,11 +718,11 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
// }
}
- private void serializeIndexedFeatureStructures(final CommonSerDesSequential aCsds)
+ private void serializeIndexedFeatureStructures(final CommonSerDesSequential csds)
throws IOException {
// fsIndexes already have the modelled address conversion
- int[] fsIndexes = isDelta ? bcsd.getDeltaIndexedFSs(mark, aCsds.fs2addr)
- : bcsd.getIndexedFSs(aCsds.fs2addr);
+ int[] fsIndexes = isDelta ? bcsd.getDeltaIndexedFSs(mark, csds.fs2addr)
+ : bcsd.getIndexedFSs(csds.fs2addr);
if (doMeasurement) {
sm.statDetails[fsIndexes_i].original = fsIndexes.length * 4 + 1;
}
@@ -748,15 +747,15 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
}
for (int vi = 0; vi < nbrViews; vi++) {
- fi = compressFsxPart(fsIndexes, fi, aCsds); // added FSs
+ fi = compressFsxPart(fsIndexes, fi, csds); // added FSs
if (isDelta) {
- fi = compressFsxPart(fsIndexes, fi, aCsds); // removed FSs
- fi = compressFsxPart(fsIndexes, fi, aCsds); // reindexed FSs
+ fi = compressFsxPart(fsIndexes, fi, csds); // removed FSs
+ fi = compressFsxPart(fsIndexes, fi, csds); // reindexed FSs
}
}
}
- private int compressFsxPart(int[] fsIndexes, int fsNdxStart, final CommonSerDesSequential aCsds)
+ private int compressFsxPart(int[] fsIndexes, int fsNdxStart, final CommonSerDesSequential csds)
throws IOException {
int ix = fsNdxStart;
final int nbrEntries = fsIndexes[ix++];
@@ -768,7 +767,7 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
final int[] ia = new int[nbrEntries];
for (int i = ix, t = 0; i < end; i++, t++) {
- ia[t] = fs2seq(aCsds.addr2fs.get(fsIndexes[i])); // convert "addr" to "seq" offset
+ ia[t] = fs2seq(csds.addr2fs.get(fsIndexes[i])); // convert "addr" to "seq" offset
}
// System.arraycopy(fsIndexes, ix, ia, 0, nbrEntries);
Arrays.sort(ia);
@@ -799,7 +798,7 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
switch (arrayElementKind) {
case Slot_HeapRef: {
int prev = getPrevArray0HeapRef();
- for (TOP item : ((FSArray<?>) fs)._getTheArray()) {
+ for (TOP item : ((FSArray) fs)._getTheArray()) {
int v = fs2seq(item);
writeDiff(arrayElementKind.ordinal(), v, prev);
prev = v;
@@ -866,20 +865,18 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
}
private int getPrevArray0HeapRef() {
- if (isNoPrevArrayValue((CommonArrayFS<?>) prevFs)) {
+ if (isNoPrevArrayValue((CommonArrayFS) prevFs))
return 0;
- }
- return fs2seq((TOP) ((FSArray<?>) prevFs).get(0));
+ return fs2seq((TOP) ((FSArray) prevFs).get(0));
}
private int getPrevArray0Int() {
- if (isNoPrevArrayValue((CommonArrayFS<?>) prevFs)) {
+ if (isNoPrevArrayValue((CommonArrayFS) prevFs))
return 0;
- }
return ((IntegerArray) prevFs).get(0);
}
- private boolean isNoPrevArrayValue(CommonArrayFS<?> prevCommonArray) {
+ private boolean isNoPrevArrayValue(CommonArrayFS prevCommonArray) {
return prevCommonArray == null || prevCommonArray.size() == 0;
}
@@ -935,7 +932,7 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
}
private int serializeArrayLength(TOP fs) throws IOException {
- int length = ((CommonArrayFS<?>) fs).size();
+ int length = ((CommonArrayFS) fs).size();
writeVnumber(arrayLength_i, length);
return length;
}
@@ -983,9 +980,9 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
long startTime = System.currentTimeMillis();
int zipBufSize = Math.max(1024, baos.size() / 100);
deflater.reset();
- try (var cds = new DeflaterOutputStream(baosZipped, deflater, zipBufSize)) {
- baos.writeTo(cds);
- }
+ DeflaterOutputStream cds = new DeflaterOutputStream(baosZipped, deflater, zipBufSize);
+ baos.writeTo(cds);
+ cds.close();
idxAndLen.add(i);
if (doMeasurement) {
idxAndLen.add((int) (sm.statDetails[i].afterZip = deflater.getBytesWritten()));
@@ -1267,6 +1264,8 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
/**
* For delta, for each fsChange element, extract any strings
+ *
+ * @param fsChange
*/
private void extractStringsFromModifications(FsChange fsChange) {
final TOP fs = fsChange.fs;
@@ -1467,7 +1466,7 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
break;
case Slot_HeapRef:
- int v = fs2seq((TOP) ((FSArray<?>) fs).get(i));
+ int v = fs2seq((TOP) ((FSArray) fs).get(i));
writeDiff(kindi, v, vPrevModHeapRef);
vPrevModHeapRef = v;
break;
@@ -1668,10 +1667,10 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
* passthru
*/
Deserializer(CASImpl cas, DataInput deserIn, boolean isDelta) throws IOException {
- baseCas = cas.getBaseCAS();
- ivCas = baseCas.getInitialView();
- bcsd = cas.getBinaryCasSerDes();
- csds = getCsds(baseCas, isDelta);
+ this.baseCas = cas.getBaseCAS();
+ this.ivCas = baseCas.getInitialView();
+ this.bcsd = cas.getBinaryCasSerDes();
+ this.csds = getCsds(baseCas, isDelta);
this.deserIn = deserIn;
this.isDelta = isDelta;
@@ -1711,9 +1710,8 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
}
private void deserialize(CommonSerDes.Header h) throws IOException {
- if (TRACE_DES) {
+ if (TRACE_DES)
System.out.println("Form4Deser starting");
- }
// fs2seq.clear();
seq2fs.clear();
@@ -1761,9 +1759,8 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
// heap = heapObj.heap;
for (int[] ia : prevFsRefsByType) {
- if (ia != null) {
+ if (ia != null)
Arrays.fill(ia, 0);
- }
}
if (heapStart == 0) {
@@ -1788,9 +1785,8 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
int arraySize = 0;
Arrays.fill(prevFsByType, null);
- if (TRACE_DES) {
+ if (TRACE_DES)
System.out.println("Form4Deser heapStart: " + heapStart + " heapEnd: " + heapEnd);
- }
for (int iHeap = heapStart; iHeap < heapEnd; iHeap += type.getFsSpaceReq(arraySize)) {
final int typeCode = readVnumber(typeCode_dis);
// final int adjTypeCode = typeCode + ((this.bcsd.isBeforeV3 && typeCode >
@@ -1805,7 +1801,7 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
if (type.isArray()) {
currentFs = readArray(iHeap, type);
- arraySize = ((CommonArrayFS<?>) currentFs).size();
+ arraySize = ((CommonArrayFS) currentFs).size();
} else {
if (!ts.annotBaseType.subsumes(type) && // defer subtypes of AnnotationBase
!(ts.sofaType == type)) { // defer sofa types
@@ -1898,15 +1894,13 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
r.run();
}
- if (TRACE_DES) {
+ if (TRACE_DES)
System.out.println("Form4Deser indexing FSs");
- }
readIndexedFeatureStructures();
if (isDelta) {
- if (TRACE_DES) {
+ if (TRACE_DES)
System.out.println("Form4Deser modifying existing FSs");
- }
(new ReadModifiedFSs()).readModifiedFSs();
}
@@ -1981,7 +1975,7 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
break;
case Slot_HeapRef: {
- final TOP[] a = ((FSArray<?>) fs)._getTheArray();
+ final TOP[] a = ((FSArray) fs)._getTheArray();
int prev = getPrevIntValue(refKind, null);
for (int i = 0; i < a.length; i++) {
final int v = readDiff(SlotKind.Slot_HeapRef, prev);
@@ -2013,6 +2007,15 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
return readVnumber(arrayLength_dis);
}
+ /**
+ * If the fs is null, accumulate fixup operations, otherwise directly set this
+ *
+ * @param fs
+ * - null or the fs whose slots are to be set
+ * @param feat
+ * @param type
+ * @throws IOException
+ */
private void readByKind(FeatureImpl feat, TypeImpl type) throws IOException {
SlotKind kind = feat.getSlotKind();
@@ -2059,7 +2062,7 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
// but binary serialization keeps creation order
}
if (ts.annotBaseSofaFeat != feat || sofaRef == null) {
- // https://issues.apache.org/jira/browse/UIMA-5588
+ https: // issues.apache.org/jira/browse/UIMA-5588
maybeStoreOrDefer(lfs -> {
// in addition to deferring if currentFs is null,
// heap refs may need deferring if forward refs
@@ -2076,9 +2079,8 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
case Slot_StrRef: {
String s = readString();
- if (null == s) {
+ if (null == s)
break; // null is default, no need to store it
- }
if (ts.sofaType.subsumes(type)) {
if (feat == ts.sofaId) {
sofaName = s;
@@ -2141,8 +2143,10 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
}
}
- bcsd.reinitIndexedFSs(fsIndexes.getArray(), isDelta, i -> seq2fs.get(i),
- // written on separate line for Eclipse breakpoint control
+ bcsd.reinitIndexedFSs(fsIndexes.getArray(), isDelta, i -> seq2fs.get(i), // written on
+ // separate line for
+ // Eclipse breakpoint
+ // control
i -> csds.addr2fs.get(i) // https://issues.apache.org/jira/browse/UIMA-5593
);
}
@@ -2150,6 +2154,10 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
/**
* Maybe defers setting features for a Feature Structure if the FS isn't created yet (perhaps
* because it needs a sofa ref, not yet read)
+ *
+ * @param fs
+ * - the Feature Structure or null if not yet created
+ * @param storeAction
*/
private void maybeStoreOrDefer(Consumer<TOP> storeAction) {
if (null == currentFs) {
@@ -2159,6 +2167,9 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
}
}
+ /**
+ * FS Ref slots fixups
+ */
/**
* FS Ref slots fixups
*
@@ -2300,6 +2311,7 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
* @param kind - the slot kind being deserialized
* @param feat - the feature (null for arrays)
* @return - the previous value, for differencing
+ * @throws IOException
*/
// @formatter:on
private int readDiffWithPrevTypeSlot(SlotKind kind, FeatureImpl feat) throws IOException {
@@ -2322,8 +2334,10 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
/**
* Common code for feature offset and array
*
+ * @param kind
* @param feat
* feature or null for array access
+ * @return
*/
private int getPrevIntValue(SlotKind kind, FeatureImpl feat) {
if (kind == SlotKind.Slot_HeapRef) {
@@ -2669,9 +2683,8 @@ public class BinaryCasSerDes4 implements SlotKindsConstants {
return cache;
}
- if (type.isArray()) {
+ if (type.isArray())
return null; // all arrays except fsArray (see above) don't have fs refs
- }
int[] cache = prevFsRefsByType[type.getCode()];
if (null == cache && type.hasRefFeature) { // skip allocating if no refs
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java
index abc95f4dc..e6bcec21c 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java
@@ -559,7 +559,7 @@ public class BinaryCasSerDes6 implements SlotKindsConstants {
cas = ((CASImpl) ((aCas instanceof JCas) ? ((JCas) aCas).getCas() : aCas)).getBaseCAS();
bcsd = cas.getBinaryCasSerDes();
- srcTs = cas.getTypeSystemImpl();
+ this.srcTs = cas.getTypeSystemImpl();
this.mark = mark;
if (null != mark && !mark.isValid()) {
@@ -567,7 +567,7 @@ public class BinaryCasSerDes6 implements SlotKindsConstants {
}
this.doMeasurements = doMeasurements;
- sm = doMeasurements ? new SerializationMeasures() : null;
+ this.sm = doMeasurements ? new SerializationMeasures() : null;
isDelta = isSerializingDelta = (mark != null);
typeMapper = srcTs.getTypeSystemMapper(tgtTs);
@@ -618,37 +618,37 @@ public class BinaryCasSerDes6 implements SlotKindsConstants {
*/
BinaryCasSerDes6(BinaryCasSerDes6 f6, TypeSystemImpl tgtTs)
throws ResourceInitializationException {
- cas = f6.cas;
- bcsd = f6.bcsd;
- stringHeapObj = f6.stringHeapObj;
- nextFsId = f6.nextFsId;
+ this.cas = f6.cas;
+ this.bcsd = f6.bcsd;
+ this.stringHeapObj = f6.stringHeapObj;
+ this.nextFsId = f6.nextFsId;
- srcTs = f6.srcTs;
+ this.srcTs = f6.srcTs;
this.tgtTs = tgtTs; // passed in argument !
- compressLevel = f6.compressLevel;
- compressStrategy = f6.compressStrategy;
+ this.compressLevel = f6.compressLevel;
+ this.compressStrategy = f6.compressStrategy;
- mark = f6.mark;
+ this.mark = f6.mark;
if (null != mark && !mark.isValid()) {
throw new CASRuntimeException(CASRuntimeException.INVALID_MARKER, "Invalid Marker.");
}
- isDelta = isSerializingDelta = (mark != null);
- fsStartIndexes = f6.fsStartIndexes;
- reuseInfoProvided = f6.reuseInfoProvided;
- doMeasurements = f6.doMeasurements;
- sm = f6.sm;
+ this.isDelta = this.isSerializingDelta = (mark != null);
+ this.fsStartIndexes = f6.fsStartIndexes;
+ this.reuseInfoProvided = f6.reuseInfoProvided;
+ this.doMeasurements = f6.doMeasurements;
+ this.sm = f6.sm;
- isTsIncluded = f6.isTsIncluded;
- isTsiIncluded = f6.isTsiIncluded;
+ this.isTsIncluded = f6.isTsIncluded;
+ this.isTsiIncluded = f6.isTsiIncluded;
- typeMapper = srcTs.getTypeSystemMapper(tgtTs);
- isTypeMapping = (null != typeMapper);
- prevHeapInstanceWithIntValues = f6.prevHeapInstanceWithIntValues;
- prevFsWithLongValues = f6.prevFsWithLongValues;
- foundFSs = f6.foundFSs;
- foundFSsBelowMark = f6.foundFSsBelowMark;
- fssToSerialize = f6.fssToSerialize;
+ this.typeMapper = srcTs.getTypeSystemMapper(tgtTs);
+ this.isTypeMapping = (null != typeMapper);
+ this.prevHeapInstanceWithIntValues = f6.prevHeapInstanceWithIntValues;
+ this.prevFsWithLongValues = f6.prevFsWithLongValues;
+ this.foundFSs = f6.foundFSs;
+ this.foundFSsBelowMark = f6.foundFSsBelowMark;
+ this.fssToSerialize = f6.fssToSerialize;
}
@@ -937,7 +937,7 @@ public class BinaryCasSerDes6 implements SlotKindsConstants {
private void serializeArray(TOP fs) throws IOException {
final TypeImpl_array arrayType = (TypeImpl_array) fs._getTypeImpl();
- CommonArrayFS<?> a = (CommonArrayFS<?>) fs;
+ CommonArrayFS a = (CommonArrayFS) fs;
final SlotKind arrayElementKind = arrayType.getComponentSlotKind();
final int length = serializeArrayLength(a);
@@ -965,7 +965,7 @@ public class BinaryCasSerDes6 implements SlotKindsConstants {
// prev = getTgtSeqFromSrcFS(prevFsArray.get(0));
// } // else use the preset 0 value
- for (TOP element : ((FSArray<?>) fs)._getTheArray()) {
+ for (TOP element : ((FSArray) fs)._getTheArray()) {
final int v = getTgtSeqFromSrcFS(element);
writeDiff(io, v, prev);
if (isUpdatePrevOK && isFirstElement) {
@@ -1049,6 +1049,7 @@ public class BinaryCasSerDes6 implements SlotKindsConstants {
* Caller iterates over target slots, but the feat arg is for the corresponding src feature
* @param fs the FS whose slot "feat" is to be serialize
* @param feat the corresponding source feature slot to serialize
+ * @throws IOException
*/
// @formatter:on
private void serializeByKind(TOP fs, FeatureImpl feat) throws IOException {
@@ -1095,7 +1096,7 @@ public class BinaryCasSerDes6 implements SlotKindsConstants {
} // end of switch
}
- private int serializeArrayLength(CommonArrayFS<?> array) throws IOException {
+ private int serializeArrayLength(CommonArrayFS array) throws IOException {
final int length = array.size();
writeVnumber(arrayLength_i, length);
return length;
@@ -1113,8 +1114,8 @@ public class BinaryCasSerDes6 implements SlotKindsConstants {
/**
* Called for non-arrays
*
- * @param ti
- * the type
+ * @param fs
+ * used to get the type
* @param featOffset
* offset to the slot
* @param newValue
@@ -1132,6 +1133,9 @@ public class BinaryCasSerDes6 implements SlotKindsConstants {
/**
* version called for arrays, captures the 0th value
+ *
+ * @param ti
+ * @param newValue
*/
private void updatePrevArray0IntValue(TypeImpl ti, int newValue) {
final int[] featCache = initPrevIntValue(ti);
@@ -1233,9 +1237,9 @@ public class BinaryCasSerDes6 implements SlotKindsConstants {
long startTime = System.currentTimeMillis();
int zipBufSize = Math.max(1024, baos.size() / 100);
deflater.reset();
- try (var cds = new DeflaterOutputStream(baosZipped, deflater, zipBufSize)) {
- baos.writeTo(cds);
- }
+ DeflaterOutputStream cds = new DeflaterOutputStream(baosZipped, deflater, zipBufSize);
+ baos.writeTo(cds);
+ cds.close();
idxAndLen.add(i);
if (doMeasurements) {
idxAndLen.add((int) (sm.statDetails[i].afterZip = deflater.getBytesWritten()));
@@ -1586,9 +1590,13 @@ public class BinaryCasSerDes6 implements SlotKindsConstants {
for (FsChange changedFs : modifiedFSs) {
final TOP fs = changedFs.fs;
final TypeImpl srcType = fs._getTypeImpl();
+ if (isTypeMapping && null == typeMapper.mapTypeSrc2Tgt(srcType)) {
+ continue; // skip this fs - it's not in target type system
+ }
+
// probably don't need this test, because change logging is done when a mark is set,
// only for items below the line
- if ((isTypeMapping && null == typeMapper.mapTypeSrc2Tgt(srcType)) || !foundFSsBelowMark.contains(fs._id)) {
+ if (!foundFSsBelowMark.contains(fs._id)) {
// System.out.format(" skipping heap addr %,d%n", currentFsId);
continue;
}
@@ -1679,6 +1687,9 @@ public class BinaryCasSerDes6 implements SlotKindsConstants {
* - Because of this,
* -- v2 deserialization can't read v3 serializations
* -- v3 deserialization can read v2 serializatoins, though.
+ *
+ * @param fsChange
+ * @throws IOException
*/
// @formatter:on
private void writeModsForOneFs(FsChange fsChange) throws IOException {
@@ -1717,17 +1728,20 @@ public class BinaryCasSerDes6 implements SlotKindsConstants {
writeDiff(int_i, vs, vPrevModShort);
vPrevModShort = vs;
break;
+
case Slot_LongRef: {
final long v = ((LongArray) fs).get(index);
writeLong(v, vPrevModLong);
vPrevModLong = v;
break;
}
+
case Slot_DoubleRef: {
final long v = Double.doubleToRawLongBits(((DoubleArray) fs).get(index));
writeDouble(v);
break;
}
+
case Slot_Int:
vPrevModInt = writeDiff(int_i, ((IntegerArray) fs).get(index), vPrevModInt);
break;
@@ -1848,12 +1862,12 @@ public class BinaryCasSerDes6 implements SlotKindsConstants {
*
* @param istream
* input stream
- * @param aAllowPreexistingFS
+ * @param allowPreexistingFS
* what to do if item already exists below the mark
* @throws IOException
* passthru
*/
- public void deserialize(InputStream istream, AllowPreexistingFS aAllowPreexistingFS)
+ public void deserialize(InputStream istream, AllowPreexistingFS allowPreexistingFS)
throws IOException {
Header h = readHeader(istream);
@@ -1866,19 +1880,19 @@ public class BinaryCasSerDes6 implements SlotKindsConstants {
throw new UnsupportedOperationException("Delta CAS required for this call");
}
- bcsd.reinit(h, deserIn, null, CasLoadMode.DEFAULT, this, aAllowPreexistingFS, null);
+ bcsd.reinit(h, deserIn, null, CasLoadMode.DEFAULT, this, allowPreexistingFS, null);
}
- public void deserializeAfterVersion(DataInputStream istream, boolean aIsDelta,
- AllowPreexistingFS aAllowPreexistingFS) throws IOException {
+ public void deserializeAfterVersion(DataInputStream istream, boolean isDelta,
+ AllowPreexistingFS allowPreexistingFS) throws IOException {
- allowPreexistingFS = aAllowPreexistingFS;
- if (aAllowPreexistingFS == AllowPreexistingFS.ignore) {
+ this.allowPreexistingFS = allowPreexistingFS;
+ if (allowPreexistingFS == AllowPreexistingFS.ignore) {
throw new UnsupportedOperationException("AllowPreexistingFS.ignore not an allowed setting");
}
deserIn = istream;
- isDelta = isReadingDelta = aIsDelta;
+ this.isDelta = isReadingDelta = isDelta;
setupReadStreams();
/************************************************
@@ -1950,9 +1964,9 @@ public class BinaryCasSerDes6 implements SlotKindsConstants {
// @formatter:n
// currentFsId only used in error message
- for (int currentFsId = nextFsId, nbrFSs = 0, nextFsAddr = 1; bcsd.isBeforeV3
+ for (int currentFsId = nextFsId, nbrFSs = 0, nextFsAddr = 1; this.bcsd.isBeforeV3
? nextFsAddr < totalMappedHeapSize
- : nbrFSs < nbrNewFSsInTarget; nbrFSs++, nextFsAddr += bcsd.isBeforeV3
+ : nbrFSs < nbrNewFSsInTarget; nbrFSs++, nextFsAddr += this.bcsd.isBeforeV3
? tgtType.getFsSpaceReq(lastArrayLength)
: 0) {
@@ -2135,10 +2149,13 @@ public class BinaryCasSerDes6 implements SlotKindsConstants {
}
/**
+ *
+ * @param storeIt
* @param srcType
* may be null if there's no source type for target when deserializing
* @param tgtType
* the type being deserialized
+ * @throws IOException
*/
private void readArray(boolean storeIt, TypeImpl srcType, TypeImpl tgtType) throws IOException {
final int length = readArrayLength();
@@ -2250,7 +2267,7 @@ public class BinaryCasSerDes6 implements SlotKindsConstants {
// @formatter:off
/**
- * @param fs The feature structure to set feature value in, but may be null if it was deferred,
+ * @param The feature structure to set feature value in, but may be null if it was deferred,
* - happens for Sofas and subtypes of AnnotationBase
* because those have "final" values
* For Sofa: these are the sofaid (String) and sofanum (int)
@@ -2294,7 +2311,7 @@ public class BinaryCasSerDes6 implements SlotKindsConstants {
}
if (srcTs.annotBaseSofaFeat != srcFeat || sofaRef == null) {
- // https://issues.apache.org/jira/browse/UIMA-5588
+ https: // issues.apache.org/jira/browse/UIMA-5588
maybeStoreOrDefer(storeIt, fs, (lfs) -> {
// outer defer done if fs is null; it is a one-feature-structure defer for sofa or
@@ -2422,6 +2439,8 @@ public class BinaryCasSerDes6 implements SlotKindsConstants {
/**
* process index information to re-index things
+ *
+ * @throws IOException
*/
private void readIndexedFeatureStructures() throws IOException {
final int nbrViews = readVnumber(control_dis);
@@ -2648,9 +2667,11 @@ public class BinaryCasSerDes6 implements SlotKindsConstants {
}
/**
+ *
* @param storeIt
* true to store value, false to skip it
* @return the string
+ * @throws IOException
*/
private String readString(boolean storeIt) throws IOException {
final int length = decodeIntSign(readVnumber(strLength_dis));
@@ -2870,6 +2891,7 @@ public class BinaryCasSerDes6 implements SlotKindsConstants {
* the modified feature structure
* @param srcType
* the type of the modified feature structure
+ * @throws IOException
*/
private void readModifiedMainHeap(int numberOfMods, TOP fs, TypeImpl srcType)
throws IOException {
@@ -3078,7 +3100,15 @@ public class BinaryCasSerDes6 implements SlotKindsConstants {
/**
* processes one view's worth of feature structures
+ *
+ * @param fsIndexes
+ * @param fsNdxStart
+ * @param isDoingEnqueue
+ * @param isWrite
+ * @return
+ * @throws IOException
*/
+
private void processFSsForView(final boolean isEnqueue, Stream<TOP> fss) {
// prev id and entries written as a captured value in context
@@ -3125,9 +3155,13 @@ public class BinaryCasSerDes6 implements SlotKindsConstants {
}
}
+ // @formatter:off
/**
- * Add Fs to toBeProcessed and set foundxxx bit - skip this if doesn't exist in target type system
+ * Add Fs to toBeProcessed and set foundxxx bit
+ * - skip this if doesn't exist in target type system
+ * @param fs
*/
+ // @formatter:on
private void enqueueFS(TOP fs) {
if (null == fs || !isTypeInTgt(fs)) {
return;
@@ -3584,6 +3618,7 @@ public class BinaryCasSerDes6 implements SlotKindsConstants {
* fs == null -> 0
* type not in target -> 0
* map src fs._id to tgt seq
+ * @param fs
* @return 0 or the mapped src id
*/
// @formatter:on
@@ -3602,7 +3637,7 @@ public class BinaryCasSerDes6 implements SlotKindsConstants {
}
TypeSystemImpl getTgtTs() {
- return tgtTs;
+ return this.tgtTs;
}
// number of views: cas.getNumberOfViews()
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/BooleanConstraint.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/BooleanConstraint.java
index 37f0b1087..10eccd236 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/BooleanConstraint.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/BooleanConstraint.java
@@ -35,12 +35,12 @@ public class BooleanConstraint extends PathConstraint implements FSMatchConstrai
BooleanConstraint(ArrayList<String> path, FSBooleanConstraint constraint) {
super(path);
- cons = constraint;
+ this.cons = constraint;
}
@Override
public boolean match(FeatureStructure fs) {
- final int max = featNames.size() - 1; // The last position in the
+ final int max = this.featNames.size() - 1; // The last position in the
// path!
if (max < 0) {
// If the path is empty, we can't get a boolean, and therefore the
@@ -49,17 +49,17 @@ public class BooleanConstraint extends PathConstraint implements FSMatchConstrai
}
Feature feat;
for (int i = 0; i < max; i++) {
- feat = fs.getType().getFeatureByBaseName(featNames.get(i));
+ feat = fs.getType().getFeatureByBaseName(this.featNames.get(i));
if (feat == null) {
return false;
}
fs = fs.getFeatureValue(feat);
}
- feat = fs.getType().getFeatureByBaseName(featNames.get(max));
+ feat = fs.getType().getFeatureByBaseName(this.featNames.get(max));
if (feat == null) {
return false;
}
- return cons.match(fs.getBooleanValue(feat));
+ return this.cons.match(fs.getBooleanValue(feat));
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/ByteHeap.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/ByteHeap.java
index ca3fdf906..6064a3919 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/ByteHeap.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/ByteHeap.java
@@ -38,17 +38,17 @@ final class ByteHeap extends CommonAuxHeap {
@Override
void initMemory() {
- heap = new byte[heapBaseSize];
+ this.heap = new byte[this.heapBaseSize];
}
@Override
void initMemory(int size) {
- heap = new byte[size];
+ this.heap = new byte[size];
}
@Override
int getCapacity() {
- return heap.length;
+ return this.heap.length;
}
@Override
@@ -64,12 +64,12 @@ final class ByteHeap extends CommonAuxHeap {
@Override
void resetToZeros() {
- Arrays.fill(heap, 0, heapPos, (byte) NULL);
+ Arrays.fill(this.heap, 0, this.heapPos, (byte) NULL);
}
// Getters
byte getHeapValue(int offset) {
- return heap[offset];
+ return this.heap[offset];
}
// setters
@@ -109,7 +109,7 @@ final class ByteHeap extends CommonAuxHeap {
heap = new byte[argLength];
System.arraycopy(byteHeap, 0, heap, 0, argLength);
- heapPos = argLength;
+ this.heapPos = argLength;
}
public byte[] toArray() {
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASCompleteSerializer.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASCompleteSerializer.java
index 21dba309e..2ecd0bf16 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASCompleteSerializer.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASCompleteSerializer.java
@@ -44,16 +44,16 @@ public class CASCompleteSerializer implements Serializable {
public CASCompleteSerializer(CASImpl cas) {
this();
- casMgrSer = Serialization.serializeCASMgr(cas);
- casSer = Serialization.serializeCAS(cas);
+ this.casMgrSer = Serialization.serializeCASMgr(cas);
+ this.casSer = Serialization.serializeCAS(cas);
}
public CASMgrSerializer getCASMgrSerializer() {
- return casMgrSer;
+ return this.casMgrSer;
}
public CASSerializer getCASSerializer() {
- return casSer;
+ return this.casSer;
}
/**
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
index a65b9fc2f..c5bb00e99 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
@@ -1209,7 +1209,7 @@ public class CASImpl extends AbstractCas_ImplBase
// FSClassRegistry instances
}
- svd = new SharedViewData(this, initialHeapSize, ts);
+ this.svd = new SharedViewData(this, initialHeapSize, ts);
// this.svd.baseCAS = this;
// this.svd.heap = new Heap(initialHeapSize);
@@ -1218,13 +1218,13 @@ public class CASImpl extends AbstractCas_ImplBase
commitTypeSystem();
}
- svd.sofa2indexMap = new ArrayList<>();
- svd.sofaNbr2ViewMap = new ArrayList<>();
- svd.sofaNameSet = new HashSet<>();
- svd.initialSofaCreated = false;
- svd.viewCount = 0;
+ this.svd.sofa2indexMap = new ArrayList<>();
+ this.svd.sofaNbr2ViewMap = new ArrayList<>();
+ this.svd.sofaNameSet = new HashSet<>();
+ this.svd.initialSofaCreated = false;
+ this.svd.viewCount = 0;
- svd.clearTrackingMarks();
+ this.svd.clearTrackingMarks();
}
public CASImpl() {
@@ -1238,34 +1238,35 @@ public class CASImpl extends AbstractCas_ImplBase
checkInternalCodes(ser);
// assert(ts != null);
// assert(getTypeSystem() != null);
- indexRepository = ser.getIndexRepository(this);
+ this.indexRepository = ser.getIndexRepository(this);
}
// Use this when creating a CAS view
CASImpl(CASImpl cas, SofaFS aSofa) {
// these next fields are final and must be set in the constructor
- svd = cas.svd;
+ this.svd = cas.svd;
- mySofaRef = (Sofa) aSofa;
+ this.mySofaRef = (Sofa) aSofa;
// get the indexRepository for this Sofa
- indexRepository = (mySofaRef == null) ? (FSIndexRepositoryImpl) cas.getSofaIndexRepository(1)
+ this.indexRepository = (this.mySofaRef == null)
+ ? (FSIndexRepositoryImpl) cas.getSofaIndexRepository(1)
: (FSIndexRepositoryImpl) cas.getSofaIndexRepository(aSofa);
- if (null == indexRepository) {
+ if (null == this.indexRepository) {
// create the indexRepository for this CAS
// use the baseIR to create a lightweight IR copy
FSIndexRepositoryImpl baseIndexRepo = (FSIndexRepositoryImpl) cas.getBaseIndexRepository();
- indexRepository = new FSIndexRepositoryImpl(this, baseIndexRepo);
+ this.indexRepository = new FSIndexRepositoryImpl(this, baseIndexRepo);
// the index creation depends on "indexRepository" already being set
baseIndexRepo.name2indexMap.keySet().stream()
- .forEach(key -> indexRepository.createIndex(baseIndexRepo, key));
- indexRepository.commit();
+ .forEach(key -> this.indexRepository.createIndex(baseIndexRepo, key));
+ this.indexRepository.commit();
// save new sofa index
- if (mySofaRef == null) {
- cas.setSofaIndexRepository(1, indexRepository);
+ if (this.mySofaRef == null) {
+ cas.setSofaIndexRepository(1, this.indexRepository);
} else {
- cas.setSofaIndexRepository(aSofa, indexRepository);
+ cas.setSofaIndexRepository(aSofa, this.indexRepository);
}
}
}
@@ -1275,29 +1276,29 @@ public class CASImpl extends AbstractCas_ImplBase
if (aSofa != null) {
// save address of SofaFS
- mySofaRef = (Sofa) aSofa;
+ this.mySofaRef = (Sofa) aSofa;
} else {
// this is the InitialView
- mySofaRef = null;
+ this.mySofaRef = null;
}
// toss the JCas, if it exists
- jcas = null;
+ this.jcas = null;
// create the indexRepository for this Sofa
final FSIndexRepositoryImpl baseIndexRepo = (FSIndexRepositoryImpl) ((CASImpl) cas)
.getBaseIndexRepository();
- indexRepository = new FSIndexRepositoryImpl(this, baseIndexRepo);
+ this.indexRepository = new FSIndexRepositoryImpl(this, baseIndexRepo);
// the index creation depends on "indexRepository" already being set
baseIndexRepo.name2indexMap.keySet().stream()
- .forEach(key -> indexRepository.createIndex(baseIndexRepo, key));
+ .forEach(key -> this.indexRepository.createIndex(baseIndexRepo, key));
- indexRepository.commit();
+ this.indexRepository.commit();
// save new sofa index
- if (mySofaRef == null) {
- ((CASImpl) cas).setSofaIndexRepository(1, indexRepository);
+ if (this.mySofaRef == null) {
+ ((CASImpl) cas).setSofaIndexRepository(1, this.indexRepository);
} else {
- ((CASImpl) cas).setSofaIndexRepository(aSofa, indexRepository);
+ ((CASImpl) cas).setSofaIndexRepository(aSofa, this.indexRepository);
}
}
@@ -1401,7 +1402,7 @@ public class CASImpl extends AbstractCas_ImplBase
@Override
public void enableReset(boolean flag) {
- svd.flushEnabled = flag;
+ this.svd.flushEnabled = flag;
}
@Override
@@ -1411,9 +1412,9 @@ public class CASImpl extends AbstractCas_ImplBase
public final TypeSystemImpl getTypeSystemImpl() {
if (tsi_local == null) {
- tsi_local = svd.tsi;
+ tsi_local = this.svd.tsi;
}
- return tsi_local;
+ return this.tsi_local;
}
/**
@@ -1422,14 +1423,14 @@ public class CASImpl extends AbstractCas_ImplBase
* @param ts
*/
void installTypeSystemInAllViews(TypeSystemImpl ts) {
- svd.tsi = ts;
- final List<CASImpl> sn2v = svd.sofaNbr2ViewMap;
+ this.svd.tsi = ts;
+ final List<CASImpl> sn2v = this.svd.sofaNbr2ViewMap;
if (sn2v.size() > 0) {
for (CASImpl view : sn2v.subList(1, sn2v.size())) {
view.tsi_local = ts;
}
}
- getBaseCAS().tsi_local = ts;
+ this.getBaseCAS().tsi_local = ts;
}
@Override
@@ -1619,11 +1620,15 @@ public class CASImpl extends AbstractCas_ImplBase
// return true if only one sofa and it is the default text sofa
public boolean isBackwardCompatibleCas() {
// check that there is exactly one sofa
- if ((svd.viewCount != 1) || !svd.initialSofaCreated) {
+ if (this.svd.viewCount != 1) {
return false;
}
- Sofa sofa = getInitialView().getSofa();
+ if (!this.svd.initialSofaCreated) {
+ return false;
+ }
+
+ Sofa sofa = this.getInitialView().getSofa();
// check for mime type exactly equal to "text"
String sofaMime = sofa.getMimeType();
@@ -1645,7 +1650,7 @@ public class CASImpl extends AbstractCas_ImplBase
}
int getViewCount() {
- return svd.viewCount;
+ return this.svd.viewCount;
}
FSIndexRepository getSofaIndexRepository(SofaFS aSofa) {
@@ -1653,10 +1658,10 @@ public class CASImpl extends AbstractCas_ImplBase
}
FSIndexRepositoryImpl getSofaIndexRepository(int aSofaRef) {
- if (aSofaRef >= svd.sofa2indexMap.size()) {
+ if (aSofaRef >= this.svd.sofa2indexMap.size()) {
return null;
}
- return svd.sofa2indexMap.get(aSofaRef);
+ return this.svd.sofa2indexMap.get(aSofaRef);
}
void setSofaIndexRepository(SofaFS aSofa, FSIndexRepositoryImpl indxRepos) {
@@ -1664,7 +1669,7 @@ public class CASImpl extends AbstractCas_ImplBase
}
void setSofaIndexRepository(int aSofaRef, FSIndexRepositoryImpl indxRepos) {
- Misc.setWithExpand(svd.sofa2indexMap, aSofaRef, indxRepos);
+ Misc.setWithExpand(this.svd.sofa2indexMap, aSofaRef, indxRepos);
}
@Override
@@ -1679,36 +1684,36 @@ public class CASImpl extends AbstractCas_ImplBase
}
Sofa createSofa(String sofaName, String mimeType) {
- return createSofa(++svd.viewCount, sofaName, mimeType);
+ return createSofa(++this.svd.viewCount, sofaName, mimeType);
}
Sofa createSofa(int sofaNum, String sofaName, String mimeType) {
- if (svd.sofaNameSet.contains(sofaName)) {
+ if (this.svd.sofaNameSet.contains(sofaName)) {
throw new CASRuntimeException(CASRuntimeException.SOFANAME_ALREADY_EXISTS, sofaName);
}
- final boolean viewAlreadyExists = sofaNum == svd.viewCount;
+ final boolean viewAlreadyExists = sofaNum == this.svd.viewCount;
if (!viewAlreadyExists) {
if (sofaNum == 1) { // skip the test for sofaNum == 1 - this can be set "later"
- if (svd.viewCount == 0) {
- svd.viewCount = 1;
+ if (this.svd.viewCount == 0) {
+ this.svd.viewCount = 1;
} // else it is == or higher, so don't reset it down
} else { // sofa is not initial sofa - is guaranteed to be set when view created
// if (sofaNum != this.svd.viewCount + 1) {
// System.out.println("debug");
// }
- assert (sofaNum == svd.viewCount + 1);
- svd.viewCount = sofaNum;
+ assert (sofaNum == this.svd.viewCount + 1);
+ this.svd.viewCount = sofaNum;
}
}
- Sofa sofa = new Sofa(getTypeSystemImpl().sofaType, getBaseCAS(), // view for a sofa is the
- // base cas to correspond
- // to where it gets
- // indexed
+ Sofa sofa = new Sofa(getTypeSystemImpl().sofaType, this.getBaseCAS(), // view for a sofa is the
+ // base cas to correspond
+ // to where it gets
+ // indexed
sofaNum, sofaName, mimeType);
- getBaseIndexRepository().addFS(sofa);
- svd.sofaNameSet.add(sofaName);
+ this.getBaseIndexRepository().addFS(sofa);
+ this.svd.sofaNameSet.add(sofaName);
if (!viewAlreadyExists) {
getView(sofa); // create the view that goes with this Sofa
}
@@ -1716,23 +1721,23 @@ public class CASImpl extends AbstractCas_ImplBase
}
boolean hasView(String name) {
- return svd.sofaNameSet.contains(name);
+ return this.svd.sofaNameSet.contains(name);
}
Sofa createInitialSofa(String mimeType) {
Sofa sofa = createSofa(1, CAS.NAME_DEFAULT_SOFA, mimeType);
registerInitialSofa();
- mySofaRef = sofa;
+ this.mySofaRef = sofa;
return sofa;
}
void registerInitialSofa() {
- svd.initialSofaCreated = true;
+ this.svd.initialSofaCreated = true;
}
boolean isInitialSofaCreated() {
- return svd.initialSofaCreated;
+ return this.svd.initialSofaCreated;
}
/**
@@ -1746,7 +1751,7 @@ public class CASImpl extends AbstractCas_ImplBase
}
private SofaFS getSofa(String sofaName) {
- FSIterator<Sofa> iterator = svd.baseCAS.getSofaIterator();
+ FSIterator<Sofa> iterator = this.svd.baseCAS.getSofaIterator();
while (iterator.hasNext()) {
SofaFS sofa = iterator.next();
if (sofaName.equals(sofa.getSofaID())) {
@@ -1778,23 +1783,23 @@ public class CASImpl extends AbstractCas_ImplBase
}
public CASImpl getBaseCAS() {
- return svd.baseCAS;
+ return this.svd.baseCAS;
}
@Override
public <T extends SofaFS> FSIterator<T> getSofaIterator() {
- FSIndex<T> sofaIndex = svd.baseCAS.indexRepository.<T> getIndex(CAS.SOFA_INDEX_NAME);
+ FSIndex<T> sofaIndex = this.svd.baseCAS.indexRepository.<T> getIndex(CAS.SOFA_INDEX_NAME);
return sofaIndex.iterator();
}
// For internal use only
public Sofa getSofaRef() {
- if (mySofaRef == null) {
+ if (this.mySofaRef == null) {
// create the SofaFS for _InitialView ...
// ... and reset mySofaRef to point to it
- mySofaRef = createInitialSofa(null);
+ this.mySofaRef = this.createInitialSofa(null);
}
- return mySofaRef;
+ return this.mySofaRef;
}
// For internal use only
@@ -1927,18 +1932,18 @@ public class CASImpl extends AbstractCas_ImplBase
}
private void createIndexRepository() {
- if (!getTypeSystemMgr().isCommitted()) {
+ if (!this.getTypeSystemMgr().isCommitted()) {
throw new CASAdminException(CASAdminException.MUST_COMMIT_TYPE_SYSTEM);
}
- if (indexRepository == null) {
- indexRepository = new FSIndexRepositoryImpl(this);
+ if (this.indexRepository == null) {
+ this.indexRepository = new FSIndexRepositoryImpl(this);
}
}
@Override
public FSIndexRepositoryMgr getIndexRepositoryMgr() {
// assert(this.cas.getIndexRepository() != null);
- return indexRepository;
+ return this.indexRepository;
}
@Deprecated
@@ -1966,13 +1971,13 @@ public class CASImpl extends AbstractCas_ImplBase
if (isCasLocked()) {
throw new CASAdminException(CASAdminException.FLUSH_DISABLED);
}
- if (this == svd.baseCAS) {
+ if (this == this.svd.baseCAS) {
resetNoQuestions();
return;
}
// called from a CAS view.
// clear CAS ...
- svd.baseCAS.resetNoQuestions();
+ this.svd.baseCAS.resetNoQuestions();
}
public void resetNoQuestions() {
@@ -1990,33 +1995,33 @@ public class CASImpl extends AbstractCas_ImplBase
@Override
public FSIndexRepository getIndexRepository() {
- if (this == svd.baseCAS) {
+ if (this == this.svd.baseCAS) {
// BaseCas has no indexes for users
return null;
}
- if (indexRepository.isCommitted()) {
- return indexRepository;
+ if (this.indexRepository.isCommitted()) {
+ return this.indexRepository;
}
return null;
}
FSIndexRepository getBaseIndexRepository() {
- if (svd.baseCAS.indexRepository.isCommitted()) {
- return svd.baseCAS.indexRepository;
+ if (this.svd.baseCAS.indexRepository.isCommitted()) {
+ return this.svd.baseCAS.indexRepository;
}
return null;
}
FSIndexRepositoryImpl getBaseIndexRepositoryImpl() {
- return svd.baseCAS.indexRepository;
+ return this.svd.baseCAS.indexRepository;
}
void addSofaFsToIndex(SofaFS sofa) {
- svd.baseCAS.getBaseIndexRepository().addFS(sofa);
+ this.svd.baseCAS.getBaseIndexRepository().addFS(sofa);
}
void registerView(Sofa aSofa) {
- mySofaRef = aSofa;
+ this.mySofaRef = aSofa;
}
/**
@@ -2033,7 +2038,7 @@ public class CASImpl extends AbstractCas_ImplBase
*/
@Override
public CAS getCAS() {
- if (indexRepository.isCommitted()) {
+ if (this.indexRepository.isCommitted()) {
return this;
}
throw new CASAdminException(CASAdminException.MUST_COMMIT_INDEX_REPOSITORY);
@@ -2066,7 +2071,7 @@ public class CASImpl extends AbstractCas_ImplBase
// log the FS
- final Map<TOP, FsChange> changes = svd.modifiedPreexistingFSs;
+ final Map<TOP, FsChange> changes = this.svd.modifiedPreexistingFSs;
// create or use last FsChange element
@@ -2090,7 +2095,7 @@ public class CASImpl extends AbstractCas_ImplBase
// log the FS
- final Map<TOP, FsChange> changes = svd.modifiedPreexistingFSs;
+ final Map<TOP, FsChange> changes = this.svd.modifiedPreexistingFSs;
// create or use last FsChange element
@@ -2182,7 +2187,7 @@ public class CASImpl extends AbstractCas_ImplBase
}
public final boolean isLoggingNeeded(FeatureStructureImplC fs) {
- return svd.trackingMark != null && !svd.trackingMark.isNew(fs._id);
+ return this.svd.trackingMark != null && !this.svd.trackingMark.isNew(fs._id);
}
/**
@@ -2238,7 +2243,7 @@ public class CASImpl extends AbstractCas_ImplBase
}
final public boolean isLogging() {
- return svd.trackingMark != null;
+ return this.svd.trackingMark != null;
}
// /**
@@ -2533,17 +2538,17 @@ public class CASImpl extends AbstractCas_ImplBase
throw new CASException(CASException.MUST_COMMIT_TYPE_SYSTEM);
}
- FSIndexComparator comp = indexRepository.createComparator();
+ FSIndexComparator comp = this.indexRepository.createComparator();
comp.setType(ts.sofaType);
comp.addKey(ts.sofaNum, FSIndexComparator.STANDARD_COMPARE);
- indexRepository.createIndex(comp, CAS.SOFA_INDEX_NAME, FSIndex.BAG_INDEX);
+ this.indexRepository.createIndex(comp, CAS.SOFA_INDEX_NAME, FSIndex.BAG_INDEX);
- comp = indexRepository.createComparator();
+ comp = this.indexRepository.createComparator();
comp.setType(ts.annotType);
comp.addKey(ts.startFeat, FSIndexComparator.STANDARD_COMPARE);
comp.addKey(ts.endFeat, FSIndexComparator.REVERSE_STANDARD_COMPARE);
- comp.addKey(indexRepository.getDefaultTypeOrder(), FSIndexComparator.STANDARD_COMPARE);
- indexRepository.createIndex(comp, CAS.STD_ANNOTATION_INDEX);
+ comp.addKey(this.indexRepository.getDefaultTypeOrder(), FSIndexComparator.STANDARD_COMPARE);
+ this.indexRepository.createIndex(comp, CAS.STD_ANNOTATION_INDEX);
}
// ///////////////////////////////////////////////////////////////////////////
@@ -2564,18 +2569,18 @@ public class CASImpl extends AbstractCas_ImplBase
@Override
public JCas getJCas() {
- if (jcas == null) {
- jcas = JCasImpl.getJCas(this);
+ if (this.jcas == null) {
+ this.jcas = JCasImpl.getJCas(this);
}
- return jcas;
+ return this.jcas;
}
@Override
public JCasImpl getJCasImpl() {
- if (jcas == null) {
- jcas = JCasImpl.getJCas(this);
+ if (this.jcas == null) {
+ this.jcas = JCasImpl.getJCas(this);
}
- return jcas;
+ return this.jcas;
}
// /**
@@ -2591,7 +2596,7 @@ public class CASImpl extends AbstractCas_ImplBase
@Override
public JCas getJCas(SofaFS aSofa) throws CASException {
// Create base JCas, if needed
- svd.baseCAS.getJCas();
+ this.svd.baseCAS.getJCas();
return getView(aSofa).getJCas();
/*
@@ -2691,7 +2696,7 @@ public class CASImpl extends AbstractCas_ImplBase
// which is now creating the associated view
// create a new CAS view
- aView = new CASImpl(svd.baseCAS, sofa);
+ aView = new CASImpl(this.svd.baseCAS, sofa);
svd.setViewForSofaNbr(sofaNbr, aView);
verifySofaNameUniqueIfDeserializedViewAdded(sofaNbr, sofa);
return aView;
@@ -2726,7 +2731,7 @@ public class CASImpl extends AbstractCas_ImplBase
* input, which would make this logic fail.
*/
private void verifySofaNameUniqueIfDeserializedViewAdded(int sofaNbr, SofaFS aSofa) {
- final int curViewCount = svd.viewCount;
+ final int curViewCount = this.svd.viewCount;
if (curViewCount < sofaNbr) {
// Only true for deserialized sofas with new views being either created,
// or
@@ -2734,14 +2739,14 @@ public class CASImpl extends AbstractCas_ImplBase
// views.
// Assume sofa numbers are incrementing by 1
assert (sofaNbr == curViewCount + 1);
- svd.viewCount = sofaNbr;
+ this.svd.viewCount = sofaNbr;
String id = aSofa.getSofaID();
// final Feature idFeat =
// getTypeSystem().getFeatureByFullName(CAS.FEATURE_FULL_NAME_SOFAID);
// String id =
// ll_getStringValue(((FeatureStructureImpl)aSofa).getAddress(),
// ((FeatureImpl) idFeat).getCode());
- Misc.assertUie(svd.sofaNameSet.contains(id));
+ Misc.assertUie(this.svd.sofaNameSet.contains(id));
// this.svd.sofaNameSet.add(id);
}
}
@@ -2763,7 +2768,7 @@ public class CASImpl extends AbstractCas_ImplBase
*/
@Override
public LowLevelIndexRepository ll_getIndexRepository() {
- return indexRepository;
+ return this.indexRepository;
}
/**
@@ -3997,7 +4002,7 @@ public class CASImpl extends AbstractCas_ImplBase
*/
@Override
public ClassLoader getJCasClassLoader() {
- return svd.jcasClassLoader;
+ return this.svd.jcasClassLoader;
}
/*
@@ -4007,11 +4012,11 @@ public class CASImpl extends AbstractCas_ImplBase
*/
@Override
public void setJCasClassLoader(ClassLoader classLoader) {
- svd.jcasClassLoader = classLoader;
+ this.svd.jcasClassLoader = classLoader;
}
public void switchClassLoader(ClassLoader newClassLoader, boolean wasLocked) {
- svd.switchClassLoader(newClassLoader, wasLocked);
+ this.svd.switchClassLoader(newClassLoader, wasLocked);
}
// Internal use only, public for cross package use
@@ -4044,8 +4049,8 @@ public class CASImpl extends AbstractCas_ImplBase
// }
public void restoreClassLoaderUnlockCas() {
- boolean empty_switchControl = svd.switchControl.isEmpty();
- SwitchControl switchControlInstance = empty_switchControl ? null : svd.switchControl.pop();
+ boolean empty_switchControl = this.svd.switchControl.isEmpty();
+ SwitchControl switchControlInstance = empty_switchControl ? null : this.svd.switchControl.pop();
if (empty_switchControl || !switchControlInstance.wasLocked) {
// unlock CAS functions
enableReset(true);
@@ -4506,10 +4511,10 @@ public class CASImpl extends AbstractCas_ImplBase
*/
// @formatter:on
public void updateDocumentAnnotation() {
- if (!mySofaIsValid() || this == svd.baseCAS) {
+ if (!mySofaIsValid() || this == this.svd.baseCAS) {
return;
}
- String newDoc = mySofaRef.getLocalStringData();
+ String newDoc = this.mySofaRef.getLocalStringData();
if (null != newDoc) {
Annotation docAnnot = getDocumentAnnotationNoCreate();
if (docAnnot != null) {
@@ -4551,7 +4556,7 @@ public class CASImpl extends AbstractCas_ImplBase
}
public <T extends AnnotationFS> T getDocumentAnnotationNoCreate() {
- if (this == svd.baseCAS) {
+ if (this == this.svd.baseCAS) {
// base CAS has no document
return null;
}
@@ -4587,7 +4592,7 @@ public class CASImpl extends AbstractCas_ImplBase
@Override
public String getDocumentLanguage() {
- if (this == svd.baseCAS) {
+ if (this == this.svd.baseCAS) {
// base CAS has no document
return null;
}
@@ -4596,12 +4601,12 @@ public class CASImpl extends AbstractCas_ImplBase
@Override
public String getDocumentText() {
- return getSofaDataString();
+ return this.getSofaDataString();
}
@Override
public String getSofaDataString() {
- if (this == svd.baseCAS) {
+ if (this == this.svd.baseCAS) {
// base CAS has no document
return null;
}
@@ -4610,7 +4615,7 @@ public class CASImpl extends AbstractCas_ImplBase
@Override
public FeatureStructure getSofaDataArray() {
- if (this == svd.baseCAS) {
+ if (this == this.svd.baseCAS) {
// base CAS has no Sofa
return null;
}
@@ -4619,7 +4624,7 @@ public class CASImpl extends AbstractCas_ImplBase
@Override
public String getSofaDataURI() {
- if (this == svd.baseCAS) {
+ if (this == this.svd.baseCAS) {
// base CAS has no Sofa
return null;
}
@@ -4628,7 +4633,7 @@ public class CASImpl extends AbstractCas_ImplBase
@Override
public InputStream getSofaDataStream() {
- if (this == svd.baseCAS) {
+ if (this == this.svd.baseCAS) {
// base CAS has no Sofa nothin
return null;
}
@@ -4639,7 +4644,7 @@ public class CASImpl extends AbstractCas_ImplBase
@Override
public String getSofaMimeType() {
- if (this == svd.baseCAS) {
+ if (this == this.svd.baseCAS) {
// base CAS has no Sofa
return null;
}
@@ -4666,7 +4671,7 @@ public class CASImpl extends AbstractCas_ImplBase
}
private boolean mySofaIsValid() {
- return mySofaRef != null;
+ return this.mySofaRef != null;
}
void setDocTextFromDeserializtion(String text) {
@@ -4678,7 +4683,7 @@ public class CASImpl extends AbstractCas_ImplBase
@Override
public void setDocumentLanguage(String languageCode) {
- if (this == svd.baseCAS) {
+ if (this == this.svd.baseCAS) {
throw new CASRuntimeException(CASRuntimeException.INVALID_BASE_CAS_METHOD,
"setDocumentLanguage(String)");
}
@@ -4686,13 +4691,13 @@ public class CASImpl extends AbstractCas_ImplBase
FeatureImpl languageFeature = getTypeSystemImpl().langFeat;
languageCode = Language.normalize(languageCode);
boolean wasRemoved = this.checkForInvalidFeatureSetting(docAnnot, languageFeature.getCode(),
- getAddbackSingle());
+ this.getAddbackSingle());
docAnnot.setStringValue(getTypeSystemImpl().langFeat, languageCode);
addbackSingleIfWasRemoved(wasRemoved, docAnnot);
}
private void setSofaThingsMime(Consumer<Sofa> c, String msg) {
- if (this == svd.baseCAS) {
+ if (this == this.svd.baseCAS) {
throw new CASRuntimeException(CASRuntimeException.INVALID_BASE_CAS_METHOD, msg);
}
Sofa sofa = getSofaRef();
@@ -4723,11 +4728,11 @@ public class CASImpl extends AbstractCas_ImplBase
@Override
public void setCurrentComponentInfo(ComponentInfo info) {
// always store component info in base CAS
- svd.componentInfo = info;
+ this.svd.componentInfo = info;
}
ComponentInfo getCurrentComponentInfo() {
- return svd.componentInfo;
+ return this.svd.componentInfo;
}
/**
@@ -4744,7 +4749,7 @@ public class CASImpl extends AbstractCas_ImplBase
// throw e;
// }
// }
- indexRepository.addFS(fs);
+ this.indexRepository.addFS(fs);
}
/**
@@ -4752,7 +4757,7 @@ public class CASImpl extends AbstractCas_ImplBase
*/
@Override
public void removeFsFromIndexes(FeatureStructure fs) {
- indexRepository.removeFS(fs);
+ this.indexRepository.removeFS(fs);
}
/**
@@ -4801,12 +4806,12 @@ public class CASImpl extends AbstractCas_ImplBase
*/
public int getNumberOfViews() {
CASImpl initialView = getInitialView(); // creates one if not existing, w/o sofa
- int nbrSofas = svd.baseCAS.indexRepository.getIndex(CAS.SOFA_INDEX_NAME).size();
+ int nbrSofas = this.svd.baseCAS.indexRepository.getIndex(CAS.SOFA_INDEX_NAME).size();
return initialView.mySofaIsValid() ? nbrSofas : 1 + nbrSofas;
}
public int getNumberOfSofas() {
- return svd.baseCAS.indexRepository.getIndex(CAS.SOFA_INDEX_NAME).size();
+ return this.svd.baseCAS.indexRepository.getIndex(CAS.SOFA_INDEX_NAME).size();
}
/*
@@ -4909,7 +4914,7 @@ public class CASImpl extends AbstractCas_ImplBase
* action to perform on the views.
*/
public void forAllViews(Consumer<CASImpl> processViews) {
- final int numViews = getNumberOfViews();
+ final int numViews = this.getNumberOfViews();
for (int viewNbr = 1; viewNbr <= numViews; viewNbr++) {
CASImpl view = (viewNbr == 1) ? getInitialView() : (CASImpl) getView(viewNbr);
processViews.accept(view);
@@ -4935,7 +4940,7 @@ public class CASImpl extends AbstractCas_ImplBase
* the code to execute
*/
void forAllIndexRepos(Consumer<FSIndexRepositoryImpl> processIr) {
- final int numViews = getViewCount();
+ final int numViews = this.getViewCount();
for (int viewNum = 1; viewNum <= numViews; viewNum++) {
processIr.accept(this.getSofaIndexRepository(viewNum));
}
@@ -5075,21 +5080,21 @@ public class CASImpl extends AbstractCas_ImplBase
if (isCasLocked()) {
throw new CASAdminException(CASAdminException.FLUSH_DISABLED);
}
- svd.trackingMark = new MarkerImpl(getLastUsedFsId() + 1, this);
- if (svd.modifiedPreexistingFSs == null) {
- svd.modifiedPreexistingFSs = new IdentityHashMap<>();
+ this.svd.trackingMark = new MarkerImpl(this.getLastUsedFsId() + 1, this);
+ if (this.svd.modifiedPreexistingFSs == null) {
+ this.svd.modifiedPreexistingFSs = new IdentityHashMap<>();
}
- if (svd.modifiedPreexistingFSs.size() > 0) {
+ if (this.svd.modifiedPreexistingFSs.size() > 0) {
errorMultipleMarkers();
}
- if (svd.trackingMarkList == null) {
- svd.trackingMarkList = new ArrayList<>();
+ if (this.svd.trackingMarkList == null) {
+ this.svd.trackingMarkList = new ArrayList<>();
} else {
errorMultipleMarkers();
}
- svd.trackingMarkList.add(svd.trackingMark);
- return svd.trackingMark;
+ this.svd.trackingMarkList.add(this.svd.trackingMark);
+ return this.svd.trackingMark;
}
private void errorMultipleMarkers() {
@@ -5098,7 +5103,7 @@ public class CASImpl extends AbstractCas_ImplBase
// made public https://issues.apache.org/jira/browse/UIMA-2478
public MarkerImpl getCurrentMark() {
- return svd.trackingMark;
+ return this.svd.trackingMark;
}
/**
@@ -5106,14 +5111,14 @@ public class CASImpl extends AbstractCas_ImplBase
* @return an array of FsChange items, one per modified Fs, sorted in order of fs._id
*/
FsChange[] getModifiedFSList() {
- final Map<TOP, FsChange> mods = svd.modifiedPreexistingFSs;
+ final Map<TOP, FsChange> mods = this.svd.modifiedPreexistingFSs;
FsChange[] r = mods.values().toArray(new FsChange[mods.size()]);
Arrays.sort(r, 0, mods.size(), (c1, c2) -> Integer.compare(c1.fs._id, c2.fs._id));
return r;
}
boolean isInModifiedPreexisting(TOP fs) {
- return svd.modifiedPreexistingFSs.containsKey(fs);
+ return this.svd.modifiedPreexistingFSs.containsKey(fs);
}
@Override
@@ -5200,7 +5205,7 @@ public class CASImpl extends AbstractCas_ImplBase
}
public <T extends TOP> T getFsFromId(int id) {
- return (T) svd.id2fs.get(id);
+ return (T) this.svd.id2fs.get(id);
}
// /**
@@ -5282,7 +5287,7 @@ public class CASImpl extends AbstractCas_ImplBase
}
public boolean isInCAS(FeatureStructure fs) {
- return ((TOP) fs)._casView.getBaseCAS() == getBaseCAS();
+ return ((TOP) fs)._casView.getBaseCAS() == this.getBaseCAS();
}
// /**
@@ -5574,7 +5579,7 @@ public class CASImpl extends AbstractCas_ImplBase
}
CommonSerDesSequential newCsds() {
- return svd.csds = new CommonSerDesSequential(getBaseCAS());
+ return svd.csds = new CommonSerDesSequential(this.getBaseCAS());
}
/**
@@ -5909,9 +5914,9 @@ public class CASImpl extends AbstractCas_ImplBase
MeasureSwitchType(TypeImpl oldType, TypeImpl newType) {
this.oldType = oldType;
- oldJCasClassName = oldType.getJavaClass().getName();
+ this.oldJCasClassName = oldType.getJavaClass().getName();
this.newType = newType;
- newJCasClassName = newType.getJavaClass().getName();
+ this.newJCasClassName = newType.getJavaClass().getName();
}
@Override
@@ -5930,7 +5935,10 @@ public class CASImpl extends AbstractCas_ImplBase
if (this == obj) {
return true;
}
- if ((obj == null) || !(obj instanceof MeasureSwitchType)) {
+ if (obj == null) {
+ return false;
+ }
+ if (!(obj instanceof MeasureSwitchType)) {
return false;
}
MeasureSwitchType other = (MeasureSwitchType) obj;
@@ -6041,7 +6049,7 @@ public class CASImpl extends AbstractCas_ImplBase
* @return the initial heap size specified or defaulted
*/
public int getInitialHeapSize() {
- return svd.initialHeapSize;
+ return this.svd.initialHeapSize;
}
// backwards compatibility - reinit calls
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java
index 1ff4066c2..b8fb60542 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java
@@ -192,7 +192,7 @@ public class CASMgrSerializer implements Serializable {
*/
public void addIndexRepository(FSIndexRepositoryImpl ir) {
// Encode the type order.
- typeOrder = ir.getDefaultTypeOrder().getOrder();
+ 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<>();
@@ -208,28 +208,28 @@ public class CASMgrSerializer implements Serializable {
// Now we know how many labels there are.
final int numNames = names.size();
// Create the array for the labels.
- indexNames = new String[numNames];
+ this.indexNames = new String[numNames];
String label;
// Fill the name array.
for (int i = 0; i < numNames; i++) {
// Get the next label.
label = names.get(i);
// Add the label.
- indexNames[i] = label;
+ this.indexNames[i] = label;
}
// Create a vector of the indexes, and build the name-to-index map.
- nameToIndexMap = new int[numNames];
+ this.nameToIndexMap = new int[numNames];
Vector<FSIndex<FeatureStructure>> indexVector = new Vector<>();
FSIndex<FeatureStructure> index;
int pos;
for (int i = 0; i < numNames; i++) {
- index = ir.getIndex(indexNames[i]);
+ index = ir.getIndex(this.indexNames[i]);
pos = indexVector.indexOf(index);
if (pos < 0) { // if we haven't yet recorded this index in indexVector
indexVector.add(index); // add it to the indexVector
pos = indexVector.size() - 1; // set the pos to the entry just added
}
- nameToIndexMap[i] = pos; // store the position of the index in the indexVector in this
+ this.nameToIndexMap[i] = pos; // store the position of the index in the indexVector in this
// map
}
// Now we know how many indexes there are.
@@ -242,13 +242,13 @@ public class CASMgrSerializer implements Serializable {
// ((TypeImpl) ((FSIndex) indexVector.get(i)).getType()).getCode();
// }
// Create the array with the indexing strategy.
- indexingStrategy = new int[numIndexes];
+ this.indexingStrategy = new int[numIndexes];
for (int i = 0; i < numIndexes; i++) {
- indexingStrategy[i] = indexVector.get(i).getIndexingStrategy();
+ this.indexingStrategy[i] = indexVector.get(i).getIndexingStrategy();
}
// Create the array for the comparator index.
- comparatorIndex = new int[numIndexes];
+ this.comparatorIndex = new int[numIndexes];
// Put the comparators in an IntVector since we don't know how long it
// will get.
IntVector comps = new IntVector();
@@ -260,7 +260,7 @@ public class CASMgrSerializer implements Serializable {
for (int i = 0; i < numIndexes; i++) {
// Set the comparator index to the current position in comparator
// array.
- comparatorIndex[i] = compPos;
+ this.comparatorIndex[i] = compPos;
// Get the comparator.
comp = ((LowLevelIndex<FeatureStructure>) indexVector.get(i)).getComparatorForIndexSpecs();
// Encode the type of the comparator.
@@ -288,11 +288,11 @@ public class CASMgrSerializer implements Serializable {
compPos += 1 + (2 * numCompFeats);
}
// Set the comparator array.
- comparators = comps.toArray();
+ this.comparators = comps.toArray();
}
public void addTypeSystem(TypeSystemImpl ts) {
- typeNames = ts.types.stream().map(type -> (null == type) ? null : type.getName())
+ this.typeNames = ts.types.stream().map(type -> (null == type) ? null : type.getName())
.toArray(String[]::new);
encodeTypeInheritance(ts);
encodeFeatureDecls(ts);
@@ -302,8 +302,8 @@ public class CASMgrSerializer implements Serializable {
private void encodeStringSubtypes(TypeSystemImpl ts) {
Vector<Type> list = getStringSubtypes(ts);
final int size = list.size();
- stringSubtypes = new int[size];
- stringSubtypeValuePos = new int[size];
+ this.stringSubtypes = new int[size];
+ this.stringSubtypeValuePos = new int[size];
List<String> strVals = new ArrayList<>();
TypeImpl_string type;
int pos = 0, typeCode;
@@ -311,17 +311,17 @@ public class CASMgrSerializer implements Serializable {
for (int i = 0; i < size; i++) {
type = (TypeImpl_string) list.get(i);
typeCode = type.getCode();
- stringSubtypes[i] = typeCode;
- stringSubtypeValuePos[i] = pos;
+ this.stringSubtypes[i] = typeCode;
+ this.stringSubtypeValuePos[i] = pos;
stringSet = ts.ll_getStringSet(typeCode);
pos += stringSet.length;
for (int j = 0; j < stringSet.length; j++) {
strVals.add(stringSet[j]);
}
}
- stringSubtypeValues = new String[strVals.size()];
+ this.stringSubtypeValues = new String[strVals.size()];
for (int i = 0; i < strVals.size(); i++) {
- stringSubtypeValues[i] = strVals.get(i);
+ this.stringSubtypeValues[i] = strVals.get(i);
}
}
@@ -348,32 +348,32 @@ public class CASMgrSerializer implements Serializable {
private void encodeFeatureDecls(TypeSystemImpl ts) {
final int max = ts.getSmallestFeature() + ts.getNumberOfFeatures();
- featureNames = new String[max];
- featDecls = new int[max * 3];
+ this.featureNames = new String[max];
+ this.featDecls = new int[max * 3];
Feature f;
for (int i = ts.getSmallestFeature(); i < max; i++) {
f = ts.ll_getFeatureForCode(i);
- featureNames[i] = f.getShortName();
- featDecls[i * 3] = ((TypeImpl) f.getDomain()).getCode();
- featDecls[(i * 3) + 1] = ((TypeImpl) f.getRange()).getCode();
- featDecls[(i * 3) + 2] = f.isMultipleReferencesAllowed() ? 1 : 0;
+ this.featureNames[i] = f.getShortName();
+ this.featDecls[i * 3] = ((TypeImpl) f.getDomain()).getCode();
+ this.featDecls[(i * 3) + 1] = ((TypeImpl) f.getRange()).getCode();
+ this.featDecls[(i * 3) + 2] = f.isMultipleReferencesAllowed() ? 1 : 0;
}
}
private void encodeTypeInheritance(TypeSystemImpl ts) {
final int tsize = ts.getTypeArraySize();
- typeInheritance = new int[tsize];
+ this.typeInheritance = new int[tsize];
// The smallest type is top, which doesn't inherit.
int i = ts.getSmallestType() + 1;
for (TypeImpl t : ts.types.subList(2, tsize)) {
- typeInheritance[i++] = t.getSuperType().getCode();
+ this.typeInheritance[i++] = t.getSuperType().getCode();
}
}
// Ouch.
private int isStringSubtype(int type) {
- for (int i = 0; i < stringSubtypes.length; i++) {
- if (stringSubtypes[i] == type) {
+ for (int i = 0; i < this.stringSubtypes.length; i++) {
+ if (this.stringSubtypes[i] == type) {
return i;
}
}
@@ -391,14 +391,14 @@ public class CASMgrSerializer implements Serializable {
private String[] getStringArray(int pos) {
int end;
- if (pos == stringSubtypes.length - 1) {
+ if (pos == this.stringSubtypes.length - 1) {
// last entry in list, get all the rest
- end = stringSubtypeValues.length;
+ end = this.stringSubtypeValues.length;
} else {
// else get up to the next entry
- end = stringSubtypeValuePos[pos + 1];
+ end = this.stringSubtypeValuePos[pos + 1];
}
- return getSubarray(stringSubtypeValues, stringSubtypeValuePos[pos], end);
+ return getSubarray(this.stringSubtypeValues, this.stringSubtypeValuePos[pos], end);
}
public TypeSystemImpl getTypeSystem() {
@@ -429,8 +429,8 @@ public class CASMgrSerializer implements Serializable {
// }
// }
// } else {
- for (int i = 2; i < typeNames.length; i++) {
- name = typeNames[i];
+ for (int i = 2; i < this.typeNames.length; i++) {
+ name = this.typeNames[i];
int pos = isStringSubtype(i);
if (pos >= 0) {
ts.addStringSubtype(name, getStringArray(pos));
@@ -438,21 +438,21 @@ public class CASMgrSerializer implements Serializable {
ts.getArrayType(ts.getType(TypeSystemImpl.getArrayComponentName(name)));
} else {
if (ts.getType(name) == null) {
- ts.addType(name, ts.ll_getTypeForCode(typeInheritance[i]));
+ ts.addType(name, ts.ll_getTypeForCode(this.typeInheritance[i]));
}
}
}
// Add feature declarations.
- final int max = featureNames.length;
+ final int max = this.featureNames.length;
for (int i = 1; i < max; i++) {
// if (this.source == SOURCE_TAF) {
// name = CASImpl.mapName(this.featureNames[i], nameMap);
// } else {
- name = featureNames[i];
+ name = this.featureNames[i];
// }
- ts.addFeature(name, ts.getTypeForCode(featDecls[i * 3]),
- ts.getTypeForCode(featDecls[(i * 3) + 1]), featDecls[(i * 3) + 2] == 1);
+ ts.addFeature(name, ts.getTypeForCode(this.featDecls[i * 3]),
+ ts.getTypeForCode(this.featDecls[(i * 3) + 1]), this.featDecls[(i * 3) + 2] == 1);
}
return ts;
}
@@ -472,64 +472,64 @@ public class CASMgrSerializer implements Serializable {
// index creation refs via the cas the index repository
// Get the type order.
ir.setDefaultTypeOrder(
- LinearTypeOrderBuilderImpl.createTypeOrder(typeOrder, cas.getTypeSystem()));
+ LinearTypeOrderBuilderImpl.createTypeOrder(this.typeOrder, cas.getTypeSystem()));
FSIndexComparator comp;
- final int max = indexNames.length;
+ final int max = this.indexNames.length;
int pos = 0, next, maxComp;
Type type;
Feature feat;
- if (nameToIndexMap == null) { // if nameToIndexMap is null
- nameToIndexMap = new int[max]; // create an identity map by default
+ if (this.nameToIndexMap == null) { // if nameToIndexMap is null
+ this.nameToIndexMap = new int[max]; // create an identity map by default
for (int i = 0; i < max; i++) {
- nameToIndexMap[i] = i;
+ this.nameToIndexMap[i] = i;
}
}
for (int i = 0; i < max; i++) {
comp = ir.createComparator();
// assert(pos == comparatorIndex[i]);
- pos = comparatorIndex[nameToIndexMap[i]]; // pos jumps by odd numbers, 1: type, 2-3,
+ pos = this.comparatorIndex[this.nameToIndexMap[i]]; // pos jumps by odd numbers, 1: type, 2-3,
// 4-5 etc are pairs: feature code and
// direction
- type = cas.getTypeSystemImpl().ll_getTypeForCode(comparators[pos]);
+ type = cas.getTypeSystemImpl().ll_getTypeForCode(this.comparators[pos]);
comp.setType(type);
++pos;
// set the end of the feat/dir pairs to the next item or the length of the array if the last
// item
- next = nameToIndexMap[i] + 1;
+ next = this.nameToIndexMap[i] + 1;
if (next < max) {
- maxComp = comparatorIndex[next];
+ maxComp = this.comparatorIndex[next];
} else {
- maxComp = comparators.length;
+ maxComp = this.comparators.length;
}
TypeSystemImpl tsi = (TypeSystemImpl) cas.getTypeSystem();
while (pos < maxComp) {
// System.out.println("Type system: " +
// cas.getTypeSystem().toString());
- if (comparators[pos] > 0) {
- feat = tsi.ll_getFeatureForCode(comparators[pos]);
+ if (this.comparators[pos] > 0) {
+ feat = tsi.ll_getFeatureForCode(this.comparators[pos]);
// assert(feat != null);
// System.out.println("Adding feature: " + feat.getName());
++pos;
- comp.addKey(feat, comparators[pos]);
+ comp.addKey(feat, this.comparators[pos]);
// assert(rc >= 0);
} else {
LinearTypeOrder order = ir.getDefaultTypeOrder();
++pos;
- comp.addKey(order, comparators[pos]); // the direction is always standard, never
+ comp.addKey(order, this.comparators[pos]); // the direction is always standard, never
// reverse
}
++pos;
}
- ir.createIndex(comp, indexNames[i], indexingStrategy[nameToIndexMap[i]]);
+ ir.createIndex(comp, this.indexNames[i], this.indexingStrategy[this.nameToIndexMap[i]]);
}
ir.commit();
return ir;
}
public boolean hasIndexRepository() {
- return typeOrder != null;
+ return this.typeOrder != null;
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASSerializer.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASSerializer.java
index 15b562c6d..d54ecb595 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASSerializer.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASSerializer.java
@@ -166,7 +166,7 @@ public class CASSerializer implements Serializable {
// the
// cas
bcsd.scanAllFSsForBinarySerialization(null, csds); // no mark
- fsIndex = bcsd.getIndexedFSs(csds.fs2addr); // must follow scanAll...
+ this.fsIndex = bcsd.getIndexedFSs(csds.fs2addr); // must follow scanAll...
if (addMetaData) {
// some details about current main-heap specifications
@@ -175,7 +175,7 @@ public class CASSerializer implements Serializable {
// is 7 words long
// not serialized by custom serializers, only by Java object serialization
int heapsz = bcsd.heap.getCellsUsed();
- heapMetaData = new int[] { Heap.getRoundedSize(heapsz), // a bit more than the size of
+ this.heapMetaData = new int[] { Heap.getRoundedSize(heapsz), // a bit more than the size of
// the used heap
heapsz, // the position of the next (unused) slot in the heap
heapsz, 0, 0, 1024, // initial size
@@ -307,7 +307,7 @@ public class CASSerializer implements Serializable {
DataOutputStream dos = new DataOutputStream(ostream);
// get the indexed FSs for all views
- fsIndex = bcsd.getIndexedFSs(csds.fs2addr);
+ this.fsIndex = bcsd.getIndexedFSs(csds.fs2addr);
// output the key and version number
CommonSerDes.createHeader().seqVer(2) // 0 original, 1 UIMA-4743 2 for uima v3
@@ -384,9 +384,9 @@ public class CASSerializer implements Serializable {
// }
// output the index FSs
- dos.writeInt(fsIndex.length);
- for (int i = 0; i < fsIndex.length; i++) {
- dos.writeInt(fsIndex[i]);
+ dos.writeInt(this.fsIndex.length);
+ for (int i = 0; i < this.fsIndex.length; i++) {
+ dos.writeInt(this.fsIndex[i]);
}
// 8bit heap
@@ -511,7 +511,7 @@ public class CASSerializer implements Serializable {
break;
}
if (fs instanceof CommonArrayFS) {
- CommonArrayFS<?> ca = (CommonArrayFS<?>) fs;
+ CommonArrayFS ca = (CommonArrayFS) fs;
SlotKind kind = fs._getTypeImpl().getComponentSlotKind();
switch (kind) {
case Slot_BooleanRef:
@@ -542,7 +542,7 @@ public class CASSerializer implements Serializable {
DataOutputStream dos = new DataOutputStream(ostream);
// get the indexed FSs
- fsIndex = bcsd.getDeltaIndexedFSs(mark, csds.fs2addr);
+ this.fsIndex = bcsd.getDeltaIndexedFSs(mark, csds.fs2addr);
CommonSerDes.createHeader().delta().seqVer(2) // 1 for UIMA-4743 2 for uima v3
.v3().write(dos);
@@ -591,9 +591,9 @@ public class CASSerializer implements Serializable {
}
// output the index FSs
- dos.writeInt(fsIndex.length);
- for (int i = 0; i < fsIndex.length; i++) {
- dos.writeInt(fsIndex[i]);
+ dos.writeInt(this.fsIndex.length);
+ for (int i = 0; i < this.fsIndex.length; i++) {
+ dos.writeInt(this.fsIndex[i]);
}
// 8bit heap new
@@ -688,19 +688,24 @@ public class CASSerializer implements Serializable {
/**
* Scan the v3 fsChange info and produce v2 style info into chgXxxAddr, chgXxxValue
*
- * A pre-scan approach is needed in order to write the number of modifications preceding the write
+ * A prescan approach is needed in order to write the number of modifications preceding the write
* of the values (which unfortunately were written to the same stream in V2).
*
* @param bcsd
* holds the model needed for v2 aux arrays
- * @param chgMainAvs
+ * @param cas
+ * the cas to use for the delta serialization
+ * @param chgMainHeapAddr
* an ordered collection of changed addresses as an array for the main heap
- * @param chgByteAvs
+ * @param chgByteAddr
* an ordered collection of changed addresses as an array for the aux byte heap
- * @param chgShortAvs
+ * @param chgShortAddr
* an ordered collection of changed addresses as an array for the aus short heap
- * @param chgLongAvs
+ * @param chgLongAddr
* an ordered collection of changed addresses as an array for the aux long heap
+ *
+ * @param chgMainHeapValue
+ * corresponding values
*/
static void scanModifications(BinaryCasSerDes bcsd, CommonSerDesSequential csds,
FsChange[] fssModified, Obj2IntIdentityHashMap<TOP> fs2auxOffset,
@@ -786,7 +791,7 @@ public class CASSerializer implements Serializable {
case Slot_HeapRef:
fsChange.arrayUpdates.forAllInts(index -> {
- TOP tgtFs = (TOP) ((FSArray<?>) fs).get(index);
+ TOP tgtFs = (TOP) ((FSArray) fs).get(index);
chgMainAvs.add(new AddrPlusValue(convertArrayIndexToMainHeapAddr(index, fs, fs2addr),
fs2addr.get(tgtFs)));
});
@@ -883,38 +888,38 @@ public class CASSerializer implements Serializable {
// }
int[] getHeapMetadata() {
- return heapMetaData;
+ return this.heapMetaData;
}
int[] getHeapArray() {
- return heapArray;
+ return this.heapArray;
}
String[] getStringTable() {
- return stringTable;
+ return this.stringTable;
}
int[] getFSIndex() {
- return fsIndex;
+ return this.fsIndex;
}
byte[] getByteArray() {
- return byteHeapArray;
+ return this.byteHeapArray;
}
short[] getShortArray() {
- return shortHeapArray;
+ return this.shortHeapArray;
}
long[] getLongArray() {
- return longHeapArray;
+ return this.longHeapArray;
}
private void copyHeapsToArrays(BinaryCasSerDes bcsd) {
- heapArray = bcsd.heap.toArray();
- byteHeapArray = bcsd.byteHeap.toArray();
- shortHeapArray = bcsd.shortHeap.toArray();
- longHeapArray = bcsd.longHeap.toArray();
- stringTable = bcsd.stringHeap.toArray();
+ this.heapArray = bcsd.heap.toArray();
+ this.byteHeapArray = bcsd.byteHeap.toArray();
+ this.shortHeapArray = bcsd.shortHeap.toArray();
+ this.longHeapArray = bcsd.longHeap.toArray();
+ this.stringTable = bcsd.stringHeap.toArray();
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasCompare.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasCompare.java
index 0de8df5a9..2b1d41e61 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasCompare.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasCompare.java
@@ -334,7 +334,10 @@ public class CasCompare {
if (this == obj) {
return true;
}
- if ((obj == null) || (getClass() != obj.getClass())) {
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
return false;
}
ScsKey other = (ScsKey) obj;
@@ -1473,7 +1476,11 @@ public class CasCompare {
private int compareFeature(TOP fs1, TOP fs2, TypeImpl ti1, FeatureImpl fi1) {
int r = 0;
if (inSortContext && isTypeMapping) {
- if ((isSrcCas && typeMapper.getTgtFeature(ti1, fi1) == null) || (!isSrcCas && typeMapper.getSrcFeature(ti1, fi1) == null)) {
+ if (isSrcCas && typeMapper.getTgtFeature(ti1, fi1) == null) {
+ return 0; // skip tests for features not in target type system
+ // so when comparing CASs, the src value won't cause a miscompare
+ }
+ if (!isSrcCas && typeMapper.getSrcFeature(ti1, fi1) == null) {
return 0; // types/features belong to target in this case
}
}
@@ -1509,9 +1516,14 @@ public class CasCompare {
if (isTypeMapping) {
+ if (isSrcCas && typeMapper.getTgtFeature(ti, fi) == null) {
+ continue; // skip for features not in target type system
+ // so when comparing CASs, the src value won't cause a miscompare
+ }
+
// probably not executed, since types discovered on first sort
// except for a type that exists only the the target
- if ((isSrcCas && typeMapper.getTgtFeature(ti, fi) == null) || (!isSrcCas && typeMapper.getSrcFeature(ti, fi) == null)) {
+ if (!isSrcCas && typeMapper.getSrcFeature(ti, fi) == null) {
continue; // types/features belong to target in this case
}
@@ -1920,7 +1932,13 @@ public class CasCompare {
private int compareRefResult(TOP rfs1, TOP rfs2) {
// exception: treat canonical empty lists
- if ((!inSortContext && IS_CANONICAL_EMPTY_LISTS && rfs1 instanceof EmptyList) || (prev1.size() <= 0)) {
+ if (!inSortContext && IS_CANONICAL_EMPTY_LISTS && rfs1 instanceof EmptyList) {
+ // if (prev1.size() <= 0 || prev2.size() <= 0) {
+ return 0;
+ // }
+ }
+
+ if (prev1.size() <= 0) {
return 0; // no recursion case
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSeqAddrMaps.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSeqAddrMaps.java
index ff30a9890..a1e38a251 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSeqAddrMaps.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSeqAddrMaps.java
@@ -72,15 +72,15 @@ public class CasSeqAddrMaps {
public CasSeqAddrMaps() {
// this call makes the first real seq number == 1.
// seq 0 refers to the NULL fs value.
- tgtId2SrcFs = new ArrayList<>();
- srcId2TgtId = new Int2IntRBT();
+ this.tgtId2SrcFs = new ArrayList<>();
+ this.srcId2TgtId = new Int2IntRBT();
addItemId(null, 0, true);
}
// copy constructor
public CasSeqAddrMaps(List<TOP> tgtSeq2SrcFs, Int2IntRBT srcAddr2TgtSeq) {
- tgtId2SrcFs = tgtSeq2SrcFs;
- srcId2TgtId = srcAddr2TgtSeq;
+ this.tgtId2SrcFs = tgtSeq2SrcFs;
+ this.srcId2TgtId = srcAddr2TgtSeq;
}
/**
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSerializerSupport.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSerializerSupport.java
index 453506b72..ba685fa55 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSerializerSupport.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSerializerSupport.java
@@ -195,7 +195,7 @@ public class CasSerializerSupport {
* @return the original instance, possibly updated
*/
public CasSerializerSupport setPrettyPrint(boolean pp) {
- isFormattedOutput = pp;
+ this.isFormattedOutput = pp;
return this;
}
@@ -208,7 +208,7 @@ public class CasSerializerSupport {
* @return the original instance, possibly updated
*/
public CasSerializerSupport setFilterTypes(TypeSystemImpl ts) {
- filterTypeSystem = ts;
+ this.filterTypeSystem = ts;
return this;
}
@@ -237,7 +237,7 @@ public class CasSerializerSupport {
* @return the original instance, possibly updated
*/
public CasSerializerSupport setErrorHandler(ErrorHandler eh) {
- errorHandler = eh;
+ this.errorHandler = eh;
return this;
}
@@ -478,10 +478,10 @@ public class CasSerializerSupport {
this.sharedData = sharedData;
// copy outer class values into final inner ones, to keep the outer thread-safe
- filterTypeSystem_inner = filterTypeSystem;
- isFormattedOutput_inner = isFormattedOutput;
+ filterTypeSystem_inner = CasSerializerSupport.this.filterTypeSystem;
+ isFormattedOutput_inner = CasSerializerSupport.this.isFormattedOutput;
this.marker = marker;
- errorHandler2 = errorHandler;
+ errorHandler2 = CasSerializerSupport.this.errorHandler;
tsi = cas.getTypeSystemImpl();
queue = new ArrayDeque<>();
@@ -505,8 +505,8 @@ public class CasSerializerSupport {
+ " multiple references. These will be serialized in duplicate.",
fi.getName());
Misc.decreasingWithTrace(errorCount, message, logger);
- if (errorHandler2 != null) {
- errorHandler2.warning(new SAXParseException(message, null));
+ if (this.errorHandler2 != null) {
+ this.errorHandler2.warning(new SAXParseException(message, null));
}
}
@@ -594,7 +594,7 @@ public class CasSerializerSupport {
Collection<TOP> fss = loopIR.getIndexedFSs();
csss.writeView(sofa, fss);
} else { // is Delta Cas
- if (sofaNum != 1 && marker.isNew(sofa)) {
+ if (sofaNum != 1 && this.marker.isNew(sofa)) {
// for views created after mark (initial view never is - it is always created with the
// CAS)
// write out the view as new
@@ -673,7 +673,7 @@ public class CasSerializerSupport {
if (sharedData == null) {
return;
}
- TOP[] fss = sharedData.getAndSortByIdAllFSsInIdMap();
+ TOP[] fss = this.sharedData.getAndSortByIdAllFSsInIdMap();
previouslySerializedFSs = new ArrayList<>();
for (TOP fs : fss) {
@@ -863,6 +863,10 @@ public class CasSerializerSupport {
* This call is recursive with enqueueFeatures, \ and an arbitrary long chain can get stack
* overflow error. Probably should fix this someday. See
* https://issues.apache.org/jira/browse/UIMA-106
+ *
+ * @param addr
+ * The FS address.
+ * @throws SAXException
*/
private void enqueueFsAndMaybeFeatures(TOP fs) throws SAXException {
if (null == fs) {
@@ -894,6 +898,8 @@ public class CasSerializerSupport {
* noting if they've already been added
* -- this indicates either a loop or another ref from outside,
* -- in either case, return true - t
+ * @param curNode -
+ * @param featCode -
* @return false if no list element is multiply-referenced,
* true if there is a loop or another ref from outside the list, for
* one or more list element nodes
@@ -988,6 +994,13 @@ public class CasSerializerSupport {
/**
* Enqueue all FSs reachable from features of the given FS.
+ *
+ * @param addr
+ * address of an FS
+ * @param typeCode
+ * type of the FS
+ * @param insideListNode
+ * true iff the enclosing FS (addr) is a list type
*/
private void enqueueFeatures(TOP fs) throws SAXException {
@@ -995,6 +1008,7 @@ public class CasSerializerSupport {
* Handle FSArrays
*/
if (fs instanceof FSArray) {
+
TOP[] theArray = ((FSArray) fs)._getTheArray();
for (TOP elem : theArray) {
@@ -1014,7 +1028,6 @@ public class CasSerializerSupport {
if (fs instanceof UimaSerializable) {
((UimaSerializable) fs)._save_to_cas_data();
}
-
for (FeatureImpl fi : fs._getTypeImpl().getFeatureImpls()) {
if (isFiltering && filterTypeSystem_inner.getFeatureByFullName(fi.getName()) == null) {
// skip features that aren't in the target type system
@@ -1114,7 +1127,7 @@ public class CasSerializerSupport {
}
} else if (startOfList_node instanceof FSList && !alreadyVisited) {
// also, we need to enqueue any FSs reachable from an FSList
- enqueueFSListElements((FSList<?>) startOfList_node);
+ enqueueFSListElements((FSList) startOfList_node);
}
break;
}
@@ -1124,8 +1137,11 @@ public class CasSerializerSupport {
/**
* Enqueues all FS reachable from an FSArray.
+ *
+ * @param addr
+ * Address of an FSArray
*/
- private <T extends TOP> void enqueueFSArrayElements(FSArray<T> fsArray) throws SAXException {
+ private void enqueueFSArrayElements(FSArray fsArray) throws SAXException {
for (TOP elem : fsArray._getTheArray()) {
if (elem != null) {
enqueueFsAndMaybeFeatures(elem);
@@ -1136,8 +1152,11 @@ public class CasSerializerSupport {
/**
* Enqueues all Head values of FSList reachable from an FSList. This does NOT include the list
* nodes themselves.
+ *
+ * @param addr
+ * Address of an FSList
*/
- private <T extends TOP> void enqueueFSListElements(FSList<T> node) throws SAXException {
+ private void enqueueFSListElements(FSList<TOP> node) throws SAXException {
node.walkList_saxException(
n -> enqueueFsAndMaybeFeatures(((NonEmptyFSList<TOP>) n).getHead()), null);
}
@@ -1337,7 +1356,10 @@ public class CasSerializerSupport {
}
public int getXmiIdAsInt(TOP fs) {
- if ((fs == null) || (isFiltering && null == filterTypeSystem_inner.getType(fs._getTypeImpl().getName()))) { // return
+ if (fs == null) {
+ return 0;
+ }
+ if (isFiltering && null == filterTypeSystem_inner.getType(fs._getTypeImpl().getName())) { // return
// as
// null
// any
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasTypeSystemMapper.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasTypeSystemMapper.java
index 17a2c363b..58699c5f8 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasTypeSystemMapper.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasTypeSystemMapper.java
@@ -92,7 +92,7 @@ public class CasTypeSystemMapper {
final private boolean typeSystemsSame;
public boolean isEqual() {
- return typeSystemsSame;
+ return this.typeSystemsSame;
}
public CasTypeSystemMapper(TypeSystemImpl tsSrc, TypeSystemImpl tsTgt) {
@@ -121,7 +121,7 @@ public class CasTypeSystemMapper {
fSrc2Tgt = null;
fTgt2Src = null;
}
- typeSystemsSame = tss;
+ this.typeSystemsSame = tss;
}
/**
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonAuxHeap.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonAuxHeap.java
index 52b5bbc55..bf70ade84 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonAuxHeap.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonAuxHeap.java
@@ -110,12 +110,12 @@ abstract class CommonAuxHeap {
initMemory(newSize);
}
}
- heapPos = FIRST_CELL_REF;
+ this.heapPos = FIRST_CELL_REF;
}
int reserve(int numCells) {
- int cellRef = heapPos;
- heapPos += numCells;
+ int cellRef = this.heapPos;
+ this.heapPos += numCells;
growHeapIfNeeded();
return cellRef;
}
@@ -193,7 +193,7 @@ abstract class CommonAuxHeap {
}
int getSize() {
- return heapPos;
+ return this.heapPos;
}
abstract int getCapacity();
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonSerDesSequential.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonSerDesSequential.java
index 10300fc32..38c1911a0 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonSerDesSequential.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonSerDesSequential.java
@@ -102,7 +102,7 @@ public class CommonSerDesSequential {
private int heapEnd; // == the last addr + length of that
public CommonSerDesSequential(CASImpl cas) {
- baseCas = cas.getBaseCAS();
+ this.baseCas = cas.getBaseCAS();
}
public boolean isEmpty() {
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/ConjunctiveConstraint.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/ConjunctiveConstraint.java
index 43632418d..d75fbe2cd 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/ConjunctiveConstraint.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/ConjunctiveConstraint.java
@@ -55,12 +55,12 @@ class ConjunctiveConstraint implements FSMatchConstraint {
@Override
public boolean match(FeatureStructure fs) {
- return (c1.match(fs) && c2.match(fs));
+ return (this.c1.match(fs) && this.c2.match(fs));
}
@Override
public String toString() {
- return "(" + c1.toString() + " & " + c2.toString() + ")";
+ return "(" + this.c1.toString() + " & " + this.c2.toString() + ")";
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/DisjunctiveConstraint.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/DisjunctiveConstraint.java
index 91a38c35e..79a541948 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/DisjunctiveConstraint.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/DisjunctiveConstraint.java
@@ -50,12 +50,12 @@ class DisjunctiveConstraint implements FSMatchConstraint {
@Override
public boolean match(FeatureStructure fs) {
- return (c1.match(fs) || c2.match(fs));
+ return (this.c1.match(fs) || this.c2.match(fs));
}
@Override
public String toString() {
- return "(" + c1.toString() + " | " + c2.toString() + ")";
+ return "(" + this.c1.toString() + " | " + this.c2.toString() + ")";
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/EmbeddedConstraint.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/EmbeddedConstraint.java
index 38bdf3a0a..49e3cb355 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/EmbeddedConstraint.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/EmbeddedConstraint.java
@@ -46,24 +46,24 @@ class EmbeddedConstraint extends PathConstraint implements FSMatchConstraint {
@Override
public boolean match(FeatureStructure fs) {
// compile(((FeatureStructureImpl) fs).getCAS().getTypeSystem());
- final int max = featNames.size();
+ final int max = this.featNames.size();
for (int i = 0; i < max; i++) {
if (fs == null) {
// for now it will throw null pointer exception on next line.
// This is the same behavior as V2
}
- Feature feat = fs.getType().getFeatureByBaseName(featNames.get(i));
+ Feature feat = fs.getType().getFeatureByBaseName(this.featNames.get(i));
if (feat == null) {
return false;
}
fs = fs.getFeatureValue(feat); // could be null
}
- return cons.match(fs);
+ return this.cons.match(fs);
}
@Override
public String toString() {
- return super.toString() + ".( " + cons.toString() + " )";
+ return super.toString() + ".( " + this.cons.toString() + " )";
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSBooleanConstraintImpl.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSBooleanConstraintImpl.java
index 710449ffb..d0c0484a1 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSBooleanConstraintImpl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSBooleanConstraintImpl.java
@@ -41,7 +41,7 @@ public class FSBooleanConstraintImpl implements FSBooleanConstraint {
*/
@Override
public void eq(boolean cond) {
- condition = cond;
+ this.condition = cond;
}
/*
@@ -51,7 +51,7 @@ public class FSBooleanConstraintImpl implements FSBooleanConstraint {
*/
@Override
public boolean match(boolean cond) {
- return (condition == cond);
+ return (this.condition == cond);
}
@Override
@@ -59,7 +59,7 @@ public class FSBooleanConstraintImpl implements FSBooleanConstraint {
// need to escape quotes and backslashes
StringBuffer buf = new StringBuffer();
buf.append("= \"");
- buf.append(condition);
+ buf.append(this.condition);
buf.append('"');
return buf.toString();
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java
index 50246d6a2..4b777674e 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java
@@ -265,7 +265,7 @@ public abstract class FSClassRegistry { // abstract to prevent instantiating; th
this.generator = generator;
this.jcasClass = jcasClass;
this.jcasType = jcasType; // typeId for jcas class, **NOT Typecode**
- features = getJCasClassFeatureInfo(jcasClass);
+ this.features = getJCasClassFeatureInfo(jcasClass);
// System.out.println("debug create jcci, class = " + jcasClass.getName() + ", typeint = " +
// jcasType);
@@ -1354,7 +1354,10 @@ public abstract class FSClassRegistry { // abstract to prevent instantiating; th
Parameter[] p = m.getParameters();
TypeImpl range = fi.getRangeImpl();
- if ((p.length > 1) || (p.length == 1 && (!range.isArray() || p[0].getType() != int.class))) {
+ if (p.length > 1) {
+ continue; // not a getter, which has either 0 or 1 arg(the index int for arrays)
+ }
+ if (p.length == 1 && (!range.isArray() || p[0].getType() != int.class)) {
continue; // has 1 arg, but is not an array or the arg is not an int
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java
index 5e59f1632..8f274466c 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java
@@ -49,41 +49,41 @@ class FSFloatConstraintImpl implements FSFloatConstraint {
private Vector<Float> values;
FSFloatConstraintImpl() {
- codes = new IntVector();
- values = new Vector<>();
+ this.codes = new IntVector();
+ this.values = new Vector<>();
}
@Override
public boolean match(float f) {
- final int max = codes.size();
+ final int max = this.codes.size();
for (int i = 0; i < max; i++) {
- switch (codes.get(i)) {
+ switch (this.codes.get(i)) {
case LT: {
- if (f >= values.get(i)) {
+ if (f >= this.values.get(i)) {
return false;
}
break;
}
case LEQ: {
- if (f > values.get(i)) {
+ if (f > this.values.get(i)) {
return false;
}
break;
}
case EQ: {
- if (f != values.get(i)) {
+ if (f != this.values.get(i)) {
return false;
}
break;
}
case GEQ: {
- if (f < values.get(i)) {
+ if (f < this.values.get(i)) {
return false;
}
break;
}
case GT: {
- if (f <= values.get(i)) {
+ if (f <= this.values.get(i)) {
return false;
}
break;
@@ -105,8 +105,8 @@ class FSFloatConstraintImpl implements FSFloatConstraint {
*/
@Override
public void eq(float f) {
- codes.add(EQ);
- values.add(f);
+ this.codes.add(EQ);
+ this.values.add(f);
}
/**
@@ -117,8 +117,8 @@ class FSFloatConstraintImpl implements FSFloatConstraint {
*/
@Override
public void lt(float f) {
- codes.add(LT);
- values.add(f);
+ this.codes.add(LT);
+ this.values.add(f);
}
/**
@@ -129,8 +129,8 @@ class FSFloatConstraintImpl implements FSFloatConstraint {
*/
@Override
public void leq(float f) {
- codes.add(LEQ);
- values.add(f);
+ this.codes.add(LEQ);
+ this.values.add(f);
}
/**
@@ -141,8 +141,8 @@ class FSFloatConstraintImpl implements FSFloatConstraint {
*/
@Override
public void gt(float f) {
- codes.add(GT);
- values.add(f);
+ this.codes.add(GT);
+ this.values.add(f);
}
/**
@@ -153,21 +153,21 @@ class FSFloatConstraintImpl implements FSFloatConstraint {
*/
@Override
public void geq(float f) {
- codes.add(GEQ);
- values.add(f);
+ this.codes.add(GEQ);
+ this.values.add(f);
}
@Override
public String toString() {
- if (codes.size() == 1) {
- return toString(codes.get(0)) + " " + values.get(0).toString();
+ if (this.codes.size() == 1) {
+ return toString(this.codes.get(0)) + " " + this.values.get(0).toString();
}
StringBuffer buf = new StringBuffer();
buf.append("( ");
- for (int i = 0; i < codes.size(); i++) {
- buf.append(toString(codes.get(i)));
+ for (int i = 0; i < this.codes.size(); i++) {
+ buf.append(toString(this.codes.get(i)));
buf.append(' ');
- buf.append(values.get(i).toString());
+ buf.append(this.values.get(i).toString());
buf.append(' ');
}
buf.append(')');
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexComparatorImpl.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexComparatorImpl.java
index 9d28ae9f4..270a49216 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexComparatorImpl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexComparatorImpl.java
@@ -50,9 +50,9 @@ public class FSIndexComparatorImpl implements FSIndexComparator {
// Public only for testing purposes.
public FSIndexComparatorImpl() {
- type = null;
- keySpecs = new ArrayList<>();
- directions = new IntVector();
+ this.type = null;
+ this.keySpecs = new ArrayList<>();
+ this.directions = new IntVector();
}
private FSIndexComparatorImpl(Type type, List<Object> keySpecs, IntVector directions) {
@@ -72,11 +72,11 @@ public class FSIndexComparatorImpl implements FSIndexComparator {
@Override
public Type getType() {
- return type;
+ return this.type;
}
int getTypeCode() {
- return ((TypeImpl) type).getCode();
+ return ((TypeImpl) this.type).getCode();
}
@Override
@@ -84,48 +84,48 @@ public class FSIndexComparatorImpl implements FSIndexComparator {
if (!checkType(feat.getRange())) {
return -1;
}
- final int rc = keySpecs.size();
- keySpecs.add(feat);
- directions.add(compareKey);
+ final int rc = this.keySpecs.size();
+ this.keySpecs.add(feat);
+ this.directions.add(compareKey);
return rc;
}
@Override
public int addKey(LinearTypeOrder typeOrder, int compareKey) {
- final int rc = keySpecs.size();
- keySpecs.add(typeOrder);
- directions.add(compareKey);
+ final int rc = this.keySpecs.size();
+ this.keySpecs.add(typeOrder);
+ this.directions.add(compareKey);
return rc;
}
@Override
public int getKeyType(int key) {
- return (keySpecs.get(key) instanceof Feature) ? FEATURE_KEY : TYPE_ORDER_KEY;
+ return (this.keySpecs.get(key) instanceof Feature) ? FEATURE_KEY : TYPE_ORDER_KEY;
}
@Override
public int getNumberOfKeys() {
- return keySpecs.size();
+ return this.keySpecs.size();
}
@Override
public FeatureImpl getKeyFeature(int key) {
if (getKeyType(key) == FEATURE_KEY) {
- return (FeatureImpl) keySpecs.get(key);
+ return (FeatureImpl) this.keySpecs.get(key);
}
return null;
}
public LinearTypeOrder getKeyTypeOrder(int key) {
if (getKeyType(key) == TYPE_ORDER_KEY) {
- return (LinearTypeOrder) keySpecs.get(key);
+ return (LinearTypeOrder) this.keySpecs.get(key);
}
return null;
}
@Override
public int getKeyComparator(int key) {
- return directions.get(key);
+ return this.directions.get(key);
}
/**
@@ -140,7 +140,7 @@ public class FSIndexComparatorImpl implements FSIndexComparator {
return false;
}
FSIndexComparatorImpl comp = (FSIndexComparatorImpl) o;
- if (type != comp.type) {
+ if (this.type != comp.type) {
return false;
}
return equalsWithoutType(comp);
@@ -154,12 +154,12 @@ public class FSIndexComparatorImpl implements FSIndexComparator {
* @return true if they're the same comparator
*/
boolean equalsWithoutType(FSIndexComparatorImpl comp) {
- final int max = getNumberOfKeys();
+ final int max = this.getNumberOfKeys();
if (max != comp.getNumberOfKeys()) {
return false;
}
for (int i = 0; i < max; i++) {
- Object keySpec1 = keySpecs.get(i);
+ Object keySpec1 = this.keySpecs.get(i);
Object keySpec2 = comp.keySpecs.get(i);
if (keySpec1 instanceof LinearTypeOrder) {
// equals compares the type codes in the ordered arrays for ==
@@ -177,7 +177,7 @@ public class FSIndexComparatorImpl implements FSIndexComparator {
// also need to confirm offsets are the same
&& f1.getOffset() == f2.getOffset()
&& f1.getAdjustedOffset() == f2.getAdjustedOffset()
- && directions.get(i) == comp.directions.get(i);
+ && this.directions.get(i) == comp.directions.get(i);
if (!featimpl_match) {
return false;
@@ -191,10 +191,10 @@ public class FSIndexComparatorImpl implements FSIndexComparator {
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + ((type == null) ? 31 : type.hashCode());
- final int max = getNumberOfKeys();
+ result = prime * result + ((this.type == null) ? 31 : type.hashCode());
+ final int max = this.getNumberOfKeys();
for (int i = 0; i < max; i++) {
- Object o = keySpecs.get(i); // LinearTypeOrder or feature
+ Object o = this.keySpecs.get(i); // LinearTypeOrder or feature
if (o instanceof LinearTypeOrder) {
result = prime * result + ((LinearTypeOrderBuilderImpl.TotalTypeOrder) o).hashCode();
} else {
@@ -205,7 +205,7 @@ public class FSIndexComparatorImpl implements FSIndexComparator {
// range type name
result = prime * result + f.getOffset();
result = prime * result + f.getAdjustedOffset();
- result = prime * result + directions.get(i);
+ result = prime * result + this.directions.get(i);
}
}
return result;
@@ -213,20 +213,20 @@ public class FSIndexComparatorImpl implements FSIndexComparator {
@Override
public boolean isValid() {
- if (type == null) {
+ if (this.type == null) {
return false;
}
- final int max = getNumberOfKeys();
+ final int max = this.getNumberOfKeys();
Feature feat;
for (int i = 0; i < max; i++) {
if (getKeyType(i) != FEATURE_KEY) {
continue;
}
- feat = (Feature) keySpecs.get(i);
+ feat = (Feature) this.keySpecs.get(i);
// if (feat.getTypeSystem() != ts) {
// return false;
// }
- if (!((TypeImpl) feat.getDomain()).subsumes((TypeImpl) type)) {
+ if (!((TypeImpl) feat.getDomain()).subsumes((TypeImpl) this.type)) {
return false;
}
}
@@ -247,21 +247,21 @@ public class FSIndexComparatorImpl implements FSIndexComparator {
@Override
public int compareTo(FSIndexComparator o) {
FSIndexComparator comp = o;
- final int thisSize = getNumberOfKeys();
+ final int thisSize = this.getNumberOfKeys();
final int compSize = comp.getNumberOfKeys();
int i = 0;
int feat1, feat2;
while ((i < thisSize) && (i < compSize)) {
- feat1 = getKeyFeature(i).getCode();
+ feat1 = this.getKeyFeature(i).getCode();
feat2 = ((FeatureImpl) comp.getKeyFeature(i)).getCode();
if (feat1 < feat2) {
return -1;
} else if (feat1 > feat2) {
return 1;
} else {
- if (getKeyComparator(i) < comp.getKeyComparator(i)) {
+ if (this.getKeyComparator(i) < comp.getKeyComparator(i)) {
return -1;
- } else if (getKeyComparator(i) > comp.getKeyComparator(i)) {
+ } else if (this.getKeyComparator(i) > comp.getKeyComparator(i)) {
return 1;
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexRepositoryImpl.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexRepositoryImpl.java
index 37538c695..dda4dfd82 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexRepositoryImpl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexRepositoryImpl.java
@@ -194,7 +194,7 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
private boolean isSetUpFromBaseCAS = false;
SharedIndexInfo(TypeSystemImpl typeSystem) {
- tsi = typeSystem;
+ this.tsi = typeSystem;
}
}
@@ -228,7 +228,7 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
final ArrayList<FsIndex_iicp<TOP>> indexesForType = new ArrayList<>(0);
IndexesForType(TypeImpl ti) {
- typename = ti.getName();
+ this.typename = ti.getName();
}
<T extends TOP> FsIndex_iicp<T> getNonSetIndex() {
@@ -329,7 +329,7 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
}
IndexesForType getIndexesForUsedType(int i) {
- return indexArray[usedIndexes.get(i)];
+ return indexArray[this.usedIndexes.get(i)];
}
// moved from here into individual indexes over each type, for better locality of reference
@@ -431,16 +431,16 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
@SuppressWarnings("unused")
private FSIndexRepositoryImpl() {
- cas = null; // because it's final
- sii = null;
- name2indexMap = null;
- indexArray = null;
+ this.cas = null; // because it's final
+ this.sii = null;
+ this.name2indexMap = null;
+ this.indexArray = null;
// this.detectIllegalIndexUpdates = null;
// this.flattenedIndexValid = null;
- indexUpdates = null;
- indexUpdateOperation = null;
- usedIndexes = null;
- isUsed = null;
+ this.indexUpdates = null;
+ this.indexUpdateOperation = null;
+ this.usedIndexes = null;
+ this.isUsed = null;
// this.isUsedChanged = true;
// this.iicps4allFSs = null;
}
@@ -452,20 +452,20 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
*/
FSIndexRepositoryImpl(CASImpl cas) {
this.cas = cas;
- sii = new SharedIndexInfo(cas.getTypeSystemImpl());
+ this.sii = new SharedIndexInfo(cas.getTypeSystemImpl());
- final TypeSystemImpl ts = sii.tsi;
+ final TypeSystemImpl ts = this.sii.tsi;
// Type counting starts at 1.
final int numTypes = ts.getNumberOfTypes() + 1;
// this.detectIllegalIndexUpdates = new int[numTypes];
// this.flattenedIndexValid = new ConcurrentBits(numTypes);
- name2indexMap = new HashMap<>();
- indexUpdates = new ArrayList<>();
- indexUpdateOperation = new BitSet();
- logProcessed = false;
- indexArray = new IndexesForType[sii.tsi.getNumberOfTypes() + 1];
- usedIndexes = new IntVector();
- isUsed = new BitSet(numTypes);
+ this.name2indexMap = new HashMap<>();
+ this.indexUpdates = new ArrayList<>();
+ this.indexUpdateOperation = new BitSet();
+ this.logProcessed = false;
+ this.indexArray = new IndexesForType[this.sii.tsi.getNumberOfTypes() + 1];
+ this.usedIndexes = new IntVector();
+ this.isUsed = new BitSet(numTypes);
// this.isUsedChanged = true;
// this.iicps4allFSs = new ArrayList<>();
init();
@@ -480,22 +480,22 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
FSIndexRepositoryImpl(CASImpl cas, FSIndexRepositoryImpl baseIndexRepo) {
this.cas = cas;
- sii = baseIndexRepo.sii;
+ this.sii = baseIndexRepo.sii;
sii.isSetUpFromBaseCAS = true; // bypasses initialization already done
- final TypeSystemImpl ts = sii.tsi;
+ final TypeSystemImpl ts = this.sii.tsi;
// Type counting starts at 1.
final int numTypes = ts.getNumberOfTypes() + 1;
// this.detectIllegalIndexUpdates = new int[numTypes];
// this.flattenedIndexValid = new ConcurrentBits(numTypes);
- name2indexMap = new HashMap<>();
- indexUpdates = new ArrayList<>();
- indexUpdateOperation = new BitSet();
- logProcessed = false;
- indexArray = new IndexesForType[numTypes];
- usedIndexes = new IntVector();
- isUsed = new BitSet(numTypes);
+ this.name2indexMap = new HashMap<>();
+ this.indexUpdates = new ArrayList<>();
+ this.indexUpdateOperation = new BitSet();
+ this.logProcessed = false;
+ this.indexArray = new IndexesForType[numTypes];
+ this.usedIndexes = new IntVector();
+ this.isUsed = new BitSet(numTypes);
// this.isUsedChanged = true;
// this.iicps4allFSs = new ArrayList<>();
init();
@@ -509,7 +509,7 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
* Initialize data. Common initialization called from the constructors.
*/
private void init() {
- final TypeSystemImpl ts = sii.tsi;
+ final TypeSystemImpl ts = this.sii.tsi;
// **********************************************
// for each type in the TypeSystem,
@@ -519,7 +519,7 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
final int numTypes = ts.getNumberOfTypes() + 1; // Type counting starts at 1.
// Can't instantiate arrays of generic types, but this is ok for ArrayList.
for (int i = 1; i < numTypes; i++) {
- indexArray[i] = new IndexesForType(ts.types.get(i));
+ this.indexArray[i] = new IndexesForType(ts.types.get(i));
}
// Arrays.fill(detectIllegalIndexUpdates, Integer.MIN_VALUE);
@@ -552,7 +552,7 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
@Override
public boolean createIndex(FSIndexComparator comp, String label, int indexType)
throws CASAdminException {
- if (locked) {
+ if (this.locked) {
throw new CASAdminException(CASAdminException.REPOSITORY_LOCKED);
}
return createIndexNoQuestionsAsked(comp, label, indexType);
@@ -575,11 +575,11 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
public <T extends FeatureStructure> boolean createIndexNoQuestionsAsked(
final FSIndexComparator comp, String label, int indexType) {
- FsIndex_iicp<TOP> cp = name2indexMap.get(label);
+ FsIndex_iicp<TOP> cp = this.name2indexMap.get(label);
if (cp == null) {
// Create new index
- cp = addNewIndexRecursive(comp, indexType);
+ cp = this.addNewIndexRecursive(comp, indexType);
// create a set of feature codes that are in one or more index definitions,
// only once for all cas views
@@ -592,7 +592,7 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
}
}
- name2indexMap.put(label, cp);
+ this.name2indexMap.put(label, cp);
return true;
}
@@ -636,7 +636,7 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
*/
//@formatter:on
public void removeIndex(String label) {
- FsIndex_iicp<TOP> cp = name2indexMap.get(label);
+ FsIndex_iicp<TOP> cp = this.name2indexMap.get(label);
if (cp == null) {
return;
}
@@ -658,11 +658,15 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
* Reset all indexes, in one view.
*/
public void flush() {
+ if (!this.locked) {
+ return;
+ }
+
// if (DEBUG) {
// System.out.println("Index Flush Top");
// }
// Do nothing really fast!
- if (!locked || (usedIndexes.size() == 0)) {
+ if (this.usedIndexes.size() == 0) {
return;
}
@@ -671,7 +675,7 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
// isUsedChanged = true;
// iicps4allFSs.clear();
for (int i = 0; i < usedIndexes.size(); i++) {
- int used = usedIndexes.get(i);
+ int used = this.usedIndexes.get(i);
for (FsIndex_iicp<?> iicp : indexArray[used].indexesForType) {
iicp.fsIndex_singletype.flush();
}
@@ -682,14 +686,14 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
// reset the index update trackers
// resetDetectIllegalIndexUpdates();
- indexUpdates.clear();
- indexUpdateOperation.clear();
+ this.indexUpdates.clear();
+ this.indexUpdateOperation.clear();
mPii = new ProcessedIndexInfo();
// this.fsAddedToIndex = new IntSet();
// this.fsDeletedFromIndex = new IntSet();
// this.fsReindexed = new PositiveIntSet_impl();
- logProcessed = false;
- usedIndexes.removeAllElements();
+ this.logProcessed = false;
+ this.usedIndexes.removeAllElements();
}
// // for now, with flattened index optimization disabled, this should be a no-op
@@ -781,7 +785,7 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
switch (indexingStrategy) {
case FSIndex.SET_INDEX:
- ind = new FsIndex_set_sorted<>(cas, type, indexingStrategy, comparatorForIndexSpecs); // false
+ ind = new FsIndex_set_sorted<>(this.cas, type, indexingStrategy, comparatorForIndexSpecs); // false
// =
// is
// set
@@ -793,14 +797,14 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
case FSIndex.BAG_INDEX:
case FSIndex.DEFAULT_BAG_INDEX:
- ind = new FsIndex_bag<>(cas, type, initialSize, indexingStrategy,
+ ind = new FsIndex_bag<>(this.cas, type, initialSize, indexingStrategy,
comparatorForIndexSpecs);
break;
default:
// SORTED_INDEX is the default. We don't throw any errors, if the code is unknown, we just
// create a sorted index.
- ind = new FsIndex_set_sorted<>(cas, type, FSIndex.SORTED_INDEX,
+ ind = new FsIndex_set_sorted<>(this.cas, type, FSIndex.SORTED_INDEX,
comparatorForIndexSpecs); // true = is sorted
break;
@@ -897,36 +901,36 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
public void commit() {
// Will create the default type order if it doesn't exist at this point.
getDefaultTypeOrder();
- locked = true;
+ this.locked = true;
}
@Override
public LinearTypeOrder getDefaultTypeOrder() {
- if (sii.defaultTypeOrder == null) {
- if (sii.defaultOrderBuilder == null) {
- sii.defaultOrderBuilder = new LinearTypeOrderBuilderImpl(sii.tsi);
+ if (this.sii.defaultTypeOrder == null) {
+ if (this.sii.defaultOrderBuilder == null) {
+ this.sii.defaultOrderBuilder = new LinearTypeOrderBuilderImpl(this.sii.tsi);
}
try {
- sii.defaultTypeOrder = sii.defaultOrderBuilder.getOrder();
+ this.sii.defaultTypeOrder = this.sii.defaultOrderBuilder.getOrder();
} catch (final CASException e) {
// Since we're doing this on an existing type names, we can't
// get here.
throw new UIMARuntimeException(UIMARuntimeException.INTERNAL_ERROR, new Object[0], e);
}
}
- return sii.defaultTypeOrder;
+ return this.sii.defaultTypeOrder;
}
@Override
public LinearTypeOrderBuilder getDefaultOrderBuilder() {
- if (sii.defaultOrderBuilder == null) {
- sii.defaultOrderBuilder = new LinearTypeOrderBuilderImpl(sii.tsi);
+ if (this.sii.defaultOrderBuilder == null) {
+ this.sii.defaultOrderBuilder = new LinearTypeOrderBuilderImpl(this.sii.tsi);
}
- return sii.defaultOrderBuilder;
+ return this.sii.defaultOrderBuilder;
}
void setDefaultTypeOrder(LinearTypeOrder order) {
- sii.defaultTypeOrder = order;
+ this.sii.defaultTypeOrder = order;
}
/**
@@ -993,7 +997,7 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
*/
@Override
public Iterator<String> getLabels() {
- return name2indexMap.keySet().iterator();
+ return this.name2indexMap.keySet().iterator();
}
/**
@@ -1011,7 +1015,7 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
String label;
while (it.hasNext()) {
label = it.next();
- if (name2indexMap.get(label).fsIndex_singletype.getComparatorImplForIndexSpecs()
+ if (this.name2indexMap.get(label).fsIndex_singletype.getComparatorImplForIndexSpecs()
.equals(comp)) {
labels.add(label);
}
@@ -1035,7 +1039,7 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
public <T extends FeatureStructure> FSIndex<T> getIndex(String label, Type type) {
// iicp is for the type the index was defined for
- final FsIndex_iicp<TOP> iicp = name2indexMap.get(label);
+ final FsIndex_iicp<TOP> iicp = this.name2indexMap.get(label);
if (iicp == null) {
return null;
}
@@ -1069,7 +1073,7 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
@Override
@SuppressWarnings("unchecked")
public <T extends FeatureStructure> LowLevelIndex<T> getIndex(String label) {
- return (LowLevelIndex<T>) name2indexMap.get(label);
+ return (LowLevelIndex<T>) this.name2indexMap.get(label);
}
/**
@@ -1100,7 +1104,7 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
@Override
public void removeAllIncludingSubtypes(Type type) {
removeAllExcludingSubtypes(type);
- List<Type> subtypes = sii.tsi.getDirectSubtypes(type);
+ List<Type> subtypes = this.sii.tsi.getDirectSubtypes(type);
for (Type subtype : subtypes) {
removeAllIncludingSubtypes(subtype);
}
@@ -1119,7 +1123,7 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
*/
@Override
public boolean isCommitted() {
- return locked;
+ return this.locked;
}
/**
@@ -1172,7 +1176,7 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
* the action to do on each FS
*/
public void walkIndexedFSs(Consumer<TOP> action) {
- for (int i = 0; i < usedIndexes.size(); i++) {
+ for (int i = 0; i < this.usedIndexes.size(); i++) {
for (TOP fs : getNonSetSingleIndexForUsedType(i)) {
action.accept(fs);
}
@@ -1187,7 +1191,7 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
*/
public void walkSortedIndexedFSs(Consumer<TOP> action) {
List<TOP> fss = new ArrayList<>();
- for (int i = 0; i < usedIndexes.size(); i++) {
+ for (int i = 0; i < this.usedIndexes.size(); i++) {
for (TOP fs : getNonSetSingleIndexForUsedType(i)) {
fss.add(fs);
}
@@ -1305,9 +1309,9 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
//@formatter:on
@Override
public LinearTypeOrderBuilder createTypeSortOrder() {
- final LinearTypeOrderBuilder orderBuilder = new LinearTypeOrderBuilderImpl(sii.tsi);
- if (sii.defaultOrderBuilder == null) {
- sii.defaultOrderBuilder = orderBuilder;
+ final LinearTypeOrderBuilder orderBuilder = new LinearTypeOrderBuilderImpl(this.sii.tsi);
+ if (this.sii.defaultOrderBuilder == null) {
+ this.sii.defaultOrderBuilder = orderBuilder;
}
return orderBuilder;
}
@@ -1319,8 +1323,8 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
@Override
public <T extends FeatureStructure> LowLevelIndex<T> ll_getIndex(String indexName, int typeCode) {
- final TypeSystemImpl tsi = sii.tsi;
- if (!tsi.isType(typeCode) || !cas.ll_isRefType(typeCode)) {
+ final TypeSystemImpl tsi = this.sii.tsi;
+ if (!tsi.isType(typeCode) || !this.cas.ll_isRefType(typeCode)) {
throw new LowLevelException(LowLevelException.INVALID_INDEX_TYPE, Integer.toString(typeCode));
}
return (LowLevelIndex<T>) getIndex(indexName, tsi.ll_getTypeForCode(typeCode));
@@ -1397,13 +1401,13 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
}
// remember if we get any set or sorted index by turning this true
- if (!setOrSorted && indexingStrategy != FSIndex.BAG_INDEX) {
+ if (setOrSorted == false && indexingStrategy != FSIndex.BAG_INDEX) {
setOrSorted = true;
}
}
// log even if added back, because remove logs remove, and might want to know it was "reindexed"
- if (cas.getCurrentMark() != null) {
+ if (this.cas.getCurrentMark() != null) {
logIndexOperation(fs, true);
}
@@ -1418,7 +1422,7 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
// https://issues.apache.org/jira/browse/UIMA-4111
if (noIndexOrOnlySetindexes) {
// lazily create a default bag index for this type
- final Type type = sii.tsi.ll_getTypeForCode(typeCode);
+ final Type type = this.sii.tsi.ll_getTypeForCode(typeCode);
final String defIndexName = getAutoIndexNameForType(type);
final FSIndexComparator comparator = createComparator(); // empty comparator
comparator.setType(type);
@@ -1429,11 +1433,11 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
((FsIndex_singletype<T>) (indexes.get(indexes.size() - 1)).fsIndex_singletype).insert(fs);
}
- if (!isUsed.get(typeCode)) {
+ if (!this.isUsed.get(typeCode)) {
// mark this type as being in some indexes
- isUsed.set(typeCode);
+ this.isUsed.set(typeCode);
// this.isUsedChanged = true;
- usedIndexes.add(typeCode);
+ this.usedIndexes.add(typeCode);
}
}
@@ -1473,7 +1477,10 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
//@formatter:on
if (i4t.aSortedIndex < 0) {
int bi = i4t.aBagIndex; // >= 0 if there is a bag index
- if ((bi < 0 && !i4t.hasSetIndex) || (bi >= 0 && !i4t.indexesForType.get(bi).fsIndex_singletype.contains(fs))) {
+ if (bi < 0 && !i4t.hasSetIndex) {
+ return false; // no indexes defined for this type
+ }
+ if (bi >= 0 && !i4t.indexesForType.get(bi).fsIndex_singletype.contains(fs)) {
return false; // not in defined bag index
}
}
@@ -1497,7 +1504,7 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
if (wasRemoved) {
// incrementIllegalIndexUpdateDetector(typeCode);
- if (cas.getCurrentMark() != null) {
+ if (this.cas.getCurrentMark() != null) {
logIndexOperation(fs, ITEM_REMOVED_FROM_INDEX);
}
@@ -1509,7 +1516,7 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
// }
}
if (CASImpl.traceCow) {
- cas.traceIndexMod(false, fs, skipBagIndexes);
+ this.cas.traceIndexMod(false, fs, skipBagIndexes);
}
return wasRemoved;
}
@@ -1604,7 +1611,7 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
@Override
public Collection<TOP> getIndexedFSs() {
final ArrayList<CopyOnWriteIndexPart<TOP>> indexes = new ArrayList<>();
- for (int i = 0; i < usedIndexes.size(); i++) {
+ for (int i = 0; i < this.usedIndexes.size(); i++) {
FsIndex_singletype<TOP> idx = getNonSetSingleIndexForUsedType(i);
if (idx.size() > 0) {
indexes.add(idx.getNonNullCow());
@@ -1932,11 +1939,11 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
}
private <T extends TOP> void logIndexOperation(T fs, boolean added) {
- indexUpdates.add(fs);
+ this.indexUpdates.add(fs);
if (added) {
- indexUpdateOperation.set(indexUpdates.size() - 1, added); // operation was "add"
+ this.indexUpdateOperation.set(this.indexUpdates.size() - 1, added); // operation was "add"
}
- logProcessed = false;
+ this.logProcessed = false;
}
// Delta Serialization support
@@ -1966,10 +1973,10 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
final ProcessedIndexInfo pii = mPii;
- final int len = indexUpdates.size();
+ final int len = this.indexUpdates.size();
for (int i = 0; i < len; i++) {
- final TOP fs = indexUpdates.get(i);
- final boolean added = indexUpdateOperation.get(i);
+ final TOP fs = this.indexUpdates.get(i);
+ final boolean added = this.indexUpdateOperation.get(i);
if (added) {
boolean wasRemoved = pii.fsDeletedFromIndex.remove(fs);
if (wasRemoved) {
@@ -1988,13 +1995,13 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
}
}
}
- logProcessed = true;
- indexUpdates.clear();
- indexUpdateOperation.clear();
+ this.logProcessed = true;
+ this.indexUpdates.clear();
+ this.indexUpdateOperation.clear();
}
public Set<TOP> getUpdatedFSs(Set<TOP> items) {
- if (!logProcessed) {
+ if (!this.logProcessed) {
processIndexUpdates();
}
return items;
@@ -2013,7 +2020,7 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
}
public boolean isModified() {
- if (!logProcessed) {
+ if (!this.logProcessed) {
processIndexUpdates();
}
final ProcessedIndexInfo pii = mPii;
@@ -2070,7 +2077,7 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
}
public Comparator<TOP> getAnnotationFsComparatorWithoutId() {
- Comparator<TOP> r = sii.annotationFsComparatorWithoutId;
+ Comparator<TOP> r = this.sii.annotationFsComparatorWithoutId;
// lazy creation
if (null != r) {
return r;
@@ -2079,7 +2086,7 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
}
Comparator<TOP> getAnnotationFsComparatorWithId() {
- Comparator<TOP> r = sii.annotationFsComparatorWithId;
+ Comparator<TOP> r = this.sii.annotationFsComparatorWithId;
// lazy creation
if (null != r) {
return r;
@@ -2091,7 +2098,7 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
final LinearTypeOrder lto = getDefaultTypeOrder(); // used as constant in comparator
if (!V2_ANNOTATION_COMPARE_TYPE_ORDER && lto.isEmptyTypeOrder()) {
- return sii.annotationFsComparatorWithoutId = (fsx1, fsx2) -> {
+ return this.sii.annotationFsComparatorWithoutId = (fsx1, fsx2) -> {
if (fsx1 == fsx2)
return 0;
Annotation fs1 = (Annotation) fsx1;
@@ -2100,7 +2107,7 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
};
} else {
- return sii.annotationFsComparatorWithoutId = (fsx1, fsx2) -> {
+ return this.sii.annotationFsComparatorWithoutId = (fsx1, fsx2) -> {
if (fsx1 == fsx2)
return 0;
Annotation fs1 = (Annotation) fsx1;
@@ -2121,7 +2128,7 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
final LinearTypeOrder lto = getDefaultTypeOrder(); // used as constant in comparator
if (!V2_ANNOTATION_COMPARE_TYPE_ORDER && lto.isEmptyTypeOrder()) {
- sii.annotationFsComparatorWithId = (fsx1, fsx2) -> {
+ this.sii.annotationFsComparatorWithId = (fsx1, fsx2) -> {
if (fsx1 == fsx2)
return 0;
final Annotation fs1 = (Annotation) fsx1;
@@ -2130,7 +2137,7 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
};
} else {
- sii.annotationFsComparatorWithId = (fsx1, fsx2) -> {
+ this.sii.annotationFsComparatorWithId = (fsx1, fsx2) -> {
if (fsx1 == fsx2)
return 0;
final Annotation fs1 = (Annotation) fsx1;
@@ -2138,7 +2145,7 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
return fs1.compareAnnotationWithId(fs2, lto);
};
}
- return sii.annotationFsComparatorWithId;
+ return this.sii.annotationFsComparatorWithId;
}
/**
@@ -2174,15 +2181,15 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
private Comparator<TOP> getCachedComparator(FSComparators withId, FSComparators withTypeOrder) {
if (withId == FSComparators.WITH_ID) {
if (withTypeOrder == FSComparators.WITH_TYPE_ORDER) {
- return sii.annotationFsComparatorWithId;
+ return this.sii.annotationFsComparatorWithId;
} else {
- return sii.annotationFsComparatorNoTypeWithId;
+ return this.sii.annotationFsComparatorNoTypeWithId;
}
} else {
if (withTypeOrder == FSComparators.WITH_TYPE_ORDER) {
- return sii.annotationFsComparatorWithoutId;
+ return this.sii.annotationFsComparatorWithoutId;
} else {
- return sii.annotationFsComparatorNoTypeWithoutId;
+ return this.sii.annotationFsComparatorNoTypeWithoutId;
}
}
}
@@ -2191,15 +2198,15 @@ public class FSIndexRepositoryImpl implements FSIndexRepositoryMgr, LowLevelInde
Comparator<TOP> c) {
if (withId == FSComparators.WITH_ID) {
if (withTypeOrder == FSComparators.WITH_TYPE_ORDER) {
- sii.annotationFsComparatorWithId = c;
+ this.sii.annotationFsComparatorWithId = c;
} else {
- sii.annotationFsComparatorNoTypeWithId = c;
+ this.sii.annotationFsComparatorNoTypeWithId = c;
}
} else {
if (withTypeOrder == FSComparators.WITH_TYPE_ORDER) {
- sii.annotationFsComparatorWithoutId = c;
+ this.sii.annotationFsComparatorWithoutId = c;
} else {
- sii.annotationFsComparatorNoTypeWithoutId = c;
+ this.sii.annotationFsComparatorNoTypeWithoutId = c;
}
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIntConstraintImpl.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIntConstraintImpl.java
index bbe067f58..db7286d3e 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIntConstraintImpl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIntConstraintImpl.java
@@ -47,41 +47,41 @@ class FSIntConstraintImpl implements FSIntConstraint {
private IntVector values;
FSIntConstraintImpl() {
- codes = new IntVector();
- values = new IntVector();
+ this.codes = new IntVector();
+ this.values = new IntVector();
}
@Override
public boolean match(int j) {
- final int max = codes.size();
+ final int max = this.codes.size();
for (int i = 0; i < max; i++) {
- switch (codes.get(i)) {
+ switch (this.codes.get(i)) {
case LT: {
- if (j >= values.get(i)) {
+ if (j >= this.values.get(i)) {
return false;
}
break;
}
case LEQ: {
- if (j > values.get(i)) {
+ if (j > this.values.get(i)) {
return false;
}
break;
}
case EQ: {
- if (j != values.get(i)) {
+ if (j != this.values.get(i)) {
return false;
}
break;
}
case GEQ: {
- if (j < values.get(i)) {
+ if (j < this.values.get(i)) {
return false;
}
break;
}
case GT: {
- if (j <= values.get(i)) {
+ if (j <= this.values.get(i)) {
return false;
}
break;
@@ -103,8 +103,8 @@ class FSIntConstraintImpl implements FSIntConstraint {
*/
@Override
public void eq(int i) {
- codes.add(EQ);
- values.add(i);
+ this.codes.add(EQ);
+ this.values.add(i);
}
/**
@@ -115,8 +115,8 @@ class FSIntConstraintImpl implements FSIntConstraint {
*/
@Override
public void lt(int i) {
- codes.add(LT);
- values.add(i);
+ this.codes.add(LT);
+ this.values.add(i);
}
/**
@@ -127,8 +127,8 @@ class FSIntConstraintImpl implements FSIntConstraint {
*/
@Override
public void leq(int i) {
- codes.add(LEQ);
- values.add(i);
+ this.codes.add(LEQ);
+ this.values.add(i);
}
/**
@@ -139,8 +139,8 @@ class FSIntConstraintImpl implements FSIntConstraint {
*/
@Override
public void gt(int i) {
- codes.add(GT);
- values.add(i);
+ this.codes.add(GT);
+ this.values.add(i);
}
/**
@@ -151,22 +151,22 @@ class FSIntConstraintImpl implements FSIntConstraint {
*/
@Override
public void geq(int i) {
- codes.add(GEQ);
- values.add(i);
+ this.codes.add(GEQ);
+ this.values.add(i);
}
@Override
public String toString() {
- if (codes.size() == 1) {
- return FSFloatConstraintImpl.toString(codes.get(0)) + " "
- + Integer.toString(values.get(0));
+ if (this.codes.size() == 1) {
+ return FSFloatConstraintImpl.toString(this.codes.get(0)) + " "
+ + Integer.toString(this.values.get(0));
}
StringBuffer buf = new StringBuffer();
buf.append("( ");
- for (int i = 0; i < codes.size(); i++) {
- buf.append(FSFloatConstraintImpl.toString(codes.get(i)));
+ for (int i = 0; i < this.codes.size(); i++) {
+ buf.append(FSFloatConstraintImpl.toString(this.codes.get(i)));
buf.append(' ');
- buf.append(Integer.toString(values.get(i)));
+ buf.append(Integer.toString(this.values.get(i)));
buf.append(' ');
}
buf.append(')');
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSStringConstraintImpl.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSStringConstraintImpl.java
index da69d19ef..d3a009d80 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSStringConstraintImpl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSStringConstraintImpl.java
@@ -37,20 +37,20 @@ class FSStringConstraintImpl implements FSStringConstraint {
* Constructor is package private.
*/
FSStringConstraintImpl() {
- string = "";
+ this.string = "";
}
@Override
public void equals(String s) {
- string = s;
+ this.string = s;
}
@Override
public boolean match(String s) {
- if (string == null) {
+ if (this.string == null) {
return (s == null);
}
- return (string.equals(s));
+ return (this.string.equals(s));
}
@Override
@@ -58,8 +58,8 @@ class FSStringConstraintImpl implements FSStringConstraint {
// need to escape quotes and backslashes
StringBuffer buf = new StringBuffer();
buf.append("= \"");
- for (int i = 0; i < string.length(); i++) {
- char c = string.charAt(i);
+ for (int i = 0; i < this.string.length(); i++) {
+ char c = this.string.charAt(i);
switch (c) {
case '"':
buf.append("\\\"");
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSTypeConstraintImpl.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSTypeConstraintImpl.java
index a372c2567..5abe0b475 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSTypeConstraintImpl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSTypeConstraintImpl.java
@@ -47,7 +47,7 @@ class FSTypeConstraintImpl implements FSTypeConstraint {
final FeatureStructureImplC fsi = (FeatureStructureImplC) fs;
compile(fsi.getCAS().getTypeSystem());
final int typeCode = fsi._getTypeCode();
- TypeSystemImpl tsi = (TypeSystemImpl) ts;
+ TypeSystemImpl tsi = (TypeSystemImpl) this.ts;
for (int i = 0; i < typeSet.size(); i++) {
if (tsi.subsumes(typeSet.get(i), typeCode)) {
return true;
@@ -74,7 +74,7 @@ class FSTypeConstraintImpl implements FSTypeConstraint {
@Override
public void add(Type type) {
- ts = null; // This will force a recompile.
+ this.ts = null; // This will force a recompile.
nameSet.add(type.getName());
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureImpl.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureImpl.java
index 6876c8fa5..bec673535 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureImpl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureImpl.java
@@ -82,38 +82,38 @@ public class FeatureImpl implements Feature {
* used to make singleton which is used for "missing feature"
*/
private FeatureImpl() {
- featureCode = 0;
- isInInt = false;
- rangeType = null;
- isMultipleRefsAllowed = false;
- isAnnotBaseSofaRef = false;
- shortName = null;
- slotKind = null;
- rangeTypeClass = 0;
- isLongOrDouble = false;
- highestDefiningType = null;
- hashCodeLong = computeHashCodeLong();
+ this.featureCode = 0;
+ this.isInInt = false;
+ this.rangeType = null;
+ this.isMultipleRefsAllowed = false;
+ this.isAnnotBaseSofaRef = false;
+ this.shortName = null;
+ this.slotKind = null;
+ this.rangeTypeClass = 0;
+ this.isLongOrDouble = false;
+ this.highestDefiningType = null;
+ this.hashCodeLong = computeHashCodeLong();
}
FeatureImpl(TypeImpl typeImpl, String shortName, TypeImpl rangeType, TypeSystemImpl tsi,
boolean isMultipleRefsAllowed, SlotKind slotKind) {
// this.code = code;
- highestDefiningType = typeImpl;
+ this.highestDefiningType = typeImpl;
List<FeatureImpl> feats = (tsi == null) ? null : tsi.features;
- featureCode = (feats == null) ? -1 : feats.size();
+ this.featureCode = (feats == null) ? -1 : feats.size();
this.rangeType = rangeType;
- isLongOrDouble = (rangeType == null) ? false : rangeType.isLongOrDouble;
+ this.isLongOrDouble = (rangeType == null) ? false : rangeType.isLongOrDouble;
this.slotKind = slotKind;
this.shortName = shortName;
this.isMultipleRefsAllowed = isMultipleRefsAllowed;
- isAnnotBaseSofaRef = (highestDefiningType == null) ? false
+ this.isAnnotBaseSofaRef = (highestDefiningType == null) ? false
: ((highestDefiningType.getCode() == TypeSystemConstants.annotBaseTypeCode)
&& shortName.equals(CAS.FEATURE_BASE_NAME_SOFA));
- isInInt = (rangeType == null) ? false : (rangeType.getTypeSystem().isInInt(rangeType));
- rangeTypeClass = (rangeType == null) ? CASImpl.TYPE_CLASS_FS
+ this.isInInt = (rangeType == null) ? false : (rangeType.getTypeSystem().isInInt(rangeType));
+ this.rangeTypeClass = (rangeType == null) ? CASImpl.TYPE_CLASS_FS
: CasSerializerSupport.classifyType(rangeType);
- hashCodeLong = computeHashCodeLong();
+ this.hashCodeLong = computeHashCodeLong();
if (typeImpl != null) {
// if typeImpl is null, this is a "jcas only" defined feature, not a real feature
typeImpl.addFeature(this); // might throw if existing feature with different range
@@ -125,7 +125,7 @@ public class FeatureImpl implements Feature {
* @return the internal code of this feature. Necessary when using low-level APIs.
*/
public int getCode() {
- return featureCode;
+ return this.featureCode;
}
/**
@@ -135,7 +135,7 @@ public class FeatureImpl implements Feature {
*/
@Override
public Type getDomain() {
- return highestDefiningType;
+ return this.highestDefiningType;
}
/**
@@ -144,15 +144,15 @@ public class FeatureImpl implements Feature {
*/
@Override
public Type getRange() {
- return rangeType;
+ return this.rangeType;
}
public TypeImpl getRangeImpl() {
- return rangeType;
+ return this.rangeType;
}
public SlotKind getSlotKind() {
- return slotKind;
+ return this.slotKind;
}
/**
@@ -168,7 +168,7 @@ public class FeatureImpl implements Feature {
@Override
public String getShortName() {
- return shortName;
+ return this.shortName;
}
@Override
@@ -186,7 +186,7 @@ public class FeatureImpl implements Feature {
@Override
public boolean isMultipleReferencesAllowed() {
- return isMultipleRefsAllowed;
+ return this.isMultipleRefsAllowed;
}
/**
@@ -307,13 +307,13 @@ public class FeatureImpl implements Feature {
// to preserve the compare contract, can't use hash for miscompare
int c;
- c = shortName.compareTo(other.shortName);
+ c = this.shortName.compareTo(other.shortName);
if (c != 0)
return c;
c = highestDefiningType.getName().compareTo(other.highestDefiningType.getName());
if (c != 0)
return c;
- c = Boolean.compare(isMultipleRefsAllowed, other.isMultipleRefsAllowed);
+ c = Boolean.compare(this.isMultipleRefsAllowed, other.isMultipleRefsAllowed);
if (c != 0)
return c;
c = rangeType.getName().compareTo(other.rangeType.getName());
@@ -327,7 +327,9 @@ public class FeatureImpl implements Feature {
public boolean equals(Object obj) {
if (this == obj)
return true;
- if ((obj == null) || !(obj instanceof FeatureImpl))
+ if (obj == null)
+ return false;
+ if (!(obj instanceof FeatureImpl))
return false;
FeatureImpl other = (FeatureImpl) obj;
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeaturePathImpl.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeaturePathImpl.java
index b0d31c7d7..6d2e8d001 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeaturePathImpl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeaturePathImpl.java
@@ -92,21 +92,21 @@ class FeaturePathImpl implements FeaturePath {
public void addFeature(Feature feat) {
// check if currently feature path ends with a built-in function
- if (builtInFunction > 0) {
+ if (this.builtInFunction > 0) {
throw new CASRuntimeException(MESSAGE_DIGEST, "INVALID_FEATURE_PATH_SYNTAX_ADD",
new Object[] { getFeaturePathString(), feat.getShortName() });
}
// add feature to feature path
- featurePathElementNames.add(feat.getShortName());
- boundFeatures.add((FeatureImpl) feat);
+ this.featurePathElementNames.add(feat.getShortName());
+ this.boundFeatures.add((FeatureImpl) feat);
// if current featurePath was already initialized we cannot guarantee that
// the path is still ever valid so we have to evaluate the path on the
// fly.
- if (boundBaseType != null && PathValid.NEVER == TypeSystemUtils
- .isPathValid(boundBaseType, featurePathElementNames)) {
- boundBaseType = null; // can't be used for this path
+ if (this.boundBaseType != null && PathValid.NEVER == TypeSystemUtils
+ .isPathValid(this.boundBaseType, this.featurePathElementNames)) {
+ this.boundBaseType = null; // can't be used for this path
}
}
@@ -117,7 +117,7 @@ class FeaturePathImpl implements FeaturePath {
*/
@Override
public FeatureImpl getFeature(int i) {
- return (size() == boundFeatures.size()) ? boundFeatures.get(i) : null;
+ return (this.size() == this.boundFeatures.size()) ? this.boundFeatures.get(i) : null;
}
/*
@@ -127,7 +127,7 @@ class FeaturePathImpl implements FeaturePath {
*/
@Override
public int size() {
- return featurePathElementNames.size();
+ return this.featurePathElementNames.size();
}
/*
@@ -138,8 +138,8 @@ class FeaturePathImpl implements FeaturePath {
@Override
public void initialize(String featurePath) throws CASException {
- builtInFunction = NO_BUILT_IN_FUNCTION;
- originalBuiltInName = null;
+ this.builtInFunction = NO_BUILT_IN_FUNCTION;
+ this.originalBuiltInName = null;
// throw exception if featurePath is null
if (featurePath == null) {
@@ -157,7 +157,7 @@ class FeaturePathImpl implements FeaturePath {
new Object[] { featurePath, "//" });
}
- featurePathElementNames.clear();
+ this.featurePathElementNames.clear();
// parse feature path into path elements
StringTokenizer tokenizer = new StringTokenizer(featurePath, FEATURE_PATH_SEPARATOR);
while (tokenizer.hasMoreTokens()) {
@@ -165,30 +165,30 @@ class FeaturePathImpl implements FeaturePath {
// check if there are more tokens available, if we are at the last
// token we have to check for built-in functions
if (tokenizer.hasMoreTokens()) {
- featurePathElementNames.add(token);
+ this.featurePathElementNames.add(token);
} else {
// we have the last token, check for built-in functions
int index = -1;
if ((index = token.indexOf(BUILT_IN_FUNCTION_SEPARATOR)) != -1) {
if (index > 0) {
// we have a built-in function that is separated with a ":"
- featurePathElementNames.add(token.substring(0, index));
+ this.featurePathElementNames.add(token.substring(0, index));
}
// get built-in function
originalBuiltInName = token.substring(index + 1);
String builtInFunctionName = originalBuiltInName.toLowerCase();
if (builtInFunctionName.equals(FUNCTION_NAME_COVERED_TEXT)) {
- builtInFunction = FUNCTION_COVERED_TEXT;
+ this.builtInFunction = FUNCTION_COVERED_TEXT;
} else if (builtInFunctionName.equals(FUNCTION_NAME_ID)) {
- builtInFunction = FUNCTION_ID;
+ this.builtInFunction = FUNCTION_ID;
} else if (builtInFunctionName.equals(FUNCTION_NAME_TYPE_NAME)) {
- builtInFunction = FUNCTION_TYPE_NAME;
+ this.builtInFunction = FUNCTION_TYPE_NAME;
} else {
throw new CASException(MESSAGE_DIGEST, "INVALID_FEATURE_PATH_SYNTAX",
new Object[] { featurePath, builtInFunctionName });
}
} else {
- featurePathElementNames.add(token);
+ this.featurePathElementNames.add(token);
}
}
}
@@ -202,20 +202,20 @@ class FeaturePathImpl implements FeaturePath {
@Override
public void typeInit(Type typeAtStartOfFeaturePath) throws CASException {
- boundBaseType = (TypeImpl) typeAtStartOfFeaturePath;
+ this.boundBaseType = (TypeImpl) typeAtStartOfFeaturePath;
// do feature path type initialization only if a featurePath is available
- if (featurePathElementNames.size() > 0) {
+ if (this.featurePathElementNames.size() > 0) {
// LowLevelTypeSystem llTypeSystem = ((TypeImpl) featurePathType)
// .getTypeSystem().getLowLevelTypeSystem();
// store featurePathType
- boundBaseType = (TypeImpl) typeAtStartOfFeaturePath;
+ this.boundBaseType = (TypeImpl) typeAtStartOfFeaturePath;
// validate featurePath for given type
if (PathValid.NEVER == TypeSystemUtils.isPathValid(typeAtStartOfFeaturePath,
- featurePathElementNames)) {
+ this.featurePathElementNames)) {
// invalid featurePath - throw an configuration exception
throw new CASException(MESSAGE_DIGEST, "ERROR_VALIDATE_FEATURE_PATH",
new Object[] { getFeaturePathString(), typeAtStartOfFeaturePath.getName() });
@@ -226,15 +226,15 @@ class FeaturePathImpl implements FeaturePath {
// available in
// one or more subtypes.
- boundFeatures.clear(); // reset
+ this.boundFeatures.clear(); // reset
// object
TypeImpl currentType = (TypeImpl) typeAtStartOfFeaturePath;
// iterate over all featurePathNames and store the resolved CAS
// feature in the boundFeatures list, until one not found
- for (String featName : featurePathElementNames) {
+ for (String featName : this.featurePathElementNames) {
FeatureImpl fi = currentType.getFeatureByBaseName(featName);
if (fi != null) {
- boundFeatures.add(fi);
+ this.boundFeatures.add(fi);
currentType = fi.getRangeImpl();
} else {
break;
@@ -422,7 +422,11 @@ class FeaturePathImpl implements FeaturePath {
@Override
public String getValueAsString(FeatureStructure fs) {
TOP tgtFs = getTargetFs((TOP) fs);
- if ((tgtFs == FEATURE_PATH_FAILED) || (targetType == null)) {
+ if (tgtFs == FEATURE_PATH_FAILED) {
+ return null;
+ }
+
+ if (targetType == null) {
return null;
}
switch (TypeSystemImpl.getTypeClass(targetType)) {
@@ -449,7 +453,7 @@ class FeaturePathImpl implements FeaturePath {
case LowLevelCAS.TYPE_CLASS_DOUBLEARRAY:
case LowLevelCAS.TYPE_CLASS_STRINGARRAY:
case LowLevelCAS.TYPE_CLASS_FSARRAY:
- if (builtInFunction > NO_BUILT_IN_FUNCTION) {
+ if (this.builtInFunction > NO_BUILT_IN_FUNCTION) {
return evaluateBuiltInFunction(tgtFs);
}
return ((CommonArrayFS) tgtFs).getValuesAsCommaSeparatedString();
@@ -458,7 +462,7 @@ class FeaturePathImpl implements FeaturePath {
if (tgtFs == null) {
return null;
}
- if (builtInFunction > NO_BUILT_IN_FUNCTION) {
+ if (this.builtInFunction > NO_BUILT_IN_FUNCTION) {
return evaluateBuiltInFunction(tgtFs);
}
return tgtFs.toString();
@@ -475,11 +479,11 @@ class FeaturePathImpl implements FeaturePath {
private void throwBuiltInFunctionException(String typeName) {
// get built-in function name
String functionName = null;
- if (builtInFunction == FUNCTION_COVERED_TEXT) {
+ if (this.builtInFunction == FUNCTION_COVERED_TEXT) {
functionName = FUNCTION_NAME_COVERED_TEXT;
- } else if (builtInFunction == FUNCTION_ID) {
+ } else if (this.builtInFunction == FUNCTION_ID) {
functionName = FUNCTION_NAME_ID;
- } else if (builtInFunction == FUNCTION_TYPE_NAME) {
+ } else if (this.builtInFunction == FUNCTION_TYPE_NAME) {
functionName = FUNCTION_NAME_TYPE_NAME;
}
// throw runtime exception
@@ -496,17 +500,17 @@ class FeaturePathImpl implements FeaturePath {
* @return Returns the built-in function value for the given FS.
*/
private String evaluateBuiltInFunction(TOP returnFS) {
- if (builtInFunction == FUNCTION_COVERED_TEXT) {
+ if (this.builtInFunction == FUNCTION_COVERED_TEXT) {
if (returnFS instanceof AnnotationFS) {
return ((AnnotationFS) returnFS).getCoveredText();
} else {
throw new CASRuntimeException(MESSAGE_DIGEST, "BUILT_IN_FUNCTION_NOT_SUPPORTED",
new Object[] { FUNCTION_NAME_COVERED_TEXT, returnFS.getType().getName() });
}
- } else if (builtInFunction == FUNCTION_ID) {
+ } else if (this.builtInFunction == FUNCTION_ID) {
return Integer.toString(returnFS._id);
- } else if (builtInFunction == FUNCTION_TYPE_NAME) {
+ } else if (this.builtInFunction == FUNCTION_TYPE_NAME) {
return returnFS.getType().getName();
}
return null;
@@ -540,7 +544,7 @@ class FeaturePathImpl implements FeaturePath {
return FEATURE_PATH_FAILED;
}
- if (featurePathElementNames.size() == 0) {
+ if (this.featurePathElementNames.size() == 0) {
targetType = fs._getTypeImpl();
return fs;
}
@@ -559,13 +563,13 @@ class FeaturePathImpl implements FeaturePath {
int rangeTypeClass = -1;
// resolve feature path value
- for (int i = 0; i < featurePathElementNames.size(); i++) {
+ for (int i = 0; i < this.featurePathElementNames.size(); i++) {
if (currentFs == null) {
return FEATURE_PATH_FAILED;
}
- if (i < boundFeatures.size()) {
- targetFeature = boundFeatures.get(i);
+ if (i < this.boundFeatures.size()) {
+ targetFeature = this.boundFeatures.get(i);
/*
* It is possible that the previously bound feature isn't valid for this FS. This can happen
* if a type hierarchy defines 2 different features for two different subtypes of type Tt
@@ -611,7 +615,7 @@ class FeaturePathImpl implements FeaturePath {
case LowLevelCAS.TYPE_CLASS_FS:
currentFs = currentFs.getFeatureValue(targetFeature);
if (currentFs == null) {
- if (i == (featurePathElementNames.size() - 1)) {
+ if (i == (this.featurePathElementNames.size() - 1)) {
// at the last element, keep targetType == to the range type
} else {
//@formatter:off
@@ -622,8 +626,8 @@ class FeaturePathImpl implements FeaturePath {
* - the PathValid is ALWAYS
*/
//@formatter:on
- PathValid pathValid = TypeSystemUtils.isPathValid(boundBaseType,
- featurePathElementNames);
+ PathValid pathValid = TypeSystemUtils.isPathValid(this.boundBaseType,
+ this.featurePathElementNames);
if (pathValid == PathValid.POSSIBLE) {
targetType = null; // following v2 design here
}
@@ -644,13 +648,13 @@ class FeaturePathImpl implements FeaturePath {
if (targetFeature == null) {
throw new CASRuntimeException(MESSAGE_DIGEST, "INVALID_FEATURE_PATH_FEATURE_NOT_DEFINED",
new Object[] { getFeaturePathString(), currentFs._getTypeImpl().getName(),
- featurePathElementNames.get(i) });
+ this.featurePathElementNames.get(i) });
}
boundFeatures.add(targetFeature); // cache for future use
}
private void verifyNoBuiltInFunction() {
- if (builtInFunction > NO_BUILT_IN_FUNCTION) {
+ if (this.builtInFunction > NO_BUILT_IN_FUNCTION) {
throwBuiltInFunctionException(targetFeature.getRangeImpl().getName());
}
}
@@ -671,7 +675,7 @@ class FeaturePathImpl implements FeaturePath {
}
private void appendBuiltInFunction(StringBuilder sb) {
- if (builtInFunction > 0) {
+ if (this.builtInFunction > 0) {
sb.append(':').append(originalBuiltInName); // because capitalization could be different
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImplC.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImplC.java
index cc91fffb3..a1f00f17f 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImplC.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImplC.java
@@ -682,7 +682,7 @@ public class FeatureStructureImplC implements FeatureStructureImpl {
* @return the FS or if it was a trampoline, the base FS
*/
public <N extends TOP> N _maybeGetBaseForPearFs() {
- return _isPearTrampoline() ? _casView.getBaseFsFromTrampoline((N) this) : (N) this;
+ return this._isPearTrampoline() ? _casView.getBaseFsFromTrampoline((N) this) : (N) this;
}
/**
@@ -1015,11 +1015,11 @@ public class FeatureStructureImplC implements FeatureStructureImpl {
*/
@Override
public CAS getCAS() {
- return _casView;
+ return this._casView;
}
public CASImpl getCASImpl() { // was package private 9-03
- return _casView;
+ return this._casView;
}
//@formatter:off
@@ -1086,7 +1086,7 @@ public class FeatureStructureImplC implements FeatureStructureImpl {
if (obj instanceof FeatureStructureImplC) {
FeatureStructureImplC c2 = (FeatureStructureImplC) obj;
- if (c2._id != _id) {
+ if (c2._id != this._id) {
return false;
}
@@ -1131,7 +1131,7 @@ public class FeatureStructureImplC implements FeatureStructureImpl {
private int count;
private PrintReferences() {
- count = 0;
+ this.count = 0;
}
/**
@@ -1146,24 +1146,24 @@ public class FeatureStructureImplC implements FeatureStructureImpl {
return false;
}
if (v.equals("seen once")) {
- tree.put(fs, refNamePrefix + Integer.toString(count++));
+ tree.put(fs, refNamePrefix + Integer.toString(this.count++));
}
return true;
}
String getLabel(FeatureStructure ref) {
- return tree.get(ref);
+ return this.tree.get(ref);
}
int printInfo(FeatureStructure ref) {
- String k = tree.get(ref);
+ String k = this.tree.get(ref);
if (k == null || k.equals("seen once")) {
return NO_LABEL;
}
- if (seen.contains(ref)) {
+ if (this.seen.contains(ref)) {
return JUST_LABEL;
}
- seen.add(ref);
+ this.seen.add(ref);
return WITH_LABEL;
}
@@ -1541,7 +1541,7 @@ public class FeatureStructureImplC implements FeatureStructureImpl {
stringVal = (null == stringVal) ? "<null>" : "\"" + Misc.elideString(stringVal, 80) + "\"";
sb.append(stringVal); // caller adds nl
} else {
- sb.append(getFeatureValueAsString(fi));
+ sb.append(this.getFeatureValueAsString(fi));
}
return sb;
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java
index e80ec9866..4a7de74f1 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java
@@ -207,24 +207,24 @@ public class FeatureValuePathImpl implements FeatureValuePath {
throw new CASRuntimeException(CASRuntimeException.INVALID_FEATURE_PATH, pathSnippet);
}
- childPath = child;
- typeNameInSnippet = getTypeInSnippet(pathSnippet);
- featureName = getFeatureInSnippet(pathSnippet);
- isArrayOrList = false;
- isArrayType = false;
+ this.childPath = child;
+ this.typeNameInSnippet = getTypeInSnippet(pathSnippet);
+ this.featureName = getFeatureInSnippet(pathSnippet);
+ this.isArrayOrList = false;
+ this.isArrayType = false;
determineArray();
- isListType = false;
+ this.isListType = false;
- isCoveredTextFeature = COVERED_TEXT.equals(featureName);
- isFsIdFeature = FS_ID.equals(featureName);
- isTypeNameFeature = TYPE_NAME.equals(featureName);
- isUniqueIdFeature = UNIQUE_ID.equals(featureName);
- isBracketsOnly = (isArrayOrList && featureName.length() == 0);
+ this.isCoveredTextFeature = COVERED_TEXT.equals(this.featureName);
+ this.isFsIdFeature = FS_ID.equals(this.featureName);
+ this.isTypeNameFeature = TYPE_NAME.equals(this.featureName);
+ this.isUniqueIdFeature = UNIQUE_ID.equals(this.featureName);
+ this.isBracketsOnly = (this.isArrayOrList && this.featureName.length() == 0);
// coveredText() asf. is only valid as the last snippet in a feature
// path
- if ((isCoveredTextFeature || isFsIdFeature || isUniqueIdFeature
- || isTypeNameFeature) && child != null) {
+ if ((this.isCoveredTextFeature || this.isFsIdFeature || this.isUniqueIdFeature
+ || this.isTypeNameFeature) && child != null) {
throw new CASRuntimeException(CASRuntimeException.INVALID_FEATURE_PATH, pathSnippet);
}
@@ -255,47 +255,47 @@ public class FeatureValuePathImpl implements FeatureValuePath {
if (currentFS == 0) {
return null;
}
- if (isArrayType) {
- if (arrayIndex == USE_ALL_ENTRIES) {
+ if (this.isArrayType) {
+ if (this.arrayIndex == USE_ALL_ENTRIES) {
throw new IllegalStateException("feature path denotes an array");
}
- int arrayFS = (isBracketsOnly ? currentFS
- : cas.ll_getRefValue(currentFS, featureCode));
+ int arrayFS = (this.isBracketsOnly ? currentFS
+ : cas.ll_getRefValue(currentFS, this.featureCode));
int arraySize = ((CASImpl) cas).ll_getArraySize(arrayFS);
// if the user specified name[1000], but the array has only 5
// entries for name...
- if (arrayIndex >= arraySize) {
+ if (this.arrayIndex >= arraySize) {
return null;
}
- int typeClass = cas.ll_getTypeClass(featureRangeType);
+ int typeClass = cas.ll_getTypeClass(this.featureRangeType);
switch (typeClass) {
case LowLevelCAS.TYPE_CLASS_FLOATARRAY:
int position = getArrayIndex(arraySize);
return cas.ll_getFloatArrayValue(arrayFS, position, false);
case LowLevelCAS.TYPE_CLASS_FSARRAY:
int childFS = getFsAtIndex(arrayFS, cas, arraySize);
- return childPath.evaluateAsFloat(childFS, cas);
+ return this.childPath.evaluateAsFloat(childFS, cas);
default:
throw new IllegalStateException("feature path snippet is neither float nor fs array");
}
}
- if (isListType) {
- if (arrayIndex == USE_ALL_ENTRIES) {
+ if (this.isListType) {
+ if (this.arrayIndex == USE_ALL_ENTRIES) {
throw new IllegalStateException("feature path denotes an array");
}
- int listFS = (isBracketsOnly ? currentFS
- : cas.ll_getRefValue(currentFS, featureCode));
+ int listFS = (this.isBracketsOnly ? currentFS
+ : cas.ll_getRefValue(currentFS, this.featureCode));
- switch (listType) {
+ switch (this.listType) {
case TYPE_CLASS_FLOATLIST:
return (Float) getValueAtListIndex(cas, listFS);
case TYPE_CLASS_FSLIST:
int childFs = getFsAtListIndex(cas, listFS);
if (childFs != 0) {
- return childPath.evaluateAsFloat(childFs, cas);
+ return this.childPath.evaluateAsFloat(childFs, cas);
}
return null;
default:
@@ -303,17 +303,17 @@ public class FeatureValuePathImpl implements FeatureValuePath {
}
}
- if (childPath != null) {
- int childFS = cas.ll_getRefValue(currentFS, featureCode, CAS_TYPE_CHECKS);
- return childPath.evaluateAsFloat(childFS, cas);
- } else if (isCoveredTextFeature || isUniqueIdFeature || isFsIdFeature
- || isTypeNameFeature) {
+ if (this.childPath != null) {
+ int childFS = cas.ll_getRefValue(currentFS, this.featureCode, CAS_TYPE_CHECKS);
+ return this.childPath.evaluateAsFloat(childFS, cas);
+ } else if (this.isCoveredTextFeature || this.isUniqueIdFeature || this.isFsIdFeature
+ || this.isTypeNameFeature) {
throw new IllegalStateException("feature path does not denote a float");
} else {
- int typeClass = cas.ll_getTypeClass(featureRangeType);
+ int typeClass = cas.ll_getTypeClass(this.featureRangeType);
switch (typeClass) {
case LowLevelCAS.TYPE_CLASS_FLOAT:
- return cas.ll_getFloatValue(currentFS, featureCode, CAS_TYPE_CHECKS);
+ return cas.ll_getFloatValue(currentFS, this.featureCode, CAS_TYPE_CHECKS);
default:
throw new IllegalStateException("feature path does not denote a float");
}
@@ -329,33 +329,33 @@ public class FeatureValuePathImpl implements FeatureValuePath {
return null;
}
- if (isArrayType) {
+ if (this.isArrayType) {
// if the path snippet is [], the currentFS itself is the aray. If
// the path snippet is like authors[], the "authors" feature
// contains the array
- int arrayFS = (isBracketsOnly ? currentFS
- : cas.ll_getRefValue(currentFS, featureCode));
+ int arrayFS = (this.isBracketsOnly ? currentFS
+ : cas.ll_getRefValue(currentFS, this.featureCode));
int arraySize = ((CASImpl) cas).ll_getArraySize(arrayFS);
// if the user specified name[1000], but the array has only 5
// entries for name...
- if (arrayIndex >= arraySize) {
+ if (this.arrayIndex >= arraySize) {
return null;
}
- if (arrayIndex == USE_ALL_ENTRIES) {
+ if (this.arrayIndex == USE_ALL_ENTRIES) {
// we currently assume that there can only be one [] in the path
// hence, it's safe to say that we can collect floats here
Float[] result = new Float[arraySize];
- if (childPath != null) { // this snippet denotes an
+ if (this.childPath != null) { // this snippet denotes an
// FSArray
// iterate through the snippets, which will return floats
for (int i = 0; i < arraySize; i++) {
int childFS = cas.ll_getRefArrayValue(arrayFS, i, CAS_TYPE_CHECKS);
- result[i] = childPath.evaluateAsFloat(childFS, cas);
+ result[i] = this.childPath.evaluateAsFloat(childFS, cas);
}
} else {
// this snippet denotes a float array, just collect it
@@ -367,15 +367,15 @@ public class FeatureValuePathImpl implements FeatureValuePath {
}
// resume evaluation at the correct array entry
int childFS = getFsAtIndex(arrayFS, cas, arraySize);
- return childPath.evaluateAsFloatArray(childFS, cas);
- } else if (isListType) {
+ return this.childPath.evaluateAsFloatArray(childFS, cas);
+ } else if (this.isListType) {
// if the path snippet is [], the currentFS itself is the list. If
// the path snippet is like authors[], the "authors" feature
// contains the list
- int listFS = (isBracketsOnly ? currentFS
- : cas.ll_getRefValue(currentFS, featureCode));
+ int listFS = (this.isBracketsOnly ? currentFS
+ : cas.ll_getRefValue(currentFS, this.featureCode));
- if (arrayIndex == USE_ALL_ENTRIES) {
+ if (this.arrayIndex == USE_ALL_ENTRIES) {
ArrayList resultList = (ArrayList) getValueAtListIndex(cas, listFS);
if (resultList == null) {
@@ -386,12 +386,12 @@ public class FeatureValuePathImpl implements FeatureValuePath {
// hence, it's safe to say that we can collect floats here
Float[] result = new Float[resultList.size()];
- if (childPath != null) { // this snippet denotes an
+ if (this.childPath != null) { // this snippet denotes an
// FSList
// iterate through the results , which will return floats
for (int i = 0; i < resultList.size(); i++) {
int childFS = (Integer) resultList.get(i);
- result[i] = childPath.evaluateAsFloat(childFS, cas);
+ result[i] = this.childPath.evaluateAsFloat(childFS, cas);
}
} else {
// this snippet denotes a float list, just collect it
@@ -401,11 +401,11 @@ public class FeatureValuePathImpl implements FeatureValuePath {
}
// resume evaluation at the correct list entry
int childFS = getFsAtListIndex(cas, listFS);
- return childPath.evaluateAsFloatArray(childFS, cas);
+ return this.childPath.evaluateAsFloatArray(childFS, cas);
} else {
// resume evaulation with the next snippet
- int childFS = cas.ll_getRefValue(currentFS, featureCode, CAS_TYPE_CHECKS);
- return childPath.evaluateAsFloatArray(childFS, cas);
+ int childFS = cas.ll_getRefValue(currentFS, this.featureCode, CAS_TYPE_CHECKS);
+ return this.childPath.evaluateAsFloatArray(childFS, cas);
}
}
@@ -415,46 +415,46 @@ public class FeatureValuePathImpl implements FeatureValuePath {
return null;
}
- if (isArrayType) {
- if (arrayIndex == USE_ALL_ENTRIES) {
+ if (this.isArrayType) {
+ if (this.arrayIndex == USE_ALL_ENTRIES) {
throw new IllegalStateException("feature path denotes an array");
}
- int arrayFS = (isBracketsOnly ? currentFS
- : cas.ll_getRefValue(currentFS, featureCode));
+ int arrayFS = (this.isBracketsOnly ? currentFS
+ : cas.ll_getRefValue(currentFS, this.featureCode));
int arraySize = ((CASImpl) cas).ll_getArraySize(arrayFS);
// if the user specified name[1000], but the array has only 5
// entries for name...
- if (arrayIndex >= arraySize) {
+ if (this.arrayIndex >= arraySize) {
return null;
}
- int typeClass = cas.ll_getTypeClass(featureRangeType);
+ int typeClass = cas.ll_getTypeClass(this.featureRangeType);
switch (typeClass) {
case LowLevelCAS.TYPE_CLASS_INTARRAY:
int position = getArrayIndex(arraySize);
return cas.ll_getIntArrayValue(arrayFS, position, false);
case LowLevelCAS.TYPE_CLASS_FSARRAY:
int childFS = getFsAtIndex(arrayFS, cas, arraySize);
- return childPath.evaluateAsInt(childFS, cas);
+ return this.childPath.evaluateAsInt(childFS, cas);
default:
throw new IllegalStateException("feature path snippet is neither int nor fs array");
}
}
- if (isListType) {
- if (arrayIndex == USE_ALL_ENTRIES) {
+ if (this.isListType) {
+ if (this.arrayIndex == USE_ALL_ENTRIES) {
throw new IllegalStateException("feature path denotes an array");
}
- int listFS = (isBracketsOnly ? currentFS
- : cas.ll_getRefValue(currentFS, featureCode));
+ int listFS = (this.isBracketsOnly ? currentFS
+ : cas.ll_getRefValue(currentFS, this.featureCode));
- switch (listType) {
+ switch (this.listType) {
case TYPE_CLASS_INTEGERLIST:
return (Integer) getValueAtListIndex(cas, listFS);
case TYPE_CLASS_FSLIST:
int childFs = getFsAtListIndex(cas, listFS);
if (childFs != 0) {
- return childPath.evaluateAsInt(childFs, cas);
+ return this.childPath.evaluateAsInt(childFs, cas);
}
return null;
default:
@@ -462,20 +462,20 @@ public class FeatureValuePathImpl implements FeatureValuePath {
}
}
- if (childPath != null) {
- int childFS = cas.ll_getRefValue(currentFS, featureCode, CAS_TYPE_CHECKS);
- return childPath.evaluateAsInt(childFS, cas);
- } else if (isCoveredTextFeature || isTypeNameFeature) {
+ if (this.childPath != null) {
+ int childFS = cas.ll_getRefValue(currentFS, this.featureCode, CAS_TYPE_CHECKS);
+ return this.childPath.evaluateAsInt(childFS, cas);
+ } else if (this.isCoveredTextFeature || this.isTypeNameFeature) {
throw new IllegalStateException("feature path does not denote an int");
- } else if (isFsIdFeature) {
+ } else if (this.isFsIdFeature) {
return currentFS;
- } else if (isUniqueIdFeature) {
+ } else if (this.isUniqueIdFeature) {
return currentFS; // TODO: return currentFs + chunkId
} else {
- int typeClass = cas.ll_getTypeClass(featureRangeType);
+ int typeClass = cas.ll_getTypeClass(this.featureRangeType);
switch (typeClass) {
case LowLevelCAS.TYPE_CLASS_INT:
- return cas.ll_getIntValue(currentFS, featureCode, CAS_TYPE_CHECKS);
+ return cas.ll_getIntValue(currentFS, this.featureCode, CAS_TYPE_CHECKS);
default:
throw new IllegalStateException("feature path does not denote an int");
}
@@ -491,33 +491,33 @@ public class FeatureValuePathImpl implements FeatureValuePath {
return null;
}
- if (isArrayType) {
+ if (this.isArrayType) {
// if the path snippet is [], the currentFS itself is the aray. If
// the path snippet is like authors[], the "authors" feature
// contains the array
- int arrayFS = (isBracketsOnly ? currentFS
- : cas.ll_getRefValue(currentFS, featureCode));
+ int arrayFS = (this.isBracketsOnly ? currentFS
+ : cas.ll_getRefValue(currentFS, this.featureCode));
int arraySize = ((CASImpl) cas).ll_getArraySize(arrayFS);
// if the user specified name[1000], but the array has only 5
// entries for name...
- if (arrayIndex >= arraySize) {
+ if (this.arrayIndex >= arraySize) {
return null;
}
- if (arrayIndex == USE_ALL_ENTRIES) {
+ if (this.arrayIndex == USE_ALL_ENTRIES) {
// we currently assume that there can only be one [] in the path
// hence, it's safe to say that we can collect integers here
Integer[] result = new Integer[arraySize];
- if (childPath != null) { // this snippet denotes an
+ if (this.childPath != null) { // this snippet denotes an
// FSArray
// iterate through the snippets, which will return integers
for (int i = 0; i < arraySize; i++) {
int childFS = cas.ll_getRefArrayValue(arrayFS, i, CAS_TYPE_CHECKS);
- result[i] = childPath.evaluateAsInt(childFS, cas);
+ result[i] = this.childPath.evaluateAsInt(childFS, cas);
}
} else {
// this snippet denotes an int array, just collect it
@@ -529,15 +529,15 @@ public class FeatureValuePathImpl implements FeatureValuePath {
}
// resume evaluation at the correct array entry
int childFS = getFsAtIndex(arrayFS, cas, arraySize);
- return childPath.evaluateAsIntArray(childFS, cas);
- } else if (isListType) {
+ return this.childPath.evaluateAsIntArray(childFS, cas);
+ } else if (this.isListType) {
// if the path snippet is [], the currentFS itself is the list. If
// the path snippet is like authors[], the "authors" feature
// contains the list
- int listFS = (isBracketsOnly ? currentFS
- : cas.ll_getRefValue(currentFS, featureCode));
+ int listFS = (this.isBracketsOnly ? currentFS
+ : cas.ll_getRefValue(currentFS, this.featureCode));
- if (arrayIndex == USE_ALL_ENTRIES) {
+ if (this.arrayIndex == USE_ALL_ENTRIES) {
ArrayList resultList = (ArrayList) getValueAtListIndex(cas, listFS);
if (resultList == null) {
@@ -548,12 +548,12 @@ public class FeatureValuePathImpl implements FeatureValuePath {
// hence, it's safe to say that we can collect floats here
Integer[] result = new Integer[resultList.size()];
- if (childPath != null) { // this snippet denotes an
+ if (this.childPath != null) { // this snippet denotes an
// FSList
// iterate through the results , which will return floats
for (int i = 0; i < resultList.size(); i++) {
int childFS = (Integer) resultList.get(i);
- result[i] = childPath.evaluateAsInt(childFS, cas);
+ result[i] = this.childPath.evaluateAsInt(childFS, cas);
}
} else {
// this snippet denotes a float list, just collect it
@@ -563,11 +563,11 @@ public class FeatureValuePathImpl implements FeatureValuePath {
}
// resume evaluation at the correct list entry
int childFS = getFsAtListIndex(cas, listFS);
- return childPath.evaluateAsIntArray(childFS, cas);
+ return this.childPath.evaluateAsIntArray(childFS, cas);
} else {
// resume evaulation with the next snippet
- int childFS = cas.ll_getRefValue(currentFS, featureCode, CAS_TYPE_CHECKS);
- return childPath.evaluateAsIntArray(childFS, cas);
+ int childFS = cas.ll_getRefValue(currentFS, this.featureCode, CAS_TYPE_CHECKS);
+ return this.childPath.evaluateAsIntArray(childFS, cas);
}
}
@@ -588,46 +588,46 @@ public class FeatureValuePathImpl implements FeatureValuePath {
return null;
}
- if (isArrayType) {
- if (arrayIndex == USE_ALL_ENTRIES) {
+ if (this.isArrayType) {
+ if (this.arrayIndex == USE_ALL_ENTRIES) {
throw new IllegalStateException("feature path denotes an array");
}
- int arrayFS = (isBracketsOnly ? currentFS
- : cas.ll_getRefValue(currentFS, featureCode));
+ int arrayFS = (this.isBracketsOnly ? currentFS
+ : cas.ll_getRefValue(currentFS, this.featureCode));
int arraySize = ((CASImpl) cas).ll_getArraySize(arrayFS);
// if the user specified name[1000], but the array has only 5
// entries for name...
- if (arrayIndex >= arraySize) {
+ if (this.arrayIndex >= arraySize) {
return null;
}
- int typeClass = cas.ll_getTypeClass(featureRangeType);
+ int typeClass = cas.ll_getTypeClass(this.featureRangeType);
switch (typeClass) {
case LowLevelCAS.TYPE_CLASS_STRINGARRAY:
int position = getArrayIndex(arraySize);
return cas.ll_getStringArrayValue(arrayFS, position, false);
case LowLevelCAS.TYPE_CLASS_FSARRAY:
int childFS = getFsAtIndex(arrayFS, cas, arraySize);
- return childPath.evaluateAsString(childFS, cas);
+ return this.childPath.evaluateAsString(childFS, cas);
default:
throw new IllegalStateException("feature path snippet is neither string nor fs array");
}
}
- if (isListType) {
- if (arrayIndex == USE_ALL_ENTRIES) {
+ if (this.isListType) {
+ if (this.arrayIndex == USE_ALL_ENTRIES) {
throw new IllegalStateException("feature path denotes an array");
}
- int listFS = (isBracketsOnly ? currentFS
- : cas.ll_getRefValue(currentFS, featureCode));
+ int listFS = (this.isBracketsOnly ? currentFS
+ : cas.ll_getRefValue(currentFS, this.featureCode));
- switch (listType) {
+ switch (this.listType) {
case TYPE_CLASS_STRINGLIST:
return (String) getValueAtListIndex(cas, listFS);
case TYPE_CLASS_FSLIST:
int childFs = getFsAtListIndex(cas, listFS);
if (childFs != 0) {
- return childPath.evaluateAsString(childFs, cas);
+ return this.childPath.evaluateAsString(childFs, cas);
}
return null;
default:
@@ -635,24 +635,24 @@ public class FeatureValuePathImpl implements FeatureValuePath {
}
}
- if (childPath != null) {
- int childFS = cas.ll_getRefValue(currentFS, featureCode, CAS_TYPE_CHECKS);
- return childPath.evaluateAsString(childFS, cas);
- } else if (isCoveredTextFeature) {
+ if (this.childPath != null) {
+ int childFS = cas.ll_getRefValue(currentFS, this.featureCode, CAS_TYPE_CHECKS);
+ return this.childPath.evaluateAsString(childFS, cas);
+ } else if (this.isCoveredTextFeature) {
AnnotationFS annotation = (AnnotationFS) cas.ll_getFSForRef(currentFS);
return annotation.getCoveredText();
- } else if (isTypeNameFeature) {
+ } else if (this.isTypeNameFeature) {
Type type = cas.ll_getTypeSystem().ll_getTypeForCode(cas.ll_getFSRefType(currentFS));
return type.getName();
- } else if (isFsIdFeature) {
+ } else if (this.isFsIdFeature) {
throw new IllegalStateException("feature path denotes fsId()");
- } else if (isUniqueIdFeature) {
+ } else if (this.isUniqueIdFeature) {
throw new IllegalStateException("feature path denotes uniqueId()");
} else {
- int typeClass = cas.ll_getTypeClass(featureRangeType);
+ int typeClass = cas.ll_getTypeClass(this.featureRangeType);
switch (typeClass) {
case LowLevelCAS.TYPE_CLASS_STRING:
- return cas.ll_getStringValue(currentFS, featureCode, CAS_TYPE_CHECKS);
+ return cas.ll_getStringValue(currentFS, this.featureCode, CAS_TYPE_CHECKS);
case LowLevelCAS.TYPE_CLASS_FLOAT:
throw new IllegalStateException("feature path denotes a float");
case LowLevelCAS.TYPE_CLASS_INT:
@@ -672,27 +672,27 @@ public class FeatureValuePathImpl implements FeatureValuePath {
return null;
}
- if (isArrayType) {
+ if (this.isArrayType) {
// if the path snippet is [], the currentFS itself is the aray. If
// the path snippet is like authors[], the "authors" feature
// contains the array
- int arrayFS = (isBracketsOnly ? currentFS
- : cas.ll_getRefValue(currentFS, featureCode));
+ int arrayFS = (this.isBracketsOnly ? currentFS
+ : cas.ll_getRefValue(currentFS, this.featureCode));
int arraySize = ((CASImpl) cas).ll_getArraySize(arrayFS);
// if the user specified name[1000], but the array has only 5
// entries for name...
- if (arrayIndex >= arraySize) {
+ if (this.arrayIndex >= arraySize) {
return null;
}
- if (arrayIndex == USE_ALL_ENTRIES) {
+ if (this.arrayIndex == USE_ALL_ENTRIES) {
// we currently assume that there can only be one [] in the path
// hence, it's safe to say that we can collect strings here
String[] result = new String[arraySize];
- if (childPath != null) { // this snippet denotes an
+ if (this.childPath != null) { // this snippet denotes an
// FSArray
// iterate through the snippets, which will return Strings
// example author[]/name: author points to an FSArray of
@@ -700,7 +700,7 @@ public class FeatureValuePathImpl implements FeatureValuePath {
// the loop below collects their names as strings
for (int i = 0; i < arraySize; i++) {
int childFS = cas.ll_getRefArrayValue(arrayFS, i, CAS_TYPE_CHECKS);
- result[i] = childPath.evaluateAsString(childFS, cas);
+ result[i] = this.childPath.evaluateAsString(childFS, cas);
}
} else {
// arrayFS itself denotes a String array, just collect it
@@ -713,15 +713,15 @@ public class FeatureValuePathImpl implements FeatureValuePath {
// the snippet is like ...[1] or ...[last]
// resume evaluation at the correct array entry
int childFS = getFsAtIndex(arrayFS, cas, arraySize);
- return childPath.evaluateAsStringArray(childFS, cas);
- } else if (isListType) {
+ return this.childPath.evaluateAsStringArray(childFS, cas);
+ } else if (this.isListType) {
// if the path snippet is [], the currentFS itself is the list. If
// the path snippet is like authors[], the "authors" feature
// contains the list
- int listFS = (isBracketsOnly ? currentFS
- : cas.ll_getRefValue(currentFS, featureCode));
+ int listFS = (this.isBracketsOnly ? currentFS
+ : cas.ll_getRefValue(currentFS, this.featureCode));
- if (arrayIndex == USE_ALL_ENTRIES) {
+ if (this.arrayIndex == USE_ALL_ENTRIES) {
ArrayList resultList = (ArrayList) getValueAtListIndex(cas, listFS);
if (resultList == null) {
@@ -732,12 +732,12 @@ public class FeatureValuePathImpl implements FeatureValuePath {
// hence, it's safe to say that we can collect floats here
String[] result = new String[resultList.size()];
- if (childPath != null) { // this snippet denotes an
+ if (this.childPath != null) { // this snippet denotes an
// FSList
// iterate through the results , which will return floats
for (int i = 0; i < resultList.size(); i++) {
int childFS = (Integer) resultList.get(i);
- result[i] = childPath.evaluateAsString(childFS, cas);
+ result[i] = this.childPath.evaluateAsString(childFS, cas);
}
} else {
// this snippet denotes a float list, just collect it
@@ -747,13 +747,13 @@ public class FeatureValuePathImpl implements FeatureValuePath {
}
// resume evaluation at the correct list entry
int childFS = getFsAtListIndex(cas, listFS);
- return childPath.evaluateAsStringArray(childFS, cas);
+ return this.childPath.evaluateAsStringArray(childFS, cas);
} else {
// this is just an intermediate feature (like "metadata" in
// metadata/author[]/name)
// resume evaulation with the next snippet
- int childFS = cas.ll_getRefValue(currentFS, featureCode, CAS_TYPE_CHECKS);
- return childPath.evaluateAsStringArray(childFS, cas);
+ int childFS = cas.ll_getRefValue(currentFS, this.featureCode, CAS_TYPE_CHECKS);
+ return this.childPath.evaluateAsStringArray(childFS, cas);
}
}
@@ -773,10 +773,10 @@ public class FeatureValuePathImpl implements FeatureValuePath {
*/
@Override
public int getFSType() {
- if (isSimpleRangeType) {
- return typeCode;
+ if (this.isSimpleRangeType) {
+ return this.typeCode;
}
- return childPath.getFSType();
+ return this.childPath.getFSType();
}
/**
@@ -795,66 +795,66 @@ public class FeatureValuePathImpl implements FeatureValuePath {
*/
@Override
public String getValueType() {
- if (valueTypeName == null) {
- valueTypeName = childPath.getValueType();
- if (arrayIndex == USE_ALL_ENTRIES) {
- if (CAS.TYPE_NAME_STRING.equals(valueTypeName)) {
- valueTypeName = CAS.TYPE_NAME_STRING_ARRAY;
- } else if (CAS.TYPE_NAME_INTEGER.equals(valueTypeName)) {
- valueTypeName = CAS.TYPE_NAME_INTEGER_ARRAY;
- } else if (CAS.TYPE_NAME_FLOAT.equals(valueTypeName)) {
- valueTypeName = CAS.TYPE_NAME_FLOAT_ARRAY;
+ if (this.valueTypeName == null) {
+ this.valueTypeName = this.childPath.getValueType();
+ if (this.arrayIndex == USE_ALL_ENTRIES) {
+ if (CAS.TYPE_NAME_STRING.equals(this.valueTypeName)) {
+ this.valueTypeName = CAS.TYPE_NAME_STRING_ARRAY;
+ } else if (CAS.TYPE_NAME_INTEGER.equals(this.valueTypeName)) {
+ this.valueTypeName = CAS.TYPE_NAME_INTEGER_ARRAY;
+ } else if (CAS.TYPE_NAME_FLOAT.equals(this.valueTypeName)) {
+ this.valueTypeName = CAS.TYPE_NAME_FLOAT_ARRAY;
}
}
}
- return valueTypeName;
+ return this.valueTypeName;
}
@Override
public String toString() {
StringBuilder result = new StringBuilder();
- if (typeNameInSnippet != null) {
- result.append(typeNameInSnippet);
+ if (this.typeNameInSnippet != null) {
+ result.append(this.typeNameInSnippet);
result.append(TypeSystem.FEATURE_SEPARATOR);
}
- result.append(featureName);
- if (isArrayOrList) {
+ result.append(this.featureName);
+ if (this.isArrayOrList) {
result.append('[');
- if (!isBracketsOnly && arrayIndex >= 0) {
- result.append(arrayIndex);
+ if (!this.isBracketsOnly && this.arrayIndex >= 0) {
+ result.append(this.arrayIndex);
}
- if (arrayIndex == LAST_ARRAY_ENTRY) {
+ if (this.arrayIndex == LAST_ARRAY_ENTRY) {
result.append(LAST_ARRAY_ENTRY_MARKER);
}
result.append(']');
}
- if (childPath != null) {
+ if (this.childPath != null) {
result.append('/');
- result.append(childPath.toString());
+ result.append(this.childPath.toString());
}
return result.toString();
}
@Override
public void typeSystemInit(int fsType, LowLevelTypeSystem ts) throws CASRuntimeException {
- if (typeNameInSnippet != null) { // if the feature path snippet
+ if (this.typeNameInSnippet != null) { // if the feature path snippet
// defines
// its own
// type,
// we use that one instead of the one that's passed in
- fsType = ts.ll_getCodeForTypeName(typeNameInSnippet);
+ fsType = ts.ll_getCodeForTypeName(this.typeNameInSnippet);
}
if (fsType == LowLevelTypeSystem.UNKNOWN_TYPE_CODE) {
throw new CASRuntimeException(CASRuntimeException.INVALID_FEATURE_PATH,
- typeNameInSnippet);
+ this.typeNameInSnippet);
}
// the range type denotes what type of FSes (or
// built-in type) is contained in this feature
int rangeTypeCode = LowLevelTypeSystem.UNKNOWN_TYPE_CODE;
- if (!(isBuiltInFeature() || isBracketsOnly)) {
+ if (!(isBuiltInFeature() || this.isBracketsOnly)) {
// find the feature in fsType that corresponds to this path snippet
int[] features = ts.ll_getAppropriateFeatures(fsType);
boolean found = false;
@@ -862,79 +862,79 @@ public class FeatureValuePathImpl implements FeatureValuePath {
int i = 0;
for (; i < features.length && (!found); i++) {
Feature feature = ts.ll_getFeatureForCode(features[i]);
- found = feature.getShortName().equals(featureName);
+ found = feature.getShortName().equals(this.featureName);
}
if (found) {
// store the feature code that corresponds to this path snippet
- featureCode = features[i - 1];
- rangeTypeCode = ts.ll_getRangeType(featureCode);
+ this.featureCode = features[i - 1];
+ rangeTypeCode = ts.ll_getRangeType(this.featureCode);
} else {
Type type = ts.ll_getTypeForCode(fsType);
- throw new CASRuntimeException(CASRuntimeException.INAPPROP_FEAT, featureName,
+ throw new CASRuntimeException(CASRuntimeException.INAPPROP_FEAT, this.featureName,
type.getName());
}
}
- if (isBracketsOnly) {
+ if (this.isBracketsOnly) {
rangeTypeCode = fsType;
}
- typeCode = fsType;
+ this.typeCode = fsType;
// TODO: check mismatch between isArray and the actual rangeTypeCode
// find out whether the type is a "simple" type that may only be used in
// the last snippet of a path
Type type = ts.ll_getTypeForCode(rangeTypeCode);
- featureRangeType = rangeTypeCode;
+ this.featureRangeType = rangeTypeCode;
if (isBuiltInFeature()) {
- isSimpleRangeType = true;
+ this.isSimpleRangeType = true;
} else {
- isSimpleRangeType = Arrays.binarySearch(SIMPLE_VAL_TYPES, type.getName()) >= 0;
+ this.isSimpleRangeType = Arrays.binarySearch(SIMPLE_VAL_TYPES, type.getName()) >= 0;
}
- if (isArrayOrList) {
+ if (this.isArrayOrList) {
int arrayType = ts.ll_getCodeForTypeName(CAS.TYPE_NAME_ARRAY_BASE);
- isArrayType = ((TypeSystemImpl) ts).subsumes(arrayType, rangeTypeCode);
- if (!isArrayType) {
+ this.isArrayType = ((TypeSystemImpl) ts).subsumes(arrayType, rangeTypeCode);
+ if (!this.isArrayType) {
// check whether the feature points to a list
- for (int i = 0; i < LIST_TYPE_NAMES.length && !isListType; i++) {
+ for (int i = 0; i < LIST_TYPE_NAMES.length && !this.isListType; i++) {
int candidateType = ts.ll_getCodeForTypeName(LIST_TYPE_NAMES[i]);
- isListType = ((TypeSystemImpl) ts).subsumes(candidateType, rangeTypeCode);
- if (isListType) {
+ this.isListType = ((TypeSystemImpl) ts).subsumes(candidateType, rangeTypeCode);
+ if (this.isListType) {
// determine the type class of the list
- listType = i;
+ this.listType = i;
}
}
// determine the right head and tail feature, depending on the
// list type
- switch (listType) {
+ switch (this.listType) {
case TYPE_CLASS_FSLIST:
- headFeature = ts.ll_getCodeForFeatureName(CAS.FEATURE_FULL_NAME_FS_LIST_HEAD);
- tailFeature = ts.ll_getCodeForFeatureName(CAS.FEATURE_FULL_NAME_FS_LIST_TAIL);
+ this.headFeature = ts.ll_getCodeForFeatureName(CAS.FEATURE_FULL_NAME_FS_LIST_HEAD);
+ this.tailFeature = ts.ll_getCodeForFeatureName(CAS.FEATURE_FULL_NAME_FS_LIST_TAIL);
break;
case TYPE_CLASS_STRINGLIST:
- headFeature = ts.ll_getCodeForFeatureName(CAS.FEATURE_FULL_NAME_STRING_LIST_HEAD);
- tailFeature = ts.ll_getCodeForFeatureName(CAS.FEATURE_FULL_NAME_STRING_LIST_TAIL);
+ this.headFeature = ts.ll_getCodeForFeatureName(CAS.FEATURE_FULL_NAME_STRING_LIST_HEAD);
+ this.tailFeature = ts.ll_getCodeForFeatureName(CAS.FEATURE_FULL_NAME_STRING_LIST_TAIL);
break;
case TYPE_CLASS_INTEGERLIST:
- headFeature = ts.ll_getCodeForFeatureName(CAS.FEATURE_FULL_NAME_INTEGER_LIST_HEAD);
- tailFeature = ts.ll_getCodeForFeatureName(CAS.FEATURE_FULL_NAME_INTEGER_LIST_TAIL);
+ this.headFeature = ts.ll_getCodeForFeatureName(CAS.FEATURE_FULL_NAME_INTEGER_LIST_HEAD);
+ this.tailFeature = ts.ll_getCodeForFeatureName(CAS.FEATURE_FULL_NAME_INTEGER_LIST_TAIL);
break;
case TYPE_CLASS_FLOATLIST:
- headFeature = ts.ll_getCodeForFeatureName(CAS.FEATURE_FULL_NAME_FLOAT_LIST_HEAD);
- tailFeature = ts.ll_getCodeForFeatureName(CAS.FEATURE_FULL_NAME_FLOAT_LIST_TAIL);
+ this.headFeature = ts.ll_getCodeForFeatureName(CAS.FEATURE_FULL_NAME_FLOAT_LIST_HEAD);
+ this.tailFeature = ts.ll_getCodeForFeatureName(CAS.FEATURE_FULL_NAME_FLOAT_LIST_TAIL);
break;
default:
break;
}
- emptyListTypes = new Type[EMPTY_LIST_TYPE_NAMES.length];
+ this.emptyListTypes = new Type[EMPTY_LIST_TYPE_NAMES.length];
for (int i = 0; i < EMPTY_LIST_TYPE_NAMES.length; i++) {
- emptyListTypes[i] = ts
+ this.emptyListTypes[i] = ts
.ll_getTypeForCode(ts.ll_getCodeForTypeName(EMPTY_LIST_TYPE_NAMES[i]));
}
@@ -942,61 +942,61 @@ public class FeatureValuePathImpl implements FeatureValuePath {
}
- if (childPath != null) {
+ if (this.childPath != null) {
// for simple range types, only [] and fsId() are allowed as child
// path
- if (isSimpleRangeType
- && !(childPath.isBracketsOnly() || childPath.isFsIdFeature)) {
- throw new CASRuntimeException(CASRuntimeException.INVALID_FEATURE_PATH, featureName);
+ if (this.isSimpleRangeType
+ && !(this.childPath.isBracketsOnly() || this.childPath.isFsIdFeature)) {
+ throw new CASRuntimeException(CASRuntimeException.INVALID_FEATURE_PATH, this.featureName);
}
// continue with the child path
- childPath.typeSystemInit(rangeTypeCode, ts);
- } else if (isCoveredTextFeature) {
+ this.childPath.typeSystemInit(rangeTypeCode, ts);
+ } else if (this.isCoveredTextFeature) {
// make sure that the type is a subtype of annotation
int annotationType = ts.ll_getCodeForTypeName(CAS.TYPE_NAME_ANNOTATION);
if (!((TypeSystemImpl) ts).subsumes(annotationType, fsType)) {
- throw new CASRuntimeException(CASRuntimeException.INVALID_FEATURE_PATH, featureName);
+ throw new CASRuntimeException(CASRuntimeException.INVALID_FEATURE_PATH, this.featureName);
}
- valueTypeName = SIMPLE_VAL_TYPES[Arrays.binarySearch(SIMPLE_VAL_TYPES,
+ this.valueTypeName = SIMPLE_VAL_TYPES[Arrays.binarySearch(SIMPLE_VAL_TYPES,
CAS.TYPE_NAME_STRING)];
- } else if (isFsIdFeature) {
- valueTypeName = SIMPLE_VAL_TYPES[Arrays.binarySearch(SIMPLE_VAL_TYPES,
+ } else if (this.isFsIdFeature) {
+ this.valueTypeName = SIMPLE_VAL_TYPES[Arrays.binarySearch(SIMPLE_VAL_TYPES,
CAS.TYPE_NAME_INTEGER)];
- } else if (isUniqueIdFeature) {
- valueTypeName = SIMPLE_VAL_TYPES[Arrays.binarySearch(SIMPLE_VAL_TYPES,
+ } else if (this.isUniqueIdFeature) {
+ this.valueTypeName = SIMPLE_VAL_TYPES[Arrays.binarySearch(SIMPLE_VAL_TYPES,
CAS.TYPE_NAME_INTEGER)];
- } else if (isTypeNameFeature) {
- valueTypeName = SIMPLE_VAL_TYPES[Arrays.binarySearch(SIMPLE_VAL_TYPES,
+ } else if (this.isTypeNameFeature) {
+ this.valueTypeName = SIMPLE_VAL_TYPES[Arrays.binarySearch(SIMPLE_VAL_TYPES,
CAS.TYPE_NAME_STRING)];
} else {
- if (!isSimpleRangeType) {
+ if (!this.isSimpleRangeType) {
CASRuntimeException exception = new CASRuntimeException(
CASRuntimeException.NO_PRIMITIVE_TAIL);
throw exception;
}
- if (isArrayOrList && (arrayIndex != USE_ALL_ENTRIES)) {
+ if (this.isArrayOrList && (this.arrayIndex != USE_ALL_ENTRIES)) {
// in the case of, say, authornames[0], the feature is of type
// string array, but it will evaluate to a string.
- valueTypeName = CONTAINER_TO_ELEMENTYPE_MAP.get(type.getName());
- } else if (isListType) { // here, we can assume that
+ this.valueTypeName = CONTAINER_TO_ELEMENTYPE_MAP.get(type.getName());
+ } else if (this.isListType) { // here, we can assume that
// arrayIndex =
// USE_ALL_ENTRIES
// we don't return lists, but arrays, so we need to map the type
// accordingly
- valueTypeName = LIST_TO_ARRAYTYPE_MAP.get(type.getName());
+ this.valueTypeName = LIST_TO_ARRAYTYPE_MAP.get(type.getName());
} else {
- valueTypeName = SIMPLE_VAL_TYPES[Arrays.binarySearch(SIMPLE_VAL_TYPES,
+ this.valueTypeName = SIMPLE_VAL_TYPES[Arrays.binarySearch(SIMPLE_VAL_TYPES,
type.getName())];
}
}
}
private boolean isBuiltInFeature() {
- return isFsIdFeature || isUniqueIdFeature || isCoveredTextFeature
- || isTypeNameFeature;
+ return this.isFsIdFeature || this.isUniqueIdFeature || this.isCoveredTextFeature
+ || this.isTypeNameFeature;
}
/**
@@ -1008,41 +1008,41 @@ public class FeatureValuePathImpl implements FeatureValuePath {
* If the closing ] is missing, or the number is not an integer
*/
private final void determineArray() throws CASRuntimeException {
- int startIndex = featureName.indexOf('[');
+ int startIndex = this.featureName.indexOf('[');
if (startIndex == -1) {
return;
}
- int endIndex = featureName.indexOf(']');
+ int endIndex = this.featureName.indexOf(']');
if (endIndex == -1) { // we're missing the ending bracket
- throw new CASRuntimeException(CASRuntimeException.INVALID_FEATURE_PATH, toString());
+ throw new CASRuntimeException(CASRuntimeException.INVALID_FEATURE_PATH, this.toString());
}
- isArrayOrList = true;
+ this.isArrayOrList = true;
- String arrayIndexString = featureName.substring(startIndex + 1, endIndex);
+ String arrayIndexString = this.featureName.substring(startIndex + 1, endIndex);
// cut off the array markers from the actual feature name
- featureName = featureName.substring(0, startIndex);
+ this.featureName = this.featureName.substring(0, startIndex);
// determine the array index to use
if (arrayIndexString.equals("")) { // empty brackets, denotes "all
// elements"
- arrayIndex = USE_ALL_ENTRIES;
+ this.arrayIndex = USE_ALL_ENTRIES;
} else if (LAST_ARRAY_ENTRY_MARKER.equalsIgnoreCase(arrayIndexString)) {
// [last],denotes "take the last array element"
- arrayIndex = LAST_ARRAY_ENTRY;
+ this.arrayIndex = LAST_ARRAY_ENTRY;
} else {
try {
- arrayIndex = Integer.parseInt(arrayIndexString);
+ this.arrayIndex = Integer.parseInt(arrayIndexString);
} catch (NumberFormatException e) {
- throw new CASRuntimeException(CASRuntimeException.INVALID_FEATURE_PATH, toString());
+ throw new CASRuntimeException(CASRuntimeException.INVALID_FEATURE_PATH, this.toString());
}
}
}
private int getArrayIndex(int arraySize) {
- return (LAST_ARRAY_ENTRY != arrayIndex ? arrayIndex : arraySize - 1);
+ return (LAST_ARRAY_ENTRY != this.arrayIndex ? this.arrayIndex : arraySize - 1);
}
private final String getFeatureInSnippet(String pathSnippet) {
@@ -1054,7 +1054,7 @@ public class FeatureValuePathImpl implements FeatureValuePath {
}
private int getFsAtIndex(int currentFS, LowLevelCAS cas, int arraySize) {
- if (!isArrayType) {
+ if (!this.isArrayType) {
throw new IllegalStateException("FeaturePath is not an array");
}
@@ -1080,7 +1080,7 @@ public class FeatureValuePathImpl implements FeatureValuePath {
* contain an entry for that index.
*/
private int getFsAtListIndex(LowLevelCAS cas, int listFS) {
- if (arrayIndex == USE_ALL_ENTRIES || listType != TYPE_CLASS_FSLIST) {
+ if (this.arrayIndex == USE_ALL_ENTRIES || this.listType != TYPE_CLASS_FSLIST) {
throw new IllegalStateException(
"feature does not denote an fs list, or does not denote a singel array entry");
}
@@ -1095,15 +1095,15 @@ public class FeatureValuePathImpl implements FeatureValuePath {
if (listFS == 0) {
return null;
}
- switch (listType) {
+ switch (this.listType) {
case TYPE_CLASS_STRINGLIST:
- return cas.ll_getStringValue(listFS, headFeature);
+ return cas.ll_getStringValue(listFS, this.headFeature);
case TYPE_CLASS_INTEGERLIST:
- return cas.ll_getIntValue(listFS, headFeature);
+ return cas.ll_getIntValue(listFS, this.headFeature);
case TYPE_CLASS_FLOATLIST:
- return cas.ll_getFloatValue(listFS, headFeature);
+ return cas.ll_getFloatValue(listFS, this.headFeature);
case TYPE_CLASS_FSLIST:
- return cas.ll_getRefValue(listFS, headFeature);
+ return cas.ll_getRefValue(listFS, this.headFeature);
default:
return null;
}
@@ -1128,8 +1128,8 @@ public class FeatureValuePathImpl implements FeatureValuePath {
if (isEmptyList(cas, type)) {
return null;
}
- int listTail = cas.ll_getRefValue(listFS, tailFeature);
- switch (arrayIndex) {
+ int listTail = cas.ll_getRefValue(listFS, this.tailFeature);
+ switch (this.arrayIndex) {
case USE_ALL_ENTRIES:
list.add(getHeadValue(cas, listFS));
return getValueAtIndexRec(cas, listTail, list, ++count);
@@ -1140,7 +1140,7 @@ public class FeatureValuePathImpl implements FeatureValuePath {
}
return getHeadValue(cas, listFS);
default:
- if (count == arrayIndex) {
+ if (count == this.arrayIndex) {
return getHeadValue(cas, listFS);
}
return getValueAtIndexRec(cas, listTail, list, ++count);
@@ -1166,15 +1166,15 @@ public class FeatureValuePathImpl implements FeatureValuePath {
}
private boolean isBracketsOnly() {
- return isBracketsOnly;
+ return this.isBracketsOnly;
}
private boolean isEmptyList(LowLevelCAS cas, int type) {
Type candidateType = cas.ll_getTypeSystem().ll_getTypeForCode(type);
TypeSystem typeSystem = ((CASImpl) cas).getTypeSystem();
boolean isEmpty = false;
- for (int i = 0; i < emptyListTypes.length && (!isEmpty); i++) {
- isEmpty = typeSystem.subsumes(emptyListTypes[i], candidateType);
+ for (int i = 0; i < this.emptyListTypes.length && (!isEmpty); i++) {
+ isEmpty = typeSystem.subsumes(this.emptyListTypes[i], candidateType);
}
return isEmpty;
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FilteredIterator.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FilteredIterator.java
index a33b58316..9a36156c9 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FilteredIterator.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FilteredIterator.java
@@ -57,50 +57,50 @@ class FilteredIterator<T extends FeatureStructure> implements LowLevelIterator<T
// at an FS
// that matches the constraint, or is not valid. Thus, for isValid(), we
// can simply refer to the underlying iterator.
- return it.isValid();
+ return this.it.isValid();
}
private void adjustForConstraintForward() {
// If the iterator is valid, but doesn't match the constraint, advance.
- while (it.isValid() && !cons.match(it.get())) {
- it.moveToNext();
+ while (this.it.isValid() && !this.cons.match(this.it.get())) {
+ this.it.moveToNext();
}
}
private void adjustForConstraintBackward() {
// If the iterator is valid, but doesn't match the constraint, advance.
- while (it.isValid() && !cons.match(it.get())) {
- it.moveToPrevious();
+ while (this.it.isValid() && !this.cons.match(this.it.get())) {
+ this.it.moveToPrevious();
}
}
@Override
public void moveToFirstNoReinit() {
- it.moveToFirstNoReinit();
+ this.it.moveToFirstNoReinit();
adjustForConstraintForward();
}
@Override
public void moveToLastNoReinit() {
- it.moveToLast();
+ this.it.moveToLast();
adjustForConstraintBackward();
}
@Override
public void moveToNextNvc() {
- it.moveToNextNvc();
+ this.it.moveToNextNvc();
adjustForConstraintForward();
}
@Override
public void moveToPreviousNvc() {
- it.moveToPreviousNvc();
+ this.it.moveToPreviousNvc();
adjustForConstraintBackward();
}
@Override
public T getNvc() {
- return it.getNvc();
+ return this.it.getNvc();
}
/**
@@ -108,7 +108,7 @@ class FilteredIterator<T extends FeatureStructure> implements LowLevelIterator<T
*/
@Override
public FilteredIterator<T> copy() {
- return new FilteredIterator<>(it.copy(), cons);
+ return new FilteredIterator<>(this.it.copy(), this.cons);
}
/**
@@ -116,7 +116,7 @@ class FilteredIterator<T extends FeatureStructure> implements LowLevelIterator<T
*/
@Override
public void moveToNoReinit(FeatureStructure fs) {
- it.moveToNoReinit(fs);
+ this.it.moveToNoReinit(fs);
adjustForConstraintForward();
}
@@ -148,7 +148,7 @@ class FilteredIterator<T extends FeatureStructure> implements LowLevelIterator<T
@Override
public boolean maybeReinitIterator() {
- return it.maybeReinitIterator();
+ return this.it.maybeReinitIterator();
}
@Override
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FloatConstraint.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FloatConstraint.java
index abbaca544..7d92fc7cf 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FloatConstraint.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FloatConstraint.java
@@ -40,13 +40,13 @@ class FloatConstraint extends PathConstraint implements FSMatchConstraint {
FloatConstraint(ArrayList<String> path, FSFloatConstraint cons) {
super(path);
- floatConstraint = cons;
+ this.floatConstraint = cons;
}
@Override
public boolean match(FeatureStructure fs) {
// compile(((FeatureStructureImpl) fs).getCAS().getTypeSystem());
- final int max = featNames.size() - 1; // The last position in the
+ final int max = this.featNames.size() - 1; // The last position in the
// path!
if (max < 0) {
// If the path is empty, we can't get a float, and therefore the
@@ -55,22 +55,22 @@ class FloatConstraint extends PathConstraint implements FSMatchConstraint {
}
Feature feat;
for (int i = 0; i < max; i++) {
- feat = fs.getType().getFeatureByBaseName(featNames.get(i));
+ feat = fs.getType().getFeatureByBaseName(this.featNames.get(i));
if (feat == null) {
return false;
}
fs = fs.getFeatureValue(feat);
}
- feat = fs.getType().getFeatureByBaseName(featNames.get(max));
+ feat = fs.getType().getFeatureByBaseName(this.featNames.get(max));
if (feat == null) {
return false;
}
- return floatConstraint.match(fs.getFloatValue(feat));
+ return this.floatConstraint.match(fs.getFloatValue(feat));
}
@Override
public String toString() {
- return super.toString() + " " + floatConstraint.toString();
+ return super.toString() + " " + this.floatConstraint.toString();
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_bag.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_bag.java
index f3daa38a9..ef7ac62dc 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_bag.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_bag.java
@@ -58,7 +58,7 @@ public class FsIndex_bag<T extends FeatureStructure> extends FsIndex_singletype<
FsIndex_bag(CASImpl cas, Type type, int initialSize, int indexType,
FSIndexComparator comparatorForIndexSpecs) {
super(cas, type, indexType, cleanUpComparator(comparatorForIndexSpecs, cas));
- index = new ObjHashSet<>(initialSize, TOP.class, TOP._singleton);
+ this.index = new ObjHashSet<>(initialSize, TOP.class, TOP._singleton);
}
/**
@@ -150,7 +150,7 @@ public class FsIndex_bag<T extends FeatureStructure> extends FsIndex_singletype<
*/
@Override
public boolean contains(FeatureStructure fs) {
- return index.contains(fs);
+ return this.index.contains(fs);
}
boolean ll_contains(int fsAddr) {
@@ -166,7 +166,7 @@ public class FsIndex_bag<T extends FeatureStructure> extends FsIndex_singletype<
*/
@Override
public T find(FeatureStructure fs) {
- final int resultAddr = index.find((TOP) fs);
+ final int resultAddr = this.index.find((TOP) fs);
if (resultAddr >= 0) {
return (T) fs;
}
@@ -179,7 +179,7 @@ public class FsIndex_bag<T extends FeatureStructure> extends FsIndex_singletype<
*/
@Override
public int size() {
- return index.size();
+ return this.index.size();
}
/**
@@ -190,7 +190,7 @@ public class FsIndex_bag<T extends FeatureStructure> extends FsIndex_singletype<
public boolean deleteFS(T fs) {
assertFsTypeMatchesIndexType(fs, "deleteFS");
maybeCopy();
- return index.remove(fs);
+ return this.index.remove(fs);
}
// @Override
@@ -205,7 +205,7 @@ public class FsIndex_bag<T extends FeatureStructure> extends FsIndex_singletype<
@Override
protected void bulkAddTo(List<T> fss) {
- fss.addAll((Collection<? extends T>) index);
+ fss.addAll((Collection<? extends T>) this.index);
}
/*
@@ -224,7 +224,7 @@ public class FsIndex_bag<T extends FeatureStructure> extends FsIndex_singletype<
@Override
protected CopyOnWriteIndexPart<T> createCopyOnWriteIndexPart() {
if (CASImpl.traceCow) {
- casImpl.traceCowCopy(this);
+ this.casImpl.traceCowCopy(this);
}
return new CopyOnWriteObjHashSet(index);
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_flat.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_flat.java
index 858fb5c2a..b22add25d 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_flat.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_flat.java
@@ -182,7 +182,7 @@ public class FsIndex_flat<T extends FeatureStructure> extends FsIndex_singletype
*/
@Override
public int size() {
- return indexedFSs.length;
+ return this.indexedFSs.length;
}
/**
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_iicp.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_iicp.java
index c74d217f5..bccded8f2 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_iicp.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_iicp.java
@@ -126,7 +126,7 @@ class FsIndex_iicp<T extends FeatureStructure> extends AbstractCollection<T>
@SuppressWarnings("rawtypes")
final FsIndex_iicp iicp = (FsIndex_iicp) o;
return this.getIndexingStrategy() == iicp.getIndexingStrategy()
- && fsIndex_singletype.getComparatorImplForIndexSpecs()
+ && this.fsIndex_singletype.getComparatorImplForIndexSpecs()
.equals(iicp.fsIndex_singletype.getComparatorImplForIndexSpecs());
}
@@ -139,7 +139,7 @@ class FsIndex_iicp<T extends FeatureStructure> extends AbstractCollection<T>
final int prime = 31;
int result = 1;
// next hashCode includes the type
- result = prime * result + fsIndex_singletype.getComparatorImplForIndexSpecs().hashCode();
+ result = prime * result + this.fsIndex_singletype.getComparatorImplForIndexSpecs().hashCode();
result = prime * result + this.getIndexingStrategy();
return result;
}
@@ -158,7 +158,7 @@ class FsIndex_iicp<T extends FeatureStructure> extends AbstractCollection<T>
return;
}
- final TypeImpl rootType = (TypeImpl) fsIndex_singletype.getComparatorImplForIndexSpecs()
+ final TypeImpl rootType = (TypeImpl) this.fsIndex_singletype.getComparatorImplForIndexSpecs()
.getType();
final int indexKind = this.getIndexingStrategy();
int size = (indexKind == FSIndex.DEFAULT_BAG_INDEX) ? 1
@@ -191,13 +191,13 @@ class FsIndex_iicp<T extends FeatureStructure> extends AbstractCollection<T>
// }
// tempSubIndexCache.add(singleIndex);});
- cachedSubFsLeafIndexes = tempSubIndexCache
+ this.cachedSubFsLeafIndexes = tempSubIndexCache
.toArray(new FsIndex_singletype[tempSubIndexCache.size()]);
if (this.getIndexingStrategy() == FSIndex.SORTED_INDEX) {
Arrays.sort(sortedTypeCodes);
}
// assign to "volatile" at end, after all initialization is complete
- isIteratorCacheSetup = true;
+ this.isIteratorCacheSetup = true;
} // end of synchronized block
}
@@ -240,14 +240,14 @@ class FsIndex_iicp<T extends FeatureStructure> extends AbstractCollection<T>
*/
@Override
public int compareTo(FsIndex_iicp<? extends FeatureStructure> cp) {
- final int typeCode1 = ((TypeImpl) fsIndex_singletype.getType()).getCode();
+ final int typeCode1 = ((TypeImpl) this.fsIndex_singletype.getType()).getCode();
final int typeCode2 = ((TypeImpl) cp.fsIndex_singletype.getType()).getCode();
if (typeCode1 < typeCode2) {
return -1;
} else if (typeCode1 > typeCode2) {
return 1;
} else { // types are equal
- return fsIndex_singletype.getComparatorImplForIndexSpecs()
+ return this.fsIndex_singletype.getComparatorImplForIndexSpecs()
.compareTo(cp.fsIndex_singletype.getComparatorImplForIndexSpecs());
}
}
@@ -302,7 +302,7 @@ class FsIndex_iicp<T extends FeatureStructure> extends AbstractCollection<T>
* @return a guess at the size, done quickly
*/
int guessedSize() {
- final FsIndex_singletype<TOP>[] localIc = cachedSubFsLeafIndexes;
+ final FsIndex_singletype<TOP>[] localIc = this.cachedSubFsLeafIndexes;
final int len = localIc.length;
final int lim = Math.min(3, len);
int size = 0;
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_set_sorted.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_set_sorted.java
index afe229d59..28b4cff99 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_set_sorted.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_set_sorted.java
@@ -68,13 +68,13 @@ final public class FsIndex_set_sorted<T extends FeatureStructure> extends FsInde
FSIndexComparator comparatorForIndexSpecs) {
super(cas, type, indexType, comparatorForIndexSpecs);
- indexedFSs = new OrderedFsSet_array<>(comparatorNoTypeWithID, comparatorNoTypeWithoutID);
+ this.indexedFSs = new OrderedFsSet_array<>(comparatorNoTypeWithID, comparatorNoTypeWithoutID);
}
@Override
public void flush() {
super.flush();
- indexedFSs.clear();
+ this.indexedFSs.clear();
}
/**
@@ -131,8 +131,8 @@ final public class FsIndex_set_sorted<T extends FeatureStructure> extends FsInde
// @formatter:on
@Override
public T find(FeatureStructure templateKey) {
- int pos = indexedFSs.findWithoutID((TOP) templateKey);
- return (pos >= 0) ? indexedFSs.getAtPos(pos) : null;
+ int pos = this.indexedFSs.findWithoutID((TOP) templateKey);
+ return (pos >= 0) ? this.indexedFSs.getAtPos(pos) : null;
}
// @Override
@@ -196,7 +196,7 @@ final public class FsIndex_set_sorted<T extends FeatureStructure> extends FsInde
*/
@Override
public int size() {
- return indexedFSs.size()/* + itemsToBeAdded.size() */;
+ return this.indexedFSs.size()/* + itemsToBeAdded.size() */;
}
/**
@@ -216,7 +216,7 @@ final public class FsIndex_set_sorted<T extends FeatureStructure> extends FsInde
assertFsTypeMatchesIndexType(fs, "deleteFS");
// maybeProcessBulkAdds(); // moved to OrderedFsSet_array class
maybeCopy();
- return indexedFSs.remove(fs);
+ return this.indexedFSs.remove(fs);
}
@Override
@@ -272,7 +272,7 @@ final public class FsIndex_set_sorted<T extends FeatureStructure> extends FsInde
@Override
protected CopyOnWriteIndexPart createCopyOnWriteIndexPart() {
if (CASImpl.traceCow) {
- casImpl.traceCowCopy(this);
+ this.casImpl.traceCowCopy(this);
}
return new CopyOnWriteOrderedFsSet_array(indexedFSs);
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_singletype.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_singletype.java
index 02121ea84..5cb786bc7 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_singletype.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_singletype.java
@@ -159,18 +159,18 @@ public abstract class FsIndex_singletype<T extends FeatureStructure> extends Abs
protected FsIndex_singletype(CASImpl cas, Type type, int indexType,
FSIndexComparator comparatorForIndexSpecs) {
this.indexType = indexType;
- casImpl = cas;
+ this.casImpl = cas;
this.type = (TypeImpl) type;
- typeCode = ((TypeImpl) type).getCode();
+ this.typeCode = ((TypeImpl) type).getCode();
FSIndexComparatorImpl compForIndexSpecs = (FSIndexComparatorImpl) comparatorForIndexSpecs;
this.comparatorForIndexSpecs = Misc.shareExisting(compForIndexSpecs, comparatorCache);
// this.comparatorForIndexSpecs = compForIndexSpecs/*.copy()*/;
// Initialize the comparator info.
final int nKeys = this.comparatorForIndexSpecs.getNumberOfKeys();
- keys = new Object[nKeys];
- keyTypeCodes = new int[nKeys];
- isReverse = new boolean[nKeys];
+ this.keys = new Object[nKeys];
+ this.keyTypeCodes = new int[nKeys];
+ this.isReverse = new boolean[nKeys];
if (!this.comparatorForIndexSpecs.isValid()) {
isAnnotIdx = false;
@@ -198,7 +198,7 @@ public abstract class FsIndex_singletype<T extends FeatureStructure> extends Abs
.getKeyComparator(i) == FSIndexComparator.REVERSE_STANDARD_COMPARE;
}
- FSIndexRepositoryImpl ir = casImpl.indexRepository;
+ FSIndexRepositoryImpl ir = this.casImpl.indexRepository;
if (ir.isAnnotationIndex(comparatorForIndexSpecs, indexType)) {
comparatorWithID = ir.getAnnotationFsComparator(FSComparators.WITH_ID,
@@ -297,16 +297,16 @@ public abstract class FsIndex_singletype<T extends FeatureStructure> extends Abs
@Override
public FSIndexComparator getComparatorForIndexSpecs() {
- return comparatorForIndexSpecs;
+ return this.comparatorForIndexSpecs;
}
public FSIndexComparatorImpl getComparatorImplForIndexSpecs() {
- return comparatorForIndexSpecs;
+ return this.comparatorForIndexSpecs;
}
@Override
public int getIndexingStrategy() {
- return indexType;
+ return this.indexType;
}
/**
@@ -430,7 +430,9 @@ public abstract class FsIndex_singletype<T extends FeatureStructure> extends Abs
public boolean equals(Object obj) {
if (this == obj)
return true;
- if ((obj == null) || (getClass() != obj.getClass()))
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
return false;
FsIndex_singletype<?> other = (FsIndex_singletype<?>) obj;
if (comparatorForIndexSpecs == null) {
@@ -447,15 +449,15 @@ public abstract class FsIndex_singletype<T extends FeatureStructure> extends Abs
*/
@Override
public Type getType() {
- return type;
+ return this.type;
}
public TypeImpl getTypeImpl() {
- return type;
+ return this.type;
}
int getTypeCode() {
- return typeCode;
+ return this.typeCode;
}
// /** true if there is a type order key, and no type priorities are defined
@@ -483,7 +485,7 @@ public abstract class FsIndex_singletype<T extends FeatureStructure> extends Abs
@Override
public CASImpl getCasImpl() {
- return casImpl;
+ return this.casImpl;
}
@Override
@@ -525,13 +527,13 @@ public abstract class FsIndex_singletype<T extends FeatureStructure> extends Abs
CopyOnWriteIndexPart<T> n = getCopyOnWriteIndexPart();
if (n != null) {
if (CASImpl.traceCow) {
- casImpl.traceCowReinit("reuse", this);
+ this.casImpl.traceCowReinit("reuse", this);
}
return n;
}
if (CASImpl.traceCow) {
- casImpl.traceCowReinit("getNew", this);
+ this.casImpl.traceCowReinit("getNew", this);
}
// null means index updated since iterator was created, need to make new cow
@@ -587,13 +589,13 @@ public abstract class FsIndex_singletype<T extends FeatureStructure> extends Abs
protected final void assertFsTypeMatchesIndexType(FeatureStructure fs, String operation) {
TypeImpl fsType = ((TOP) fs)._getTypeImpl();
- if (fsType != type) {
+ if (fsType != this.type) {
String message = String.format(
"%s operation using a feature structure of type [%s](%d) from type system [%s] on index using "
+ "different type system [%s] is not supported.",
operation, fsType.getName(), fsType.getCode(),
format("<%,d>", identityHashCode(fsType.getTypeSystem())),
- format("<%,d>", identityHashCode(type.getTypeSystem())));
+ format("<%,d>", identityHashCode(this.type.getTypeSystem())));
if (TypeSystemImpl.IS_ENABLE_STRICT_TYPE_SOURCE_CHECK) {
throw new IllegalArgumentException(message);
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_snapshot.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_snapshot.java
index 1b321e64e..5fd826508 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_snapshot.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_snapshot.java
@@ -46,7 +46,7 @@ public class FsIndex_snapshot<T extends FeatureStructure> extends AbstractCollec
Comparator<TOP> comparatorTypeWithoutId) {
this.wrapped = wrapped;
this.comparatorWithoutId = comparatorWithoutId;
- comparatorNoTypeWithoutId = comparatorTypeWithoutId;
+ this.comparatorNoTypeWithoutId = comparatorTypeWithoutId;
}
/*
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_backwards.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_backwards.java
index 358cdace7..56148a91a 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_backwards.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_backwards.java
@@ -33,7 +33,7 @@ class FsIterator_backwards<T extends FeatureStructure> implements LowLevelIterat
final private LowLevelIterator<T> it; // not just for single-type iterators
FsIterator_backwards(FSIterator<T> iterator) {
- it = (LowLevelIterator<T>) iterator;
+ this.it = (LowLevelIterator<T>) iterator;
it.moveToLast(); // will act like move to first
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_bag.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_bag.java
index f0cfada3b..b4c4dfaf1 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_bag.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_bag.java
@@ -143,7 +143,7 @@ class FsIterator_bag<T extends FeatureStructure> extends FsIterator_singletype<T
*/
@Override
public FsIterator_bag<T> copy() {
- FsIterator_bag<T> copy = new FsIterator_bag<>(fsBagIndex, ti, bag);
+ FsIterator_bag<T> copy = new FsIterator_bag<>(this.fsBagIndex, this.ti, bag);
copyCommonSetup(copy);
return copy;
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_bag_pear.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_bag_pear.java
index dc7e6615f..ba7619999 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_bag_pear.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_bag_pear.java
@@ -43,7 +43,7 @@ class FsIterator_bag_pear<T extends FeatureStructure> extends FsIterator_bag<T>
@Override
public FsIterator_bag_pear<T> copy() {
- FsIterator_bag_pear<T> copy = new FsIterator_bag_pear<>(fsBagIndex, ti, bag);
+ FsIterator_bag_pear<T> copy = new FsIterator_bag_pear<>(this.fsBagIndex, this.ti, this.bag);
copyCommonSetup(copy);
return copy;
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_limited.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_limited.java
index 0572399ca..17ad1a752 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_limited.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_limited.java
@@ -41,7 +41,7 @@ class FsIterator_limited<T extends FeatureStructure> implements LowLevelIterator
FsIterator_limited(FSIterator<T> iterator, int limit) {
this.iterator = (LowLevelIterator<T>) iterator;
this.limit = limit;
- limitReached = limit <= count;
+ this.limitReached = limit <= count;
}
private void maybeMakeInvalid() {
@@ -84,7 +84,7 @@ class FsIterator_limited<T extends FeatureStructure> implements LowLevelIterator
public void moveToFirstNoReinit() {
iterator.moveToFirstNoReinit();
count = 0;
- limitReached = limit <= count;
+ this.limitReached = limit <= count;
}
@Override
@@ -105,7 +105,7 @@ class FsIterator_limited<T extends FeatureStructure> implements LowLevelIterator
count++;
}
}
- limitReached = limit <= count;
+ this.limitReached = limit <= count;
}
@Override
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_multiple_indexes.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_multiple_indexes.java
index 8ff512dea..6e9b13499 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_multiple_indexes.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_multiple_indexes.java
@@ -74,7 +74,7 @@ public abstract class FsIterator_multiple_indexes<T extends FeatureStructure>
public FsIterator_multiple_indexes(LowLevelIndex<T> main_idx, LowLevelIterator<T>[] iterators,
// boolean ignoreType_moveToLeftmost) {
Comparator<TOP> comparatorMaybeNoTypeWithoutId) {
- allIterators = iterators;
+ this.allIterators = iterators;
this.main_idx = main_idx;
this.comparatorMaybeNoTypeWithoutId = comparatorMaybeNoTypeWithoutId;
separate_into_empty_indexes_and_non_empty_iterators();
@@ -88,8 +88,8 @@ public abstract class FsIterator_multiple_indexes<T extends FeatureStructure>
*/
public FsIterator_multiple_indexes(FsIterator_multiple_indexes<T> v) {
allIterators = v.allIterators.clone();
- main_idx = v.main_idx;
- comparatorMaybeNoTypeWithoutId = v.comparatorMaybeNoTypeWithoutId;
+ this.main_idx = v.main_idx;
+ this.comparatorMaybeNoTypeWithoutId = v.comparatorMaybeNoTypeWithoutId;
int i = 0;
for (LowLevelIterator<T> it : allIterators) {
allIterators[i++] = (LowLevelIterator<T>) it.copy();
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_set_sorted_pear.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_set_sorted_pear.java
index 4b6f2967c..f97c3e77a 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_set_sorted_pear.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_set_sorted_pear.java
@@ -48,7 +48,7 @@ class FsIterator_set_sorted_pear<T extends FeatureStructure> extends FsIterator_
@Override
public FsIterator_set_sorted_pear<T> copy() {
FsIterator_set_sorted_pear<T> r = new FsIterator_set_sorted_pear<>(ll_index, ofsa,
- comparatorMaybeNoTypeWithoutID);
+ this.comparatorMaybeNoTypeWithoutID);
copyCommonSetup(r);
return r;
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_singletype.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_singletype.java
index 097abf887..a9cfcbd53 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_singletype.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_singletype.java
@@ -96,7 +96,7 @@ public abstract class FsIterator_singletype<T extends FeatureStructure>
.append(System.identityHashCode(this));
sb.append(" over Type: ").append(type.getName()).append(":").append(ti.getCode());
sb.append(", index size (may not match current index size): ")
- .append(ll_indexSizeMaybeNotCurrent());
+ .append(this.ll_indexSizeMaybeNotCurrent());
return sb.toString();
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_subtypes_ordered.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_subtypes_ordered.java
index 31d16808f..dfa2a63db 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_subtypes_ordered.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_subtypes_ordered.java
@@ -87,12 +87,12 @@ public class FsIterator_subtypes_ordered<T extends FeatureStructure>
dumpIteratorInfo("moveToFirstNoReinit - start");
}
- int lvi = nonEmptyIterators.length - 1;
+ int lvi = this.nonEmptyIterators.length - 1;
// Need to consider all iterators.
// Set all iterators to insertion point.
int i = 0;
while (i <= lvi) {
- final LowLevelIterator<T> it = nonEmptyIterators[i];
+ final LowLevelIterator<T> it = this.nonEmptyIterators[i];
it.moveToFirstNoReinit();
if (it.isValid()) {
heapify_up(it, i, 1);
@@ -100,14 +100,14 @@ public class FsIterator_subtypes_ordered<T extends FeatureStructure>
} else {
// swap this iterator with the last possibly valid one
// lvi might be equal to i, this will not be a problem
- nonEmptyIterators[i] = nonEmptyIterators[lvi];
- nonEmptyIterators[lvi] = it;
+ this.nonEmptyIterators[i] = this.nonEmptyIterators[lvi];
+ this.nonEmptyIterators[lvi] = it;
--lvi;
}
}
// configured to continue with forward iterations
- wentForward = true;
- lastValidIteratorIndex = lvi;
+ this.wentForward = true;
+ this.lastValidIteratorIndex = lvi;
if (DEBUG) {
dumpIteratorInfo("moveToFirstNoReinit - end");
@@ -123,12 +123,12 @@ public class FsIterator_subtypes_ordered<T extends FeatureStructure>
// no need to call isIndexesHaveBeenUpdated because
// there's no state in this iterator that needs updating.
- int lvi = nonEmptyIterators.length - 1;
+ int lvi = this.nonEmptyIterators.length - 1;
// Need to consider all iterators.
// Set all iterators to insertion point.
int i = 0;
while (i <= lvi) {
- final LowLevelIterator<T> it = nonEmptyIterators[i];
+ final LowLevelIterator<T> it = this.nonEmptyIterators[i];
// it.resetConcurrentModification();
it.moveToLastNoReinit();
if (it.isValid()) {
@@ -137,14 +137,14 @@ public class FsIterator_subtypes_ordered<T extends FeatureStructure>
} else {
// swap this iterator with the last possibly valid one
// lvi might be equal to i, this will not be a problem
- nonEmptyIterators[i] = nonEmptyIterators[lvi];
- nonEmptyIterators[lvi] = it;
+ this.nonEmptyIterators[i] = this.nonEmptyIterators[lvi];
+ this.nonEmptyIterators[lvi] = it;
--lvi;
}
}
// configured to continue with backward iterations
- wentForward = false;
- lastValidIteratorIndex = lvi;
+ this.wentForward = false;
+ this.lastValidIteratorIndex = lvi;
if (DEBUG) {
dumpIteratorInfo("moveToLastNoReinit - end");
@@ -159,7 +159,7 @@ public class FsIterator_subtypes_ordered<T extends FeatureStructure>
final LowLevelIterator<T> it0 = nonEmptyIterators[0]/* .checkConcurrentModification() */;
- if (wentForward) {
+ if (this.wentForward) {
it0.moveToNextNvc();
heapify_down(it0, 1);
} else {
@@ -178,7 +178,7 @@ public class FsIterator_subtypes_ordered<T extends FeatureStructure>
*/
private void moveToNextCmn(final LowLevelIterator<T> it0) {
// We need to increment everything.
- int lvi = nonEmptyIterators.length - 1;
+ int lvi = this.nonEmptyIterators.length - 1;
int i = 1;
while (i <= lvi) {
// Any iterator other than the current one needs to be
@@ -203,14 +203,14 @@ public class FsIterator_subtypes_ordered<T extends FeatureStructure>
} else {
// swap this iterator with the last possibly valid one
// lvi might be equal to i, this will not be a problem
- nonEmptyIterators[i] = nonEmptyIterators[lvi];
- nonEmptyIterators[lvi] = it;
+ this.nonEmptyIterators[i] = this.nonEmptyIterators[lvi];
+ this.nonEmptyIterators[lvi] = it;
--lvi;
}
}
- lastValidIteratorIndex = lvi;
- wentForward = true;
+ this.lastValidIteratorIndex = lvi;
+ this.wentForward = true;
it0.moveToNext();
heapify_down(it0, 1);
@@ -224,13 +224,13 @@ public class FsIterator_subtypes_ordered<T extends FeatureStructure>
}
final LowLevelIterator<T> it0 = nonEmptyIterators[0]/* .checkConcurrentModification() */;
- if (!wentForward) {
+ if (!this.wentForward) {
it0.moveToPreviousNvc();
// this also takes care of invalid iterators
heapify_down(it0, -1);
} else {
// We need to decrement everything.
- int lvi = nonEmptyIterators.length - 1;
+ int lvi = this.nonEmptyIterators.length - 1;
int i = 1;
while (i <= lvi) {
// Any iterator other than the current one needs to be
@@ -255,14 +255,14 @@ public class FsIterator_subtypes_ordered<T extends FeatureStructure>
} else {
// swap this iterator with the last possibly valid one
// lvi might be equal to i, this will not be a problem
- nonEmptyIterators[i] = nonEmptyIterators[lvi];
- nonEmptyIterators[lvi] = it;
+ this.nonEmptyIterators[i] = this.nonEmptyIterators[lvi];
+ this.nonEmptyIterators[lvi] = it;
--lvi;
}
}
- lastValidIteratorIndex = lvi;
- wentForward = false;
+ this.lastValidIteratorIndex = lvi;
+ this.wentForward = false;
it0.moveToPrevious();
heapify_down(it0, -1);
@@ -346,25 +346,25 @@ public class FsIterator_subtypes_ordered<T extends FeatureStructure>
while (idx > SORTED_SECTION) {
nidx = (idx + SORTED_SECTION - 1) >> 1;
- if (!is_before(it, nonEmptyIterators[nidx], dir)) {
- nonEmptyIterators[idx] = it;
+ if (!is_before(it, this.nonEmptyIterators[nidx], dir)) {
+ this.nonEmptyIterators[idx] = it;
return;
}
- nonEmptyIterators[idx] = nonEmptyIterators[nidx];
+ this.nonEmptyIterators[idx] = this.nonEmptyIterators[nidx];
idx = nidx;
}
while (idx > 0) {
nidx = idx - 1;
- if (!is_before(it, nonEmptyIterators[nidx], dir)) {
- nonEmptyIterators[idx] = it;
+ if (!is_before(it, this.nonEmptyIterators[nidx], dir)) {
+ this.nonEmptyIterators[idx] = it;
return;
}
- nonEmptyIterators[idx] = nonEmptyIterators[nidx];
+ this.nonEmptyIterators[idx] = this.nonEmptyIterators[nidx];
idx = nidx;
}
- nonEmptyIterators[idx] = it;
+ this.nonEmptyIterators[idx] = it;
}
/**
@@ -385,24 +385,24 @@ public class FsIterator_subtypes_ordered<T extends FeatureStructure>
// if at the end of the iteration, the lastValidIteratorIndex is this one (e.g., is 0)
// and this operation is a noop, but sets the lastValidIteratorIndex to -1, indicating the
// iterator is invalid
- final LowLevelIterator<T> itl = nonEmptyIterators[lastValidIteratorIndex]/*
+ final LowLevelIterator<T> itl = this.nonEmptyIterators[this.lastValidIteratorIndex]/*
* .checkConcurrentModification
* ()
*/;
- nonEmptyIterators[lastValidIteratorIndex] = it;
- nonEmptyIterators[0] = itl;
- --lastValidIteratorIndex;
+ this.nonEmptyIterators[this.lastValidIteratorIndex] = it;
+ this.nonEmptyIterators[0] = itl;
+ --this.lastValidIteratorIndex;
it = itl;
}
- final int num = lastValidIteratorIndex;
+ final int num = this.lastValidIteratorIndex;
if ((num < 1)
- || !is_before(nonEmptyIterators[1]/* .checkConcurrentModification() */, it, dir)) {
+ || !is_before(this.nonEmptyIterators[1]/* .checkConcurrentModification() */, it, dir)) {
return;
}
int idx = 1;
- nonEmptyIterators[0] = nonEmptyIterators[1];
+ this.nonEmptyIterators[0] = this.nonEmptyIterators[1];
final int end = Math.min(num, SORTED_SECTION);
int nidx = idx + 1;
@@ -411,11 +411,11 @@ public class FsIterator_subtypes_ordered<T extends FeatureStructure>
// in case of a concurrent modification
try {
while (nidx <= end) {
- if (!is_before(nonEmptyIterators[nidx]/* .checkConcurrentModification() */, it, dir)) {
+ if (!is_before(this.nonEmptyIterators[nidx]/* .checkConcurrentModification() */, it, dir)) {
return; // passes through finally
}
- nonEmptyIterators[idx] = nonEmptyIterators[nidx];
+ this.nonEmptyIterators[idx] = this.nonEmptyIterators[nidx];
idx = nidx;
nidx = idx + 1;
}
@@ -423,21 +423,21 @@ public class FsIterator_subtypes_ordered<T extends FeatureStructure>
nidx = SORTED_SECTION + 1;
while (nidx <= num) {
if ((nidx < num)
- && is_before(nonEmptyIterators[nidx + 1]/* .checkConcurrentModification() */,
- nonEmptyIterators[nidx]/* .checkConcurrentModification() */, dir)) {
+ && is_before(this.nonEmptyIterators[nidx + 1]/* .checkConcurrentModification() */,
+ this.nonEmptyIterators[nidx]/* .checkConcurrentModification() */, dir)) {
++nidx;
}
- if (!is_before(nonEmptyIterators[nidx], it, dir)) {
+ if (!is_before(this.nonEmptyIterators[nidx], it, dir)) {
return;
}
- nonEmptyIterators[idx] = nonEmptyIterators[nidx];
+ this.nonEmptyIterators[idx] = this.nonEmptyIterators[nidx];
idx = nidx;
nidx = (nidx << 1) - (SORTED_SECTION - 1);
}
} finally {
- nonEmptyIterators[idx] = it;
+ this.nonEmptyIterators[idx] = it;
}
}
@@ -482,12 +482,12 @@ public class FsIterator_subtypes_ordered<T extends FeatureStructure>
// set null unless need special extra type compare
// Type typeCompare = (isSortedAndIgnoringTypeOrderKey) ? fs.getType() : null;
- int lastValidIterator_local = nonEmptyIterators.length - 1;
+ int lastValidIterator_local = this.nonEmptyIterators.length - 1;
// Need to consider all iterators.
// Set all iterators to insertion point.
int i = 0;
while (i <= lastValidIterator_local) {
- final LowLevelIterator<T> it = nonEmptyIterators[i];
+ final LowLevelIterator<T> it = this.nonEmptyIterators[i];
it.moveToNoReinit(fs);
// If the moveTo operation moved the iterator beyond the end (made it invalid), we need to
@@ -541,15 +541,15 @@ public class FsIterator_subtypes_ordered<T extends FeatureStructure>
} else {
// swap this iterator with the last possibly valid one
// lvi might be equal to i, this will not be a problem
- nonEmptyIterators[i] = nonEmptyIterators[lastValidIterator_local];
- nonEmptyIterators[lastValidIterator_local] = it;
+ this.nonEmptyIterators[i] = this.nonEmptyIterators[lastValidIterator_local];
+ this.nonEmptyIterators[lastValidIterator_local] = it;
--lastValidIterator_local;
}
}
// configured to continue with forward iterations
- wentForward = true;
- lastValidIteratorIndex = lastValidIterator_local;
+ this.wentForward = true;
+ this.lastValidIteratorIndex = lastValidIterator_local;
if (DEBUG) {
dumpIteratorInfo("moveToNoReinit - end");
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_subtypes_snapshot.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_subtypes_snapshot.java
index 645f048d8..51ab82746 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_subtypes_snapshot.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_subtypes_snapshot.java
@@ -48,11 +48,11 @@ public class FsIterator_subtypes_snapshot<T extends FeatureStructure>
public FsIterator_subtypes_snapshot(FsIndex_flat<T> flatIndex,
Comparator<TOP> comparatorMaybeNoTypeWithoutId) {
- indexForComparator = flatIndex;
- snapshot = (T[]) flatIndex.getFlatArray();
- is_unordered = flatIndex.getIndexingStrategy() != FSIndex.SORTED_INDEX;
+ this.indexForComparator = flatIndex;
+ this.snapshot = (T[]) flatIndex.getFlatArray();
+ this.is_unordered = flatIndex.getIndexingStrategy() != FSIndex.SORTED_INDEX;
this.comparatorMaybeNoTypeWithoutId = comparatorMaybeNoTypeWithoutId;
- isNotUimaIndexSource = false;
+ this.isNotUimaIndexSource = false;
}
/**
@@ -72,11 +72,11 @@ public class FsIterator_subtypes_snapshot<T extends FeatureStructure>
*/
public FsIterator_subtypes_snapshot(T[] snapshot, LowLevelIndex<T> index, boolean is_unordered,
Comparator<TOP> comparatorMaybeNoTypeWithoutId) {
- indexForComparator = index;
+ this.indexForComparator = index;
this.snapshot = snapshot;
this.is_unordered = is_unordered;
this.comparatorMaybeNoTypeWithoutId = comparatorMaybeNoTypeWithoutId;
- isNotUimaIndexSource = true;
+ this.isNotUimaIndexSource = true;
}
/*
@@ -225,8 +225,8 @@ public class FsIterator_subtypes_snapshot<T extends FeatureStructure>
*/
@Override
public FSIterator<T> copy() {
- FsIterator_subtypes_snapshot<T> it = new FsIterator_subtypes_snapshot<>(snapshot,
- indexForComparator, is_unordered, comparatorMaybeNoTypeWithoutId);
+ FsIterator_subtypes_snapshot<T> it = new FsIterator_subtypes_snapshot<>(this.snapshot,
+ this.indexForComparator, this.is_unordered, this.comparatorMaybeNoTypeWithoutId);
it.pos = pos;
return it;
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/Heap.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/Heap.java
index 2da912e67..d9220a5db 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/Heap.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/Heap.java
@@ -100,15 +100,15 @@ public final class Heap {
}
private void initHeap() {
- heap = new int[initialSize];
- pos = 1; // 0 is not a valid address
- max = heap.length;
+ this.heap = new int[this.initialSize];
+ this.pos = 1; // 0 is not a valid address
+ this.max = this.heap.length;
}
private void initHeap(int size) {
- heap = new int[size];
- pos = 1; // 0 is not a valid address
- max = heap.length;
+ this.heap = new int[size];
+ this.pos = 1; // 0 is not a valid address
+ this.max = this.heap.length;
}
void reinit(int[] md, int[] shortHeap) {
@@ -119,13 +119,13 @@ public final class Heap {
// assert(md != null);
// assert(shortHeap != null);
final int heapSize = md[SIZE_POS];
- pos = md[TMPP_POS];
- max = md[TMPM_POS];
- initialSize = md[PGSZ_POS];
+ this.pos = md[TMPP_POS];
+ this.max = md[TMPM_POS];
+ this.initialSize = md[PGSZ_POS];
// Copy the shortened version of the heap into a full version.
- heap = new int[heapSize];
- System.arraycopy(shortHeap, 0, heap, 0, shortHeap.length);
+ this.heap = new int[heapSize];
+ System.arraycopy(shortHeap, 0, this.heap, 0, shortHeap.length);
}
@@ -135,16 +135,16 @@ public final class Heap {
* @param shortHeap
*/
private void reinitNoMetaData(int[] shortHeap) {
- initialSize = (shortHeap.length < MIN_SIZE) ? MIN_SIZE : shortHeap.length;
- if (shortHeap.length >= initialSize) {
- heap = shortHeap;
+ this.initialSize = (shortHeap.length < MIN_SIZE) ? MIN_SIZE : shortHeap.length;
+ if (shortHeap.length >= this.initialSize) {
+ this.heap = shortHeap;
} else {
- System.arraycopy(shortHeap, 0, heap, 0, shortHeap.length);
+ System.arraycopy(shortHeap, 0, this.heap, 0, shortHeap.length);
}
// Set position and max.
- pos = shortHeap.length;
+ this.pos = shortHeap.length;
// this.max = this.initialSize;
- max = heap.length; // heap could be repl by short heap
+ this.max = this.heap.length; // heap could be repl by short heap
}
/**
@@ -155,34 +155,34 @@ public final class Heap {
* @param newSize
*/
void reinitSizeOnly(int newSize) {
- initialSize = (newSize < MIN_SIZE) ? MIN_SIZE : newSize;
- heap = new int[initialSize];
+ this.initialSize = (newSize < MIN_SIZE) ? MIN_SIZE : newSize;
+ this.heap = new int[this.initialSize];
// Set position and max.
- pos = newSize;
- max = initialSize;
+ this.pos = newSize;
+ this.max = this.initialSize;
}
/**
* Return the number of cells used (including slot 0 reserved for null)
*/
int getCellsUsed() {
- return pos;
+ return this.pos;
}
/**
* @return The overall size of the heap (in words) (including unused space).
*/
int getHeapSize() {
- return heap.length;
+ return this.heap.length;
}
int[] getMetaData() {
final int arSize = AVST_POS;
int[] ar = new int[arSize];
- ar[SIZE_POS] = heap.length;
- ar[TMPP_POS] = pos;
- ar[TMPM_POS] = max;
- ar[PGSZ_POS] = initialSize;
+ ar[SIZE_POS] = this.heap.length;
+ ar[TMPP_POS] = this.pos;
+ ar[TMPM_POS] = this.max;
+ ar[PGSZ_POS] = this.initialSize;
final int availablePagesSize = 0;
ar[AVSZ_POS] = availablePagesSize;
@@ -191,12 +191,12 @@ public final class Heap {
// Grow the heap.
private void grow() {
- final int start = heap.length;
+ final int start = this.heap.length;
// This will grow the heap by doubling its size if it's smaller than
// MULTIPLICATION_LIMIT, and by MULTIPLICATION_LIMIT if it's larger.
- heap = IntArrayUtils.ensure_size(heap, start + initialSize, 2,
+ this.heap = IntArrayUtils.ensure_size(this.heap, start + this.initialSize, 2,
MULTIPLICATION_LIMIT);
- max = heap.length;
+ this.max = this.heap.length;
}
static int getRoundedSize(int size) {
@@ -239,13 +239,13 @@ public final class Heap {
final int newCapacity = CommonAuxHeap.computeShrunkArraySize(curCapacity, curSize, 2,
MULTIPLICATION_LIMIT, initialSize, shrinkableCount);
if (newCapacity == curCapacity) {
- Arrays.fill(heap, 0, pos, 0);
+ Arrays.fill(this.heap, 0, this.pos, 0);
} else {
if (debugLogShrink)
System.out.format("Debug shrink Heap from %,d to %,d%n", curCapacity, newCapacity);
this.initHeap(newCapacity);
}
- pos = 1;
+ this.pos = 1;
}
}
@@ -258,12 +258,12 @@ public final class Heap {
* structure.
*/
public int add(int[] fs) {
- while ((pos + fs.length) >= max) {
+ while ((this.pos + fs.length) >= this.max) {
grow();
}
- System.arraycopy(fs, 0, heap, pos, fs.length);
- final int pos1 = pos;
- pos += fs.length;
+ System.arraycopy(fs, 0, this.heap, this.pos, fs.length);
+ final int pos1 = this.pos;
+ this.pos += fs.length;
return pos1;
}
@@ -279,12 +279,12 @@ public final class Heap {
* structure.
*/
public int add(int len, int val) {
- while ((pos + len) >= max) {
+ while ((this.pos + len) >= this.max) {
grow();
}
- final int pos1 = pos;
- pos += len;
- heap[pos1] = val;
+ final int pos1 = this.pos;
+ this.pos += len;
+ this.heap[pos1] = val;
return pos1;
}
@@ -293,10 +293,10 @@ public final class Heap {
}
public void grow(int len) {
- while ((pos + len) >= max) {
+ while ((this.pos + len) >= this.max) {
grow();
}
- pos += len;
+ this.pos += len;
}
// used by JCas to default the size the JCasHashMap
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/Id2FS.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/Id2FS.java
index d478578e1..ef5bd4f23 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/Id2FS.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/Id2FS.java
@@ -78,7 +78,7 @@ public class Id2FS implements Iterable<TOP> {
final private int initialSize;
public Id2FS(int initialHeapSize) {
- initialSize = Math.max(32, initialHeapSize >> 4); // won't shrink below this
+ this.initialSize = Math.max(32, initialHeapSize >> 4); // won't shrink below this
id2fs = new JCasHashMap(initialSize);
}
@@ -304,7 +304,10 @@ public class Id2FS implements Iterable<TOP> {
if (this == obj) {
return true;
}
- if ((obj == null) || !(obj instanceof MeasureCaller)) {
+ if (obj == null) {
+ return false;
+ }
+ if (!(obj instanceof MeasureCaller)) {
return false;
}
MeasureCaller other = (MeasureCaller) obj;
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/IntConstraint.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/IntConstraint.java
index e0cde12b4..9f030041d 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/IntConstraint.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/IntConstraint.java
@@ -40,13 +40,13 @@ class IntConstraint extends PathConstraint implements FSMatchConstraint {
IntConstraint(ArrayList<String> path, FSIntConstraint cons) {
super(path);
- intConstraint = cons;
+ this.intConstraint = cons;
}
@Override
public boolean match(FeatureStructure fs) {
// compile(((FeatureStructureImpl) fs).getCAS().getTypeSystem());
- final int max = featNames.size() - 1; // The last position in the
+ final int max = this.featNames.size() - 1; // The last position in the
// path!
if (max < 0) {
// If the path is empty, we can't get an int, and therefore the
@@ -55,22 +55,22 @@ class IntConstraint extends PathConstraint implements FSMatchConstraint {
}
Feature feat;
for (int i = 0; i < max; i++) {
- feat = fs.getType().getFeatureByBaseName(featNames.get(i));
+ feat = fs.getType().getFeatureByBaseName(this.featNames.get(i));
if (feat == null) {
return false;
}
fs = fs.getFeatureValue(feat);
}
- feat = fs.getType().getFeatureByBaseName(featNames.get(max));
+ feat = fs.getType().getFeatureByBaseName(this.featNames.get(max));
if (feat == null) {
return false;
}
- return intConstraint.match(fs.getIntValue(feat));
+ return this.intConstraint.match(fs.getIntValue(feat));
}
@Override
public String toString() {
- return super.toString() + " " + intConstraint.toString();
+ return super.toString() + " " + this.intConstraint.toString();
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/LinearTypeOrderBuilderImpl.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/LinearTypeOrderBuilderImpl.java
index 22ca6200d..4979c89f6 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/LinearTypeOrderBuilderImpl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/LinearTypeOrderBuilderImpl.java
@@ -95,17 +95,17 @@ public class LinearTypeOrderBuilderImpl implements LinearTypeOrderBuilder {
*/
private TotalTypeOrder(int[] typeList, TypeSystem ts, boolean isEmpty) {
TypeSystemImpl tsi = (TypeSystemImpl) ts;
- order = typeList;
- final int sz = order.length + tsi.getSmallestType();
+ this.order = typeList;
+ final int sz = this.order.length + tsi.getSmallestType();
if (sz > 32767) {
/** Total number of UIMA types, {0}, exceeds the maximum of 32766. **/
throw new CASAdminException(CASAdminException.TOO_MANY_TYPES, sz - 1);
}
- typeCodeToOrder = new short[order.length + tsi.getSmallestType()];
- for (int i = 0; i < order.length; i++) {
- typeCodeToOrder[order[i]] = (short) i;
+ this.typeCodeToOrder = new short[this.order.length + tsi.getSmallestType()];
+ for (int i = 0; i < this.order.length; i++) {
+ this.typeCodeToOrder[this.order[i]] = (short) i;
}
- isEmptyTypeOrder = isEmpty;
+ this.isEmptyTypeOrder = isEmpty;
}
/*
@@ -120,7 +120,7 @@ public class LinearTypeOrderBuilderImpl implements LinearTypeOrderBuilder {
TypeImpl t2 = ((FeatureStructureImplC) fs2)._getTypeImpl();
if (t1 == t2)
return 0;
- return Short.compare(typeCodeToOrder[t1.getCode()], typeCodeToOrder[t2.getCode()]);
+ return Short.compare(this.typeCodeToOrder[t1.getCode()], this.typeCodeToOrder[t2.getCode()]);
}
// Look-up.
@@ -133,13 +133,13 @@ public class LinearTypeOrderBuilderImpl implements LinearTypeOrderBuilder {
@Override
public boolean lessThan(int t1, int t2) {
- return typeCodeToOrder[t1] < typeCodeToOrder[t2];
+ return this.typeCodeToOrder[t1] < this.typeCodeToOrder[t2];
// return this.lt[t1].get(t2);
}
@Override
public int[] getOrder() {
- return order;
+ return this.order;
}
@Override
@@ -156,7 +156,10 @@ public class LinearTypeOrderBuilderImpl implements LinearTypeOrderBuilder {
if (this == obj) {
return true;
}
- if ((obj == null) || (getClass() != obj.getClass())) {
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
return false;
}
TotalTypeOrder other = (TotalTypeOrder) obj;
@@ -183,7 +186,7 @@ public class LinearTypeOrderBuilderImpl implements LinearTypeOrderBuilder {
}
private void removeAncestor(Node node) {
- predecessors.remove(node);
+ this.predecessors.remove(node);
}
private int outRank() {
@@ -195,21 +198,21 @@ public class LinearTypeOrderBuilderImpl implements LinearTypeOrderBuilder {
}
private ArrayList<GraphNode> getAllPredecessors() {
- return predecessors;
+ return this.predecessors;
}
private ArrayList<GraphNode> getAllSuccessors() {
- return successors;
+ return this.successors;
}
private void removeSuccessor(int i) {
- successors.remove(i);
+ this.successors.remove(i);
}
private void addAllPredecessors(ArrayList<? extends GraphNode> pred) {
for (Iterator<? extends GraphNode> it = pred.iterator(); it.hasNext();) {
Node n = (Node) it.next();
- if (!order.pathFromTo(this, n)) {
+ if (!LinearTypeOrderBuilderImpl.this.order.pathFromTo(this, n)) {
n.connect(this);
}
// else {
@@ -223,7 +226,7 @@ public class LinearTypeOrderBuilderImpl implements LinearTypeOrderBuilder {
private void addAllSuccessors(ArrayList<? extends GraphNode> successors1) {
for (Iterator<? extends GraphNode> it = successors1.iterator(); it.hasNext();) {
Node n = (Node) it.next();
- if (!order.pathFromTo(n, this)) {
+ if (!LinearTypeOrderBuilderImpl.this.order.pathFromTo(n, this)) {
connect(n);
}
// else {
@@ -241,21 +244,21 @@ public class LinearTypeOrderBuilderImpl implements LinearTypeOrderBuilder {
private final Map<String, Node> nodeMap = new HashMap<>();
private int size() {
- return nodeMap.size();
+ return this.nodeMap.size();
}
private Node getNode(String name) {
- Node node = nodeMap.get(name);
+ Node node = this.nodeMap.get(name);
if (node == null) {
node = new Node(name);
- nodeMap.put(name, node);
+ this.nodeMap.put(name, node);
}
return node;
}
private Graph copy(Node inRank0nodes) {
Graph copy = new Graph();
- Iterator<Map.Entry<String, Node>> it = nodeMap.entrySet().iterator();
+ Iterator<Map.Entry<String, Node>> it = this.nodeMap.entrySet().iterator();
Map.Entry<String, Node> entry;
String key;
// Copy the nodes.
@@ -266,7 +269,7 @@ public class LinearTypeOrderBuilderImpl implements LinearTypeOrderBuilder {
// node
}
// Set pred's and succ's for nodes.
- it = nodeMap.entrySet().iterator();
+ it = this.nodeMap.entrySet().iterator();
Node origNode, copyNode;
while (it.hasNext()) {
entry = it.next();
@@ -299,7 +302,7 @@ public class LinearTypeOrderBuilderImpl implements LinearTypeOrderBuilder {
// if (node == null) {
// return ;
// }
- nodeMap.remove(node.getElement());
+ this.nodeMap.remove(node.getElement());
final int max = node.outRank();
for (int i = 0; i < max; i++) {
Node n = (Node) node.getSuccessor(i);
@@ -339,7 +342,7 @@ public class LinearTypeOrderBuilderImpl implements LinearTypeOrderBuilder {
private TypeSystem ts;
public LinearTypeOrderBuilderImpl(TypeSystem ts) {
- order = new Graph();
+ this.order = new Graph();
this.ts = ts;
}
@@ -370,12 +373,12 @@ public class LinearTypeOrderBuilderImpl implements LinearTypeOrderBuilder {
}
private boolean add(String s1, String s2) {
- final Node n1 = order.getNode(s1);
- final Node n2 = order.getNode(s2);
- if (order.pathFromTo(n1, n2)) {
+ final Node n1 = this.order.getNode(s1);
+ final Node n2 = this.order.getNode(s2);
+ if (this.order.pathFromTo(n1, n2)) {
return true;
}
- if (order.pathFromTo(n2, n1)) {
+ if (this.order.pathFromTo(n2, n1)) {
return false;
}
n1.connect(n2);
@@ -385,7 +388,7 @@ public class LinearTypeOrderBuilderImpl implements LinearTypeOrderBuilder {
private void addInheritanceTypes() {
List<Type> typesToModify = new ArrayList<>();
- for (Iterator<Type> tsi = ts.getTypeIterator(); tsi.hasNext();) {
+ for (Iterator<Type> tsi = this.ts.getTypeIterator(); tsi.hasNext();) {
Type bottomType = tsi.next();
Type type = bottomType;
@@ -395,25 +398,28 @@ public class LinearTypeOrderBuilderImpl implements LinearTypeOrderBuilder {
while (true) {
String typeName = type.getName();
- final Node n = order.getNode(typeName);
+ final Node n = this.order.getNode(typeName);
if ((nIn == null) && (n.inRank() != 0)) {
nIn = n;
}
if ((nOut == null) && (n.outRank() != 0)) {
nOut = n;
}
- if (((nIn != null) && (nOut != null)) || typeName.equals(CAS.TYPE_NAME_TOP)) {
+ if ((nIn != null) && (nOut != null)) {
+ break;
+ }
+ if (typeName.equals(CAS.TYPE_NAME_TOP)) {
break;
}
typesToModify.add(type);
- type = ts.getParent(type);
+ type = this.ts.getParent(type);
}
boolean doIn = true;
boolean doOut = true;
for (Iterator<Type> ni = typesToModify.iterator(); ni.hasNext();) {
type = ni.next();
String typeName = type.getName();
- final Node n = order.getNode(typeName);
+ final Node n = this.order.getNode(typeName);
if (doIn && (nIn != null)) {
if (n.inRank() == 0) {
n.addAllPredecessors(nIn.getAllPredecessors());
@@ -438,7 +444,7 @@ public class LinearTypeOrderBuilderImpl implements LinearTypeOrderBuilder {
int origOrderSize = order.size();
addInheritanceTypes();
Node inRank0Nodes = new Node("");
- Graph g = order.copy(inRank0Nodes);
+ Graph g = this.order.copy(inRank0Nodes);
String[] totalOrder = new String[g.size()];
// String s;
@@ -456,7 +462,7 @@ public class LinearTypeOrderBuilderImpl implements LinearTypeOrderBuilder {
// for (int i = 0; i < totalOrder.length; i++) {
// System.out.println(" " + totalOrder[i]);
// }
- return new TotalTypeOrder(totalOrder, ts, origOrderSize == 0);
+ return new TotalTypeOrder(totalOrder, this.ts, origOrderSize == 0);
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongHeap.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongHeap.java
index d71139422..fef0919c3 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongHeap.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongHeap.java
@@ -38,17 +38,17 @@ final class LongHeap extends CommonAuxHeap {
@Override
void initMemory() {
- heap = new long[heapBaseSize];
+ this.heap = new long[this.heapBaseSize];
}
@Override
void initMemory(int size) {
- heap = new long[size];
+ this.heap = new long[size];
}
@Override
int getCapacity() {
- return heap.length;
+ return this.heap.length;
}
@Override
@@ -64,12 +64,12 @@ final class LongHeap extends CommonAuxHeap {
@Override
void resetToZeros() {
- Arrays.fill(heap, 0, heapPos, NULL);
+ Arrays.fill(this.heap, 0, this.heapPos, NULL);
}
// Getters
long getHeapValue(int offset) {
- return heap[offset];
+ return this.heap[offset];
}
// setters
@@ -104,7 +104,7 @@ final class LongHeap extends CommonAuxHeap {
heap = new long[argLength];
System.arraycopy(longHeap, 0, heap, 0, argLength);
- heapPos = argLength;
+ this.heapPos = argLength;
}
public long[] toArray() {
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongSet.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongSet.java
index d6604d488..f24d71a4b 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongSet.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongSet.java
@@ -73,7 +73,7 @@ final class LongSet {
}
int getSize() {
- return longs.size();
+ return this.longs.size();
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelException.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelException.java
index aafb47c0f..6ac198006 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelException.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelException.java
@@ -112,7 +112,7 @@ public class LowLevelException extends UIMARuntimeException {
/** @return The same as getMessage(), but prefixed with <code>"LowLevelException: "</code>. */
@Override
public String toString() {
- return "LowLevelException: " + getMessage();
+ return "LowLevelException: " + this.getMessage();
}
/**
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/MarkerImpl.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/MarkerImpl.java
index 4d0902e95..e7a8a680b 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/MarkerImpl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/MarkerImpl.java
@@ -42,7 +42,7 @@ public class MarkerImpl implements Marker {
MarkerImpl(int nextFSId, CASImpl cas) {
this.nextFSId = nextFSId;
this.cas = cas;
- isValid = true;
+ this.isValid = true;
}
@Override
@@ -60,7 +60,7 @@ public class MarkerImpl implements Marker {
if (isNew(fs)) {
return false; // new fs's are not modified ones
}
- return cas.isInModifiedPreexisting((TOP) fs);
+ return this.cas.isInModifiedPreexisting((TOP) fs);
}
boolean isNew(int id) {
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/PathConstraint.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/PathConstraint.java
index 6c385672a..e62eff496 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/PathConstraint.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/PathConstraint.java
@@ -40,15 +40,15 @@ abstract class PathConstraint implements FSMatchConstraint {
@Override
public String toString() {
- if (featNames == null) {
+ if (this.featNames == null) {
return "";
}
StringBuffer buf = new StringBuffer();
- for (int i = 0; i < featNames.size(); i++) {
+ for (int i = 0; i < this.featNames.size(); i++) {
if (i > 0) {
buf.append('.');
}
- buf.append(featNames.get(i));
+ buf.append(this.featNames.get(i));
}
return buf.toString();
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/SelectFSs_impl.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/SelectFSs_impl.java
index 69d793e81..807fa8052 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/SelectFSs_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/SelectFSs_impl.java
@@ -151,8 +151,8 @@ public class SelectFSs_impl<T extends FeatureStructure> implements SelectFSs<T>
************************************************/
//@formatter:on
public SelectFSs_impl(CAS cas) {
- view = (CASImpl) cas.getLowLevelCAS();
- jcas = (JCasImpl) view.getJCas();
+ this.view = (CASImpl) cas.getLowLevelCAS();
+ this.jcas = (JCasImpl) view.getJCas();
}
public SelectFSs_impl(FSArray source) {
@@ -184,12 +184,12 @@ public class SelectFSs_impl<T extends FeatureStructure> implements SelectFSs<T>
* @return -
*/
public SelectFSs_impl<T> index(String indexName) {
- index = view.indexRepository.getIndex(indexName);
+ this.index = view.indexRepository.getIndex(indexName);
return this;
}
public SelectFSs_impl<T> index(FSIndex<T> aIndex) {
- index = (LowLevelIndex<T>) aIndex;
+ this.index = (LowLevelIndex<T>) aIndex;
return this;
}
@@ -197,7 +197,7 @@ public class SelectFSs_impl<T extends FeatureStructure> implements SelectFSs<T>
* Select the index's uppermost type.
*/
public <N extends T> SelectFSs_impl<N> anyType() {
- ti = (TypeImpl) null;
+ this.ti = (TypeImpl) null;
return (SelectFSs_impl<N>) this;
}
@@ -213,7 +213,7 @@ public class SelectFSs_impl<T extends FeatureStructure> implements SelectFSs<T>
}
}
- ti = (TypeImpl) uimaType;
+ this.ti = (TypeImpl) uimaType;
return (SelectFSs_impl<N>) this;
}
@@ -227,12 +227,12 @@ public class SelectFSs_impl<T extends FeatureStructure> implements SelectFSs<T>
throw new IllegalArgumentException("Undefined type: [" + fullyQualifiedTypeName + "]");
}
- ti = type;
+ this.ti = type;
return (SelectFSs_impl<N>) this;
}
public <N extends T> SelectFSs_impl<N> type(int jcasClass_dot_type) {
- ti = (TypeImpl) view.getJCas().getCasType(jcasClass_dot_type);
+ this.ti = (TypeImpl) view.getJCas().getCasType(jcasClass_dot_type);
return (SelectFSs_impl<N>) this;
}
@@ -240,7 +240,7 @@ public class SelectFSs_impl<T extends FeatureStructure> implements SelectFSs<T>
if (jcasClass_dot_class == null) {
throw new IllegalArgumentException("Must specify a type");
}
- ti = (TypeImpl) view.getJCasImpl().getCasType(jcasClass_dot_class);
+ this.ti = (TypeImpl) view.getJCasImpl().getCasType(jcasClass_dot_class);
return (SelectFSs_impl<N>) this;
}
@@ -251,7 +251,7 @@ public class SelectFSs_impl<T extends FeatureStructure> implements SelectFSs<T>
*/
@Override
public SelectFSs<T> typePriority() {
- isTypePriority = true;
+ this.isTypePriority = true;
return this;
}
@@ -262,7 +262,7 @@ public class SelectFSs_impl<T extends FeatureStructure> implements SelectFSs<T>
*/
@Override
public SelectFSs<T> typePriority(boolean aTypePriority) {
- isTypePriority = aTypePriority;
+ this.isTypePriority = aTypePriority;
return this;
}
@@ -301,7 +301,7 @@ public class SelectFSs_impl<T extends FeatureStructure> implements SelectFSs<T>
*/
@Override
public SelectFSs<T> skipWhenSameBeginEndType() {
- isSkipSameBeginEndType = true;
+ this.isSkipSameBeginEndType = true;
return this;
}
@@ -312,7 +312,7 @@ public class SelectFSs_impl<T extends FeatureStructure> implements SelectFSs<T>
*/
@Override
public SelectFSs<T> useAnnotationEquals(boolean useAnnotationEquals) {
- isSkipSameBeginEndType = useAnnotationEquals;
+ this.isSkipSameBeginEndType = useAnnotationEquals;
return this;
}
@@ -322,13 +322,13 @@ public class SelectFSs_impl<T extends FeatureStructure> implements SelectFSs<T>
@Override
public SelectFSs_impl<T> nonOverlapping() { // AI known as unambiguous
- isNonOverlapping = true;
+ this.isNonOverlapping = true;
return this;
}
@Override
public SelectFSs_impl<T> nonOverlapping(boolean bNonOverlapping) { // AI
- isNonOverlapping = bNonOverlapping;
+ this.isNonOverlapping = bNonOverlapping;
return this;
}
@@ -358,49 +358,49 @@ public class SelectFSs_impl<T extends FeatureStructure> implements SelectFSs<T>
@Override
public SelectFSs_impl<T> allViews() {
- isAllViews = true;
+ this.isAllViews = true;
return this;
}
@Override
public SelectFSs_impl<T> allViews(boolean bAllViews) {
- isAllViews = bAllViews;
+ this.isAllViews = bAllViews;
return this;
}
@Override
public SelectFSs_impl<T> nullOK() { // applies to get() and single()
- isNullOK = true;
+ this.isNullOK = true;
return this;
}
@Override
public SelectFSs_impl<T> nullOK(boolean bNullOk) { // applies to get() and single()
- isNullOK = bNullOk;
+ this.isNullOK = bNullOk;
return this;
}
@Override
public SelectFSs_impl<T> orderNotNeeded() { // ignored if not ordered index
- isUnordered = true;
+ this.isUnordered = true;
return this;
}
@Override
public SelectFSs_impl<T> orderNotNeeded(boolean bUnordered) { // ignored if not ordered index
- isUnordered = bUnordered;
+ this.isUnordered = bUnordered;
return this;
}
@Override
public SelectFSs_impl<T> backwards() { // ignored if not ordered index
- isBackwards = true;
+ this.isBackwards = true;
return this;
}
@Override
public SelectFSs_impl<T> backwards(boolean bBackwards) { // ignored if not ordered index
- isBackwards = bBackwards;
+ this.isBackwards = bBackwards;
return this;
}
@@ -417,19 +417,19 @@ public class SelectFSs_impl<T extends FeatureStructure> implements SelectFSs<T>
@Override
public SelectFSs_impl<T> shifted(int shiftAmount) {
- shift = shiftAmount;
+ this.shift = shiftAmount;
return this;
}
@Override
public SelectFSs_impl<T> startAt(FeatureStructure fs) {
- startingFs = (TOP) fs;
+ this.startingFs = (TOP) fs;
return this;
}
@Override
public SelectFSs_impl<T> startAt(TOP fs) { // Ordered
- startingFs = fs;
+ this.startingFs = fs;
return this;
}
// @Override
@@ -443,35 +443,35 @@ public class SelectFSs_impl<T extends FeatureStructure> implements SelectFSs<T>
@Override
public SelectFSs_impl<T> startAt(int begin) {
- isTypePriority = false;
- startingFs = makePosAnnot(begin, Integer.MAX_VALUE);
+ this.isTypePriority = false;
+ this.startingFs = makePosAnnot(begin, Integer.MAX_VALUE);
return this;
}
@Override
public SelectFSs_impl<T> startAt(int begin, int end) { // AI
- startingFs = makePosAnnot(begin, end);
+ this.startingFs = makePosAnnot(begin, end);
return this;
}
@Override
public SelectFSs_impl<T> startAt(TOP fs, int offset) { // Ordered
- startingFs = fs;
- shift = offset;
+ this.startingFs = fs;
+ this.shift = offset;
return this;
}
@Override
public SelectFSs_impl<T> startAt(FeatureStructure fs, int offset) { // Ordered
- startingFs = (TOP) fs;
- shift = offset;
+ this.startingFs = (TOP) fs;
+ this.shift = offset;
return this;
}
@Override
public SelectFSs_impl<T> startAt(int begin, int end, int offset) { // AI
- startingFs = makePosAnnot(begin, end);
- shift = offset;
+ this.startingFs = makePosAnnot(begin, end);
+ this.shift = offset;
return this;
}
@@ -480,7 +480,7 @@ public class SelectFSs_impl<T extends FeatureStructure> implements SelectFSs<T>
if (alimit < 0) {
throw new IllegalArgumentException("limit argument must be >= 0, but was " + alimit);
}
- limit = alimit;
+ this.limit = alimit;
return this;
}
@@ -490,7 +490,7 @@ public class SelectFSs_impl<T extends FeatureStructure> implements SelectFSs<T>
@Override
public SelectFSs_impl<T> coveredBy(AnnotationFS fs) { // AI
boundsUse = BoundsUse.coveredBy;
- boundingFs = fs;
+ this.boundingFs = fs;
// this.isIncludeAnnotWithEndBeyondBounds = false; //default
return this;
}
@@ -498,7 +498,7 @@ public class SelectFSs_impl<T extends FeatureStructure> implements SelectFSs<T>
@Override
public SelectFSs_impl<T> coveredBy(int begin, int end) { // AI
boundsUse = BoundsUse.coveredBy;
- boundingFs = makePosAnnot(begin, end);
+ this.boundingFs = makePosAnnot(begin, end);
// this.isIncludeAnnotWithEndBeyondBounds = true; //default
return this;
}
@@ -506,14 +506,14 @@ public class SelectFSs_impl<T extends FeatureStructure> implements SelectFSs<T>
@Override
public SelectFSs_impl<T> covering(AnnotationFS fs) { // AI
boundsUse = BoundsUse.covering;
- boundingFs = fs;
+ this.boundingFs = fs;
return this;
}
@Override
public SelectFSs_impl<T> covering(int begin, int end) { // AI
boundsUse = BoundsUse.covering;
- boundingFs = makePosAnnot(begin, end);
+ this.boundingFs = makePosAnnot(begin, end);
return this;
}
@@ -1182,19 +1182,19 @@ public class SelectFSs_impl<T extends FeatureStructure> implements SelectFSs<T>
@Override
public T get(int offset) {
- shift = offset;
+ this.shift = offset;
return getNullChk();
}
@Override
public T single(int offset) {
- shift = offset;
+ this.shift = offset;
return single();
}
@Override
public T singleOrNull(int offset) {
- shift = offset;
+ this.shift = offset;
return singleOrNull();
}
@@ -1513,16 +1513,16 @@ public class SelectFSs_impl<T extends FeatureStructure> implements SelectFSs<T>
// }
private SelectFSs<T> commonFollowing(Annotation annotation, int offset) {
- startingFs = annotation;
- shift = offset;
+ this.startingFs = annotation;
+ this.shift = offset;
isFollowing = true;
return this;
}
private SelectFSs<T> commonPreceding(Annotation annotation, int offset) {
// validateSinglePosition(fs, offset);
- startingFs = annotation;
- shift = offset;
+ this.startingFs = annotation;
+ this.shift = offset;
isPreceding = true;
return this;
}
@@ -1743,7 +1743,7 @@ public class SelectFSs_impl<T extends FeatureStructure> implements SelectFSs<T>
@Override
public boolean isEmpty() {
- if (limit == 0) {
+ if (this.limit == 0) {
return true;
}
return fsIterator().size() == 0;
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/ShortHeap.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/ShortHeap.java
index 49e9f1942..94cb95522 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/ShortHeap.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/ShortHeap.java
@@ -38,17 +38,17 @@ final class ShortHeap extends CommonAuxHeap {
@Override
void initMemory() {
- heap = new short[heapBaseSize];
+ this.heap = new short[this.heapBaseSize];
}
@Override
void initMemory(int size) {
- heap = new short[size];
+ this.heap = new short[size];
}
@Override
int getCapacity() {
- return heap.length;
+ return this.heap.length;
}
@Override
@@ -64,12 +64,12 @@ final class ShortHeap extends CommonAuxHeap {
@Override
void resetToZeros() {
- Arrays.fill(heap, 0, heapPos, (short) NULL);
+ Arrays.fill(this.heap, 0, this.heapPos, (short) NULL);
}
// Getters
short getHeapValue(int offset) {
- return heap[offset];
+ return this.heap[offset];
}
// setters
@@ -95,7 +95,7 @@ final class ShortHeap extends CommonAuxHeap {
heap = new short[argLength];
System.arraycopy(shortHeap, 0, heap, 0, argLength);
- heapPos = argLength;
+ this.heapPos = argLength;
}
public short[] toArray() {
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringConstraint.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringConstraint.java
index 2bd80ed5b..852d743e3 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringConstraint.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringConstraint.java
@@ -40,13 +40,13 @@ class StringConstraint extends PathConstraint implements FSMatchConstraint {
StringConstraint(ArrayList<String> path, FSStringConstraint cons) {
super(path);
- stringConstraint = cons;
+ this.stringConstraint = cons;
}
@Override
public boolean match(FeatureStructure fs) {
// compile(((FeatureStructureImpl) fs).getCAS().getTypeSystem());
- final int max = featNames.size() - 1; // The last position in the
+ final int max = this.featNames.size() - 1; // The last position in the
// path!
if (max < 0) {
// If the path is empty, we can't get a string, and therefore the
@@ -55,22 +55,22 @@ class StringConstraint extends PathConstraint implements FSMatchConstraint {
}
Feature feat;
for (int i = 0; i < max; i++) {
- feat = fs.getType().getFeatureByBaseName(featNames.get(i));
+ feat = fs.getType().getFeatureByBaseName(this.featNames.get(i));
if (feat == null) {
return false;
}
fs = fs.getFeatureValue(feat);
}
- feat = fs.getType().getFeatureByBaseName(featNames.get(max));
+ feat = fs.getType().getFeatureByBaseName(this.featNames.get(max));
if (feat == null) {
return false;
}
- return stringConstraint.match(fs.getStringValue(feat));
+ return this.stringConstraint.match(fs.getStringValue(feat));
}
@Override
public String toString() {
- return super.toString() + " " + stringConstraint.toString();
+ return super.toString() + " " + this.stringConstraint.toString();
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringHeap.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringHeap.java
index bb6e3b983..21b87e7b1 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringHeap.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringHeap.java
@@ -41,8 +41,8 @@ final class StringHeap {
// Initialize internal datastructures. This used to be a lot more complicated when we had the
// character heap option.
private void initMemory() {
- stringList = new ArrayList<>();
- stringList.add(null);
+ this.stringList = new ArrayList<>();
+ this.stringList.add(null);
}
/**
@@ -67,7 +67,7 @@ final class StringHeap {
stringLength = shdh.refHeap[i + StringHeapDeserializationHelper.CHAR_HEAP_STRLEN_OFFSET];
String s = charHeapInString.substring(stringOffset, stringOffset + stringLength);
String reuse = reuseStrings.putIfAbsent(s, s);
- stringList.add(reuse != null ? reuse : s);
+ this.stringList.add(reuse != null ? reuse : s);
}
}
@@ -83,13 +83,13 @@ final class StringHeap {
StringHeapDeserializationHelper serialize(int startPos) {
StringHeapDeserializationHelper shdh = new StringHeapDeserializationHelper();
// Ref heap is 3 times the size of the string list.
- shdh.refHeap = new int[(stringList.size() - startPos + 1)
+ shdh.refHeap = new int[(this.stringList.size() - startPos + 1)
* StringHeapDeserializationHelper.REF_HEAP_CELL_SIZE];
shdh.refHeapPos = shdh.refHeap.length;
// Compute required size of character heap.
int charHeapSize = 0;
- for (int i = startPos; i < stringList.size(); i++) {
- String s = stringList.get(i);
+ for (int i = startPos; i < this.stringList.size(); i++) {
+ String s = this.stringList.get(i);
if (s != null) {
charHeapSize += s.length();
}
@@ -100,8 +100,8 @@ final class StringHeap {
int charCount = 0;
// Now write out the actual data
int r = 1;
- for (int i = startPos; i < stringList.size(); i++) {
- String s = stringList.get(i);
+ for (int i = startPos; i < this.stringList.size(); i++) {
+ String s = this.stringList.get(i);
int refHeapOffset = r * StringHeapDeserializationHelper.REF_HEAP_CELL_SIZE;
shdh.refHeap[refHeapOffset
+ StringHeapDeserializationHelper.CHAR_HEAP_POINTER_OFFSET] = charCount;
@@ -125,12 +125,12 @@ final class StringHeap {
if (stringCode == LowLevelCAS.NULL_FS_REF) {
return null;
}
- return stringList.get(stringCode);
+ return this.stringList.get(stringCode);
}
// Who uses this?
int copyCharsToBuffer(int stringCode, char[] buffer, int start) {
- final String str = stringList.get(stringCode);
+ final String str = this.stringList.get(stringCode);
final int len = str.length();
final int requestedMax = start + len;
// Check that the buffer is long enough to copy the whole string. If it isn't long enough, we
@@ -153,8 +153,8 @@ final class StringHeap {
if (s == null) {
return LowLevelCAS.NULL_FS_REF;
}
- final int addr = stringList.size();
- stringList.add(s);
+ final int addr = this.stringList.size();
+ this.stringList.add(s);
return addr;
}
@@ -166,11 +166,11 @@ final class StringHeap {
// Who uses this?
int addCharBuffer(char[] buffer, int start, int length) {
String s = new String(buffer, start, length);
- return addString(s);
+ return this.addString(s);
}
int getCharArrayLength(int stringCode) {
- return stringList.get(stringCode).length();
+ return this.stringList.get(stringCode).length();
}
int getLeastStringCode() {
@@ -178,11 +178,11 @@ final class StringHeap {
}
int getLargestStringCode() {
- return stringList.size() - 1;
+ return this.stringList.size() - 1;
}
int getSize() {
- return stringList.size();
+ return this.stringList.size();
}
public String[] toArray() {
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringSet.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringSet.java
index 2967584ef..21f875483 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringSet.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringSet.java
@@ -75,7 +75,7 @@ final class StringSet {
}
int getSize() {
- return strings.size();
+ return this.strings.size();
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java
index 4cb1b4f56..178e702ed 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java
@@ -293,24 +293,24 @@ public class Subiterator<T extends AnnotationFS> implements LowLevelIterator<T>
this.originalBoundingAnnotation = (Annotation) ((originalBoundingAnnotation != null)
? originalBoundingAnnotation
: boundingAnnot);
- isBounded = boundsUse != null && boundsUse != BoundsUse.notBounded;
+ this.isBounded = boundsUse != null && boundsUse != BoundsUse.notBounded;
this.boundsUse = (boundsUse == null) ? BoundsUse.notBounded : boundsUse;
if (isBounded && (null == boundingAnnot || !(boundingAnnot instanceof Annotation))) {
Misc.internalError(
new IllegalArgumentException("Bounded Subiterators require a bounding annotation"));
}
- boundBegin = isBounded ? this.boundingAnnot.getBegin() : -1;
- boundEnd = isBounded ? this.boundingAnnot.getEnd() : -1;
- boundType = isBounded ? (TypeImpl) this.originalBoundingAnnotation.getType() : null;
- originalBoundBegin = isBounded ? this.originalBoundingAnnotation.getBegin() : -1;
- originalBoundEnd = isBounded ? this.originalBoundingAnnotation.getEnd() : -1;
+ this.boundBegin = isBounded ? this.boundingAnnot.getBegin() : -1;
+ this.boundEnd = isBounded ? this.boundingAnnot.getEnd() : -1;
+ this.boundType = isBounded ? (TypeImpl) this.originalBoundingAnnotation.getType() : null;
+ this.originalBoundBegin = isBounded ? this.originalBoundingAnnotation.getBegin() : -1;
+ this.originalBoundEnd = isBounded ? this.originalBoundingAnnotation.getEnd() : -1;
- isIncludesAnnotationsStartingAtEndPosition = isNonStrictIncludesAnnotationsStartingAtEndPosition;
+ this.isIncludesAnnotationsStartingAtEndPosition = isNonStrictIncludesAnnotationsStartingAtEndPosition;
this.isIncludeZeroWidthAtBegin = isIncludeZeroWidthAtBegin;
this.isIncludeZeroWidthAtEnd = isIncludeZeroWidthAtEnd;
- isUnambiguous = !ambiguous;
- if (isUnambiguous) {
+ this.isUnambiguous = !ambiguous;
+ if (this.isUnambiguous) {
switch (this.boundsUse) {
case notBounded: // ok
case coveredBy: // ok
@@ -327,7 +327,7 @@ public class Subiterator<T extends AnnotationFS> implements LowLevelIterator<T>
+ " is only allowed for coveredBy subiterator specification");
}
}
- isStrict = strict;
+ this.isStrict = strict;
this.isSkipSameBeginEndType = isSkipSameBeginEndType;
FSIndexRepositoryImpl ir = this.it.ll_getIndex().getCasImpl().indexRepository;
@@ -341,11 +341,11 @@ public class Subiterator<T extends AnnotationFS> implements LowLevelIterator<T>
this.isUseTypePriority = isUseTypePriority;
lto = isUseTypePriority ? ir.getDefaultTypeOrder() : null;
- comparatorMaybeNoTypeWithoutId = ir.getAnnotationFsComparator(FSComparators.WITHOUT_ID,
+ this.comparatorMaybeNoTypeWithoutId = ir.getAnnotationFsComparator(FSComparators.WITHOUT_ID,
isUseTypePriority ? FSComparators.WITH_TYPE_ORDER : FSComparators.WITHOUT_TYPE_ORDER);
- annotationComparator_withId = ir.getAnnotationFsComparatorWithId();
+ this.annotationComparator_withId = ir.getAnnotationFsComparatorWithId();
- jcas = (JCasImpl) ll_getIndex().getCasImpl().getJCas();
+ this.jcas = (JCasImpl) ll_getIndex().getCasImpl().getJCas();
isDoEqualsTest = (boundsUse == coveredBy || boundsUse == sameBeginEnd || boundsUse == covering)
&& this.originalBoundingAnnotation._inSetSortedIndex();
@@ -413,28 +413,28 @@ public class Subiterator<T extends AnnotationFS> implements LowLevelIterator<T>
boolean isIncludeZeroWidthAtBegin, boolean isIncludeZeroWidthAtEnd) {
this.it = (LowLevelIterator<Annotation>) it;
- isIncludesAnnotationsStartingAtEndPosition = isStrictIncludesAnnotationsStartingAtEndPosition;
+ this.isIncludesAnnotationsStartingAtEndPosition = isStrictIncludesAnnotationsStartingAtEndPosition;
this.isIncludeZeroWidthAtBegin = isIncludeZeroWidthAtBegin;
this.isIncludeZeroWidthAtEnd = isIncludeZeroWidthAtEnd;
this.boundingAnnot = boundingAnnot; // could be same begin/end, coveredby, or covering
this.originalBoundingAnnotation = originalBoundingAnnotation;
- isBounded = boundsUse != null && boundsUse != BoundsUse.notBounded;
+ this.isBounded = boundsUse != null && boundsUse != BoundsUse.notBounded;
this.boundsUse = (boundsUse == null) ? BoundsUse.notBounded : boundsUse;
- isUnambiguous = !ambiguous;
+ this.isUnambiguous = !ambiguous;
if (strict) {
if (BoundsUse.coveredBy != boundsUse && BoundsUse.sameBeginEnd != boundsUse) {
throw new IllegalArgumentException(
"Strict requires BoundsUse.coveredBy or BoundsUse.sameBeginEnd");
}
}
- isStrict = strict;
+ this.isStrict = strict;
this.isSkipSameBeginEndType = isSkipSameBeginEndType;
- boundBegin = isBounded ? boundingAnnot.getBegin() : -1;
- boundEnd = isBounded ? boundingAnnot.getEnd() : -1;
- boundType = isBounded ? (TypeImpl) originalBoundingAnnotation.getType() : null;
- originalBoundBegin = isBounded ? this.originalBoundingAnnotation.getBegin() : -1;
- originalBoundEnd = isBounded ? this.originalBoundingAnnotation.getEnd() : -1;
+ this.boundBegin = isBounded ? boundingAnnot.getBegin() : -1;
+ this.boundEnd = isBounded ? boundingAnnot.getEnd() : -1;
+ this.boundType = isBounded ? (TypeImpl) originalBoundingAnnotation.getType() : null;
+ this.originalBoundBegin = isBounded ? this.originalBoundingAnnotation.getBegin() : -1;
+ this.originalBoundEnd = isBounded ? this.originalBoundingAnnotation.getEnd() : -1;
FSIndexRepositoryImpl ir = this.it.ll_getIndex().getCasImpl().indexRepository;
// underlying_iterator_using_typepriorities = ir.isAnnotationComparator_usesTypeOrder();
@@ -442,11 +442,11 @@ public class Subiterator<T extends AnnotationFS> implements LowLevelIterator<T>
this.isUseTypePriority = isUseTypePriority;
lto = isUseTypePriority ? ir.getDefaultTypeOrder() : null;
- comparatorMaybeNoTypeWithoutId = ir.getAnnotationFsComparator(FSComparators.WITHOUT_ID,
+ this.comparatorMaybeNoTypeWithoutId = ir.getAnnotationFsComparator(FSComparators.WITHOUT_ID,
isUseTypePriority ? FSComparators.WITH_TYPE_ORDER : FSComparators.WITHOUT_TYPE_ORDER);
- annotationComparator_withId = ir.getAnnotationFsComparatorWithId();
+ this.annotationComparator_withId = ir.getAnnotationFsComparatorWithId();
- jcas = (JCasImpl) ll_getIndex().getCasImpl().getJCas();
+ this.jcas = (JCasImpl) ll_getIndex().getCasImpl().getJCas();
this.coveringStartPos = coveringStartPos;
this.startId = startId;
@@ -469,13 +469,13 @@ public class Subiterator<T extends AnnotationFS> implements LowLevelIterator<T>
// moves to the start annotation, including moving past equals for annot style,
// and accommodating strict
moveToStart();
- list = new ArrayList<>();
+ this.list = new ArrayList<>();
while (isValid()) {
list.add(it.getNvc());
// does all the adjustments, so list has only appropriate elements
moveToNextNvc();
}
- pos = 0;
+ this.pos = 0;
// do at end, so up to this point, iterator is not the list form style
isListForm = true;
}
@@ -512,7 +512,7 @@ public class Subiterator<T extends AnnotationFS> implements LowLevelIterator<T>
@Override
public boolean isValid() {
if (isListForm) {
- return (pos >= 0) && (pos < list.size());
+ return (this.pos >= 0) && (this.pos < this.list.size());
}
// assume all non-list form movements leave the underlying iterator
// positioned either as invalid, or at the valid spot including the bounds, for
@@ -524,7 +524,7 @@ public class Subiterator<T extends AnnotationFS> implements LowLevelIterator<T>
@Override
public T getNvc() {
if (isListForm) {
- return (T) list.get(pos);
+ return (T) this.list.get(this.pos);
} else {
return (T) it.getNvc();
}
@@ -534,7 +534,7 @@ public class Subiterator<T extends AnnotationFS> implements LowLevelIterator<T>
public void moveToNextNvc() {
// no isValid check because caller checked: "Nvc"
if (isListForm) {
- ++pos;
+ ++this.pos;
// maybeSetPrevEnd not needed because list form already accounted for unambiguous
return;
}
@@ -610,7 +610,7 @@ public class Subiterator<T extends AnnotationFS> implements LowLevelIterator<T>
public void moveToPreviousNvc() {
// no isValid check because caller checked: "Nvc"
if (isListForm) {
- --pos;
+ --this.pos;
return;
}
@@ -618,8 +618,8 @@ public class Subiterator<T extends AnnotationFS> implements LowLevelIterator<T>
// Convert to list form
Annotation currentAnnotation = it.getNvc(); // save to restore position
convertToListForm();
- pos = Collections.binarySearch(list, currentAnnotation, annotationComparator_withId);
- --pos;
+ pos = Collections.binarySearch(this.list, currentAnnotation, annotationComparator_withId);
+ --this.pos;
return;
}
@@ -637,7 +637,7 @@ public class Subiterator<T extends AnnotationFS> implements LowLevelIterator<T>
}
if (isListForm) {
- pos = 0;
+ this.pos = 0;
} else {
moveToStart();
}
@@ -671,7 +671,7 @@ public class Subiterator<T extends AnnotationFS> implements LowLevelIterator<T>
}
if (isListForm) {
- pos = list.size() - 1;
+ this.pos = this.list.size() - 1;
} else {
switch (boundsUse) {
@@ -842,7 +842,7 @@ public class Subiterator<T extends AnnotationFS> implements LowLevelIterator<T>
// Don't need strict, skip-over-boundary, or type priority adjustments,
// because these were done when the list form was created
// Want to move to leftmost
- pos = Collections.binarySearch(list, fsa, comparatorMaybeNoTypeWithoutId);
+ pos = Collections.binarySearch(this.list, fsa, comparatorMaybeNoTypeWithoutId);
// int begin = fsa.getBegin();
// int end = fsa.getEnd();
// Type type = fsa.getType();
@@ -928,7 +928,7 @@ public class Subiterator<T extends AnnotationFS> implements LowLevelIterator<T>
// find equal match and position to left most of the equal, including types, or
// not find equal match and position to next greater one, which won't match next test
if (is_beyond_bounds_chk_sameBeginEnd()) {
- isEmpty = true; // iterator was made invalid
+ this.isEmpty = true; // iterator was made invalid
return;
}
// skip over bounding annotation
@@ -996,7 +996,7 @@ public class Subiterator<T extends AnnotationFS> implements LowLevelIterator<T>
private boolean is_beyond_bounds_chk_sameBeginEndNvc() {
Annotation a = it.getNvc();
- if (a.getBegin() != boundBegin || a.getEnd() != boundEnd
+ if (a.getBegin() != this.boundBegin || a.getEnd() != this.boundEnd
|| (isUseTypePriority && a._getTypeImpl() != boundType)) {
makeInvalid();
return true;
@@ -1042,7 +1042,7 @@ public class Subiterator<T extends AnnotationFS> implements LowLevelIterator<T>
int begin = a.getBegin();
int end = a.getEnd();
- if (begin > boundBegin || (begin == boundBegin && (end < boundEnd
+ if (begin > this.boundBegin || (begin == this.boundBegin && (end < boundEnd
|| (end == boundEnd && lto != null && lto.lessThan(a._getTypeImpl(), boundType))))) {
makeInvalid();
return true;
@@ -1186,8 +1186,8 @@ public class Subiterator<T extends AnnotationFS> implements LowLevelIterator<T>
private void maybeSetPrevBounds() {
if (isUnambiguous && it.isValid()) {
Annotation a = it.getNvc();
- prevBegin = a.getBegin();
- prevEnd = a.getEnd();
+ this.prevBegin = a.getBegin();
+ this.prevEnd = a.getEnd();
}
}
@@ -1223,7 +1223,7 @@ public class Subiterator<T extends AnnotationFS> implements LowLevelIterator<T>
return true;
}
- while ((item.getBegin() == boundEnd && item.getBegin() < item.getEnd())
+ while ((item.getBegin() == this.boundEnd && item.getBegin() < item.getEnd())
|| equalToBounds(item) || (isUnambiguous && overlapping(item, prevBegin, prevEnd))) {
it.moveToNextNvc();
if (!isValid()) {
@@ -1231,7 +1231,7 @@ public class Subiterator<T extends AnnotationFS> implements LowLevelIterator<T>
}
item = it.getNvc();
- if (item.getBegin() > boundEnd) { // not >= because could of 0 length annot at end
+ if (item.getBegin() > this.boundEnd) { // not >= because could of 0 length annot at end
makeInvalid();
return false;
}
@@ -1239,7 +1239,7 @@ public class Subiterator<T extends AnnotationFS> implements LowLevelIterator<T>
return true;
}
- while (item.getEnd() > boundEnd || equalToBounds(item)
+ while (item.getEnd() > this.boundEnd || equalToBounds(item)
|| (isUnambiguous && overlapping(item, prevBegin, prevEnd)) ||
// Item is zero-width at end
(!isIncludeZeroWidthAtEnd && boundEnd == item.getBegin()
@@ -1254,7 +1254,7 @@ public class Subiterator<T extends AnnotationFS> implements LowLevelIterator<T>
}
item = it.getNvc();
- if (item.getBegin() > boundEnd) { // not >= because could of 0 length annot at end
+ if (item.getBegin() > this.boundEnd) { // not >= because could of 0 length annot at end
makeInvalid();
return false;
}
@@ -1299,7 +1299,7 @@ public class Subiterator<T extends AnnotationFS> implements LowLevelIterator<T>
// moveTo may move to invalid position
// if the cur pos item has a begin beyond the bound, it cannot be a covering annotation
- if (begin > boundBegin) {
+ if (begin > this.boundBegin) {
makeInvalid();
return;
}
@@ -1309,9 +1309,9 @@ public class Subiterator<T extends AnnotationFS> implements LowLevelIterator<T>
// skip until get an FS whose end >= boundEnd, it is a candidate.
// stop if begin gets too large (going forwards)
// while test: is true if need to move to skip over a too-small "end"
- while (it.isValid() && (equalToBounds(a = it.getNvc()) || (a.getBegin()) <= boundBegin
- && ((end = a.getEnd()) < boundEnd || (end == boundEnd && lto != null
- && lto.lessThan(a._getTypeImpl(), boundType))))) {
+ while (it.isValid() && (equalToBounds(a = it.getNvc()) || (a.getBegin()) <= this.boundBegin
+ && ((end = a.getEnd()) < this.boundEnd || (end == this.boundEnd && lto != null
+ && lto.lessThan(a._getTypeImpl(), this.boundType))))) {
it.moveToNextNvc();
}
}
@@ -1333,16 +1333,16 @@ public class Subiterator<T extends AnnotationFS> implements LowLevelIterator<T>
*/
@Override
public FSIterator<T> copy() {
- Subiterator<T> copy = new Subiterator<>(it.copy(), boundingAnnot,
- originalBoundingAnnotation, !isUnambiguous, isStrict, boundsUse,
- isUseTypePriority, isSkipSameBeginEndType,
-
- startId, isEmpty, coveringStartPos, isDoEqualsTest,
- isIncludesAnnotationsStartingAtEndPosition, isIncludeZeroWidthAtBegin,
- isIncludeZeroWidthAtEnd);
- copy.list = list; // non-final things
- copy.pos = pos;
- copy.isListForm = isListForm;
+ Subiterator<T> copy = new Subiterator<>(this.it.copy(), this.boundingAnnot,
+ this.originalBoundingAnnotation, !this.isUnambiguous, this.isStrict, this.boundsUse,
+ this.isUseTypePriority, this.isSkipSameBeginEndType,
+
+ this.startId, this.isEmpty, this.coveringStartPos, this.isDoEqualsTest,
+ this.isIncludesAnnotationsStartingAtEndPosition, this.isIncludeZeroWidthAtBegin,
+ this.isIncludeZeroWidthAtEnd);
+ copy.list = this.list; // non-final things
+ copy.pos = this.pos;
+ copy.isListForm = this.isListForm;
return copy;
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java
index 56ee85e25..b5b6b539c 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java
@@ -178,26 +178,26 @@ public class TypeImpl implements Type, Comparable<TypeImpl> {
// FeatureImpl featUimaUID = null; // null or the feature named uimaUID with range type long
private TypeImpl() {
- name = null;
- shortName = null;
- jcasClassName = null;
- superType = null;
-
- isInheritanceFinal = false;
- isFeatureFinal = false;
- isLongOrDouble = false;
- isCreatableAndNotBuiltinArray = false;
- tsi = null;
- typeCode = 0;
-
- isRefType = false;
- javaClass = null;
+ this.name = null;
+ this.shortName = null;
+ this.jcasClassName = null;
+ this.superType = null;
+
+ this.isInheritanceFinal = false;
+ this.isFeatureFinal = false;
+ this.isLongOrDouble = false;
+ this.isCreatableAndNotBuiltinArray = false;
+ this.tsi = null;
+ this.typeCode = 0;
+
+ this.isRefType = false;
+ this.javaClass = null;
// getter_funct_intfc_class = null;
// setter_funct_intfc_class = null;
slotKind = TypeSystemImpl.getSlotKindFromType(this);
- allSuperTypes = null;
- hashCodeNameLong = Misc.hashStringLong(name);
+ this.allSuperTypes = null;
+ this.hashCodeNameLong = Misc.hashStringLong(name);
}
/**
@@ -215,19 +215,19 @@ public class TypeImpl implements Type, Comparable<TypeImpl> {
}
this.name = name;
- jcasClassName = Misc.typeName2ClassName(name);
+ this.jcasClassName = Misc.typeName2ClassName(name);
final int pos = this.name.lastIndexOf(TypeSystem.NAMESPACE_SEPARATOR);
- shortName = (pos >= 0) ? this.name.substring(pos + 1) : name;
- superType = supertype;
+ this.shortName = (pos >= 0) ? this.name.substring(pos + 1) : name;
+ this.superType = supertype;
- isInheritanceFinal = false;
- isFeatureFinal = false;
- isLongOrDouble = name.equals(CAS.TYPE_NAME_LONG) || name.equals(CAS.TYPE_NAME_DOUBLE);
+ this.isInheritanceFinal = false;
+ this.isFeatureFinal = false;
+ this.isLongOrDouble = name.equals(CAS.TYPE_NAME_LONG) || name.equals(CAS.TYPE_NAME_DOUBLE);
this.tsi = tsi;
if (tsi.types.size() > Short.MAX_VALUE) {
throw new RuntimeException("Too many types declared, max is 32767.");
}
- typeCode = (short) tsi.types.size(); // initialized with one null; so first typeCode == 1
+ this.typeCode = (short) tsi.types.size(); // initialized with one null; so first typeCode == 1
tsi.types.add(this);
TypeImpl node = supertype;
@@ -238,7 +238,7 @@ public class TypeImpl implements Type, Comparable<TypeImpl> {
}
allSuperTypes = a.toArray(new TypeImpl[a.size()]);
- if (null != superType) { // top has null super
+ if (null != this.superType) { // top has null super
// if (!superType.isArray()) {
// this because we have from V2: xyz[] is a subtype of FSArray, but FSArray doesn't list it as
// a direct subtype
@@ -249,13 +249,13 @@ public class TypeImpl implements Type, Comparable<TypeImpl> {
staticMergedFeatures.putAll(superType.staticMergedFeatures);
}
}
- isCreatableAndNotBuiltinArray =
+ this.isCreatableAndNotBuiltinArray =
// until stringType is set, skip this part of the test
(tsi.stringType == null || supertype != tsi.stringType) // string subtypes aren't FSs,
// they are only values
&& !BuiltinTypeKinds.nonCreatableTypesAndBuiltinArrays_contains(name);
- isRefType = tsi.classifyAsRefType(name, supertype);
+ this.isRefType = tsi.classifyAsRefType(name, supertype);
this.javaClass = javaClass;
tsi.typeName2TypeImpl.put(name, this);
@@ -289,7 +289,7 @@ public class TypeImpl implements Type, Comparable<TypeImpl> {
hasRefFeature = name.equals(CAS.TYPE_NAME_FS_ARRAY); // initialization of other cases done at
// commit time
- hashCodeNameLong = Misc.hashStringLong(name);
+ this.hashCodeNameLong = Misc.hashStringLong(name);
}
/**
@@ -299,11 +299,11 @@ public class TypeImpl implements Type, Comparable<TypeImpl> {
*/
@Override
public String getName() {
- return name;
+ return this.name;
}
public String getJCasClassName() {
- return jcasClassName;
+ return this.jcasClassName;
}
/**
@@ -312,7 +312,7 @@ public class TypeImpl implements Type, Comparable<TypeImpl> {
* @return The super type or null for Top.
*/
public TypeImpl getSuperType() {
- return superType;
+ return this.superType;
}
/**
@@ -322,7 +322,7 @@ public class TypeImpl implements Type, Comparable<TypeImpl> {
* @return The internal code for this type, <code>&gt;=0</code>.
*/
public int getCode() {
- return typeCode;
+ return this.typeCode;
}
@Override
@@ -435,7 +435,7 @@ public class TypeImpl implements Type, Comparable<TypeImpl> {
* @return The type hierarchy.
*/
public TypeSystemImpl getTypeSystem() {
- return tsi;
+ return this.tsi;
}
/**
@@ -451,7 +451,7 @@ public class TypeImpl implements Type, Comparable<TypeImpl> {
*/
@Override
public String getShortName() {
- return shortName;
+ return this.shortName;
}
/**
@@ -459,7 +459,7 @@ public class TypeImpl implements Type, Comparable<TypeImpl> {
*/
@Override
public boolean isFeatureFinal() {
- return isFeatureFinal;
+ return this.isFeatureFinal;
}
/**
@@ -467,23 +467,23 @@ public class TypeImpl implements Type, Comparable<TypeImpl> {
*/
@Override
public boolean isInheritanceFinal() {
- return isInheritanceFinal;
+ return this.isInheritanceFinal;
}
void setFeatureFinal() {
- isFeatureFinal = true;
+ this.isFeatureFinal = true;
}
void setInheritanceFinal() {
- isInheritanceFinal = true;
+ this.isInheritanceFinal = true;
}
void setBuiltIn() {
- isBuiltIn = true;
+ this.isBuiltIn = true;
}
public boolean isLongOrDouble() {
- return isLongOrDouble;
+ return this.isLongOrDouble;
}
/**
@@ -639,7 +639,7 @@ public class TypeImpl implements Type, Comparable<TypeImpl> {
* been defined on (super)type "{3}" with range "{4}".
*/
throw new CASAdminException(CASAdminException.DUPLICATE_FEATURE, existingFi.getShortName(),
- getName(), range.getName(), existingFi.getDomain().getName(),
+ this.getName(), range.getName(), existingFi.getDomain().getName(),
existingFi.getRange().getName());
}
}
@@ -866,7 +866,11 @@ public class TypeImpl implements Type, Comparable<TypeImpl> {
return true;
}
- if ((depthFirstNextSibling != 0) || equals(ti)) {
+ if (depthFirstNextSibling != 0) { // means that these codes are valid
+ return false;
+ }
+
+ if (this.equals(ti)) {
return false;
}
@@ -990,8 +994,8 @@ public class TypeImpl implements Type, Comparable<TypeImpl> {
private long hashCodeLong() {
if (!hasHashCodeLong) {
synchronized (this) {
- hashCodeLong = computeHashCodeLong();
- if (getTypeSystem().isCommitted()) {
+ this.hashCodeLong = computeHashCodeLong();
+ if (this.getTypeSystem().isCommitted()) {
hasHashCodeLong = true; // no need to recompute
}
}
@@ -1077,7 +1081,7 @@ public class TypeImpl implements Type, Comparable<TypeImpl> {
if (this == t)
return 0;
- long hcl = hashCodeLong();
+ long hcl = this.hashCodeLong();
long thcl = t.hashCodeLong();
if (hcl == thcl)
return 0;
@@ -1088,23 +1092,23 @@ public class TypeImpl implements Type, Comparable<TypeImpl> {
if (c != 0)
return c;
- if (superType == null || t.superType == null) {
+ if (this.superType == null || t.superType == null) {
throw Misc.internalError();
}
;
- c = Long.compare(superType.hashCodeNameLong, t.superType.hashCodeNameLong);
+ c = Long.compare(this.superType.hashCodeNameLong, t.superType.hashCodeNameLong);
if (c != 0)
return c;
- c = Integer.compare(getNumberOfFeatures(), t.getNumberOfFeatures());
+ c = Integer.compare(this.getNumberOfFeatures(), t.getNumberOfFeatures());
if (c != 0)
return c;
- c = Boolean.compare(isFeatureFinal, t.isFeatureFinal);
+ c = Boolean.compare(this.isFeatureFinal, t.isFeatureFinal);
if (c != 0)
return c;
- c = Boolean.compare(isInheritanceFinal, t.isInheritanceFinal);
+ c = Boolean.compare(this.isInheritanceFinal, t.isInheritanceFinal);
if (c != 0)
return c;
@@ -1130,7 +1134,7 @@ public class TypeImpl implements Type, Comparable<TypeImpl> {
return false;
}
- switch (typeCode) {
+ switch (this.typeCode) {
case TypeSystemConstants.floatArrayTypeCode:
case TypeSystemConstants.intArrayTypeCode:
case TypeSystemConstants.booleanArrayTypeCode:
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl_array.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl_array.java
index 2d76cefc0..7812362fb 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl_array.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl_array.java
@@ -35,8 +35,8 @@ public class TypeImpl_array extends TypeImpl implements TypeSystemConstants {
public TypeImpl_array(String name, TypeImpl componentType, TypeSystemImpl tsi, TypeImpl supertype,
SlotKind componentSlotKind, boolean isHeapStoredArray, Class<?> javaClass) {
super(name, tsi, supertype, javaClass);
- isInheritanceFinal = true;
- isFeatureFinal = true;
+ this.isInheritanceFinal = true;
+ this.isFeatureFinal = true;
this.componentType = componentType;
this.isHeapStoredArray = isHeapStoredArray;
this.componentSlotKind = componentSlotKind;
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl_string.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl_string.java
index b01540e8d..81cf09093 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl_string.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl_string.java
@@ -40,7 +40,7 @@ public class TypeImpl_string extends TypeImpl_primitive { // string considered a
@Override
public boolean subsumes(TypeImpl ti) {
- if (isStringSubtype()) {
+ if (this.isStringSubtype()) {
return this == ti; // a string subtype only can subsume itself
}
return ti.isStringOrStringSubtype();
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeNameSpaceImpl.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeNameSpaceImpl.java
index 31afd8976..b3d47943f 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeNameSpaceImpl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeNameSpaceImpl.java
@@ -42,7 +42,7 @@ public class TypeNameSpaceImpl implements TypeNameSpace {
*/
@Override
public Type getType(String typeName) {
- return ts.getType(name + TypeSystem.NAMESPACE_SEPARATOR + typeName);
+ return this.ts.getType(this.name + TypeSystem.NAMESPACE_SEPARATOR + typeName);
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java
index d50c26962..aa9fe7ebf 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java
@@ -907,7 +907,7 @@ public class TypeSystemImpl implements TypeSystem, TypeSystemMgr, LowLevelTypeSy
if (typeName.endsWith(ARRAY_TYPE_SUFFIX)) {
checkTypeSyntax(typeName.substring(0, typeName.length() - 2));
} else {
- if (locked) {
+ if (this.locked) {
throw new CASAdminException(CASAdminException.TYPE_SYSTEM_LOCKED);
}
@@ -919,7 +919,7 @@ public class TypeSystemImpl implements TypeSystem, TypeSystemMgr, LowLevelTypeSy
}
void newTypeCheckNoInheritanceFinalCheck(String typeName, Type superType) {
- if (locked) {
+ if (this.locked) {
throw new CASAdminException(CASAdminException.TYPE_SYSTEM_LOCKED);
}
checkTypeSyntax(typeName);
@@ -990,7 +990,7 @@ public class TypeSystemImpl implements TypeSystem, TypeSystemMgr, LowLevelTypeSy
public Feature addFeature(String shortFeatName, Type domainType, Type rangeType,
boolean multipleReferencesAllowed) throws CASAdminException {
- if (locked) {
+ if (this.locked) {
throw new CASAdminException(CASAdminException.TYPE_SYSTEM_LOCKED);
}
@@ -1070,11 +1070,11 @@ public class TypeSystemImpl implements TypeSystem, TypeSystemMgr, LowLevelTypeSy
*/
@Override
public TypeImpl getTopType() {
- return topType;
+ return this.topType;
}
public TypeImpl getTopTypeImpl() {
- return topType;
+ return this.topType;
}
/**
@@ -1205,7 +1205,11 @@ public class TypeSystemImpl implements TypeSystem, TypeSystemMgr, LowLevelTypeSy
// committed
}
- if ((subType == fsArrayType) || subType.isArray()) {
+ if (subType == fsArrayType) {
+ return superType == topType || superType == arrayBaseType;
+ }
+
+ if (subType.isArray()) {
// If the subtype is an array, and the supertype is not, then the
// supertype must be top, or the abstract array base.
return ((superType == topType) || (superType == arrayBaseType));
@@ -1351,7 +1355,7 @@ public class TypeSystemImpl implements TypeSystem, TypeSystemMgr, LowLevelTypeSy
* @return true if first argument subsumes the second
*/
public boolean subsumes(int superType, int type) {
- return ll_subsumes(superType, type);
+ return this.ll_subsumes(superType, type);
}
// private void updateSubsumption(int type, int superType) {
@@ -1415,7 +1419,7 @@ public class TypeSystemImpl implements TypeSystem, TypeSystemMgr, LowLevelTypeSy
@Override
public TypeSystemImpl commit(ClassLoader cl) {
synchronized (this) {
- if (locked) {
+ if (this.locked) {
// is a no-op if already loaded for this Class Loader
// otherwise, need to load and set up generators for this class loader
getGeneratorsForClassLoader(cl, false); // false - is not pear
@@ -1450,7 +1454,7 @@ public class TypeSystemImpl implements TypeSystem, TypeSystemMgr, LowLevelTypeSy
if (IS_TRACE_JCAS_EXPAND) {
if (this == maybeConsolidatedTypesystem) {
System.out.format("debug type system impl commited new type system and loaded JCas %d%n",
- hashCode());
+ this.hashCode());
System.out.println(Misc.getCallers(1, 50).toString());
} else {
System.out.format(
@@ -1492,7 +1496,7 @@ public class TypeSystemImpl implements TypeSystem, TypeSystemMgr, LowLevelTypeSy
// fsClassRegistry = new FSClassRegistry(this, true);
// FSClassRegistry.loadAtTypeSystemCommitTime(this, true, cl);
- locked = true;
+ this.locked = true;
return this;
}
@@ -1622,7 +1626,7 @@ public class TypeSystemImpl implements TypeSystem, TypeSystemMgr, LowLevelTypeSy
String superClassName = superClass.getName();
String uimaSuperTypeName = Misc.javaClassName2UimaTypeName(superClassName);
- if (getType(uimaSuperTypeName) != null) {
+ if (this.getType(uimaSuperTypeName) != null) {
// ****************************
// STOP if get to UIMA type *
@@ -1632,7 +1636,7 @@ public class TypeSystemImpl implements TypeSystem, TypeSystemMgr, LowLevelTypeSy
// then return to recursively process other jcas class levels.
String className = clazz.getName();
String uimaTypeName = Misc.javaClassName2UimaTypeName(className);
- TypeImpl ti = getType(uimaTypeName);
+ TypeImpl ti = this.getType(uimaTypeName);
if (ti != null) {
maybeAddJCasOffsets(ti, tempIntFis, tempRefFis, tempNsrFis);
}
@@ -1786,7 +1790,7 @@ public class TypeSystemImpl implements TypeSystem, TypeSystemMgr, LowLevelTypeSy
*/
@Override
public boolean isCommitted() {
- return locked;
+ return this.locked;
}
/**
@@ -1880,7 +1884,7 @@ public class TypeSystemImpl implements TypeSystem, TypeSystemMgr, LowLevelTypeSy
@Override
public Type addStringSubtype(String typeName, String[] stringList) throws CASAdminException {
Set<String> allowedValues = new HashSet<>(Arrays.asList(stringList));
- TypeImpl supertype = stringType;
+ TypeImpl supertype = this.stringType;
// Check type name syntax.
checkTypeSyntax(typeName);
@@ -1930,7 +1934,7 @@ public class TypeSystemImpl implements TypeSystem, TypeSystemMgr, LowLevelTypeSy
TypeImpl supertype = computeArrayParentFromComponentType(componentType);
TypeImpl_array ti = new TypeImpl_array(arrayTypeName, (TypeImpl) componentType, this, supertype,
slotKind, isHeapStoredArray, javaClass);
- arrayComponentTypeToArrayType.put(componentType, ti);
+ this.arrayComponentTypeToArrayType.put(componentType, ti);
// the reverse - going from array type to component type is done via the getComponentType method
// of TypeImplArray
return ti;
@@ -2290,7 +2294,7 @@ public class TypeSystemImpl implements TypeSystem, TypeSystemMgr, LowLevelTypeSy
public TypeImpl getTypeForCode(int typeCode) {
if (isType(typeCode)) {
- return types.get(typeCode);
+ return this.types.get(typeCode);
}
return null;
}
@@ -2328,7 +2332,7 @@ public class TypeSystemImpl implements TypeSystem, TypeSystemMgr, LowLevelTypeSy
}
private final int getLargestFeatureCode() {
- return features.size();
+ return this.features.size();
}
final boolean isFeature(int featureCode) {
@@ -2338,13 +2342,13 @@ public class TypeSystemImpl implements TypeSystem, TypeSystemMgr, LowLevelTypeSy
@Override
public Feature ll_getFeatureForCode(int featureCode) {
if (isFeature(featureCode)) {
- return features.get(featureCode);
+ return this.features.get(featureCode);
}
return null;
}
FeatureImpl getFeatureForCode(int featureCode) {
- return features.get(featureCode);
+ return this.features.get(featureCode);
}
FeatureImpl getFeatureForCode_checked(int featureCode) {
@@ -2537,7 +2541,7 @@ public class TypeSystemImpl implements TypeSystem, TypeSystemMgr, LowLevelTypeSy
@Override
public Iterator<Feature> getFeatures() {
- List<Feature> lf = Collections.unmodifiableList(features);
+ List<Feature> lf = Collections.unmodifiableList(this.features);
Iterator<Feature> it = lf.iterator();
// The first element is null, so skip it.
it.next();
@@ -2555,7 +2559,7 @@ public class TypeSystemImpl implements TypeSystem, TypeSystemMgr, LowLevelTypeSy
* @return the domain type for a feature.
*/
public int intro(int feat) {
- return ((TypeImpl) (features.get(feat).getDomain())).getCode();
+ return ((TypeImpl) (this.features.get(feat).getDomain())).getCode();
}
/**
@@ -2566,7 +2570,7 @@ public class TypeSystemImpl implements TypeSystem, TypeSystemMgr, LowLevelTypeSy
* @return -
*/
public int range(int feat) {
- return ((TypeImpl) (features.get(feat).getRange())).getCode();
+ return ((TypeImpl) (this.features.get(feat).getRange())).getCode();
}
//@formatter:off
@@ -2909,7 +2913,10 @@ public class TypeSystemImpl implements TypeSystem, TypeSystemMgr, LowLevelTypeSy
if (this == obj) {
return true;
}
- if ((obj == null) || (getClass() != obj.getClass())) {
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
return false;
}
TypeSystemImpl other = (TypeSystemImpl) obj;
@@ -3135,7 +3142,7 @@ public class TypeSystemImpl implements TypeSystem, TypeSystemMgr, LowLevelTypeSy
}
public void set_skip_loading_user_jcas(boolean v) {
- skip_loading_user_jcas = v;
+ this.skip_loading_user_jcas = v;
}
// private static boolean isBuiltIn(Class<? extends TOP> clazz) {
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemUtils.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemUtils.java
index 35070e247..9fc85ed8e 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemUtils.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemUtils.java
@@ -44,7 +44,7 @@ public abstract class TypeSystemUtils {
}
boolean hasError() {
- return (error != null);
+ return (this.error != null);
}
/**
@@ -53,7 +53,7 @@ public abstract class TypeSystemUtils {
* @return ParsingError
*/
ParsingError getError() {
- return error;
+ return this.error;
}
/**
@@ -81,7 +81,7 @@ public abstract class TypeSystemUtils {
* @return String
*/
String getName() {
- return name;
+ return this.name;
}
/**
@@ -111,15 +111,15 @@ public abstract class TypeSystemUtils {
}
boolean isQualified() {
- return (nameSpace != null);
+ return (this.nameSpace != null);
}
String getName() {
- return name;
+ return this.name;
}
NameSpaceParse getNameSpace() {
- return nameSpace;
+ return this.nameSpace;
}
/**
@@ -156,7 +156,7 @@ public abstract class TypeSystemUtils {
* @return String
*/
public String getName() {
- return name;
+ return this.name;
}
/**
@@ -165,7 +165,7 @@ public abstract class TypeSystemUtils {
* @return Type
*/
public TypeParse getType() {
- return type;
+ return this.type;
}
/**
@@ -202,7 +202,7 @@ public abstract class TypeSystemUtils {
* @return int
*/
public int getErrorCode() {
- return errorCode;
+ return this.errorCode;
}
/**
@@ -211,7 +211,7 @@ public abstract class TypeSystemUtils {
* @return int
*/
public int getErrorPosition() {
- return errorPosition;
+ return this.errorPosition;
}
/**
@@ -295,8 +295,11 @@ public abstract class TypeSystemUtils {
}
// If there is a next token, it must be a separator.
if (tok.hasMoreTokens()) {
+ if (!tok.nextToken().equals(NAMESPACE_SEPARATOR_AS_STRING)) {
+ return false;
+ }
// A sequence can not end in a separator.
- if (!tok.nextToken().equals(NAMESPACE_SEPARATOR_AS_STRING) || !tok.hasMoreTokens()) {
+ if (!tok.hasMoreTokens()) {
return false;
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java
index ccd8a0b55..3ec3e1e03 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java
@@ -203,21 +203,21 @@ public class XCASDeserializer {
private int fsId;
private XCASDeserializerHandler(CASImpl aCAS, OutOfTypeSystemData ootsData) {
- cas = aCAS.getBaseCAS();
+ this.cas = aCAS.getBaseCAS();
// Reset the CAS.
cas.resetNoQuestions();
- fsTree = new RedBlackTree<>();
- idLess = new ArrayList<>();
- buffer = new StringBuffer();
- outOfTypeSystemData = ootsData;
- indexRepositories = new ArrayList<>();
- views = new ArrayList<>();
+ this.fsTree = new RedBlackTree<>();
+ this.idLess = new ArrayList<>();
+ this.buffer = new StringBuffer();
+ this.outOfTypeSystemData = ootsData;
+ this.indexRepositories = new ArrayList<>();
+ this.views = new ArrayList<>();
// using the baseCas for indexing Sofas
- indexRepositories.add(cas.getBaseIndexRepository());
+ indexRepositories.add(this.cas.getBaseIndexRepository());
// There should always be another index for the Initial View
- indexRepositories.add(cas.getView(CAS.NAME_DEFAULT_SOFA).getIndexRepository());
- sofaRefMap = new IntVector();
- indexMap = new IntVector();
+ indexRepositories.add(this.cas.getView(CAS.NAME_DEFAULT_SOFA).getIndexRepository());
+ this.sofaRefMap = new IntVector();
+ this.indexMap = new IntVector();
// add entry for baseCAS ... point non-compliant annotations at first Sofa
sofaRefMap.add(1);
// add entry for baseCAS ... _indexed=0 stays in 0
@@ -226,7 +226,7 @@ public class XCASDeserializer {
private final void resetBuffer() {
// this.buffer.delete(0, this.buffer.length());
- buffer = new StringBuffer();
+ this.buffer = new StringBuffer();
}
/*
@@ -237,7 +237,7 @@ public class XCASDeserializer {
@Override
public void startDocument() throws SAXException {
// Do setup work in the constructor.
- state = DOC_STATE;
+ this.state = DOC_STATE;
// System.out.println("Starting to read document.");
// time = System.currentTimeMillis();
}
@@ -263,11 +263,11 @@ public class XCASDeserializer {
if (!qualifiedName.equals(XCASSerializer.casTagName)) {
throw createException(XCASParsingException.WRONG_ROOT_TAG, qualifiedName);
}
- state = FS_STATE;
+ this.state = FS_STATE;
break;
}
case FS_STATE: {
- currentContentFeat = DEFAULT_CONTENT_FEATURE;
+ this.currentContentFeat = DEFAULT_CONTENT_FEATURE;
if (qualifiedName.equals(getDocumentTypeName())) {
readDocument(attrs);
} else {
@@ -288,7 +288,7 @@ public class XCASDeserializer {
// Get ready to read document text.
private void readDocument(Attributes attrs) {
- state = DOC_TEXT_STATE;
+ this.state = DOC_TEXT_STATE;
}
// Get ready to read array element.
@@ -299,7 +299,7 @@ public class XCASDeserializer {
if (attrs.getLength() > 0) {
throw createException(XCASParsingException.ARRAY_ELE_ATTRS);
}
- state = ARRAY_ELE_CONTENT_STATE;
+ this.state = ARRAY_ELE_CONTENT_STATE;
// resetBuffer();
}
@@ -316,7 +316,7 @@ public class XCASDeserializer {
TypeImpl type = ts.getType(typeName);
if (type == null) {
- if (outOfTypeSystemData == null) {
+ if (this.outOfTypeSystemData == null) {
throw createException(XCASParsingException.UNKNOWN_TYPE, typeName);
} else {
// add this FS to out-of-typesystem data - this also sets the
@@ -371,30 +371,30 @@ public class XCASDeserializer {
// Two scenarios ... the initial view is the first sofa, or not.
// If not, the _indexed values need to be remapped to leave room for the initial view,
// which may or may not be in the received CAS.
- if (indexMap.size() == 1) {
+ if (this.indexMap.size() == 1) {
if (isInitialView) {
// the first Sofa an initial view
if (extSofaNum == 2) {
// this sofa was mapped to the initial view
- indexMap.add(-1); // for this CAS, there should not be a sofanum = 1
- indexMap.add(1); // map 2 to 1
- nextIndex = 2;
+ this.indexMap.add(-1); // for this CAS, there should not be a sofanum = 1
+ this.indexMap.add(1); // map 2 to 1
+ this.nextIndex = 2;
} else {
- indexMap.add(1);
- nextIndex = 2;
+ this.indexMap.add(1);
+ this.nextIndex = 2;
}
} else {
if (extSofaNum > 1) {
// the first Sofa not initial, but sofaNum > 1
// must be a v2 format, and sofaNum better be 2
- indexMap.add(1);
+ this.indexMap.add(1);
assert (extSofaNum == 2);
- indexMap.add(2);
- nextIndex = 3;
+ this.indexMap.add(2);
+ this.nextIndex = 3;
} else {
// must be v1 format
- indexMap.add(2);
- nextIndex = 3;
+ this.indexMap.add(2);
+ this.nextIndex = 3;
}
}
} else {
@@ -403,35 +403,35 @@ public class XCASDeserializer {
if (isInitialView) {
// the initial view is not the first
// if v2 format, space already reserved in mapping
- if (indexMap.size() == extSofaNum) {
+ if (this.indexMap.size() == extSofaNum) {
// v1 format, add mapping for initial view
- indexMap.add(1);
+ this.indexMap.add(1);
}
} else {
- indexMap.add(nextIndex);
- nextIndex++;
+ this.indexMap.add(this.nextIndex);
+ this.nextIndex++;
}
}
// Now update the mapping from annotation int to ref values
- if (sofaRefMap.size() == extSofaNum) {
+ if (this.sofaRefMap.size() == extSofaNum) {
// Sofa received in sofaNum order, add new one
- sofaRefMap.add(fsId);
- } else if (sofaRefMap.size() > extSofaNum) {
+ this.sofaRefMap.add(fsId);
+ } else if (this.sofaRefMap.size() > extSofaNum) {
// new Sofa has lower sofaNum than last one
- sofaRefMap.set(extSofaNum, fsId);
+ this.sofaRefMap.set(extSofaNum, fsId);
} else {
// new Sofa has skipped ahead more than 1
- sofaRefMap.setSize(extSofaNum + 1);
- sofaRefMap.set(extSofaNum, fsId);
+ this.sofaRefMap.setSize(extSofaNum + 1);
+ this.sofaRefMap.set(extSofaNum, fsId);
}
// get the sofa's mimeType
String sofaMimeType = attrs.getValue(CAS.FEATURE_BASE_NAME_SOFAMIME);
String finalSofaId = sofaID;
fs = maybeCreateWithV2Id(fsId,
- () -> cas.createSofa(indexMap.get(extSofaNum), finalSofaId, sofaMimeType));
+ () -> cas.createSofa(this.indexMap.get(extSofaNum), finalSofaId, sofaMimeType));
} else { // not a Sofa
if (type.isAnnotationBaseType()) {
@@ -443,9 +443,9 @@ public class XCASDeserializer {
String extSofaNum = attrs.getValue(CAS.FEATURE_BASE_NAME_SOFA);
CAS casView;
if (extSofaNum != null) {
- casView = cas.getView((indexMap.size() == 1) ? 1 // case of no Sofa, but view ref =
+ casView = cas.getView((this.indexMap.size() == 1) ? 1 // case of no Sofa, but view ref =
// 1 = _InitialView
- : indexMap.get(Integer.parseInt(extSofaNum)));
+ : this.indexMap.get(Integer.parseInt(extSofaNum)));
} else {
String extSofaRefString = attrs
.getValue(XCASSerializer.REF_PREFIX + CAS.FEATURE_BASE_NAME_SOFA);
@@ -475,7 +475,7 @@ public class XCASDeserializer {
}
// Hang on to FS for setting content feature (things coded as child xml elements)
- currentFs = fs;
+ this.currentFs = fs;
int extId = -1;
IntVector indexRep = new IntVector(1); // empty means not indexed
@@ -498,7 +498,7 @@ public class XCASDeserializer {
throw createException(XCASParsingException.ILLEGAL_ID, attrValue);
}
} else if (attrName.equals(XCASSerializer.CONTENT_ATTR_NAME)) {
- currentContentFeat = attrValue;
+ this.currentContentFeat = attrValue;
// this.state = CONTENT_STATE; APL-6/28/04 - removed, see below
} else if (attrName.equals(XCASSerializer.INDEXED_ATTR_NAME)) {
// if (attrValue.equals(XCASSerializer.TRUE_VALUE) && toIndex)
@@ -556,7 +556,7 @@ public class XCASDeserializer {
// would
// be assigned to the "value" feature, as per XCAS spec. FEAT_STATE did not really seem to be
// working, anyway.
- state = CONTENT_STATE;
+ this.state = CONTENT_STATE;
// if (this.state != CONTENT_STATE)
// {
// this.state = FEAT_STATE;
@@ -608,10 +608,10 @@ public class XCASDeserializer {
idLess.add(fsInfo);
}
// Hang on to those for setting array values.
- currentFs = fs;
- arrayPos = 0;
+ this.currentFs = fs;
+ this.arrayPos = 0;
- state = ARRAY_ELE_STATE;
+ this.state = ARRAY_ELE_STATE;
}
// The definition of a null value. Any other value must be in the expected
@@ -635,7 +635,7 @@ public class XCASDeserializer {
// handle v1.x format annotations, mapping int to ref values
final String featVal = (featName.equals("sofa") && ((TypeImpl) type).isAnnotationBaseType())
- ? Integer.toString(sofaRefMap
+ ? Integer.toString(this.sofaRefMap
.get(((Sofa) fsTree.get(Integer.parseInt(featValIn)).fs).getSofaNum()))
: featValIn;
@@ -693,7 +693,7 @@ public class XCASDeserializer {
*/
@Override
public void characters(char[] chars, int start, int length) throws SAXException {
- switch (state) {
+ switch (this.state) {
case DOC_TEXT_STATE:
case CONTENT_STATE:
case OOTS_CONTENT_STATE:
@@ -724,17 +724,17 @@ public class XCASDeserializer {
@Override
public void endElement(String nsURI, String localName, String qualifiedName)
throws SAXException {
- switch (state) {
+ switch (this.state) {
case DOC_STATE: {
// Do nothing.
break;
}
case FS_STATE: {
- state = DOC_STATE;
+ this.state = DOC_STATE;
break;
}
case FEAT_STATE: {
- state = FS_STATE;
+ this.state = FS_STATE;
break;
}
case CONTENT_STATE: {
@@ -746,23 +746,23 @@ public class XCASDeserializer {
// Not sure why we are calling handleFeature for WF content
}
}
- state = FS_STATE;
+ this.state = FS_STATE;
break;
}
case FEAT_CONTENT_STATE: {
// Create a feature value from an element.
handleFeature(currentFs, qualifiedName, buffer.toString(), false);
- state = FEAT_STATE;
+ this.state = FEAT_STATE;
break;
}
case ARRAY_ELE_CONTENT_STATE: {
// Create an array value.
addArrayElement(buffer.toString());
- state = ARRAY_ELE_STATE;
+ this.state = ARRAY_ELE_STATE;
break;
}
case ARRAY_ELE_STATE: {
- state = FS_STATE;
+ this.state = FS_STATE;
break;
}
case DOC_TEXT_STATE: {
@@ -776,13 +776,13 @@ public class XCASDeserializer {
// and assume the new Sofa is at location 1!
int id = 1;
- sofaRefMap.add(id);
+ this.sofaRefMap.add(id);
// and register the id for this Sofa
FSInfo fsInfo = new FSInfo(newSofa, new IntVector());
fsTree.put(id, fsInfo);
- state = FS_STATE;
+ this.state = FS_STATE;
break;
}
case OOTS_CONTENT_STATE: {
@@ -791,11 +791,11 @@ public class XCASDeserializer {
// Set the value of the content feature.
currentOotsFs.featVals.put(currentContentFeat, buffer.toString());
}
- state = FS_STATE;
+ this.state = FS_STATE;
break;
}
case OOTS_FEAT_STATE: {
- state = FS_STATE;
+ this.state = FS_STATE;
break;
}
}
@@ -1112,7 +1112,7 @@ public class XCASDeserializer {
@Override
public void setDocumentLocator(Locator loc) {
// System.out.println("Setting document locator.");
- locator = loc;
+ this.locator = loc;
}
/*
@@ -1131,7 +1131,7 @@ public class XCASDeserializer {
*/
private void addToOutOfTypeSystemData(String typeName, Attributes attrs)
throws XCASParsingException {
- if (outOfTypeSystemData != null) {
+ if (this.outOfTypeSystemData != null) {
FSData fsData = new FSData();
fsData.type = typeName;
fsData.indexRep = null; // not indexed
@@ -1143,7 +1143,7 @@ public class XCASDeserializer {
if (attrName.equals(XCASSerializer.ID_ATTR_NAME)) {
fsData.id = attrValue;
} else if (attrName.equals(XCASSerializer.CONTENT_ATTR_NAME)) {
- currentContentFeat = attrValue;
+ this.currentContentFeat = attrValue;
} else if (attrName.equals(XCASSerializer.INDEXED_ATTR_NAME)) {
fsData.indexRep = attrValue;
} else {
@@ -1153,11 +1153,11 @@ public class XCASDeserializer {
fsData.featVals.put(attrName, attrValue);
}
}
- outOfTypeSystemData.fsList.add(fsData);
- currentOotsFs = fsData;
+ this.outOfTypeSystemData.fsList.add(fsData);
+ this.currentOotsFs = fsData;
// Set the state; we're ready to accept the "content" feature,
// if one is specified
- state = OOTS_CONTENT_STATE;
+ this.state = OOTS_CONTENT_STATE;
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASParsingException.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASParsingException.java
index 6ebef7fca..4fcc21f06 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASParsingException.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASParsingException.java
@@ -174,7 +174,7 @@ public class XCASParsingException extends org.xml.sax.SAXParseException {
/** @return The same as getMessage(), but prefixed with <code>"XCASParsingException: "</code>. */
@Override
public String toString() {
- return "XCASParsingException: " + getMessage();
+ return "XCASParsingException: " + this.getMessage();
}
/**
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java
index 358691eba..8303b3178 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java
@@ -140,7 +140,7 @@ public class XCASSerializer {
private XCASDocSerializer(ContentHandler ch, CASImpl cas) {
this.ch = ch;
this.cas = cas;
- numDuplicates = 0;
+ this.numDuplicates = 0;
}
/**
@@ -230,7 +230,7 @@ public class XCASSerializer {
* with a different value.
*/
private int isQueued(TOP fs, int value) {
- Integer v = queued.get(fs);
+ Integer v = this.queued.get(fs);
return (null == v) ? KEY_NOT_FOUND : (value == v) ? KEY_AND_VALUE_MATCH : KEY_ONLY_MATCH;
}
@@ -809,7 +809,7 @@ public class XCASSerializer {
this.ts = (TypeSystemImpl) ts;
// Create feature name cache.
final int featArraySize = this.ts.getNumberOfFeatures() + 1;
- featureNames = new String[featArraySize];
+ this.featureNames = new String[featArraySize];
FeatureImpl feat;
String featName;
Iterator<Feature> it = this.ts.getFeatures();
@@ -820,7 +820,7 @@ public class XCASSerializer {
} else {
featName = REF_PREFIX + feat.getShortName();
}
- featureNames[feat.getCode()] = featName;
+ this.featureNames[feat.getCode()] = featName;
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
index b3d6aef45..78e7c30e5 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
@@ -297,13 +297,13 @@ public class XmiCasDeserializer {
private XmiCasDeserializerHandler(CASImpl aCAS, boolean lenient,
XmiSerializationSharedData sharedData, int mergePoint,
AllowPreexistingFS allowPreexistingFS) {
- casBeingFilled = aCAS.getBaseCAS();
+ this.casBeingFilled = aCAS.getBaseCAS();
this.lenient = lenient;
this.sharedData = sharedData != null ? sharedData : new XmiSerializationSharedData();
this.mergePoint = mergePoint;
this.allowPreexistingFS = allowPreexistingFS;
- featsSeen = null;
- disallowedViewMemberEncountered = false;
+ this.featsSeen = null;
+ this.disallowedViewMemberEncountered = false;
if (mergePoint < 0) {
// If not merging, reset the CAS.
// Necessary to get Sofas to work properly.
@@ -312,20 +312,20 @@ public class XmiCasDeserializer {
// clear ID mappings stored in the SharedData (from previous deserializations)
this.sharedData.clearIdMap();
// new Sofas start at 2
- nextSofaNum = 2;
+ this.nextSofaNum = 2;
} else {
- nextSofaNum = casBeingFilled.getViewCount() + 1;
+ this.nextSofaNum = this.casBeingFilled.getViewCount() + 1;
}
- buffer = new StringBuilder();
- indexRepositories = new ArrayList<>();
- views = new ArrayList<>();
- indexRepositories.add(casBeingFilled.getBaseIndexRepository());
+ this.buffer = new StringBuilder();
+ this.indexRepositories = new ArrayList<>();
+ this.views = new ArrayList<>();
+ indexRepositories.add(this.casBeingFilled.getBaseIndexRepository());
// There should always be another index for the Initial View
indexRepositories
- .add(casBeingFilled.getView(CAS.NAME_DEFAULT_SOFA).getIndexRepository());
+ .add(this.casBeingFilled.getView(CAS.NAME_DEFAULT_SOFA).getIndexRepository());
// add an entry to indexRepositories for each Sofa in the CAS (which can only happen if
// a mergePoint was specified)
- FSIterator<Sofa> sofaIter = casBeingFilled.getSofaIterator();
+ FSIterator<Sofa> sofaIter = this.casBeingFilled.getSofaIterator();
while (sofaIter.hasNext()) {
SofaFS sofa = sofaIter.next();
if (sofa.getSofaRef() == 1) {
@@ -353,7 +353,7 @@ public class XmiCasDeserializer {
@Override
public void startDocument() throws SAXException {
// Do setup work in the constructor.
- state = DOC_STATE;
+ this.state = DOC_STATE;
// System.out.println("Starting to read document.");
// time = System.currentTimeMillis();
}
@@ -389,29 +389,29 @@ public class XmiCasDeserializer {
}
}
}
- state = FS_STATE;
+ this.state = FS_STATE;
break;
}
case FS_STATE: {
// ignore elements with XMI prefix (such as XMI annotations)
if (qualifiedName.startsWith("xmi")) {
- state = IGNORING_XMI_ELEMENTS_STATE;
- ignoreDepth++;
+ this.state = IGNORING_XMI_ELEMENTS_STATE;
+ this.ignoreDepth++;
return;
}
// if Delta CAS check if preexisting FS check if allowed
- if (mergePoint >= 0) {
+ if (this.mergePoint >= 0) {
String id = attrs.getValue(ID_ATTR_NAME);
if (id != null) {
int idInt = Integer.parseInt(id);
- if (idInt > 0 && !isNewFS(idInt)) { // preexisting FS
- if (allowPreexistingFS == AllowPreexistingFS.ignore) { // skip elements whose
+ if (idInt > 0 && !this.isNewFS(idInt)) { // preexisting FS
+ if (this.allowPreexistingFS == AllowPreexistingFS.ignore) { // skip elements whose
// ID is <= mergePoint
- state = IGNORING_XMI_ELEMENTS_STATE;
- ignoreDepth++;
+ this.state = IGNORING_XMI_ELEMENTS_STATE;
+ this.ignoreDepth++;
return;
- } else if (allowPreexistingFS == AllowPreexistingFS.disallow) { // fail
+ } else if (this.allowPreexistingFS == AllowPreexistingFS.disallow) { // fail
throw new CASRuntimeException(
CASRuntimeException.DELTA_CAS_PREEXISTING_FS_DISALLOWED,
ID_ATTR_NAME + "=" + id, nameSpaceURI, localName, qualifiedName);
@@ -451,19 +451,19 @@ public class XmiCasDeserializer {
// for out-of-typesystem objects, there's special handling here
// to keep track of the fact this was an href so we re-serialize
// correctly.
- if (outOfTypeSystemElement != null) {
+ if (this.outOfTypeSystemElement != null) {
XmlElementName elemName = new XmlElementName(nameSpaceURI, localName, qualifiedName);
List<XmlAttribute> ootsAttrs = new ArrayList<>();
ootsAttrs.add(new XmlAttribute("href", href));
XmlElementNameAndContents elemWithContents = new XmlElementNameAndContents(elemName,
null, ootsAttrs);
- outOfTypeSystemElement.childElements.add(elemWithContents);
+ this.outOfTypeSystemElement.childElements.add(elemWithContents);
} else {
// In-typesystem FS, so we can forget this was an href and just add
// the integer value, which will be interpreted as a reference later.
// NOTE: this will end up causing it to be reserialized as an attribute
// rather than an element, but that is not in violation of the XMI spec.
- ArrayList<String> valueList = multiValuedFeatures.computeIfAbsent(qualifiedName,
+ ArrayList<String> valueList = this.multiValuedFeatures.computeIfAbsent(qualifiedName,
k -> new ArrayList<>());
valueList.add(href.substring(1));
}
@@ -567,7 +567,7 @@ public class XmiCasDeserializer {
int thisSofaNum = (sofaID.equals(CAS.NAME_DEFAULT_SOFA)
|| sofaID.equals("_DefaultTextSofaName")) ? 1 // initial view Sofa always has
// sofaNum = 1
- : nextSofaNum++;
+ : this.nextSofaNum++;
// get the sofa's mimeType
String sofaMimeType = attrs.getValue(CAS.FEATURE_BASE_NAME_SOFAMIME);
@@ -628,10 +628,10 @@ public class XmiCasDeserializer {
} // end of not a sofa, not an array
readFS(fs, attrs, IS_NEW_FS);
} else { // preexisting
- if (allowPreexistingFS == AllowPreexistingFS.disallow) {
+ if (this.allowPreexistingFS == AllowPreexistingFS.disallow) {
throw new CASRuntimeException(CASRuntimeException.DELTA_CAS_PREEXISTING_FS_DISALLOWED,
ID_ATTR_NAME + "=" + idStr, nameSpaceURI, localName, qualifiedName);
- } else if (allowPreexistingFS == AllowPreexistingFS.allow) { // get the FS
+ } else if (this.allowPreexistingFS == AllowPreexistingFS.allow) { // get the FS
final TOP fs = getFsForXmiId(xmiId);
// remove from indexes, and remember if was there, per view
// (might be indexed in some views, not in others)
@@ -649,18 +649,18 @@ public class XmiCasDeserializer {
if (processingDeferredFSs) {
throw createException(XCASParsingException.SOFA_REF_MISSING);
}
- if (deferredFSs == null) {
- deferredFSs = new ArrayList<>();
+ if (this.deferredFSs == null) {
+ this.deferredFSs = new ArrayList<>();
}
- deferredFsElement = new OotsElementData(idStr,
+ this.deferredFsElement = new OotsElementData(idStr,
new XmlElementName(nameSpaceURI, localName, qualifiedName),
(locator == null) ? 0 : locator.getLineNumber(),
(locator == null) ? 0 : locator.getColumnNumber());
- deferredFSs.add(deferredFsElement);
+ deferredFSs.add(this.deferredFsElement);
// This next call isn't about oots data, it's reusing that to store the attributes with the
// deferred thing.
- addOutOfTypeSystemAttributes(deferredFsElement, attrs);
+ addOutOfTypeSystemAttributes(this.deferredFsElement, attrs);
}
/**
@@ -692,13 +692,13 @@ public class XmiCasDeserializer {
// special handling for merge operations ...
if (!newview && !isNewFS(xmiId)) {
// a pre-existing FS is indexed in a pre-existing view
- if (allowPreexistingFS == AllowPreexistingFS.ignore) {
+ if (this.allowPreexistingFS == AllowPreexistingFS.ignore) {
// merging with full CAS: ignore anything below the high water mark
continue;
}
- if (allowPreexistingFS == AllowPreexistingFS.disallow) {
+ if (this.allowPreexistingFS == AllowPreexistingFS.disallow) {
// merging with delta CAS: flag it
- disallowedViewMemberEncountered = true;
+ this.disallowedViewMemberEncountered = true;
continue;
}
}
@@ -714,7 +714,7 @@ public class XmiCasDeserializer {
throw createException(XCASParsingException.UNKNOWN_ID, Integer.toString(xmiId));
} else {
// unknown view member may be an OutOfTypeSystem FS
- sharedData.addOutOfTypeSystemViewMember(sofa, members[i]);
+ this.sharedData.addOutOfTypeSystemViewMember(sofa, members[i]);
}
}
}
@@ -788,10 +788,10 @@ public class XmiCasDeserializer {
for (int i = 0; i < members.length; i++) {
int xmiId = Integer.parseInt(members[i]);
if (!isNewFS(xmiId)) { // preexisting FS
- if (allowPreexistingFS == AllowPreexistingFS.disallow) {
- disallowedViewMemberEncountered = true; // ignore but flag it.
+ if (this.allowPreexistingFS == AllowPreexistingFS.disallow) {
+ this.disallowedViewMemberEncountered = true; // ignore but flag it.
continue;
- } else if (allowPreexistingFS == AllowPreexistingFS.ignore) {
+ } else if (this.allowPreexistingFS == AllowPreexistingFS.ignore) {
continue; // ignore
}
}
@@ -807,7 +807,7 @@ public class XmiCasDeserializer {
throw createException(XCASParsingException.UNKNOWN_ID, Integer.toString(xmiId));
} else {
// unknown view member may be an OutOfTypeSystem FS
- sharedData.addOutOfTypeSystemViewMember(sofa, members[i]);
+ this.sharedData.addOutOfTypeSystemViewMember(sofa, members[i]);
}
}
} // end of for loop over members
@@ -845,7 +845,7 @@ public class XmiCasDeserializer {
private void readFS(final TOP fs, Attributes attrs, final boolean isNewFs) throws SAXException {
// Hang on to FS for setting content feature (things coded as child xml elements)
- currentFs = fs;
+ this.currentFs = fs;
String attrName, attrValue;
final TypeImpl type = fs._getTypeImpl();
final int typeCode = type.getCode();
@@ -877,7 +877,7 @@ public class XmiCasDeserializer {
// throw createException(XCASParsingException.ILLEGAL_ID, attrs.getValue(ID_ATTR_NAME));
// }
- featsSeen = null;
+ this.featsSeen = null;
// before looping over all features for this FS,
// remove this FS if
@@ -908,7 +908,7 @@ public class XmiCasDeserializer {
addFsToXmiId(fs, extId);
// set up feats seen for existing, non-sofa FSs
- featsSeen = (sofaTypeCode != typeCode && !isNewFs) ? new IntVector(attrs.getLength())
+ this.featsSeen = (sofaTypeCode != typeCode && !isNewFs) ? new IntVector(attrs.getLength())
: null;
// loop over all attributes in the xml for this FS
@@ -922,8 +922,8 @@ public class XmiCasDeserializer {
int featCode = handleFeatureFromName(type, fs, attrName, attrValue, isNewFs);
// if processing delta cas preexisting FS, keep track of features that have
// been deserialized.
- if (featsSeen != null && featCode != -1) {
- featsSeen.add(featCode);
+ if (this.featsSeen != null && featCode != -1) {
+ this.featsSeen.add(featCode);
}
} // end of all features loop
} finally {
@@ -977,7 +977,7 @@ public class XmiCasDeserializer {
final boolean isNewFS) throws SAXException {
final FeatureImpl feat = (FeatureImpl) type.getFeatureByBaseName(featName);
if (feat == null) {
- if (!lenient) {
+ if (!this.lenient) {
throw createException(XCASParsingException.UNKNOWN_FEATURE, featName);
} else {
// this logic mimics the way version 2 did this.
@@ -1028,7 +1028,7 @@ public class XmiCasDeserializer {
ArrayList<String> featVals) throws SAXException {
final FeatureImpl feat = (FeatureImpl) type.getFeatureByBaseName(featName);
if (feat == null) {
- if (!lenient) {
+ if (!this.lenient) {
throw createException(XCASParsingException.UNKNOWN_FEATURE, featName);
} else {
sharedData.addOutOfTypeSystemChildElements(fs, featName, featVals);
@@ -1690,7 +1690,7 @@ public class XmiCasDeserializer {
*/
@Override
public void characters(char[] chars, int start, int length) throws SAXException {
- switch (state) {
+ switch (this.state) {
case FEAT_CONTENT_STATE:
buffer.append(chars, start, length);
break;
@@ -1707,36 +1707,36 @@ public class XmiCasDeserializer {
@Override
public void endElement(String nsURI, String localName, String qualifiedName)
throws SAXException {
- switch (state) {
+ switch (this.state) {
case DOC_STATE: {
// Do nothing.
break;
}
case FS_STATE: {
- state = DOC_STATE;
+ this.state = DOC_STATE;
break;
}
case FEAT_CONTENT_STATE: {
// We have just processed one of possibly many values for a feature.
// Store this value in the multiValuedFeatures map for later use.
- ArrayList<String> valueList = multiValuedFeatures.computeIfAbsent(qualifiedName,
+ ArrayList<String> valueList = this.multiValuedFeatures.computeIfAbsent(qualifiedName,
k -> new ArrayList<>());
valueList.add(buffer.toString());
// go back to the state where we're expecting a feature
- state = FEAT_STATE;
+ this.state = FEAT_STATE;
break;
}
case REF_FEAT_STATE: {
- state = FEAT_STATE;
+ this.state = FEAT_STATE;
break;
}
case FEAT_STATE: {
// end of FS. Process multi-valued features or array elements that were
// encoded as subelements
- if (outOfTypeSystemElement != null || deferredFsElement != null) {
- if (!multiValuedFeatures.isEmpty()) {
- for (Map.Entry<String, ArrayList<String>> entry : multiValuedFeatures
+ if (this.outOfTypeSystemElement != null || this.deferredFsElement != null) {
+ if (!this.multiValuedFeatures.isEmpty()) {
+ for (Map.Entry<String, ArrayList<String>> entry : this.multiValuedFeatures
.entrySet()) {
String featName = entry.getKey();
ArrayList<String> featVals = entry.getValue();
@@ -1746,7 +1746,7 @@ public class XmiCasDeserializer {
featName, featVals);
}
}
- outOfTypeSystemElement = deferredFsElement = null;
+ this.outOfTypeSystemElement = this.deferredFsElement = null;
} else if (currentType != null) {
@@ -1758,48 +1758,48 @@ public class XmiCasDeserializer {
// the overhead of parsing into a String array first
if (currentArrayElements == null) // were not specified as attributes
{
- currentArrayElements = multiValuedFeatures.get("elements");
+ currentArrayElements = this.multiValuedFeatures.get("elements");
if (currentArrayElements == null) {
currentArrayElements = Collections.emptyList();
}
}
createOrUpdateArray(currentType, currentArrayElements, currentArrayId, null);
- } else if (!multiValuedFeatures.isEmpty()) {
- for (Map.Entry<String, ArrayList<String>> entry : multiValuedFeatures
+ } else if (!this.multiValuedFeatures.isEmpty()) {
+ for (Map.Entry<String, ArrayList<String>> entry : this.multiValuedFeatures
.entrySet()) {
String featName = entry.getKey();
ArrayList<String> featVals = entry.getValue();
int featcode = handleFeatMultiValueFromName(currentType, currentFs, featName,
featVals);
- if (featcode != -1 && featsSeen != null) {
- featsSeen.add(featcode);
+ if (featcode != -1 && this.featsSeen != null) {
+ this.featsSeen.add(featcode);
}
}
}
// if this is a preexisting FS which is not a Sofa FS,
// set the features that were not deserialized to null.
- if (sofaTypeCode != currentType.getCode() && featsSeen != null) {
+ if (sofaTypeCode != currentType.getCode() && this.featsSeen != null) {
for (FeatureImpl fi : currentType.getFeatureImpls()) {
if (!(fi.getName().equals(CAS.FEATURE_FULL_NAME_SOFA))) {
- if (!featsSeen.contains(fi.getCode())) {
+ if (!this.featsSeen.contains(fi.getCode())) {
CASImpl.setFeatureValueFromStringNoDocAnnotUpdate(currentFs, fi, null);
}
}
}
- featsSeen = null; // set for every feature instance being deserialized
+ this.featsSeen = null; // set for every feature instance being deserialized
}
}
- state = FS_STATE;
+ this.state = FS_STATE;
break;
}
case IGNORING_XMI_ELEMENTS_STATE: {
ignoreDepth--;
if (ignoreDepth == 0) {
- state = FS_STATE;
+ this.state = FS_STATE;
}
break;
}
@@ -1849,7 +1849,7 @@ public class XmiCasDeserializer {
}
// check if disallowed fs encountered]
- if (disallowedViewMemberEncountered) {
+ if (this.disallowedViewMemberEncountered) {
throw new CASRuntimeException(CASRuntimeException.DELTA_CAS_PREEXISTING_FS_DISALLOWED,
"Preexisting FS view member encountered.");
}
@@ -1868,7 +1868,7 @@ public class XmiCasDeserializer {
} else {
// the element may be out of typesystem. In that case set it
// to null, but record the id so we can add it back on next serialization.
- sharedData.addOutOfTypeSystemAttribute(fs, fi.getShortName(),
+ this.sharedData.addOutOfTypeSystemAttribute(fs, fi.getShortName(),
Integer.toString(xmiId));
CASImpl.setFeatureValueMaybeSofa(fs, fi, null);
}
@@ -1887,7 +1887,7 @@ public class XmiCasDeserializer {
} else {
// the element may be out of typesystem. In that case set it
// to null, but record the id so we can add it back on next serialization.
- sharedData.addOutOfTypeSystemAttribute(neNode, CAS.FEATURE_BASE_NAME_HEAD,
+ this.sharedData.addOutOfTypeSystemAttribute(neNode, CAS.FEATURE_BASE_NAME_HEAD,
Integer.toString(xmiId));
neNode.setHead(null);
}
@@ -1905,7 +1905,7 @@ public class XmiCasDeserializer {
} else {
// the array element may be out of typesystem. In that case set it
// to null, but record the id so we can add it back on next serialization.
- sharedData.addOutOfTypeSystemArrayElement(fsArray, index, xmiId);
+ this.sharedData.addOutOfTypeSystemArrayElement(fsArray, index, xmiId);
fsArray.set(index, null);
}
} else {
@@ -1980,7 +1980,7 @@ public class XmiCasDeserializer {
@Override
public void setDocumentLocator(Locator loc) {
// System.out.println("debug DEBUG Setting document locator.");
- locator = loc;
+ this.locator = loc;
}
/*
@@ -2052,19 +2052,19 @@ public class XmiCasDeserializer {
private void addToOutOfTypeSystemData(XmlElementName xmlElementName, Attributes attrs)
throws XCASParsingException {
String xmiId = attrs.getValue(ID_ATTR_NAME);
- outOfTypeSystemElement = new OotsElementData(xmiId, xmlElementName);
- addOutOfTypeSystemAttributes(outOfTypeSystemElement, attrs);
- sharedData.addOutOfTypeSystemElement(outOfTypeSystemElement);
+ this.outOfTypeSystemElement = new OotsElementData(xmiId, xmlElementName);
+ addOutOfTypeSystemAttributes(this.outOfTypeSystemElement, attrs);
+ this.sharedData.addOutOfTypeSystemElement(this.outOfTypeSystemElement);
}
private boolean isNewFS(int id) {
- return (id > mergePoint);
+ return (id > this.mergePoint);
}
private void addNonsharedFSToEncompassingFSMapping(TOP nonsharedFS, TOP encompassingFS) {
// System.out.println("addNonsharedFSToEncompassingFSMapping" + nonsharedFS + " " +
// encompassingFS);
- sharedData.addNonsharedRefToFSMapping(nonsharedFS, encompassingFS);
+ this.sharedData.addNonsharedRefToFSMapping(nonsharedFS, encompassingFS);
}
private void processDeferredFSs() throws SAXException {
@@ -2100,8 +2100,8 @@ public class XmiCasDeserializer {
for (NameMultiValue nmv : deferredFs.multiValuedFeatures) {
int featcode = handleFeatMultiValueFromName(currentType, currentFs, nmv.name,
nmv.values);
- if (featcode != -1 && featsSeen != null) {
- featsSeen.add(featcode);
+ if (featcode != -1 && this.featsSeen != null) {
+ this.featsSeen.add(featcode);
}
} // end of for loop over child elements
} finally {
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java
index 65b0e45e4..f53049185 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java
@@ -894,7 +894,10 @@ public class XmiCasSerializer {
* XmiSerializationSharedData during the last deserialization.
*/
private void serializeOutOfTypeSystemElements() throws SAXException {
- if ((cds.marker != null) || (cds.sharedData == null)) {
+ if (cds.marker != null) {
+ return;
+ }
+ if (cds.sharedData == null) {
return;
}
Iterator<OotsElementData> it = cds.sharedData.getOutOfTypeSystemElements().iterator();
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java
index 2e10388f5..4ea26e1d9 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java
@@ -201,7 +201,7 @@ public class XmiSerializationSharedData {
* information about the out-of-typesystem XMI element
*/
public void addOutOfTypeSystemElement(OotsElementData elemData) {
- ootsFs.add(elemData);
+ this.ootsFs.add(elemData);
// check if we need to update max ID
int xmiId = Integer.parseInt(elemData.xmiId);
if (xmiId > maxXmiId) {
@@ -218,7 +218,7 @@ public class XmiSerializationSharedData {
* objects
*/
public List<OotsElementData> getOutOfTypeSystemElements() {
- return Collections.unmodifiableList(ootsFs);
+ return Collections.unmodifiableList(this.ootsFs);
}
/**
@@ -231,7 +231,7 @@ public class XmiSerializationSharedData {
* given Sofa
*/
public void addOutOfTypeSystemViewMember(String sofaXmiId, String memberXmiId) {
- List<String> membersList = ootsViewMembers.computeIfAbsent(sofaXmiId,
+ List<String> membersList = this.ootsViewMembers.computeIfAbsent(sofaXmiId,
k -> new ArrayList<>());
membersList.add(memberXmiId);
}
@@ -245,7 +245,7 @@ public class XmiSerializationSharedData {
* @return List of xmi:id's of members of the view for the given Sofa.
*/
public List<String> getOutOfTypeSystemViewMembers(String sofaXmiId) {
- List<String> members = ootsViewMembers.get(sofaXmiId);
+ List<String> members = this.ootsViewMembers.get(sofaXmiId);
return members == null ? null : Collections.unmodifiableList(members);
}
@@ -261,10 +261,10 @@ public class XmiSerializationSharedData {
* value of the feature, as a string
*/
public void addOutOfTypeSystemAttribute(TOP fs, String featName, String featVal) {
- OotsElementData oed = ootsFeatures.get(fs);
+ OotsElementData oed = this.ootsFeatures.get(fs);
if (oed == null) {
oed = new OotsElementData(null, null, -1, -1);
- ootsFeatures.put(fs, oed);
+ this.ootsFeatures.put(fs, oed);
}
oed.attributes.add(new XmlAttribute(featName, featVal));
}
@@ -281,10 +281,10 @@ public class XmiSerializationSharedData {
* values of the feature, as a List of strings
*/
public void addOutOfTypeSystemChildElements(TOP fs, String featName, ArrayList<String> featVals) {
- OotsElementData oed = ootsFeatures.get(fs);
+ OotsElementData oed = this.ootsFeatures.get(fs);
if (oed == null) {
oed = new OotsElementData(null, null, -1, -1);
- ootsFeatures.put(fs, oed);
+ this.ootsFeatures.put(fs, oed);
}
addOutOfTypeSystemFeature(oed, featName, featVals);
}
@@ -307,7 +307,7 @@ public class XmiSerializationSharedData {
* child elements)
*/
public OotsElementData getOutOfTypeSystemFeatures(TOP fs) {
- return ootsFeatures.get(fs);
+ return this.ootsFeatures.get(fs);
}
/**
@@ -331,7 +331,7 @@ public class XmiSerializationSharedData {
* reference to an out-of-typesystem FS.
*/
public List<XmiArrayElement> getOutOfTypeSystemArrayElements(FSArray fsarray) {
- return ootsArrayElements.get(fsarray);
+ return this.ootsArrayElements.get(fsarray);
}
public boolean hasOutOfTypeSystemArrayElements() {
@@ -349,7 +349,7 @@ public class XmiSerializationSharedData {
* xmi:id of the out-of-typesystem element that is the value at the given index
*/
public void addOutOfTypeSystemArrayElement(FSArray fsarray, int index, int xmiId) {
- List<XmiArrayElement> list = ootsArrayElements.computeIfAbsent(fsarray,
+ List<XmiArrayElement> list = this.ootsArrayElements.computeIfAbsent(fsarray,
k -> new ArrayList<>());
list.add(new XmiArrayElement(index, Integer.toString(xmiId)));
}
@@ -364,7 +364,7 @@ public class XmiSerializationSharedData {
* - the encompassing Feature Structure
*/
public void addNonsharedRefToFSMapping(TOP nonsharedFS, TOP fs) {
- nonsharedfeatureIdToFSId.put(nonsharedFS, fs);
+ this.nonsharedfeatureIdToFSId.put(nonsharedFS, fs);
}
/**
@@ -372,7 +372,7 @@ public class XmiSerializationSharedData {
* @return the non-shared featureId to FS Id key set
*/
public TOP[] getNonsharedMulitValuedFSs() {
- return getSortedKeys(nonsharedfeatureIdToFSId);
+ return getSortedKeys(this.nonsharedfeatureIdToFSId);
}
private TOP[] getSortedKeys(Map<TOP, ?> map) {
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/text/Language.java b/uimaj-core/src/main/java/org/apache/uima/cas/text/Language.java
index a6873beb0..9ea0cfd8f 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/text/Language.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/text/Language.java
@@ -39,8 +39,8 @@ public class Language {
private String territoryPart = null;
public Language(String language) {
- lang = normalize(language);
- parseLanguage();
+ this.lang = normalize(language);
+ this.parseLanguage();
}
public static final String normalize(String lang) {
@@ -53,35 +53,35 @@ public class Language {
}
public String getLanguagePart() {
- return langPart;
+ return this.langPart;
}
public String getTerritoryPart() {
- return territoryPart;
+ return this.territoryPart;
}
public String getFullLanguage() {
- return lang;
+ return this.lang;
}
private final void parseLanguage() {
- int pos = lang.indexOf(CANONICAL_LANG_SEPARATOR);
+ int pos = this.lang.indexOf(CANONICAL_LANG_SEPARATOR);
if (pos >= 0) {
- langPart = lang.substring(0, pos);
+ this.langPart = this.lang.substring(0, pos);
} else {
- langPart = lang;
+ this.langPart = this.lang;
return;
}
++pos;
- if (pos < lang.length()) {
- territoryPart = lang.substring(pos);
+ if (pos < this.lang.length()) {
+ this.territoryPart = this.lang.substring(pos);
}
}
@Override
public String toString() {
- return "Full language string: " + getFullLanguage() + ", language part: "
- + getLanguagePart() + ", territory part: " + getTerritoryPart();
+ return "Full language string: " + this.getFullLanguage() + ", language part: "
+ + this.getLanguagePart() + ", territory part: " + this.getTerritoryPart();
}
public static void main(String[] args) {
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/CasDataToXCas.java b/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/CasDataToXCas.java
index f2a04d794..888869f0d 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/CasDataToXCas.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/CasDataToXCas.java
@@ -206,7 +206,7 @@ public class CasDataToXCas {
private void _generate(FeatureStructure aFS, DocTextHolder aDocTextHolder) throws SAXException {
// document text is special case
- if (aFS.getType().equals(getDocumentTextTypeName())) {
+ if (aFS.getType().equals(this.getDocumentTextTypeName())) {
_generateDocFS(aFS, aDocTextHolder);
} else {
// generate attributes for features (except "value" feature, which is represented in element
@@ -311,7 +311,7 @@ public class CasDataToXCas {
private void _generateDocFS(FeatureStructure aFS, DocTextHolder aDocTextHolder)
throws SAXException {
AttributesImpl attrs = new AttributesImpl();
- String textFeature = getDocumentTextFeatureName();
+ String textFeature = this.getDocumentTextFeatureName();
FeatureValue docTextValue = aFS.getFeatureValue(textFeature);
if (docTextValue != null) {
String text = docTextValue.toString();
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/XCasToCasDataSaxHandler.java b/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/XCasToCasDataSaxHandler.java
index 3487755d0..75a068638 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/XCasToCasDataSaxHandler.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/XCasToCasDataSaxHandler.java
@@ -106,13 +106,13 @@ public class XCasToCasDataSaxHandler extends DefaultHandler {
* the CasData to which FeatureStructures parsed from XCAS will be appended
*/
public XCasToCasDataSaxHandler(CasData aCasData) {
- buffer = new StringBuffer();
- cas = aCasData;
+ this.buffer = new StringBuffer();
+ this.cas = aCasData;
}
private final void resetBuffer() {
// this.buffer.delete(0, this.buffer.length());
- buffer = new StringBuffer();
+ this.buffer = new StringBuffer();
}
/*
@@ -123,7 +123,7 @@ public class XCasToCasDataSaxHandler extends DefaultHandler {
@Override
public void startDocument() throws SAXException {
// Do setup work in the constructor.
- state = DOC_STATE;
+ this.state = DOC_STATE;
// System.out.println("Starting to read document.");
// time = System.currentTimeMillis();
}
@@ -143,11 +143,11 @@ public class XCasToCasDataSaxHandler extends DefaultHandler {
if (!qualifiedName.equals(XCASSerializer.casTagName)) {
throw createException(XCASParsingException.WRONG_ROOT_TAG, qualifiedName);
}
- state = FS_STATE;
+ this.state = FS_STATE;
break;
}
case FS_STATE: {
- currentContentFeat = DEFAULT_CONTENT_FEATURE;
+ this.currentContentFeat = DEFAULT_CONTENT_FEATURE;
readFS(qualifiedName, attrs);
break;
}
@@ -170,7 +170,7 @@ public class XCasToCasDataSaxHandler extends DefaultHandler {
if (attrs.getLength() > 0) {
throw createException(XCASParsingException.ARRAY_ELE_ATTRS);
}
- state = ARRAY_ELE_CONTENT_STATE;
+ this.state = ARRAY_ELE_CONTENT_STATE;
resetBuffer();
}
@@ -179,11 +179,11 @@ public class XCasToCasDataSaxHandler extends DefaultHandler {
if (isArrayType(qualifiedName)) {
readArray(qualifiedName, attrs);
} else {
- currentFS = new FeatureStructureImpl();
- currentFS.setType(getCasTypeName(qualifiedName));
- readFS(currentFS, attrs);
+ this.currentFS = new FeatureStructureImpl();
+ this.currentFS.setType(getCasTypeName(qualifiedName));
+ readFS(this.currentFS, attrs);
}
- cas.addFeatureStructure(currentFS);
+ this.cas.addFeatureStructure(this.currentFS);
}
/**
@@ -208,7 +208,7 @@ public class XCasToCasDataSaxHandler extends DefaultHandler {
if (attrName.equals(XCASSerializer.ID_ATTR_NAME)) {
fsImpl.setId(attrValue);
} else if (attrName.equals(XCASSerializer.CONTENT_ATTR_NAME)) {
- currentContentFeat = attrValue;
+ this.currentContentFeat = attrValue;
} else if (attrName.equals(XCASSerializer.INDEXED_ATTR_NAME)) {
if (attrValue.equals(XCASSerializer.TRUE_VALUE)) {
fsImpl.setIndexed(new int[] { 1 }); // Backwards compatible CAS, has one default text
@@ -229,7 +229,7 @@ public class XCasToCasDataSaxHandler extends DefaultHandler {
// would
// be assigned to the "value" feature, as per XCAS spec. FEAT_STATE did not really seem to be
// working, anyway.
- state = CONTENT_STATE;
+ this.state = CONTENT_STATE;
// if (this.state != CONTENT_STATE)
// {
// this.state = FEAT_STATE;
@@ -285,25 +285,25 @@ public class XCasToCasDataSaxHandler extends DefaultHandler {
}
}
// Hang on to those for setting array values.
- arrayPos = 0;
+ this.arrayPos = 0;
if (CAS.TYPE_NAME_INTEGER_ARRAY.equals(type)) {
- currentFS = new PrimitiveArrayFSImpl(new int[size]);
- arrayType = INT_TYPE;
+ this.currentFS = new PrimitiveArrayFSImpl(new int[size]);
+ this.arrayType = INT_TYPE;
} else if (CAS.TYPE_NAME_FLOAT_ARRAY.equals(type)) {
- currentFS = new PrimitiveArrayFSImpl(new float[size]);
- arrayType = FLOAT_TYPE;
+ this.currentFS = new PrimitiveArrayFSImpl(new float[size]);
+ this.arrayType = FLOAT_TYPE;
} else if (CAS.TYPE_NAME_STRING_ARRAY.equals(type)) {
- currentFS = new PrimitiveArrayFSImpl(new String[size]);
- arrayType = STRING_TYPE;
+ this.currentFS = new PrimitiveArrayFSImpl(new String[size]);
+ this.arrayType = STRING_TYPE;
} else {
- currentFS = new ReferenceArrayFSImpl(new String[size]);
- arrayType = FS_TYPE;
+ this.currentFS = new ReferenceArrayFSImpl(new String[size]);
+ this.arrayType = FS_TYPE;
}
- currentFS.setId(id);
- currentFS.setType(type);
- currentFS.setIndexed(indexed);
- currentFS.setFeatureValue(XCASSerializer.ARRAY_SIZE_ATTR, new PrimitiveValueImpl(size));
- state = ARRAY_ELE_STATE;
+ this.currentFS.setId(id);
+ this.currentFS.setType(type);
+ this.currentFS.setIndexed(indexed);
+ this.currentFS.setFeatureValue(XCASSerializer.ARRAY_SIZE_ATTR, new PrimitiveValueImpl(size));
+ this.state = ARRAY_ELE_STATE;
}
// The definition of a null value. Any other value must be in the expected
@@ -330,8 +330,8 @@ public class XCasToCasDataSaxHandler extends DefaultHandler {
*/
@Override
public void characters(char[] chars, int start, int length) throws SAXException {
- if ((state == CONTENT_STATE) || (state == ARRAY_ELE_CONTENT_STATE)
- || (state == FEAT_CONTENT_STATE)) {
+ if ((this.state == CONTENT_STATE) || (this.state == ARRAY_ELE_CONTENT_STATE)
+ || (this.state == FEAT_CONTENT_STATE)) {
// When we're in a text expecting state, add the characters to the
// text buffer. Else, do nothing.
buffer.append(chars, start, length);
@@ -346,41 +346,41 @@ public class XCasToCasDataSaxHandler extends DefaultHandler {
*/
@Override
public void endElement(String nsURI, String localName, String qualifiedName) throws SAXException {
- switch (state) {
+ switch (this.state) {
case DOC_STATE: {
// Do nothing.
break;
}
case FS_STATE: {
- state = DOC_STATE;
+ this.state = DOC_STATE;
break;
}
case FEAT_STATE: {
- state = FS_STATE;
+ this.state = FS_STATE;
break;
}
case CONTENT_STATE: {
if (!isAllWhitespace(buffer)) {
// Set the value of the content feature.
- handleFeature(currentFS, currentContentFeat, buffer.toString());
+ handleFeature(this.currentFS, currentContentFeat, buffer.toString());
}
- state = FS_STATE;
+ this.state = FS_STATE;
break;
}
case FEAT_CONTENT_STATE: {
// Create a feature value from an element.
- handleFeature(currentFS, qualifiedName, buffer.toString());
- state = FEAT_STATE;
+ handleFeature(this.currentFS, qualifiedName, buffer.toString());
+ this.state = FEAT_STATE;
break;
}
case ARRAY_ELE_CONTENT_STATE: {
// Create an array value.
addArrayElement(buffer.toString());
- state = ARRAY_ELE_STATE;
+ this.state = ARRAY_ELE_STATE;
break;
}
case ARRAY_ELE_STATE: {
- state = FS_STATE;
+ this.state = FS_STATE;
break;
}
}
@@ -401,7 +401,7 @@ public class XCasToCasDataSaxHandler extends DefaultHandler {
case INT_TYPE: {
if (!emptyVal(content)) {
try {
- ((PrimitiveArrayFS) currentFS).toIntArray()[arrayPos] = Integer.parseInt(content);
+ ((PrimitiveArrayFS) this.currentFS).toIntArray()[arrayPos] = Integer.parseInt(content);
} catch (NumberFormatException e) {
throw createException(XCASParsingException.INTEGER_EXPECTED, content);
}
@@ -411,7 +411,7 @@ public class XCasToCasDataSaxHandler extends DefaultHandler {
case FLOAT_TYPE: {
if (!emptyVal(content)) {
try {
- ((PrimitiveArrayFS) currentFS).toFloatArray()[arrayPos] = Float
+ ((PrimitiveArrayFS) this.currentFS).toFloatArray()[arrayPos] = Float
.parseFloat(content);
} catch (NumberFormatException e) {
throw createException(XCASParsingException.FLOAT_EXPECTED, content);
@@ -420,12 +420,12 @@ public class XCasToCasDataSaxHandler extends DefaultHandler {
break;
}
case STRING_TYPE: {
- ((PrimitiveArrayFS) currentFS).toStringArray()[arrayPos] = content;
+ ((PrimitiveArrayFS) this.currentFS).toStringArray()[arrayPos] = content;
break;
}
case FS_TYPE: {
if (!emptyVal(content)) {
- ((ReferenceArrayFS) currentFS).getIdRefArray()[arrayPos] = content;
+ ((ReferenceArrayFS) this.currentFS).getIdRefArray()[arrayPos] = content;
}
break;
}
@@ -510,7 +510,7 @@ public class XCasToCasDataSaxHandler extends DefaultHandler {
@Override
public void setDocumentLocator(Locator loc) {
// System.out.println("Setting document locator.");
- locator = loc;
+ this.locator = loc;
}
/*
diff --git a/uimaj-core/src/main/java/org/apache/uima/flow/impl/FlowControllerContext_impl.java b/uimaj-core/src/main/java/org/apache/uima/flow/impl/FlowControllerContext_impl.java
index 83b2f41d2..8fdc913a9 100644
--- a/uimaj-core/src/main/java/org/apache/uima/flow/impl/FlowControllerContext_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/flow/impl/FlowControllerContext_impl.java
@@ -62,7 +62,7 @@ public class FlowControllerContext_impl extends ChildUimaContext_impl
// add our MBean to the tree
((AnalysisEngineManagementImpl) aParentContext.getManagementInterface())
- .addComponent(aContextName, mMBean);
+ .addComponent(aContextName, this.mMBean);
}
/*
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/BinaryTree.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/BinaryTree.java
index f33bf2285..4ae219a0c 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/BinaryTree.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/BinaryTree.java
@@ -33,10 +33,10 @@ public class BinaryTree {
private Object value;
public BinaryTree() {
- mother = null;
- left = null;
- right = null;
- value = null;
+ this.mother = null;
+ this.left = null;
+ this.right = null;
+ this.value = null;
}
public void setValue(Object value) {
@@ -44,31 +44,31 @@ public class BinaryTree {
}
public BinaryTree newLeftDtr() {
- left = new BinaryTree();
- left.mother = this;
- return left;
+ this.left = new BinaryTree();
+ this.left.mother = this;
+ return this.left;
}
public BinaryTree newRightDtr() {
- right = new BinaryTree();
- right.mother = this;
- return right;
+ this.right = new BinaryTree();
+ this.right.mother = this;
+ return this.right;
}
public BinaryTree getLeftDtr() {
- return left;
+ return this.left;
}
public BinaryTree getRightDtr() {
- return right;
+ return this.right;
}
public BinaryTree getMother() {
- return mother;
+ return this.mother;
}
public Object getValue() {
- return value;
+ return this.value;
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/CharArraySpanMap.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/CharArraySpanMap.java
index 965e264d8..216ea7857 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/CharArraySpanMap.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/CharArraySpanMap.java
@@ -28,9 +28,9 @@ public class CharArraySpanMap {
private static final class Entry {
private Entry() {
- start = 0;
- length = 0;
- value = null;
+ this.start = 0;
+ this.length = 0;
+ this.value = null;
}
private int start;
@@ -85,12 +85,12 @@ public class CharArraySpanMap {
if (initialMapSize < MIN_MAP_SIZE) {
initialMapSize = MIN_MAP_SIZE;
}
- charArray = new char[initialArraySize];
- map = new ArrayList[initialMapSize];
+ this.charArray = new char[initialArraySize];
+ this.map = new ArrayList[initialMapSize];
for (int i = 0; i < initialMapSize; i++) {
- map[i] = new ArrayList<>();
+ this.map[i] = new ArrayList<>();
}
- pos = 0;
+ this.pos = 0;
}
private final int isInList(String s, ArrayList<Entry> entryList) {
@@ -107,7 +107,7 @@ public class CharArraySpanMap {
}
found = true;
for (int j = 0; j < strLen; j++) {
- if (s.charAt(j) != charArray[j + entry.start]) {
+ if (s.charAt(j) != this.charArray[j + entry.start]) {
found = false;
break;
}
@@ -137,7 +137,7 @@ public class CharArraySpanMap {
k = entry.start;
max = start + strLen;
for (int count = start; count < max; count++) {
- if (inputArray[count] != charArray[k]) {
+ if (inputArray[count] != this.charArray[k]) {
found = false;
break;
}
@@ -162,18 +162,18 @@ public class CharArraySpanMap {
*/
public void put(String s, Object value) {
final int hashCode = CharArrayString.hashCode(s);
- ArrayList<Entry> list = map[hashCode % map.length];
+ ArrayList<Entry> list = this.map[hashCode % this.map.length];
final int listPos = isInList(s, list);
if (listPos >= 0) {
Entry entry = list.get(listPos);
entry.value = value;
return;
}
- final int start = pos;
+ final int start = this.pos;
addString(s);
Entry entry = new Entry();
entry.start = start;
- entry.length = pos - start;
+ entry.length = this.pos - start;
entry.value = value;
list.add(entry);
}
@@ -195,22 +195,22 @@ public class CharArraySpanMap {
*/
public final boolean containsKey(char[] characterArray, int start, int length) {
final int hashCode = CharArrayString.hashCode(characterArray, start, (start + length));
- final ArrayList<Entry> list = map[hashCode % map.length];
+ final ArrayList<Entry> list = this.map[hashCode % this.map.length];
final int listPos = isInList(characterArray, start, length, list);
return (listPos >= 0);
}
public final Object get(char[] characterArray, int start, int length) {
final int hashCode = CharArrayString.hashCode(characterArray, start, (start + length));
- final ArrayList<Entry> list = map[hashCode % map.length];
+ final ArrayList<Entry> list = this.map[hashCode % this.map.length];
final int listPos = isInList(characterArray, start, length, list);
return (listPos >= 0) ? list.get(listPos).value : null;
}
private final void addString(String s) {
final int strLen = s.length();
- final int newMinLength = pos + strLen;
- int newLength = charArray.length;
+ final int newMinLength = this.pos + strLen;
+ int newLength = this.charArray.length;
boolean needToCopy = false;
while (newLength < newMinLength) {
newLength += MIN_ARRAY_SIZE;
@@ -218,12 +218,12 @@ public class CharArraySpanMap {
}
if (needToCopy) {
char[] newCharArray = new char[newLength];
- System.arraycopy(charArray, 0, newCharArray, 0, pos);
- charArray = newCharArray;
+ System.arraycopy(this.charArray, 0, newCharArray, 0, this.pos);
+ this.charArray = newCharArray;
}
for (int i = 0; i < strLen; i++) {
- charArray[pos] = s.charAt(i);
- ++pos;
+ this.charArray[this.pos] = s.charAt(i);
+ ++this.pos;
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/CharArrayString.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/CharArrayString.java
index c9ca78174..b3602dc4a 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/CharArrayString.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/CharArrayString.java
@@ -50,11 +50,11 @@ public class CharArrayString {
* @pre string != null
*/
public CharArrayString(String string) {
- len = string.length();
- start = 0;
- end = len;
- chars = new char[len];
- string.getChars(0, len, chars, 0);
+ this.len = string.length();
+ this.start = 0;
+ this.end = this.len;
+ this.chars = new char[this.len];
+ string.getChars(0, this.len, this.chars, 0);
}
/**
@@ -84,10 +84,10 @@ public class CharArrayString {
* @pre length &le; charArray.length - startPos
*/
public CharArrayString(char[] charArray, int startPos, int length) {
- start = startPos;
- len = length;
- end = start + len;
- chars = charArray;
+ this.start = startPos;
+ this.len = length;
+ this.end = this.start + this.len;
+ this.chars = charArray;
}
/**
@@ -96,7 +96,7 @@ public class CharArrayString {
* @return The length.
*/
public int length() {
- return len;
+ return this.len;
}
/**
@@ -105,7 +105,7 @@ public class CharArrayString {
* @return The start position.
*/
public int getStart() {
- return start;
+ return this.start;
}
/**
@@ -114,7 +114,7 @@ public class CharArrayString {
* @return The end position.
*/
public int getEnd() {
- return end;
+ return this.end;
}
/**
@@ -123,7 +123,7 @@ public class CharArrayString {
* @return The char array.
*/
public char[] getChars() {
- return chars;
+ return this.chars;
}
/**
@@ -132,25 +132,25 @@ public class CharArrayString {
* @return A trimmed version.
*/
public CharArrayString trim() {
- int newStart = start;
- int newEnd = end - 1;
+ int newStart = this.start;
+ int newEnd = this.end - 1;
while (newStart <= newEnd) {
- if (Character.isWhitespace(chars[newStart])) {
+ if (Character.isWhitespace(this.chars[newStart])) {
++newStart;
} else {
break;
}
}
while (newEnd >= newStart) {
- if (Character.isWhitespace(chars[newEnd])) {
+ if (Character.isWhitespace(this.chars[newEnd])) {
--newEnd;
} else {
break;
}
}
++newEnd;
- if ((start != newStart) || (end != newEnd)) {
- return new CharArrayString(chars, newStart, newEnd - newStart);
+ if ((this.start != newStart) || (this.end != newEnd)) {
+ return new CharArrayString(this.chars, newStart, newEnd - newStart);
}
return this;
}
@@ -169,10 +169,10 @@ public class CharArrayString {
* If the position parameters are not valid string positions.
*/
public CharArrayString substring(int startPos, int endPos) throws IndexOutOfBoundsException {
- if (startPos >= len || startPos > endPos || startPos < 0) {
+ if (startPos >= this.len || startPos > endPos || startPos < 0) {
throw new IndexOutOfBoundsException();
}
- return new CharArrayString(chars, start + startPos, endPos - startPos);
+ return new CharArrayString(this.chars, this.start + startPos, endPos - startPos);
}
/**
@@ -183,7 +183,7 @@ public class CharArrayString {
* @return A new substring, starting at <code>startPos</code>.
*/
public CharArrayString substring(int startPos) {
- return this.substring(startPos, len);
+ return this.substring(startPos, this.len);
}
/**
@@ -195,10 +195,10 @@ public class CharArrayString {
* contained in the string.
*/
public int lastIndexOf(char c) {
- final int last = end - 1;
- for (int pos = last; pos >= start; pos--) {
- if (chars[pos] == c) {
- return pos - start;
+ final int last = this.end - 1;
+ for (int pos = last; pos >= this.start; pos--) {
+ if (this.chars[pos] == c) {
+ return pos - this.start;
}
}
return -1;
@@ -211,7 +211,7 @@ public class CharArrayString {
*/
@Override
public String toString() {
- return new String(chars, start, len);
+ return new String(this.chars, this.start, this.len);
}
/**
@@ -223,15 +223,15 @@ public class CharArrayString {
* @pre string != null
*/
public boolean endsWith(CharArrayString string) {
- if (string.len > len) {
+ if (string.len > this.len) {
return false;
}
- int thisPos = end;
+ int thisPos = this.end;
int stringPos = string.end;
while (stringPos > string.start) {
--thisPos;
--stringPos;
- if (chars[thisPos] != string.chars[stringPos]) {
+ if (this.chars[thisPos] != string.chars[stringPos]) {
return false;
}
}
@@ -246,10 +246,10 @@ public class CharArrayString {
* @return <code>true</code> iff we end in <code>c</code>.
*/
public boolean endsWith(char c) {
- if (len <= 0) {
+ if (this.len <= 0) {
return false;
}
- return (chars[start + len - 1] == c);
+ return (this.chars[this.start + this.len - 1] == c);
}
/**
@@ -260,10 +260,10 @@ public class CharArrayString {
* @return The character at the position.
*/
public char charAt(int pos) {
- if (pos < start || pos >= len) {
+ if (pos < this.start || pos >= this.len) {
throw new IndexOutOfBoundsException();
}
- return chars[pos + start];
+ return this.chars[pos + this.start];
}
/**
@@ -281,10 +281,10 @@ public class CharArrayString {
if (offset < 0) {
throw new IndexOutOfBoundsException();
}
- int pos = start + offset;
- while (pos < end) {
- if (chars[pos] == c) {
- return pos - start;
+ int pos = this.start + offset;
+ while (pos < this.end) {
+ if (this.chars[pos] == c) {
+ return pos - this.start;
}
++pos;
}
@@ -313,11 +313,11 @@ public class CharArrayString {
* If <code>pos</code> is out of bounds.
*/
public void setChar(int pos, char c) throws IndexOutOfBoundsException {
- pos = pos + start;
- if (pos < start || pos >= end) {
+ pos = pos + this.start;
+ if (pos < this.start || pos >= this.end) {
throw new IndexOutOfBoundsException();
}
- chars[pos] = c;
+ this.chars[pos] = c;
}
/**
@@ -326,9 +326,9 @@ public class CharArrayString {
* @return A copy.
*/
public CharArrayString copy() {
- final char[] newChars = new char[len];
- System.arraycopy(chars, 0, newChars, 0, len);
- return new CharArrayString(newChars, 0, len);
+ final char[] newChars = new char[this.len];
+ System.arraycopy(this.chars, 0, newChars, 0, this.len);
+ return new CharArrayString(newChars, 0, this.len);
}
/**
@@ -338,7 +338,7 @@ public class CharArrayString {
*/
@Override
public int hashCode() {
- return hashCode(chars, start, end);
+ return hashCode(this.chars, this.start, this.end);
}
/**
@@ -408,12 +408,12 @@ public class CharArrayString {
}
if (o instanceof CharArrayString) {
CharArrayString s = (CharArrayString) o;
- if (len != s.len) {
+ if (this.len != s.len) {
return false;
}
int j = s.start;
- for (int i = start; i < end; i++) {
- if (chars[i] != s.chars[j]) {
+ for (int i = this.start; i < this.end; i++) {
+ if (this.chars[i] != s.chars[j]) {
return false;
}
++j;
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/Class_TCCL.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/Class_TCCL.java
index 5315772ba..42355681f 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/Class_TCCL.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/Class_TCCL.java
@@ -58,39 +58,42 @@ public class Class_TCCL {
throws ClassNotFoundException {
List<ClassLoader> clsTried = new ArrayList<>();
List<ClassNotFoundException> suppressedExceptions = new ArrayList<>();
-
+
// Try extension classloader
if (rm != null) {
ClassLoader excl = rm.getExtensionClassLoader();
-
+
if (excl != null) {
try {
return (Class<T>) Class.forName(className, resolve, excl);
- } catch (ClassNotFoundException e) {
+ }
+ catch (ClassNotFoundException e) {
clsTried.add(excl);
suppressedExceptions.add(e);
}
}
}
-
+
// Try TCCL
ClassLoader tccl = Thread.currentThread().getContextClassLoader();
if (tccl != null) {
try {
return (Class<T>) Class.forName(className, resolve, tccl);
- } catch (ClassNotFoundException e) {
+ }
+ catch (ClassNotFoundException e) {
clsTried.add(tccl);
suppressedExceptions.add(e);
}
}
-
+
try {
return (Class<T>) Class.forName(className, resolve, Class_TCCL.class.getClassLoader());
- } catch (ClassNotFoundException e) {
+ }
+ catch (ClassNotFoundException e) {
clsTried.add(tccl);
suppressedExceptions.add(e);
}
-
+
ClassNotFoundException e = new ClassNotFoundException(
"Class [" + className + "] not found in any of the accessible classloaders "
+ clsTried.stream().map(Objects::toString).collect(Collectors.joining(", ")));
@@ -122,7 +125,7 @@ public class Class_TCCL {
}
/**
- * @deprecated Method should not be used and will be removed in a future version.
+ * @deprecated Method should not be used and will be removed in a future version.
*/
@Deprecated
static public ClassLoader get_parent_cl() {
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/CommandLineParser.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/CommandLineParser.java
index d2a5754e1..a1e8c8f49 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/CommandLineParser.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/CommandLineParser.java
@@ -62,7 +62,7 @@ public class CommandLineParser {
* Create a new command line parser.
*/
public CommandLineParser() {
- paramMap = new HashMap<>();
+ this.paramMap = new HashMap<>();
}
/**
@@ -76,10 +76,10 @@ public class CommandLineParser {
* @return <code>false</code> iff <code>paramName</code> already exists.
*/
public boolean addParameter(String paramName, boolean hasArg) {
- if (paramMap.containsKey(paramName)) {
+ if (this.paramMap.containsKey(paramName)) {
return false;
}
- paramMap.put(paramName, new CmdLineParam(hasArg));
+ this.paramMap.put(paramName, new CmdLineParam(hasArg));
return true;
}
@@ -104,10 +104,10 @@ public class CommandLineParser {
* @return <code>false</code> iff the parameter does not exist or the alias is already known.
*/
public boolean addAlias(String param, String alias) {
- if (paramMap.containsKey(alias) || !paramMap.containsKey(param)) {
+ if (this.paramMap.containsKey(alias) || !this.paramMap.containsKey(param)) {
return false;
}
- paramMap.put(alias, paramMap.get(param));
+ this.paramMap.put(alias, this.paramMap.get(param));
return true;
}
@@ -121,30 +121,30 @@ public class CommandLineParser {
* parameter in the list).
*/
public void parseCmdLine(String[] args) throws Exception {
- cmdLineMap = new HashMap<>();
+ this.cmdLineMap = new HashMap<>();
int i = 0;
while (i < args.length) {
String cmdLineArg = args[i];
- if (paramMap.containsKey(cmdLineArg)) {
- CmdLineParam metaParam = paramMap.get(cmdLineArg);
+ if (this.paramMap.containsKey(cmdLineArg)) {
+ CmdLineParam metaParam = this.paramMap.get(cmdLineArg);
if (metaParam.hasArg) {
++i;
if (i >= args.length) {
// TODO: throw proper exception.
throw new Exception("Required argument to parameter missing: " + cmdLineArg);
}
- cmdLineMap.put(metaParam, args[i]);
+ this.cmdLineMap.put(metaParam, args[i]);
} else {
- cmdLineMap.put(metaParam, null);
+ this.cmdLineMap.put(metaParam, null);
}
} else {
- restArgs = new String[args.length - i];
- System.arraycopy(args, i, restArgs, 0, restArgs.length);
+ this.restArgs = new String[args.length - i];
+ System.arraycopy(args, i, this.restArgs, 0, this.restArgs.length);
return;
}
++i;
}
- restArgs = Constants.EMPTY_STRING_ARRAY;
+ this.restArgs = Constants.EMPTY_STRING_ARRAY;
}
/**
@@ -153,7 +153,7 @@ public class CommandLineParser {
* @return The tail end of the args list, usually file name arguments.
*/
public String[] getRestArgs() {
- return restArgs;
+ return this.restArgs;
}
/**
@@ -165,7 +165,7 @@ public class CommandLineParser {
* addParameter()} or {@link #addAlias(String, String) addAlias()}.
*/
public boolean isKnownParameter(String paramName) {
- return paramMap.containsKey(paramName);
+ return this.paramMap.containsKey(paramName);
}
/**
@@ -176,10 +176,10 @@ public class CommandLineParser {
* @return <code>true</code> iff the name is known and was used as a command line argument.
*/
public boolean isInArgsList(String paramName) {
- if (!paramMap.containsKey(paramName)) {
+ if (!this.paramMap.containsKey(paramName)) {
return false;
}
- return cmdLineMap.containsKey(paramMap.get(paramName));
+ return this.cmdLineMap.containsKey(this.paramMap.get(paramName));
}
/**
@@ -192,7 +192,7 @@ public class CommandLineParser {
*/
public String getParamArgument(String paramName) {
if (isKnownParameter(paramName)) {
- return cmdLineMap.get(paramMap.get(paramName));
+ return this.cmdLineMap.get(this.paramMap.get(paramName));
}
return null;
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/Common_hash_support.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/Common_hash_support.java
index 7574f23f3..01e3c9cc6 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/Common_hash_support.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/Common_hash_support.java
@@ -63,8 +63,8 @@ public abstract class Common_hash_support {
}
public Common_hash_support(int initialSizeBeforeExpanding, float factor) {
- loadFactor = factor;
- initialCapacity = tableSpace(initialSizeBeforeExpanding, factor);
+ this.loadFactor = factor;
+ this.initialCapacity = tableSpace(initialSizeBeforeExpanding, factor);
if (TUNE) {
tune_instance = this;
histogram = new int[200];
@@ -75,13 +75,13 @@ public abstract class Common_hash_support {
public Common_hash_support(Common_hash_support orig) {
this(orig.initialCapacity);
- sizeWhichTriggersExpansion = orig.sizeWhichTriggersExpansion;
- size = orig.size;
- removed = orig.removed;
- secondTimeShrinkable = orig.secondTimeShrinkable;
+ this.sizeWhichTriggersExpansion = orig.sizeWhichTriggersExpansion;
+ this.size = orig.size;
+ this.removed = orig.removed;
+ this.secondTimeShrinkable = orig.secondTimeShrinkable;
// copy doesn't do tuning measurements
- histogram = null;
+ this.histogram = null;
}
public void clear() {
@@ -331,7 +331,10 @@ public abstract class Common_hash_support {
pos = 0;
}
while (true) {
- if ((pos >= max) || is_valid_key(pos)) {
+ if (pos >= max) {
+ return pos;
+ }
+ if (is_valid_key(pos)) {
return pos;
}
pos++;
@@ -353,7 +356,10 @@ public abstract class Common_hash_support {
}
while (true) {
- if ((pos < 0) || is_valid_key(pos)) {
+ if (pos < 0) {
+ return pos;
+ }
+ if (is_valid_key(pos)) {
return pos;
}
pos--;
@@ -483,7 +489,7 @@ public abstract class Common_hash_support {
protected final int firstPosition;
protected CommonKeyIterator() {
- curPosition = moveToNextFilled(0);
+ this.curPosition = moveToNextFilled(0);
firstPosition = curPosition;
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/CopyOnWriteObjHashSet.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/CopyOnWriteObjHashSet.java
index b80f783ca..0671822a3 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/CopyOnWriteObjHashSet.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/CopyOnWriteObjHashSet.java
@@ -37,9 +37,9 @@ public class CopyOnWriteObjHashSet<T extends FeatureStructure> implements CopyOn
private final int original_size;
public CopyOnWriteObjHashSet(ObjHashSet<T> original) {
- ohs = original;
+ this.ohs = original;
this.original = original;
- original_size = original.size();
+ this.original_size = original.size();
}
/**
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/CopyOnWriteOrderedFsSet_array.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/CopyOnWriteOrderedFsSet_array.java
index 78d0462f6..d0c0772da 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/CopyOnWriteOrderedFsSet_array.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/CopyOnWriteOrderedFsSet_array.java
@@ -41,14 +41,14 @@ public class CopyOnWriteOrderedFsSet_array<T extends FeatureStructure>
public T[] a; // derived from "set" above
public CopyOnWriteOrderedFsSet_array(OrderedFsSet_array<T> original) {
- set = original;
+ this.set = original;
this.original = original;
// this.comparatorNoTypeWithoutID = original.comparatorNoTypeWithoutID;
// this.comparatorNoTypeWithID = original.comparatorNoTypeWithID;
- a_firstUsedslot = original.a_firstUsedslot;
- a_nextFreeslot = original.a_nextFreeslot;
- a = (T[]) original.a;
- original_size = original.size();
+ this.a_firstUsedslot = original.a_firstUsedslot;
+ this.a_nextFreeslot = original.a_nextFreeslot;
+ this.a = (T[]) original.a;
+ this.original_size = original.size();
}
/**
@@ -57,8 +57,8 @@ public class CopyOnWriteOrderedFsSet_array<T extends FeatureStructure>
*/
@Override
public void makeReadOnlyCopy() {
- set = new OrderedFsSet_array<>(set, true); // true = make read only copy
- a = (T[]) set.a;
+ this.set = new OrderedFsSet_array<>(set, true); // true = make read only copy
+ this.a = (T[]) set.a;
}
/*
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/EncodedPrintStream.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/EncodedPrintStream.java
index 7914efb29..83c7bda29 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/EncodedPrintStream.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/EncodedPrintStream.java
@@ -72,7 +72,6 @@ public class EncodedPrintStream extends PrintStream {
"test".getBytes(encoding);
}
- @Override
public final void writeBytes(byte[] bytes) {
super.write(bytes, 0, bytes.length);
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/Graph.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/Graph.java
index 54f2f5806..592caa975 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/Graph.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/Graph.java
@@ -32,7 +32,7 @@ public class Graph {
/** @return The root of the graph. */
public GraphNode getRoot() {
- return root;
+ return this.root;
}
/**
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/GraphNode.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/GraphNode.java
index d790c3633..513c7328d 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/GraphNode.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/GraphNode.java
@@ -44,7 +44,7 @@ public class GraphNode {
* @return The object contained in the node.
*/
public Object getElement() {
- return element;
+ return this.element;
}
/**
@@ -63,7 +63,7 @@ public class GraphNode {
* @return The number of successor nodes.
*/
public int getNbrSucc() {
- return successors.size();
+ return this.successors.size();
}
/**
@@ -74,8 +74,8 @@ public class GraphNode {
* @return The successor node.
*/
public GraphNode getSuccessor(int i) {
- if (i >= 0 && i < successors.size()) {
- return successors.get(i);
+ if (i >= 0 && i < this.successors.size()) {
+ return this.successors.get(i);
}
throw new UtilError(UtilError.ILLEGAL_SUCCESSOR_INDEX);
}
@@ -87,7 +87,7 @@ public class GraphNode {
* The node to be added.
*/
public void addSuccessor(GraphNode succ) {
- successors.add(succ);
+ this.successors.add(succ);
}
/**
@@ -96,7 +96,7 @@ public class GraphNode {
* @return The number of predecessor nodes.
*/
public int getNbrPred() {
- return predecessors.size();
+ return this.predecessors.size();
}
/**
@@ -107,8 +107,8 @@ public class GraphNode {
* @return The predecessor node.
*/
public GraphNode getPredecessor(int i) {
- if (i >= 0 && i < predecessors.size()) {
- return predecessors.get(i);
+ if (i >= 0 && i < this.predecessors.size()) {
+ return this.predecessors.get(i);
}
throw new UtilError(UtilError.ILLEGAL_PREDECESSOR_INDEX);
}
@@ -120,7 +120,7 @@ public class GraphNode {
* The node to be added.
*/
public void addPredecessor(GraphNode pred) {
- predecessors.add(pred);
+ this.predecessors.add(pred);
}
/**
@@ -130,7 +130,7 @@ public class GraphNode {
* The node to be connected to.
*/
public void connect(GraphNode node) {
- addSuccessor(node);
+ this.addSuccessor(node);
node.addPredecessor(this);
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/I18nx_impl.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/I18nx_impl.java
index 33e31b89d..79cc695b8 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/I18nx_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/I18nx_impl.java
@@ -244,7 +244,7 @@ public class I18nx_impl {
* @return true if this exception or any of its root causes has a particular UIMA message key.
*/
public boolean hasMessageKey(String messageKey) {
- if (messageKey.equals(getMessageKey())) {
+ if (messageKey.equals(this.getMessageKey())) {
return true;
}
Throwable cause = getCause();
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/Int2ObjHashMap.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/Int2ObjHashMap.java
index e1aef1abf..5f5b6d15c 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/Int2ObjHashMap.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/Int2ObjHashMap.java
@@ -115,8 +115,8 @@ public class Int2ObjHashMap<T, E extends T> extends Common_hash_support
public Int2ObjHashMap(Class<T> clazz, int initialSizeBeforeExpanding) {
super(initialSizeBeforeExpanding);
- componentType = clazz;
- newTable(initialCapacity);
+ this.componentType = clazz;
+ newTable(this.initialCapacity);
}
/**
@@ -127,9 +127,9 @@ public class Int2ObjHashMap<T, E extends T> extends Common_hash_support
*/
private Int2ObjHashMap(Int2ObjHashMap orig) {
super(orig);
- componentType = orig.componentType;
- keys = Arrays.copyOf(orig.keys, keys.length);
- values = (T[]) Arrays.copyOf(orig.values, values.length);
+ this.componentType = orig.componentType;
+ this.keys = Arrays.copyOf(orig.keys, keys.length);
+ this.values = (T[]) Arrays.copyOf(orig.values, values.length);
}
// private void newTableKeepSize(int capacity) {
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/IntHashSet.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/IntHashSet.java
index d328d6b45..b146abc0a 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/IntHashSet.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/IntHashSet.java
@@ -108,7 +108,7 @@ public class IntHashSet extends Common_hash_support implements PositiveIntSet {
super(initialSizeBeforeExpanding);
isMake4 = offset == Integer.MIN_VALUE;
this.offset = isMake4 ? 0 : offset;
- newTable(initialCapacity);
+ newTable(this.initialCapacity);
resetTable();
if (IS_TRACE_MODE_SWITCH) {
System.out.println("TRACE_MODE new IntHashSet, sizeBeforeExpanding = "
@@ -818,7 +818,7 @@ public class IntHashSet extends Common_hash_support implements PositiveIntSet {
private int curPosition;
private IntHashSetIterator() {
- curPosition = 0;
+ this.curPosition = 0;
}
@Override
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/IntSet.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/IntSet.java
index f6446536e..25f398343 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/IntSet.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/IntSet.java
@@ -34,7 +34,7 @@ public class IntSet implements PositiveIntSet {
/** Creates a new instance of this set. */
public IntSet() {
- iVec = new IntVector();
+ this.iVec = new IntVector();
}
/**
@@ -43,7 +43,7 @@ public class IntSet implements PositiveIntSet {
* allocate enough space to hold at least this before expanding
*/
public IntSet(int capacity) {
- iVec = new IntVector(capacity);
+ this.iVec = new IntVector(capacity);
if (IS_TRACE_MODE_SWITCH) {
System.out.println("TRACE_MODE new IntSet with capacity: " + capacity);
}
@@ -59,8 +59,8 @@ public class IntSet implements PositiveIntSet {
*/
@Override
public boolean add(int element) {
- if (!iVec.contains(element)) {
- iVec.add(element);
+ if (!this.iVec.contains(element)) {
+ this.iVec.add(element);
return true;
}
return false;
@@ -76,18 +76,18 @@ public class IntSet implements PositiveIntSet {
*/
@Override
public boolean contains(int element) {
- return iVec.contains(element);
+ return this.iVec.contains(element);
}
@Override
public int find(int element) {
- return iVec.indexOf(element);
+ return this.iVec.indexOf(element);
}
/** @return the size of this set. */
@Override
public int size() {
- return iVec.size();
+ return this.iVec.size();
}
/** @return the <code>n</code>-th element in this set. */
@@ -100,7 +100,7 @@ public class IntSet implements PositiveIntSet {
*/
@Override
public int get(int n) {
- return iVec.get(n);
+ return this.iVec.get(n);
}
/**
@@ -110,7 +110,7 @@ public class IntSet implements PositiveIntSet {
* -
*/
public void removeElementAt(int n) {
- iVec.remove(n);
+ this.iVec.remove(n);
}
/**
@@ -139,7 +139,7 @@ public class IntSet implements PositiveIntSet {
// maybe a speedup - is order size(), vs order size*size
int sum1 = 0;
int sum2 = 0;
- final IntVector v1 = iVec;
+ final IntVector v1 = this.iVec;
final IntVector v2 = s.iVec;
for (int i = 0; i < size; i++) {
sum1 += v1.get(i);
@@ -159,18 +159,18 @@ public class IntSet implements PositiveIntSet {
@Override
public int hashCode() {
- if (iVec == null) {
+ if (this.iVec == null) {
return 0;
}
int sum = 0;
- for (int i = 0; i < size(); i++) {
- sum += iVec.get(i);
+ for (int i = 0; i < this.size(); i++) {
+ sum += this.iVec.get(i);
}
return sum;
}
public int indexOf(int element) {
- return iVec.indexOf(element);
+ return this.iVec.indexOf(element);
}
@Override
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/IntStack.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/IntStack.java
index 27430545f..31d242c27 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/IntStack.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/IntStack.java
@@ -65,7 +65,7 @@ public class IntStack extends IntVector {
*/
public int push(int i) {
this.add(i);
- return pos - 1;
+ return this.pos - 1;
}
/**
@@ -74,8 +74,8 @@ public class IntStack extends IntVector {
* @return The popped element.
*/
public int pop() {
- --pos;
- return get(pos); // this.array[this.pos];
+ --this.pos;
+ return get(this.pos); // this.array[this.pos];
}
/**
@@ -84,7 +84,7 @@ public class IntStack extends IntVector {
* @return The top element.
*/
public int peek() {
- return get(pos - 1); // this.array[this.pos - 1];
+ return get(this.pos - 1); // this.array[this.pos - 1];
}
/**
@@ -93,14 +93,14 @@ public class IntStack extends IntVector {
* @return <code>true</code>, if stack is empty; <code>false</code>, else.
*/
public boolean empty() {
- return (pos == 0);
+ return (this.pos == 0);
}
/**
* Clears the stack. The amount of space reserved for this stack remains unchanged.
*/
public void clear() {
- pos = 0;
+ this.pos = 0;
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/IntVector.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/IntVector.java
index 5a6afc88f..ea90d1a9e 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/IntVector.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/IntVector.java
@@ -69,10 +69,10 @@ public class IntVector implements Serializable {
if (array == null) {
array = Constants.EMPTY_INT_ARRAY;
}
- pos = array.length;
+ this.pos = array.length;
this.array = array;
- growth_factor = default_growth_factor;
- multiplication_limit = default_multiplication_limit;
+ this.growth_factor = default_growth_factor;
+ this.multiplication_limit = default_multiplication_limit;
}
/**
@@ -115,12 +115,12 @@ public class IntVector implements Serializable {
if (capacity <= 0) {
capacity = default_size;
}
- array = new int[capacity];
+ this.array = new int[capacity];
}
public void setSize(int size) {
if (size > 0) {
- ensure_size(size);
+ this.ensure_size(size);
}
}
@@ -150,9 +150,9 @@ public class IntVector implements Serializable {
*/
public void add(int[] elements, int startpos, int endpos) {
final int len = endpos - startpos;
- final int posNow = pos;
- ensure_size(pos + len); // changes pos
- System.arraycopy(elements, startpos, array, posNow, len);
+ final int posNow = this.pos;
+ ensure_size(this.pos + len); // changes pos
+ System.arraycopy(elements, startpos, this.array, posNow, len);
// this.pos += len; done by ensure_size
}
@@ -164,17 +164,17 @@ public class IntVector implements Serializable {
* -
*/
public void add(int element) {
- final int i = pos;
- ++pos;
- ensure_size(pos);
- array[i] = element;
+ final int i = this.pos;
+ ++this.pos;
+ ensure_size(this.pos);
+ this.array[i] = element;
}
public void multiAdd(int element, int count) {
- final int i = pos;
- pos += count;
- ensure_size(pos);
- Arrays.fill(array, i, pos, element);
+ final int i = this.pos;
+ this.pos += count;
+ ensure_size(this.pos);
+ Arrays.fill(this.array, i, this.pos, element);
}
/**
@@ -188,32 +188,32 @@ public class IntVector implements Serializable {
* -
*/
public void add(int index, int element) {
- if (index >= pos) {
+ if (index >= this.pos) {
ensure_size(index + 1);
} else {
- if (array.length <= pos) {
- ensure_size(pos + 1);
+ if (this.array.length <= this.pos) {
+ ensure_size(this.pos + 1);
} else {
- ++pos;
+ ++this.pos;
}
- System.arraycopy(array, index, array, index + 1, pos - (index + 1));
+ System.arraycopy(this.array, index, this.array, index + 1, this.pos - (index + 1));
}
- array[index] = element;
+ this.array[index] = element;
}
public void multiAdd(int index, int element, int count) {
final int endPos = index + count;
- if (index >= pos) {
+ if (index >= this.pos) {
ensure_size(endPos);
} else {
- if (array.length < pos + count) { // "<" because cocunt
- ensure_size(pos + count);
+ if (this.array.length < this.pos + count) { // "<" because cocunt
+ ensure_size(this.pos + count);
} else {
- pos += count;
+ this.pos += count;
}
- System.arraycopy(array, index, array, endPos, pos - endPos);
+ System.arraycopy(this.array, index, this.array, endPos, this.pos - endPos);
}
- Arrays.fill(array, index, endPos, element);
+ Arrays.fill(this.array, index, endPos, element);
}
/**
@@ -225,10 +225,10 @@ public class IntVector implements Serializable {
* -
*/
public void set(int index, int element) {
- if (index >= pos) {
+ if (index >= this.pos) {
throw new ArrayIndexOutOfBoundsException();
}
- array[index] = element;
+ this.array[index] = element;
}
/**
@@ -242,7 +242,7 @@ public class IntVector implements Serializable {
*/
public void put(int index, int element) {
ensure_size(index + 1);
- array[index] = element;
+ this.array[index] = element;
}
/**
@@ -256,10 +256,10 @@ public class IntVector implements Serializable {
*/
public int get(int index) {
// Will throw an ArrayIndexOutOfBoundsException if out of bounds.
- if (index >= pos) {
+ if (index >= this.pos) {
throw new ArrayIndexOutOfBoundsException();
}
- return array[index];
+ return this.array[index];
}
/**
@@ -272,16 +272,16 @@ public class IntVector implements Serializable {
* If <code>index</code> is not a valid index.
*/
public int remove(int index) {
- if (index >= pos) {
+ if (index >= this.pos) {
throw new ArrayIndexOutOfBoundsException();
}
- --pos;
- int retval = array[index];
+ --this.pos;
+ int retval = this.array[index];
// special case - remove from end
if (index == pos) {
return retval;
}
- System.arraycopy(array, index + 1, array, index, pos - index);
+ System.arraycopy(this.array, index + 1, this.array, index, this.pos - index);
// for (int i = index; i < this.pos; i++) {
// this.array[i] = this.array[i + 1];
// }
@@ -292,7 +292,7 @@ public class IntVector implements Serializable {
* Remove all elements and set size to 0. Will not change current capacity.
*/
public void removeAllElements() {
- pos = 0;
+ this.pos = 0;
}
public void removeAllElementsAdjustSizeDown() {
@@ -319,7 +319,10 @@ public class IntVector implements Serializable {
if (this == o) {
return true;
}
- if ((o == null) || !getClass().equals(o.getClass())) {
+ if (o == null) {
+ return false;
+ }
+ if (!getClass().equals(o.getClass())) {
return false;
}
IntVector v = (IntVector) o;
@@ -327,7 +330,7 @@ public class IntVector implements Serializable {
return false;
}
for (int i = 0; i < size(); i++) {
- if (array[i] != v.get(i)) {
+ if (this.array[i] != v.get(i)) {
return false;
}
}
@@ -339,7 +342,7 @@ public class IntVector implements Serializable {
* @return The number of elements in the vector.
*/
public int size() {
- return pos;
+ return this.pos;
}
/**
@@ -381,7 +384,7 @@ public class IntVector implements Serializable {
* The fill value.
*/
public void fill(int value) {
- java.util.Arrays.fill(array, value);
+ java.util.Arrays.fill(this.array, value);
}
/**
@@ -390,7 +393,7 @@ public class IntVector implements Serializable {
*/
public int[] toArray() {
trimToSize();
- return array;
+ return this.array;
}
/**
@@ -435,9 +438,9 @@ public class IntVector implements Serializable {
* @return a copy of the underlying array.
*/
public int[] toArrayCopy() {
- final int max = size();
+ final int max = this.size();
int[] copy = new int[max];
- System.arraycopy(array, 0, copy, 0, max);
+ System.arraycopy(this.array, 0, copy, 0, max);
return copy;
}
@@ -447,7 +450,7 @@ public class IntVector implements Serializable {
* @return -
*/
public int[] getArray() {
- return array;
+ return this.array;
}
/**
@@ -458,9 +461,9 @@ public class IntVector implements Serializable {
* @return the index or <code>-1</code> if the element was not found.
*/
public int indexOf(int element) {
- final int size = pos;
+ final int size = this.pos;
for (int i = 0; i < size; i++) {
- if (element == array[i]) {
+ if (element == this.array[i]) {
return i;
}
}
@@ -468,9 +471,9 @@ public class IntVector implements Serializable {
}
public int lastIndexOf(int element) {
- final int size = pos;
+ final int size = this.pos;
for (int i = size - 1; i >= 0; i--) {
- if (element == array[i]) {
+ if (element == this.array[i]) {
return i;
}
}
@@ -493,19 +496,19 @@ public class IntVector implements Serializable {
*/
public int indexOfOptimizeAscending(int element) {
// return indexOf(element);
- final int midValue = array[pos >>> 1];
+ final int midValue = this.array[this.pos >>> 1];
if (element > midValue) {
- for (int i = pos - 1; i >= 0; i--) {
- if (element == array[i]) {
+ for (int i = this.pos - 1; i >= 0; i--) {
+ if (element == this.array[i]) {
return i;
}
}
return -1;
}
- final int size = pos;
+ final int size = this.pos;
for (int i = 0; i < size; i++) {
- if (element == array[i]) {
+ if (element == this.array[i]) {
return i;
}
}
@@ -517,23 +520,23 @@ public class IntVector implements Serializable {
* this if you know that your vector will not grow anymore.
*/
public void trimToSize() {
- if (pos == array.length) {
+ if (this.pos == this.array.length) {
return;
}
- int[] new_array = new int[pos];
- System.arraycopy(array, 0, new_array, 0, pos);
- array = new_array;
+ int[] new_array = new int[this.pos];
+ System.arraycopy(this.array, 0, new_array, 0, this.pos);
+ this.array = new_array;
return;
}
public IntVector copy() {
- IntVector copy = new IntVector(array.length, growth_factor,
- multiplication_limit);
- copy.pos = pos;
+ IntVector copy = new IntVector(this.array.length, this.growth_factor,
+ this.multiplication_limit);
+ copy.pos = this.pos;
// for (int i = 0; i < this.pos; i++) {
// copy.array[i] = this.array[i];
// }
- System.arraycopy(array, 0, copy.array, 0, pos);
+ System.arraycopy(this.array, 0, copy.array, 0, this.pos);
return copy;
}
@@ -542,48 +545,48 @@ public class IntVector implements Serializable {
*/
public int[] toIntArray() {
final int[] r = new int[size()];
- System.arraycopy(array, 0, r, 0, pos);
+ System.arraycopy(this.array, 0, r, 0, this.pos);
return r;
}
public void copyFromArray(int[] src, int srcPos, int destPos, int length) {
- System.arraycopy(src, srcPos, array, destPos, length);
+ System.arraycopy(src, srcPos, this.array, destPos, length);
}
public void copyToArray(int srcPos, int[] dest, int destPos, int length) {
- System.arraycopy(array, srcPos, dest, destPos, length);
+ System.arraycopy(this.array, srcPos, dest, destPos, length);
}
@Override
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append('[');
- for (int i = 0; i < pos; i++) {
+ for (int i = 0; i < this.pos; i++) {
if (i > 0) {
buf.append(", ");
}
- buf.append(array[i]);
+ buf.append(this.array[i]);
}
buf.append(']');
return buf.toString();
}
public void ensure_size(int req) {
- array = IntArrayUtils.ensure_size(array, req, growth_factor,
- multiplication_limit);
- if (pos < req) {
- pos = req;
+ this.array = IntArrayUtils.ensure_size(this.array, req, this.growth_factor,
+ this.multiplication_limit);
+ if (this.pos < req) {
+ this.pos = req;
}
}
@Override
public int hashCode() {
- if (array == null) {
+ if (this.array == null) {
return 0;
}
int sum = 0;
- for (int i = 0; i < size(); i++) {
- sum += get(i);
+ for (int i = 0; i < this.size(); i++) {
+ sum += this.get(i);
}
return sum;
}
@@ -655,7 +658,7 @@ public class IntVector implements Serializable {
}
public void sort() {
- Arrays.sort(array, 0, size());
+ Arrays.sort(this.array, 0, size());
}
// testing
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/Obj2IntIdentityHashMap.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/Obj2IntIdentityHashMap.java
index 763f53420..05644eccf 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/Obj2IntIdentityHashMap.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/Obj2IntIdentityHashMap.java
@@ -70,7 +70,7 @@ public class Obj2IntIdentityHashMap<T> extends Common_hash_support {
*/
public Obj2IntIdentityHashMap(int initialCapacity, Class<T> clazz, T removedMarker) {
super(initialCapacity);
- componentType = clazz;
+ this.componentType = clazz;
this.removedMarker = removedMarker;
newTable(this.initialCapacity);
}
@@ -420,8 +420,8 @@ public class Obj2IntIdentityHashMap<T> extends Common_hash_support {
private final int firstPosition;
private Obj2IntIdentityHashMapIterator() {
- curPosition = moveToNextFilled(0);
- firstPosition = curPosition;
+ this.curPosition = moveToNextFilled(0);
+ this.firstPosition = this.curPosition;
}
@Override
@@ -471,12 +471,12 @@ public class Obj2IntIdentityHashMap<T> extends Common_hash_support {
@Override
public void moveToStart() {
- curPosition = firstPosition;
+ this.curPosition = firstPosition;
}
@Override
public void moveToEnd() {
- curPosition = moveToPreviousFilled(getCapacity() - 1);
+ this.curPosition = moveToPreviousFilled(getCapacity() - 1);
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/ObjHashSet.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/ObjHashSet.java
index e075344fc..99785a67f 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/ObjHashSet.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/ObjHashSet.java
@@ -103,15 +103,15 @@ public class ObjHashSet<T> extends Common_hash_support implements Set<T> {
*/
public ObjHashSet(ObjHashSet<T> ohs) {
super(ohs);
- removedMarker = ohs.removedMarker;
- clazz = ohs.clazz;
+ this.removedMarker = ohs.removedMarker;
+ this.clazz = ohs.clazz;
// this.initialCapacity = ohs.initialCapacity;
// this.histogram = ohs.histogram;
// this.maxProbe = ohs.maxProbe;
// this.sizeWhichTriggersExpansion = ohs.sizeWhichTriggersExpansion;
// this.size = ohs.size;
// this.nbrRemoved = ohs.nbrRemoved;
- keys = Arrays.copyOf(ohs.keys, ohs.keys.length);
+ this.keys = Arrays.copyOf(ohs.keys, ohs.keys.length);
// this.secondTimeShrinkable = ohs.secondTimeShrinkable;
// this.modificationCount = ohs.modificationCount;
}
@@ -494,7 +494,7 @@ public class ObjHashSet<T> extends Common_hash_support implements Set<T> {
protected int curPosition;
private ObjHashSetIterator() {
- curPosition = moveToNextFilled(0);
+ this.curPosition = moveToNextFilled(0);
}
@Override
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/OrderedFsSet_array.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/OrderedFsSet_array.java
index 5cf9f7db4..cdc59f55f 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/OrderedFsSet_array.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/OrderedFsSet_array.java
@@ -110,14 +110,14 @@ public class OrderedFsSet_array<T extends FeatureStructure> implements Iterable<
// Iterators have refs into this, so don't change the start offset
// No issue with truncating though - these are read-only
- a = new TOP[set.a.length];
- System.arraycopy(set.a, 0, a, 0, set.a_nextFreeslot);
- a_firstUsedslot = set.a_firstUsedslot;
- a_nextFreeslot = set.a_nextFreeslot;
- comparatorNoTypeWithID = set.comparatorNoTypeWithID;
- comparatorNoTypeWithoutID = set.comparatorNoTypeWithoutID;
-
- maxSize = set.maxSize;
+ this.a = new TOP[set.a.length];
+ System.arraycopy(set.a, 0, this.a, 0, set.a_nextFreeslot);
+ this.a_firstUsedslot = set.a_firstUsedslot;
+ this.a_nextFreeslot = set.a_nextFreeslot;
+ this.comparatorNoTypeWithID = set.comparatorNoTypeWithID;
+ this.comparatorNoTypeWithoutID = set.comparatorNoTypeWithoutID;
+
+ this.maxSize = set.maxSize;
// this.modificationCount = set.modificationCount;
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/OrderedFsSet_array2.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/OrderedFsSet_array2.java
index bbdc2a92d..c355ec01d 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/OrderedFsSet_array2.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/OrderedFsSet_array2.java
@@ -143,18 +143,18 @@ public class OrderedFsSet_array2 implements NavigableSet<TOP> {
*/
public OrderedFsSet_array2(OrderedFsSet_array2 set) {
set.processBatch();
- a = Arrays.copyOf(set.a, set.a.length);
- a_nextFreeslot = set.a_nextFreeslot;
- a_firstUsedslot = set.a_firstUsedslot;
- comparatorWithID = set.comparatorWithID;
- comparatorWithoutID = set.comparatorWithoutID;
- size = set.size;
- maxSize = set.maxSize;
- highest = set.highest;
- nullBlockStart = set.nullBlockStart;
- nullBlockEnd = set.nullBlockEnd;
- modificationCount = set.modificationCount;
- lastRemovedPos = set.lastRemovedPos;
+ this.a = Arrays.copyOf(set.a, set.a.length);
+ this.a_nextFreeslot = set.a_nextFreeslot;
+ this.a_firstUsedslot = set.a_firstUsedslot;
+ this.comparatorWithID = set.comparatorWithID;
+ this.comparatorWithoutID = set.comparatorWithoutID;
+ this.size = set.size;
+ this.maxSize = set.maxSize;
+ this.highest = set.highest;
+ this.nullBlockStart = set.nullBlockStart;
+ this.nullBlockEnd = set.nullBlockEnd;
+ this.modificationCount = set.modificationCount;
+ this.lastRemovedPos = set.lastRemovedPos;
}
/**
@@ -169,19 +169,19 @@ public class OrderedFsSet_array2 implements NavigableSet<TOP> {
if (!isReadOnly)
Misc.internalError();
set.processBatch();
- size = set.size;
- a = (size == 0) ? Constants.EMPTY_TOP_ARRAY : Arrays.copyOf(set.a, set.a.length);
- a_nextFreeslot = set.a_nextFreeslot;
- a_firstUsedslot = set.a_firstUsedslot;
- comparatorWithID = set.comparatorWithID;
- comparatorWithoutID = set.comparatorWithoutID;
-
- maxSize = set.maxSize;
- highest = set.highest;
- nullBlockStart = set.nullBlockStart;
- nullBlockEnd = set.nullBlockEnd;
- modificationCount = set.modificationCount;
- lastRemovedPos = set.lastRemovedPos;
+ this.size = set.size;
+ this.a = (size == 0) ? Constants.EMPTY_TOP_ARRAY : Arrays.copyOf(set.a, set.a.length);
+ this.a_nextFreeslot = set.a_nextFreeslot;
+ this.a_firstUsedslot = set.a_firstUsedslot;
+ this.comparatorWithID = set.comparatorWithID;
+ this.comparatorWithoutID = set.comparatorWithoutID;
+
+ this.maxSize = set.maxSize;
+ this.highest = set.highest;
+ this.nullBlockStart = set.nullBlockStart;
+ this.nullBlockEnd = set.nullBlockEnd;
+ this.modificationCount = set.modificationCount;
+ this.lastRemovedPos = set.lastRemovedPos;
}
/**
@@ -479,7 +479,10 @@ public class OrderedFsSet_array2 implements NavigableSet<TOP> {
synchronized (batch) {
int batchSize = batch.size();
- if ((batchSize == 0) || doingBatchAdds) {
+ if (batchSize == 0) {
+ return; // another thread did this
+ }
+ if (doingBatchAdds == true) {
return; // bypass recursive calls from Eclipse IDE on same thread,
// when its toString methods invoke this recursively to update the
// debug UI for instance, while single stepping.
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/Pair.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/Pair.java
index 7b2b07ae8..014a9a13b 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/Pair.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/Pair.java
@@ -44,7 +44,10 @@ public class Pair<T, U> {
if (this == obj) {
return true;
}
- if ((obj == null) || (getClass() != obj.getClass())) {
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
return false;
}
Pair other = (Pair) obj;
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/ReplaceStringInFiles.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/ReplaceStringInFiles.java
index 9482b5c7f..57cb9c65c 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/ReplaceStringInFiles.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/ReplaceStringInFiles.java
@@ -37,12 +37,12 @@ public class ReplaceStringInFiles {
private String ext;
private ExtFileFilter(String extension) {
- ext = extension;
+ this.ext = extension;
}
@Override
public boolean accept(File file) {
- return (file.isFile() && file.getName().endsWith(ext));
+ return (file.isFile() && file.getName().endsWith(this.ext));
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/SerializationUtils.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/SerializationUtils.java
index 98766e13a..b7073db18 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/SerializationUtils.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/SerializationUtils.java
@@ -19,24 +19,12 @@
package org.apache.uima.internal.util;
-import static java.io.ObjectInputFilter.allowFilter;
-import static java.io.ObjectInputFilter.Status.UNDECIDED;
-import static java.util.stream.Collectors.toSet;
-import static java.util.stream.Stream.concat;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputFilter;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
-import java.util.Set;
-
-import org.apache.uima.cas.impl.CASCompleteSerializer;
-import org.apache.uima.cas.impl.CASMgrSerializer;
-import org.apache.uima.cas.impl.CASSerializer;
/**
* Serialize and Deserialize arbitrary objects to/from byte arrays, using standard Java object
@@ -47,23 +35,7 @@ import org.apache.uima.cas.impl.CASSerializer;
*
* This class is abstract only to prevent instantiation. All the methods are static.
*/
-public final class SerializationUtils {
-
- private static final Set<Class<?>> CAS_MGR_SERIALIZER_SAFE_CLASSES = Set.of( //
- CASMgrSerializer.class, //
- String.class);
- private static final Set<Class<?>> CAS_SERIALIZER_SAFE_CLASSES = Set.of( //
- CASSerializer.class, //
- String.class);
- private static final Set<Class<?>> CAS_COMPLETE_SERIALIZER_SAFE_CLASSES = Set.of( //
- CASCompleteSerializer.class, //
- String.class, //
- CASMgrSerializer.class, //
- CASSerializer.class);
-
- private SerializationUtils() {
- // No instances
- }
+public abstract class SerializationUtils {
/**
* Serializes an object to a byte array.
@@ -82,8 +54,8 @@ public final class SerializationUtils {
return null;
}
- try (var byteStream = new ByteArrayOutputStream();
- var objStream = new ObjectOutputStream(byteStream)) {
+ try (ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
+ ObjectOutputStream objStream = new ObjectOutputStream(byteStream)) {
objStream.writeObject(aObject);
objStream.flush();
return byteStream.toByteArray();
@@ -91,8 +63,7 @@ public final class SerializationUtils {
}
/**
- * Deserializes a supported object from a byte array. Supported objects are
- * {@link CASMgrSerializer}, {@link CASSerializer}, {@link CASCompleteSerializer}.
+ * Deserializes an object from a byte array.
*
* @param aBytes
* byte array to read from
@@ -106,164 +77,13 @@ public final class SerializationUtils {
* if a required class could not be found
*/
public static Object deserialize(byte[] aBytes) throws IOException, ClassNotFoundException {
-
- Object object;
-
- try {
- object = deserialize(aBytes,
- concat(concat(CAS_SERIALIZER_SAFE_CLASSES.stream(),
- CAS_COMPLETE_SERIALIZER_SAFE_CLASSES.stream()),
- CAS_MGR_SERIALIZER_SAFE_CLASSES.stream()).collect(toSet()));
- } catch (IOException e) {
- if (e.getCause() instanceof ClassNotFoundException) {
- throw (ClassNotFoundException) e.getCause();
- }
-
- throw e;
- }
-
- if (object != null && !(object instanceof CASMgrSerializer || object instanceof CASSerializer
- || object instanceof CASCompleteSerializer)) {
- throw new IOException("Unexpected object type: [" + object.getClass().getName() + "]");
- }
-
- return object;
- }
-
- /**
- * Deserializes a {@link CASSerializer} or {@link CASCompleteSerializer} from a byte array.
- *
- * @param aIs
- * stream to read from
- *
- * @return The <code>Object</code> deserialized from <code>aBytes</code>. If <code>aBytes</code>
- * is <code>null</code>, <code>null</code> is returned.
- *
- * @throws IOException
- * if an I/O error occurs
- */
- public static Object deserializeCASSerializerOrCASCompleteSerializer(InputStream aIs)
- throws IOException {
- var object = deserialize(aIs, concat(CAS_SERIALIZER_SAFE_CLASSES.stream(),
- CAS_COMPLETE_SERIALIZER_SAFE_CLASSES.stream()).collect(toSet()));
-
- if (object != null
- && !(object instanceof CASSerializer || object instanceof CASCompleteSerializer)) {
- throw new IOException("Unexpected object type: [" + object.getClass().getName() + "]");
- }
-
- return object;
- }
-
- /**
- * Deserializes a {@link CASCompleteSerializer} from a byte array.
- *
- * @param aBytes
- * byte array to read from
- *
- * @return The <code>Object</code> deserialized from <code>aBytes</code>. If <code>aBytes</code>
- * is <code>null</code>, <code>null</code> is returned.
- *
- * @throws IOException
- * if an I/O error occurs
- */
- public static CASCompleteSerializer deserializeCASCompleteSerializer(byte[] aBytes)
- throws IOException {
- var object = deserialize(aBytes, CAS_COMPLETE_SERIALIZER_SAFE_CLASSES);
-
- if (object != null && !(object instanceof CASCompleteSerializer)) {
- throw new IOException("Unexpected object type: [" + object.getClass().getName() + "]");
- }
-
- return (CASCompleteSerializer) object;
- }
-
- /**
- * Deserializes a {@link CASSerializer} from a byte array.
- *
- * @param aBytes
- * byte array to read from
- *
- * @return The <code>Object</code> deserialized from <code>aBytes</code>. If <code>aBytes</code>
- * is <code>null</code>, <code>null</code> is returned.
- *
- * @throws IOException
- * if an I/O error occurs
- */
- public static CASSerializer deserializeCASSerializer(byte[] aBytes) throws IOException {
-
- var object = deserialize(aBytes, CAS_SERIALIZER_SAFE_CLASSES);
-
- if (object != null && !(object instanceof CASSerializer)) {
- throw new IOException("Unexpected object type: [" + object.getClass().getName() + "]");
- }
-
- return (CASSerializer) object;
- }
-
- /**
- * Deserializes a {@link CASSerializer} from a byte array.
- *
- * @param aBytes
- * byte array to read from
- *
- * @return The <code>Object</code> deserialized from <code>aBytes</code>. If <code>aBytes</code>
- * is <code>null</code>, <code>null</code> is returned.
- *
- * @throws IOException
- * if an I/O error occurs
- */
- public static CASMgrSerializer deserializeCASMgrSerializer(byte[] aBytes) throws IOException {
- var object = deserialize(aBytes, CAS_MGR_SERIALIZER_SAFE_CLASSES);
-
- if (object != null && !(object instanceof CASMgrSerializer)) {
- throw new IOException("Unexpected object type: [" + object.getClass().getName() + "]");
- }
-
- return (CASMgrSerializer) object;
- }
-
- /**
- * Deserializes a {@link CASMgrSerializer} from an {@link InputStream}.
- *
- * @param aIn
- * stream read from
- *
- * @return The <code>Object</code> deserialized from <code>aBytes</code>. If <code>aBytes</code>
- * is <code>null</code>, <code>null</code> is returned.
- *
- * @throws IOException
- * if an I/O error occurs
- */
- public static CASMgrSerializer deserializeCASMgrSerializer(InputStream aIn) throws IOException {
- var object = deserialize(aIn, CAS_MGR_SERIALIZER_SAFE_CLASSES);
-
- if (object != null && !(object instanceof CASMgrSerializer)) {
- throw new IOException("Unexpected object type: [" + object.getClass().getName() + "]");
- }
-
- return (CASMgrSerializer) object;
- }
-
- private static <T> T deserialize(byte[] aBytes, Set<Class<?>> aFilter) throws IOException {
if (aBytes == null) {
return null;
}
- try (var is = new ByteArrayInputStream(aBytes)) {
- return deserialize(is, aFilter);
- }
- }
-
- @SuppressWarnings("unchecked")
- private static <T> T deserialize(InputStream aIs, Set<Class<?>> aSafeClasses) throws IOException {
- var ois = new ObjectInputStream(aIs);
- var f = ObjectInputFilter.rejectUndecidedClass(allowFilter(aSafeClasses::contains, UNDECIDED));
- ois.setObjectInputFilter(f);
- try {
- return (T) ois.readObject();
- } catch (ClassNotFoundException e) {
- throw new IOException("Unexpected deserialization error", e);
+ try (ByteArrayInputStream byteStream = new ByteArrayInputStream(aBytes);
+ ObjectInputStream objStream = new ObjectInputStream(byteStream)) {
+ return objStream.readObject();
}
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/SortedIntSet.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/SortedIntSet.java
index ad8e7b720..e1b9de1b2 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/SortedIntSet.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/SortedIntSet.java
@@ -33,13 +33,13 @@ public class SortedIntSet {
/** Default constructor. */
public SortedIntSet() {
- vector = new IntVector();
+ this.vector = new IntVector();
}
public SortedIntSet(int[] array) {
this();
for (int i = 0; i < array.length; i++) {
- add(array[i]);
+ this.add(array[i]);
}
}
@@ -53,8 +53,8 @@ public class SortedIntSet {
* IntArrayUtils.binarySearch()}.
*/
public int find(int ele) {
- int[] array = vector.getArray();
- return IntArrayUtils.binarySearch(array, ele, 0, vector.size());
+ int[] array = this.vector.getArray();
+ return IntArrayUtils.binarySearch(array, ele, 0, this.vector.size());
}
/**
@@ -63,7 +63,7 @@ public class SortedIntSet {
* @return <code>true</code> iff <code>ele</code> is contained in the set.
*/
public boolean contains(int ele) {
- return find(ele) >= 0;
+ return this.find(ele) >= 0;
}
/**
@@ -74,11 +74,11 @@ public class SortedIntSet {
* @return <code>true</code> iff <code>ele</code> was not already contained in the set.
*/
public boolean add(int ele) {
- final int pos = find(ele);
+ final int pos = this.find(ele);
if (pos >= 0) {
return false;
}
- vector.add(-(pos + 1), ele);
+ this.vector.add(-(pos + 1), ele);
return true;
}
@@ -90,11 +90,11 @@ public class SortedIntSet {
* @return <code>true</code> iff <code>ele</code> was actually contained in the set.
*/
public boolean remove(int ele) {
- final int pos = find(ele);
+ final int pos = this.find(ele);
if (pos < 0) {
return false;
}
- vector.remove(pos);
+ this.vector.remove(pos);
return true;
}
@@ -104,7 +104,7 @@ public class SortedIntSet {
* @return Current number of elements in set.
*/
public int size() {
- return vector.size();
+ return this.vector.size();
}
/**
@@ -115,22 +115,22 @@ public class SortedIntSet {
* @return The element at this position.
*/
public int get(int pos) {
- return vector.get(pos);
+ return this.vector.get(pos);
}
public void union(SortedIntSet set) {
final int max = set.size();
for (int i = 0; i < max; i++) {
- add(set.get(i));
+ this.add(set.get(i));
}
}
public void removeAll() {
- vector.removeAllElements();
+ this.vector.removeAllElements();
}
public int[] toArray() {
- return vector.toArrayCopy();
+ return this.vector.toArrayCopy();
}
public int[] getArray() {
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/StringToIntMap.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/StringToIntMap.java
index 113b1e123..5cb528ce4 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/StringToIntMap.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/StringToIntMap.java
@@ -39,7 +39,7 @@ public class StringToIntMap {
* @see java.lang.Object#Object()
*/
public StringToIntMap() {
- map = new HashMap<>();
+ this.map = new HashMap<>();
}
/**
@@ -51,7 +51,7 @@ public class StringToIntMap {
* @return <code>true</code> if a value is defined for this string; <code>false</code> else.
*/
public boolean containsKey(String key) {
- return map.containsKey(key);
+ return this.map.containsKey(key);
}
/**
@@ -64,7 +64,7 @@ public class StringToIntMap {
* <code>key</code> is actually defined in the map.
*/
public int get(String key) {
- Integer i = map.get(key);
+ Integer i = this.map.get(key);
if (i == null) {
return DEFAULT_VALUE;
}
@@ -81,7 +81,7 @@ public class StringToIntMap {
* @return The previous value of <code>key</code>, if it was set. <code>0</code> else.
*/
public int put(String key, int value) {
- Integer i = map.get(key);
+ Integer i = this.map.get(key);
int rc;
if (i == null) {
rc = 0;
@@ -89,7 +89,7 @@ public class StringToIntMap {
rc = i;
}
i = value;
- map.put(key, i);
+ this.map.put(key, i);
return rc;
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/SymbolTable.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/SymbolTable.java
index 1d2c8bdf7..2fd72b046 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/SymbolTable.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/SymbolTable.java
@@ -53,8 +53,8 @@ public class SymbolTable {
* larger code points.
*/
public SymbolTable(int start) {
- symbol2intMap = new HashMap<>();
- int2symbolMap = new ArrayList<>();
+ this.symbol2intMap = new HashMap<>();
+ this.int2symbolMap = new ArrayList<>();
this.start = start;
}
@@ -74,12 +74,12 @@ public class SymbolTable {
// Start numbering at 0.
this(0);
for (int i = 0; i < names.length; i++) {
- set(names[i]);
+ this.set(names[i]);
}
}
public boolean contains(String symbol) {
- return (getStart() <= get(symbol));
+ return (this.getStart() <= this.get(symbol));
}
/**
@@ -88,7 +88,7 @@ public class SymbolTable {
* @return The start of the table.
*/
public int getStart() {
- return start;
+ return this.start;
}
/**
@@ -98,10 +98,10 @@ public class SymbolTable {
*/
public SymbolTable copy() {
// not efficient, but no internal callers Feb 2914 scan
- SymbolTable copy = new SymbolTable(start);
- int max = int2symbolMap.size();
+ SymbolTable copy = new SymbolTable(this.start);
+ int max = this.int2symbolMap.size();
for (int i = 0; i < max; i++) {
- copy.set(int2symbolMap.get(i));
+ copy.set(this.int2symbolMap.get(i));
}
return copy;
}
@@ -109,13 +109,13 @@ public class SymbolTable {
// Utility function to convert from relative addressing (external)
// to absolute addressing (internal).
private final int rel2abs(int i) {
- return (i - start);
+ return (i - this.start);
}
// Utility function to convert from absolute addressing (internal)
// to relative addressing (external).
private final int abs2rel(int i) {
- return (i + start);
+ return (i + this.start);
}
/**
@@ -127,17 +127,17 @@ public class SymbolTable {
* @return the symbol's number.
*/
public int set(String symbol) {
- if (symbol2intMap.containsKey(symbol)) {
- return symbol2intMap.get(symbol);
+ if (this.symbol2intMap.containsKey(symbol)) {
+ return this.symbol2intMap.get(symbol);
}
int rel;
int abs;
synchronized (this) { // synchronize write access to internal data
// structures
- abs = symbol2intMap.size();
+ abs = this.symbol2intMap.size();
rel = abs2rel(abs);
// System.out.println("Adding symbol " + symbol + " at pos: " + i);
- symbol2intMap.put(symbol, rel);
+ this.symbol2intMap.put(symbol, rel);
int2symbolMap.add(symbol);
}
return rel;
@@ -165,7 +165,7 @@ public class SymbolTable {
*/
public String getSymbol(int i) {
int abs = rel2abs(i);
- if (abs < 0 || abs >= int2symbolMap.size()) {
+ if (abs < 0 || abs >= this.int2symbolMap.size()) {
// System.out.println("Out of bounds error in SymbolTable object");
return null;
}
@@ -178,7 +178,7 @@ public class SymbolTable {
* @return The number of symbols in the table.
*/
public int size() {
- return int2symbolMap.size();
+ return this.int2symbolMap.size();
}
/**
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/TextStringTokenizer.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/TextStringTokenizer.java
index ac81c5beb..3e2362e6c 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/TextStringTokenizer.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/TextStringTokenizer.java
@@ -115,9 +115,9 @@ public class TextStringTokenizer {
*/
public TextStringTokenizer(String string) {
// assert(string != null);
- text = string;
- pos = 0;
- end = string.length() - 1;
+ this.text = string;
+ this.pos = 0;
+ this.end = string.length() - 1;
setToNext();
}
@@ -128,7 +128,7 @@ public class TextStringTokenizer {
* The whitespace flag.
*/
public void setShowWhitespace(boolean b) {
- showWhitespace = b;
+ this.showWhitespace = b;
}
/**
@@ -138,7 +138,7 @@ public class TextStringTokenizer {
* The flag.
*/
public void setShowSeparators(boolean b) {
- showSeparators = b;
+ this.showSeparators = b;
}
/**
@@ -151,7 +151,7 @@ public class TextStringTokenizer {
if (chars == null) {
makeSortedList("");
} else {
- eosDels = makeSortedList(chars);
+ this.eosDels = makeSortedList(chars);
}
}
@@ -165,7 +165,7 @@ public class TextStringTokenizer {
if (chars == null) {
return;
}
- eosDels = addToSortedList(chars, eosDels);
+ this.eosDels = addToSortedList(chars, this.eosDels);
}
/**
@@ -178,7 +178,7 @@ public class TextStringTokenizer {
if (chars == null) {
chars = "";
}
- separators = makeSortedList(chars);
+ this.separators = makeSortedList(chars);
}
/**
@@ -191,7 +191,7 @@ public class TextStringTokenizer {
if (chars == null) {
return;
}
- separators = addToSortedList(chars, separators);
+ this.separators = addToSortedList(chars, this.separators);
}
/**
@@ -204,7 +204,7 @@ public class TextStringTokenizer {
if (chars == null) {
chars = "";
}
- whitespace = makeSortedList(chars);
+ this.whitespace = makeSortedList(chars);
}
/**
@@ -217,7 +217,7 @@ public class TextStringTokenizer {
if (chars == null) {
return;
}
- whitespace = addToSortedList(chars, whitespace);
+ this.whitespace = addToSortedList(chars, this.whitespace);
}
/**
@@ -230,7 +230,7 @@ public class TextStringTokenizer {
if (chars == null) {
chars = "";
}
- wordChars = makeSortedList(chars);
+ this.wordChars = makeSortedList(chars);
}
/**
@@ -243,7 +243,7 @@ public class TextStringTokenizer {
if (chars == null) {
return;
}
- wordChars = addToSortedList(chars, wordChars);
+ this.wordChars = addToSortedList(chars, this.wordChars);
}
/**
@@ -252,8 +252,8 @@ public class TextStringTokenizer {
* @return The token type, or <code>-1</code> if there is no next token.
*/
public int getTokenType() {
- if (nextComputed) {
- return nextTokenType;
+ if (this.nextComputed) {
+ return this.nextTokenType;
}
return -1;
}
@@ -264,14 +264,14 @@ public class TextStringTokenizer {
* @return <code>true</code> iff there is a next token.
*/
public boolean isValid() {
- return nextComputed;
+ return this.nextComputed;
}
/**
* Reset the tokenizer at any time.
*/
public void setToFirst() {
- pos = 0;
+ this.pos = 0;
setToNext();
}
@@ -281,10 +281,10 @@ public class TextStringTokenizer {
* @return The next token.
*/
public String getToken() {
- if (!nextComputed) {
+ if (!this.nextComputed) {
return null;
}
- return text.substring(nextTokenStart, nextTokenEnd);
+ return this.text.substring(this.nextTokenStart, this.nextTokenEnd);
}
/**
@@ -293,10 +293,10 @@ public class TextStringTokenizer {
* @return The start of the token.
*/
public int getTokenStart() {
- if (!nextComputed) {
+ if (!this.nextComputed) {
return -1;
}
- return nextTokenStart;
+ return this.nextTokenStart;
}
/**
@@ -305,59 +305,59 @@ public class TextStringTokenizer {
* @return The token end.
*/
public int getTokenEnd() {
- if (!nextComputed) {
+ if (!this.nextComputed) {
return -1;
}
- return nextTokenEnd;
+ return this.nextTokenEnd;
}
/**
* Compute the next token.
*/
public void setToNext() {
- if (pos > end) {
- nextComputed = false;
+ if (this.pos > this.end) {
+ this.nextComputed = false;
return;
}
- nextTokenStart = pos;
- int charType = getCharType(text.charAt(pos));
+ this.nextTokenStart = this.pos;
+ int charType = getCharType(this.text.charAt(this.pos));
switch (charType) {
case EOS: {
- ++pos;
- nextTokenType = EOS;
+ ++this.pos;
+ this.nextTokenType = EOS;
break;
}
case SEP: {
- ++pos;
- if (!showSeparators) {
+ ++this.pos;
+ if (!this.showSeparators) {
setToNext();
return;
}
- nextTokenType = SEP;
+ this.nextTokenType = SEP;
break;
}
case WSP: {
- ++pos;
- while (pos <= end && getCharType(text.charAt(pos)) == WSP) {
- ++pos;
+ ++this.pos;
+ while (this.pos <= this.end && getCharType(this.text.charAt(this.pos)) == WSP) {
+ ++this.pos;
}
- if (!showWhitespace) {
+ if (!this.showWhitespace) {
setToNext();
return;
}
- nextTokenType = WSP;
+ this.nextTokenType = WSP;
break;
}
case WCH: {
- ++pos;
- nextTokenType = WCH;
- if (pos <= end) {
- charType = getCharType(text.charAt(pos));
+ ++this.pos;
+ this.nextTokenType = WCH;
+ if (this.pos <= this.end) {
+ charType = getCharType(this.text.charAt(this.pos));
} else {
break;
}
- while (pos < end && (charType == WCH || charType == EOS)) {
- ++pos;
+ while (this.pos < this.end && (charType == WCH || charType == EOS)) {
+ ++this.pos;
// If the type of the _current_ character is EOS, check what
// the type of the _next_ character is. If this is the last
// char in the buffer, we treat it as an EOS char. If the
@@ -368,19 +368,19 @@ public class TextStringTokenizer {
// the other hand, the current character is a WCH, keep on
// looping.
if (charType == EOS) { // Current char is EOS
- if (pos >= end) { // If current char is last
+ if (this.pos >= this.end) { // If current char is last
// char...
- --pos; // ...reset position...
+ --this.pos; // ...reset position...
break; // ...and break.
}
- charType = getCharType(text.charAt(pos));
+ charType = getCharType(this.text.charAt(this.pos));
// Get type of next char
if (charType != WCH) { // If next char is not WCH...
- --pos; // ...reset position...
+ --this.pos; // ...reset position...
break; // ...and break out of loop.
}
}
- charType = getCharType(text.charAt(pos));
+ charType = getCharType(this.text.charAt(this.pos));
// Get type of next char and keep on going.
}
break;
@@ -389,8 +389,8 @@ public class TextStringTokenizer {
return;
}
}
- nextTokenEnd = pos;
- nextComputed = true;
+ this.nextTokenEnd = this.pos;
+ this.nextComputed = true;
return;
}
@@ -405,16 +405,16 @@ public class TextStringTokenizer {
// First, check user-defined lists in the order end-of-sentence
// delimiter, separator character, whitespace and finally regular
// character that can be part of a word.
- if (Arrays.binarySearch(eosDels, c) >= 0) {
+ if (Arrays.binarySearch(this.eosDels, c) >= 0) {
return EOS;
}
- if (Arrays.binarySearch(separators, c) >= 0) {
+ if (Arrays.binarySearch(this.separators, c) >= 0) {
return SEP;
}
- if (Arrays.binarySearch(whitespace, c) >= 0) {
+ if (Arrays.binarySearch(this.whitespace, c) >= 0) {
return WSP;
}
- if (Arrays.binarySearch(wordChars, c) >= 0) {
+ if (Arrays.binarySearch(this.wordChars, c) >= 0) {
return WCH;
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/TextTokenizer.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/TextTokenizer.java
index 496ff782d..78ccd93fe 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/TextTokenizer.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/TextTokenizer.java
@@ -114,9 +114,9 @@ public class TextTokenizer {
* @pre string != null
*/
public TextTokenizer(CharArrayString string) {
- text = string.getChars();
- pos = string.getStart();
- end = string.getEnd() - 1;
+ this.text = string.getChars();
+ this.pos = string.getStart();
+ this.end = string.getEnd() - 1;
}
/**
@@ -137,7 +137,7 @@ public class TextTokenizer {
* -
*/
public void setShowWhitespace(boolean b) {
- showWhitespace = b;
+ this.showWhitespace = b;
}
/**
@@ -147,7 +147,7 @@ public class TextTokenizer {
* -
*/
public void setShowSeparators(boolean b) {
- showSeparators = b;
+ this.showSeparators = b;
}
/**
@@ -160,7 +160,7 @@ public class TextTokenizer {
if (chars == null) {
chars = "";
}
- eosDels = makeSortedList(chars);
+ this.eosDels = makeSortedList(chars);
}
/**
@@ -173,7 +173,7 @@ public class TextTokenizer {
if (chars == null) {
return;
}
- eosDels = addToSortedList(chars, eosDels);
+ this.eosDels = addToSortedList(chars, this.eosDels);
}
/**
@@ -186,7 +186,7 @@ public class TextTokenizer {
if (chars == null) {
chars = "";
}
- separators = makeSortedList(chars);
+ this.separators = makeSortedList(chars);
}
/**
@@ -199,7 +199,7 @@ public class TextTokenizer {
if (chars == null) {
return;
}
- separators = addToSortedList(chars, separators);
+ this.separators = addToSortedList(chars, this.separators);
}
/**
@@ -212,7 +212,7 @@ public class TextTokenizer {
if (chars == null) {
chars = "";
}
- whitespace = makeSortedList(chars);
+ this.whitespace = makeSortedList(chars);
}
/**
@@ -225,7 +225,7 @@ public class TextTokenizer {
if (chars == null) {
return;
}
- whitespace = addToSortedList(chars, whitespace);
+ this.whitespace = addToSortedList(chars, this.whitespace);
}
/**
@@ -238,7 +238,7 @@ public class TextTokenizer {
if (chars == null) {
chars = "";
}
- wordChars = makeSortedList(chars);
+ this.wordChars = makeSortedList(chars);
}
/**
@@ -251,7 +251,7 @@ public class TextTokenizer {
if (chars == null) {
return;
}
- wordChars = addToSortedList(chars, wordChars);
+ this.wordChars = addToSortedList(chars, this.wordChars);
}
/**
@@ -261,8 +261,8 @@ public class TextTokenizer {
*/
public int getNextTokenType() {
computeNextToken();
- if (nextComputed) {
- return nextTokenType;
+ if (this.nextComputed) {
+ return this.nextTokenType;
}
return -1;
}
@@ -271,7 +271,7 @@ public class TextTokenizer {
* @return <code>true</code> iff there is a next token.
*/
public boolean hasNext() {
- if (nextComputed) {
+ if (this.nextComputed) {
return true;
}
return computeNextToken();
@@ -283,57 +283,57 @@ public class TextTokenizer {
*/
public String nextToken() {
computeNextToken();
- if (!nextComputed) {
+ if (!this.nextComputed) {
return null;
}
- nextComputed = false;
- return new String(text, nextTokenStart, nextTokenEnd - nextTokenStart);
+ this.nextComputed = false;
+ return new String(this.text, this.nextTokenStart, this.nextTokenEnd - this.nextTokenStart);
}
/**
* Compute the next token.
*/
private boolean computeNextToken() {
- if (nextComputed) {
+ if (this.nextComputed) {
return true;
}
- if (pos >= end) {
- nextComputed = false;
+ if (this.pos >= this.end) {
+ this.nextComputed = false;
return false;
}
- nextTokenStart = pos;
- int charType = getCharType(text[pos]);
+ this.nextTokenStart = this.pos;
+ int charType = getCharType(this.text[this.pos]);
switch (charType) {
case EOS: {
- ++pos;
- nextTokenType = EOS;
+ ++this.pos;
+ this.nextTokenType = EOS;
break;
}
case SEP: {
- ++pos;
- if (!showSeparators) {
+ ++this.pos;
+ if (!this.showSeparators) {
return computeNextToken();
}
- nextTokenType = SEP;
+ this.nextTokenType = SEP;
break;
}
case WSP: {
- ++pos;
- while (pos <= end && getCharType(text[pos]) == WSP) {
- ++pos;
+ ++this.pos;
+ while (this.pos <= this.end && getCharType(this.text[this.pos]) == WSP) {
+ ++this.pos;
}
- if (!showWhitespace) {
+ if (!this.showWhitespace) {
return computeNextToken();
}
- nextTokenType = WSP;
+ this.nextTokenType = WSP;
break;
}
case WCH: {
- ++pos;
- nextTokenType = WCH;
- charType = getCharType(text[pos]);
- while (pos < end && (charType == WCH || charType == EOS)) {
- ++pos;
+ ++this.pos;
+ this.nextTokenType = WCH;
+ charType = getCharType(this.text[this.pos]);
+ while (this.pos < this.end && (charType == WCH || charType == EOS)) {
+ ++this.pos;
// If the type of the _current_ character is EOS, check what
// the type of the _next_ character is. If this is the last
// char in the buffer, we treat it as an EOS char. If the
@@ -344,20 +344,20 @@ public class TextTokenizer {
// the other hand, the current character is a WCH, keep on
// looping.
if (charType == EOS) { // Current char is EOS
- if (pos >= end) { // If current char is last
+ if (this.pos >= this.end) { // If current char is last
// char...
- --pos; // ...reset position...
+ --this.pos; // ...reset position...
break; // ...and break.
}
- charType = getCharType(text[pos]); // Get type
+ charType = getCharType(this.text[this.pos]); // Get type
// of next
// char
if (charType != WCH) { // If next char is not WCH...
- --pos; // ...reset position...
+ --this.pos; // ...reset position...
break; // ...and break out of loop.
}
}
- charType = getCharType(text[pos]); // Get type of
+ charType = getCharType(this.text[this.pos]); // Get type of
// next char and
// keep on going.
}
@@ -367,8 +367,8 @@ public class TextTokenizer {
return false;
}
}
- nextTokenEnd = pos;
- nextComputed = true;
+ this.nextTokenEnd = this.pos;
+ this.nextComputed = true;
return true;
}
@@ -383,16 +383,16 @@ public class TextTokenizer {
// First, check user-defined lists in the order end-of-sentence
// delimiter, separator character, whitespace and finally regular
// character that can be part of a word.
- if (Arrays.binarySearch(eosDels, c) >= 0) {
+ if (Arrays.binarySearch(this.eosDels, c) >= 0) {
return EOS;
}
- if (Arrays.binarySearch(separators, c) >= 0) {
+ if (Arrays.binarySearch(this.separators, c) >= 0) {
return SEP;
}
- if (Arrays.binarySearch(whitespace, c) >= 0) {
+ if (Arrays.binarySearch(this.whitespace, c) >= 0) {
return WSP;
}
- if (Arrays.binarySearch(wordChars, c) >= 0) {
+ if (Arrays.binarySearch(this.wordChars, c) >= 0) {
return WCH;
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/TimeSpan.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/TimeSpan.java
index 8bf931388..691b82543 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/TimeSpan.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/TimeSpan.java
@@ -92,8 +92,8 @@ public class TimeSpan {
*/
public TimeSpan(long milliseconds) {
if (milliseconds >= 0) {
- all = milliseconds;
- knowsMS = true;
+ this.all = milliseconds;
+ this.knowsMS = true;
}
}
@@ -102,7 +102,7 @@ public class TimeSpan {
* <code>false</code>, else.
*/
public boolean isInstantiated() {
- return (knowsMS || knowsFull);
+ return (this.knowsMS || this.knowsFull);
}
/**
@@ -117,8 +117,8 @@ public class TimeSpan {
return false;
}
this.years = years;
- knowsFull = true;
- knowsMS = false;
+ this.knowsFull = true;
+ this.knowsMS = false;
return true;
}
@@ -134,8 +134,8 @@ public class TimeSpan {
return false;
}
this.days = days;
- knowsFull = true;
- knowsMS = false;
+ this.knowsFull = true;
+ this.knowsMS = false;
return true;
}
@@ -151,8 +151,8 @@ public class TimeSpan {
return false;
}
this.hours = hours;
- knowsFull = true;
- knowsMS = false;
+ this.knowsFull = true;
+ this.knowsMS = false;
return true;
}
@@ -168,8 +168,8 @@ public class TimeSpan {
return false;
}
this.minutes = minutes;
- knowsFull = true;
- knowsMS = false;
+ this.knowsFull = true;
+ this.knowsMS = false;
return true;
}
@@ -185,8 +185,8 @@ public class TimeSpan {
return false;
}
this.seconds = seconds;
- knowsFull = true;
- knowsMS = false;
+ this.knowsFull = true;
+ this.knowsMS = false;
return true;
}
@@ -202,8 +202,8 @@ public class TimeSpan {
return false;
}
this.milliseconds = milliseconds;
- knowsFull = true;
- knowsMS = false;
+ this.knowsFull = true;
+ this.knowsMS = false;
return true;
}
@@ -218,9 +218,9 @@ public class TimeSpan {
if (milliseconds < 0) {
return false;
}
- all = milliseconds;
- knowsMS = true;
- knowsFull = false;
+ this.all = milliseconds;
+ this.knowsMS = true;
+ this.knowsFull = false;
return true;
}
@@ -232,10 +232,10 @@ public class TimeSpan {
*/
public long getFullMilliseconds() {
ensureAll();
- if (!knowsMS) {
+ if (!this.knowsMS) {
return -1;
}
- return all;
+ return this.all;
}
/**
@@ -245,7 +245,7 @@ public class TimeSpan {
*/
public int getYears() {
ensureFull();
- return isInstantiated() ? years : -1;
+ return this.isInstantiated() ? this.years : -1;
}
/**
@@ -255,7 +255,7 @@ public class TimeSpan {
*/
public int getDays() {
ensureFull();
- return isInstantiated() ? days : -1;
+ return this.isInstantiated() ? this.days : -1;
}
/**
@@ -265,7 +265,7 @@ public class TimeSpan {
*/
public int getHours() {
ensureFull();
- return isInstantiated() ? hours : -1;
+ return this.isInstantiated() ? this.hours : -1;
}
/**
@@ -275,7 +275,7 @@ public class TimeSpan {
*/
public int getMinutes() {
ensureFull();
- return isInstantiated() ? minutes : -1;
+ return this.isInstantiated() ? this.minutes : -1;
}
/**
@@ -285,7 +285,7 @@ public class TimeSpan {
*/
public int getSeconds() {
ensureFull();
- return isInstantiated() ? seconds : -1;
+ return this.isInstantiated() ? this.seconds : -1;
}
/**
@@ -295,7 +295,7 @@ public class TimeSpan {
*/
public int getMilliseconds() {
ensureFull();
- return isInstantiated() ? milliseconds : -1;
+ return this.isInstantiated() ? this.milliseconds : -1;
}
/**
@@ -304,64 +304,64 @@ public class TimeSpan {
@Override
public String toString() {
ensureFull();
- if (!knowsFull) {
+ if (!this.knowsFull) {
return unknownTime;
}
StringBuffer buf = new StringBuffer();
boolean started = false;
- if (years > 0) {
- buf.append(years);
+ if (this.years > 0) {
+ buf.append(this.years);
buf.append(' ');
buf.append(yearsString);
started = true;
}
- if (started || days > 0) {
+ if (started || this.days > 0) {
if (started) {
buf.append(' ');
}
- buf.append(days);
+ buf.append(this.days);
buf.append(' ');
buf.append(daysString);
started = true;
}
- if (started || hours > 0) {
+ if (started || this.hours > 0) {
if (started) {
buf.append(' ');
}
- buf.append(hours);
+ buf.append(this.hours);
buf.append(' ');
buf.append(hoursString);
started = true;
}
- if (started || minutes > 0) {
+ if (started || this.minutes > 0) {
if (started) {
buf.append(' ');
}
- buf.append(minutes);
+ buf.append(this.minutes);
buf.append(' ');
buf.append(minutesString);
started = true;
}
- if (started || seconds > 0) {
+ if (started || this.seconds > 0) {
if (started) {
buf.append(' ');
}
- buf.append(seconds);
+ buf.append(this.seconds);
started = true;
}
if (started) {
buf.append('.');
- if (milliseconds < 100) {
+ if (this.milliseconds < 100) {
buf.append('0');
- if (milliseconds < 10) {
+ if (this.milliseconds < 10) {
buf.append('0');
}
}
- buf.append(milliseconds);
+ buf.append(this.milliseconds);
buf.append(' ');
buf.append(secondsString);
} else {
- buf.append(milliseconds);
+ buf.append(this.milliseconds);
buf.append(' ');
buf.append(msString);
}
@@ -369,36 +369,36 @@ public class TimeSpan {
}
private void ensureAll() {
- if (knowsMS || !knowsFull) {
+ if (this.knowsMS || !this.knowsFull) {
return;
}
- all = 0;
- all += years * msYear;
- all += days * msDay;
- all += hours * msHour;
- all += minutes * msMinute;
- all += seconds * msSecond;
- all += milliseconds;
- knowsMS = true;
+ this.all = 0;
+ this.all += this.years * msYear;
+ this.all += this.days * msDay;
+ this.all += this.hours * msHour;
+ this.all += this.minutes * msMinute;
+ this.all += this.seconds * msSecond;
+ this.all += this.milliseconds;
+ this.knowsMS = true;
}
private void ensureFull() {
- if (knowsFull || !knowsMS) {
+ if (this.knowsFull || !this.knowsMS) {
return;
}
- long t = all;
- years = (int) (t / msYear);
+ long t = this.all;
+ this.years = (int) (t / msYear);
t %= msYear;
- days = (int) (t / msDay);
+ this.days = (int) (t / msDay);
t %= msDay;
- hours = (int) (t / msHour);
+ this.hours = (int) (t / msHour);
t %= msHour;
- minutes = (int) (t / msMinute);
+ this.minutes = (int) (t / msMinute);
t %= msMinute;
- seconds = (int) (t / msSecond);
+ this.seconds = (int) (t / msSecond);
t %= msSecond;
- milliseconds = (int) t;
- knowsFull = true;
+ this.milliseconds = (int) t;
+ this.knowsFull = true;
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/Timer.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/Timer.java
index f24ef50c7..13ff03e67 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/Timer.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/Timer.java
@@ -37,9 +37,9 @@ public final class Timer {
* {@link #start() start()} explicitly.
*/
public Timer() {
- time = 0;
- start = 0;
- isRunning = false;
+ this.time = 0;
+ this.start = 0;
+ this.isRunning = false;
}
/**
@@ -48,11 +48,11 @@ public final class Timer {
* @return <code>false</code> iff the timer is already running.
*/
public boolean start() {
- if (isRunning) {
+ if (this.isRunning) {
return false;
}
- isRunning = true;
- start = System.currentTimeMillis();
+ this.isRunning = true;
+ this.start = System.currentTimeMillis();
return true;
}
@@ -63,11 +63,11 @@ public final class Timer {
*/
public boolean stop() {
final long end = System.currentTimeMillis();
- if (!isRunning) {
+ if (!this.isRunning) {
return false;
}
- isRunning = false;
- time += end - start;
+ this.isRunning = false;
+ this.time += end - this.start;
return true;
}
@@ -77,10 +77,10 @@ public final class Timer {
* @return <code>false</code> iff the timer is currently running.
*/
public boolean reset() {
- if (isRunning) {
+ if (this.isRunning) {
return false;
}
- time = 0;
+ this.time = 0;
return true;
}
@@ -91,13 +91,13 @@ public final class Timer {
* @return The duration in milliseconds.
*/
public long getTime() {
- if (isRunning) {
+ if (this.isRunning) {
stop();
- final long rt = time;
+ final long rt = this.time;
start();
return rt;
}
- return time;
+ return this.time;
}
/**
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMAStreamHandler.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMAStreamHandler.java
index adc8140e8..1b34ae7ab 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMAStreamHandler.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMAStreamHandler.java
@@ -39,7 +39,7 @@ public class UIMAStreamHandler extends StreamHandler {
public synchronized void publish(LogRecord record) {
if (record != null) {
super.publish(record);
- flush();
+ this.flush();
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/UtilError.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/UtilError.java
index 76c5846f3..67c6fc79f 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/UtilError.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/UtilError.java
@@ -72,7 +72,7 @@ public class UtilError extends RuntimeException {
* file. Unfortunately, the error parameters get lost that way.
*/
public int getError() {
- return error;
+ return this.error;
}
/**
@@ -80,18 +80,18 @@ public class UtilError extends RuntimeException {
*/
@Override
public String getMessage() {
- if (resource == null) {
+ if (this.resource == null) {
try {
- resource = ResourceBundle.getBundle(resource_file);
+ this.resource = ResourceBundle.getBundle(resource_file);
} catch (MissingResourceException e) {
- error = MESSAGES_NOT_FOUND;
+ this.error = MESSAGES_NOT_FOUND;
return missing_resource_error;
}
}
// Retrieve message from resource bundle, format using arguments,
// and return resulting string.
- return (new MessageFormat(resource.getString(identifiers[error])))
- .format(arguments);
+ return (new MessageFormat(this.resource.getString(identifiers[this.error])))
+ .format(this.arguments);
}
/**
@@ -99,7 +99,7 @@ public class UtilError extends RuntimeException {
*/
@Override
public String toString() {
- return "UtilError: " + getMessage();
+ return "UtilError: " + this.getMessage();
}
/**
@@ -115,9 +115,9 @@ public class UtilError extends RuntimeException {
*/
public boolean addArgument(String s) {
int i = 0;
- while (i < arguments.length) {
- if (arguments[i] == null) {
- arguments[i] = s;
+ while (i < this.arguments.length) {
+ if (this.arguments[i] == null) {
+ this.arguments[i] = s;
return true;
}
i++;
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/CompIntArrayRBT.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/CompIntArrayRBT.java
index 05413c94f..6d4859759 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/CompIntArrayRBT.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/CompIntArrayRBT.java
@@ -50,7 +50,7 @@ public class CompIntArrayRBT extends IntArrayRBT {
@Override
protected int compare(int v1, int v2) {
- return comp.compare(v1, v2);
+ return this.comp.compare(v1, v2);
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/Int2IntRBT.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/Int2IntRBT.java
index 1b27e3d26..429a7dd50 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/Int2IntRBT.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/Int2IntRBT.java
@@ -56,7 +56,7 @@ public class Int2IntRBT extends IntArrayRBTcommon {
*/
@Override
public void dec() {
- currentNode = previousNode(currentNode);
+ this.currentNode = previousNode(this.currentNode);
}
/**
@@ -67,7 +67,7 @@ public class Int2IntRBT extends IntArrayRBTcommon {
if (!isValid()) {
throw new NoSuchElementException();
}
- return getKeyForNode(currentNode);
+ return Int2IntRBT.this.getKeyForNode(this.currentNode);
}
@Override
@@ -75,7 +75,7 @@ public class Int2IntRBT extends IntArrayRBTcommon {
if (!isValid()) {
throw new NoSuchElementException();
}
- return Int2IntRBT.this.getValue(currentNode);
+ return Int2IntRBT.this.getValue(this.currentNode);
}
/**
@@ -83,7 +83,7 @@ public class Int2IntRBT extends IntArrayRBTcommon {
*/
@Override
public void inc() {
- currentNode = nextNode(currentNode);
+ this.currentNode = nextNode(this.currentNode);
}
/**
@@ -91,7 +91,7 @@ public class Int2IntRBT extends IntArrayRBTcommon {
*/
@Override
public boolean isValid() {
- return (currentNode != NIL);
+ return (this.currentNode != NIL);
}
/**
@@ -99,7 +99,7 @@ public class Int2IntRBT extends IntArrayRBTcommon {
*/
@Override
public void moveToFirst() {
- currentNode = getFirstNode();
+ this.currentNode = getFirstNode();
}
/**
@@ -107,7 +107,7 @@ public class Int2IntRBT extends IntArrayRBTcommon {
*/
@Override
public void moveToLast() {
- currentNode = Int2IntRBT.this.greatestNode;
+ this.currentNode = Int2IntRBT.this.greatestNode;
}
/**
@@ -116,7 +116,7 @@ public class Int2IntRBT extends IntArrayRBTcommon {
@Override
public Object copy() {
KeyValueIterator it = new KeyValueIterator();
- it.currentNode = currentNode;
+ it.currentNode = this.currentNode;
return it;
}
@@ -125,7 +125,7 @@ public class Int2IntRBT extends IntArrayRBTcommon {
*/
@Override
public void moveTo(int i) {
- currentNode = findInsertionPointNoDups(i);
+ this.currentNode = findInsertionPointNoDups(i);
}
}
@@ -135,18 +135,18 @@ public class Int2IntRBT extends IntArrayRBTcommon {
private int currentNode;
private KeyIterator() {
- currentNode = getFirstNode();
+ this.currentNode = getFirstNode();
}
@Override
public final boolean hasNext() {
- return currentNode != NIL;
+ return this.currentNode != NIL;
}
@Override
public final int nextNvc() {
- int v = getKeyForNode(currentNode);
- currentNode = nextNode(currentNode);
+ int v = Int2IntRBT.this.getKeyForNode(this.currentNode);
+ this.currentNode = nextNode(this.currentNode);
return v;
}
@@ -155,13 +155,13 @@ public class Int2IntRBT extends IntArrayRBTcommon {
*/
@Override
public boolean hasPrevious() {
- return currentNode != NIL && currentNode != getFirstNode();
+ return this.currentNode != NIL && this.currentNode != getFirstNode();
}
@Override
public int previousNvc() {
- currentNode = previousNode(currentNode);
- return getKeyForNode(currentNode);
+ this.currentNode = previousNode(this.currentNode);
+ return Int2IntRBT.this.getKeyForNode(this.currentNode);
}
/**
@@ -169,7 +169,7 @@ public class Int2IntRBT extends IntArrayRBTcommon {
*/
@Override
public void moveToEnd() {
- currentNode = Int2IntRBT.this.greatestNode;
+ this.currentNode = Int2IntRBT.this.greatestNode;
}
/**
@@ -177,7 +177,7 @@ public class Int2IntRBT extends IntArrayRBTcommon {
*/
@Override
public void moveToStart() {
- currentNode = NIL;
+ this.currentNode = NIL;
}
}
@@ -206,7 +206,7 @@ public class Int2IntRBT extends IntArrayRBTcommon {
@Override
protected void setupArrays() {
super.setupArrays();
- values = new int[initialSize];
+ this.values = new int[initialSize];
}
public Int2IntRBT copy() {
@@ -237,7 +237,7 @@ public class Int2IntRBT extends IntArrayRBTcommon {
@Override
protected void ensureCapacityKlrp(int requiredSize) {
super.ensureCapacityKlrp(requiredSize);
- values = ensureArrayCapacity(values, requiredSize);
+ this.values = ensureArrayCapacity(this.values, requiredSize);
}
/**
@@ -249,16 +249,16 @@ public class Int2IntRBT extends IntArrayRBTcommon {
* @return negative index if key is found
*/
private int treeInsert(final int k, final int v) {
- if ((greatestNode != NIL) && (getKeyForNode(greatestNode) < k)) {
- final int y = greatestNode;
+ if ((this.greatestNode != NIL) && (getKeyForNode(this.greatestNode) < k)) {
+ final int y = this.greatestNode;
final int z = newNode(k);
values[z] = v; // addition
- greatestNode = z;
+ this.greatestNode = z;
setRight(y, z);
setParent(z, y);
return z;
}
- int x = root;
+ int x = this.root;
int y = NIL;
while (x != NIL) {
y = x;
@@ -277,7 +277,7 @@ public class Int2IntRBT extends IntArrayRBTcommon {
values[z] = v;
if (y == NIL) {
setAsRoot(z);
- greatestNode = z;
+ this.greatestNode = z;
setParent(z, NIL);
} else {
setParent(z, y);
@@ -324,12 +324,12 @@ public class Int2IntRBT extends IntArrayRBTcommon {
* @return previous value or 0 if key not previously present
*/
public int put(final int k, final int v) {
- if (root == NIL) {
+ if (this.root == NIL) {
final int x = newNode(k);
values[x] = v;
setAsRoot(x);
- color[root] = black;
- greatestNode = x;
+ this.color[this.root] = black;
+ this.greatestNode = x;
return 0;
}
int x = treeInsert(k, v);
@@ -338,16 +338,16 @@ public class Int2IntRBT extends IntArrayRBTcommon {
}
// inserted a new key, no previous value
- color[x] = red;
- while ((x != root) && (color[getParent(x)] == red)) {
+ this.color[x] = red;
+ while ((x != this.root) && (this.color[getParent(x)] == red)) {
final int parent_x = getParent(x);
final int parent_parent_x = getParent(parent_x);
if (parent_x == getLeft(parent_parent_x)) {
final int y = getRight(parent_parent_x);
- if (color[y] == red) {
- color[parent_x] = black;
- color[y] = black;
- color[parent_parent_x] = red;
+ if (this.color[y] == red) {
+ this.color[parent_x] = black;
+ this.color[y] = black;
+ this.color[parent_parent_x] = red;
x = parent_parent_x;
} else {
if (x == getRight(parent_x)) {
@@ -355,17 +355,17 @@ public class Int2IntRBT extends IntArrayRBTcommon {
leftRotate(x);
}
final int parent2_x = getParent(x);
- color[parent2_x] = black;
+ this.color[parent2_x] = black;
final int parent2_parent2_x = getParent(parent2_x);
- color[parent2_parent2_x] = red;
+ this.color[parent2_parent2_x] = red;
rightRotate(parent2_parent2_x);
}
} else {
final int y = getLeft(parent_parent_x);
- if (color[y] == red) {
- color[parent_x] = black;
- color[y] = black;
- color[parent_parent_x] = red;
+ if (this.color[y] == red) {
+ this.color[parent_x] = black;
+ this.color[y] = black;
+ this.color[parent_parent_x] = red;
x = parent_parent_x;
} else {
if (x == getLeft(parent_x)) {
@@ -373,14 +373,14 @@ public class Int2IntRBT extends IntArrayRBTcommon {
rightRotate(x);
}
final int parent2_x = getParent(x);
- color[parent2_x] = black;
+ this.color[parent2_x] = black;
final int parent2_parent2_x = getParent(parent2_x);
- color[parent2_parent2_x] = red;
+ this.color[parent2_parent2_x] = red;
leftRotate(parent2_parent2_x);
}
}
}
- color[root] = black;
+ this.color[this.root] = black;
return 0;
}
@@ -404,8 +404,8 @@ public class Int2IntRBT extends IntArrayRBTcommon {
if (lastNodeGotten == NIL) {
node = findKey(k);
} else {
- final int distanceToTop = Math.abs(k - getKeyForNode(root));
- final int distanceToLast = Math.abs(k - getKeyForNode(lastNodeGotten));
+ final int distanceToTop = Math.abs(k - getKeyForNode(this.root));
+ final int distanceToLast = Math.abs(k - getKeyForNode(this.lastNodeGotten));
node = (distanceToTop < distanceToLast) ? findKey(k) : findKeyFromLast(k);
}
if (node != NIL) {
@@ -498,7 +498,7 @@ public class Int2IntRBT extends IntArrayRBTcommon {
public IntListIterator keyIterator(int aKey) {
KeyIterator it = new KeyIterator();
- it.currentNode = findKey(aKey);
+ it.currentNode = this.findKey(aKey);
return it;
}
@@ -508,7 +508,7 @@ public class Int2IntRBT extends IntArrayRBTcommon {
public IntKeyValueIterator keyValueIterator(int aKey) {
KeyValueIterator it = new KeyValueIterator();
- it.currentNode = findKey(aKey);
+ it.currentNode = this.findKey(aKey);
return it;
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntArrayRBT.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntArrayRBT.java
index 99642353d..8bed37ef6 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntArrayRBT.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntArrayRBT.java
@@ -192,13 +192,13 @@ public class IntArrayRBT extends IntArrayRBTcommon {
@Override
public final boolean hasNext() {
- return (currentNode != NIL);
+ return (this.currentNode != NIL);
}
@Override
public final int nextNvc() {
- int r = getKeyForNode(currentNode);
- currentNode = nextNode(currentNode);
+ int r = IntArrayRBT.this.getKeyForNode(this.currentNode);
+ this.currentNode = nextNode(this.currentNode);
return r;
}
@@ -207,7 +207,7 @@ public class IntArrayRBT extends IntArrayRBTcommon {
*/
@Override
public boolean hasPrevious() {
- return previousNode(currentNode) != NIL;
+ return previousNode(this.currentNode) != NIL;
}
/**
@@ -215,17 +215,17 @@ public class IntArrayRBT extends IntArrayRBTcommon {
*/
@Override
public int previous() {
- currentNode = previousNode(currentNode);
- if (currentNode != NIL) {
- return getKey(currentNode);
+ this.currentNode = previousNode(this.currentNode);
+ if (this.currentNode != NIL) {
+ return getKey(this.currentNode);
}
throw new NoSuchElementException();
}
@Override
public int previousNvc() {
- currentNode = previousNode(currentNode);
- return getKey(currentNode);
+ this.currentNode = previousNode(this.currentNode);
+ return getKey(this.currentNode);
}
/**
@@ -233,7 +233,7 @@ public class IntArrayRBT extends IntArrayRBTcommon {
*/
@Override
public void moveToEnd() {
- currentNode = IntArrayRBT.this.greatestNode;
+ this.currentNode = IntArrayRBT.this.greatestNode;
}
/**
@@ -241,11 +241,11 @@ public class IntArrayRBT extends IntArrayRBTcommon {
*/
@Override
public void moveToStart() {
- currentNode = getFirstNode();
+ this.currentNode = getFirstNode();
}
protected final int getKey(int node) {
- return getKeyForNode(node);
+ return IntArrayRBT.this.getKeyForNode(node);
}
}
@@ -298,19 +298,19 @@ public class IntArrayRBT extends IntArrayRBTcommon {
}
protected int treeInsert(final int k, boolean withDups) {
- if (greatestNode != NIL) {
+ if (this.greatestNode != NIL) {
final int lt = withDups ? 1 : 0;
- if (compare(getKeyForNode(greatestNode), k) < lt) {
- final int y = greatestNode;
+ if (compare(getKeyForNode(this.greatestNode), k) < lt) {
+ final int y = this.greatestNode;
final int z = newNode(k);
- greatestNode = z;
+ this.greatestNode = z;
setRight(y, z);
setParent(z, y);
return z;
}
}
- int x = root; // could be NIL
+ int x = this.root; // could be NIL
int y = NIL;
// find existing value (key)
@@ -344,7 +344,7 @@ public class IntArrayRBT extends IntArrayRBTcommon {
final int z = newNode(k);
if (y == NIL) { // only happens if this.root is NIL, e.g. table is empty.
setAsRoot(z); // also set parent to NIL
- greatestNode = z;
+ this.greatestNode = z;
} else {
setParent(z, y);
if (cr < 0) {
@@ -379,11 +379,11 @@ public class IntArrayRBT extends IntArrayRBTcommon {
* @return true if added (not present before)
*/
public boolean addAdded(int k) {
- if (root == NIL) {
+ if (this.root == NIL) {
final int x = newNode(k);
setAsRoot(x);
- color[root] = black;
- greatestNode = x;
+ this.color[this.root] = black;
+ this.greatestNode = x;
return true;
}
final int x = treeInsert(k);
@@ -399,11 +399,11 @@ public class IntArrayRBT extends IntArrayRBTcommon {
// }
private int insertKey(final int k, final boolean withDups) {
- if (root == NIL) {
+ if (this.root == NIL) {
final int x = newNode(k);
setAsRoot(x);
- color[root] = black;
- greatestNode = x;
+ this.color[this.root] = black;
+ this.greatestNode = x;
return x;
}
final int x = treeInsert(k, withDups);
@@ -415,11 +415,11 @@ public class IntArrayRBT extends IntArrayRBTcommon {
// for testing only
public int insertKeyShowNegative(int k) {
- if (root == NIL) {
+ if (this.root == NIL) {
final int x = newNode(k);
setAsRoot(x);
- color[root] = black;
- greatestNode = x;
+ this.color[this.root] = black;
+ this.greatestNode = x;
return x;
}
final int x = treeInsert(k, false);
@@ -438,17 +438,17 @@ public class IntArrayRBT extends IntArrayRBTcommon {
* @return -
*/
private int commonInsertKey(int x) {
- color[x] = red;
+ this.color[x] = red;
final int node = x;
- while ((x != root) && (color[getParent(x)] == red)) {
+ while ((x != this.root) && (this.color[getParent(x)] == red)) {
final int parent_x = getParent(x);
final int parent_parent_x = getParent(parent_x);
if (parent_x == getLeft(parent_parent_x)) {
final int y = getRight(parent_parent_x);
- if (color[y] == red) {
- color[parent_x] = black;
- color[y] = black;
- color[parent_parent_x] = red;
+ if (this.color[y] == red) {
+ this.color[parent_x] = black;
+ this.color[y] = black;
+ this.color[parent_parent_x] = red;
x = parent_parent_x;
} else {
if (x == getRight(parent_x)) {
@@ -456,17 +456,17 @@ public class IntArrayRBT extends IntArrayRBTcommon {
leftRotate(x);
}
final int parent2_x = getParent(x);
- color[parent2_x] = black;
+ this.color[parent2_x] = black;
final int parent2_parent2_x = getParent(parent2_x);
- color[parent2_parent2_x] = red;
+ this.color[parent2_parent2_x] = red;
rightRotate(parent2_parent2_x);
}
} else {
final int y = getLeft(parent_parent_x);
- if (color[y] == red) {
- color[parent_x] = black;
- color[y] = black;
- color[parent_parent_x] = red;
+ if (this.color[y] == red) {
+ this.color[parent_x] = black;
+ this.color[y] = black;
+ this.color[parent_parent_x] = red;
x = parent_parent_x;
} else {
if (x == getLeft(parent_x)) {
@@ -474,14 +474,14 @@ public class IntArrayRBT extends IntArrayRBTcommon {
rightRotate(x);
}
final int parent2_x = getParent(x);
- color[parent2_x] = black;
+ this.color[parent2_x] = black;
final int parent2_parent2_x = getParent(parent2_x);
- color[parent2_parent2_x] = red;
+ this.color[parent2_parent2_x] = red;
leftRotate(parent2_parent2_x);
}
}
}
- color[root] = black;
+ this.color[this.root] = black;
return node;
}
@@ -508,7 +508,7 @@ public class IntArrayRBT extends IntArrayRBTcommon {
return false;
}
deleteNode(node);
- --size;
+ --this.size;
if (size == 0 && next > multiplication_limit) {
flush(); // recover space
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntArrayRBTcommon.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntArrayRBTcommon.java
index c7f935139..ce7d05602 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntArrayRBTcommon.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntArrayRBTcommon.java
@@ -194,18 +194,18 @@ public class IntArrayRBTcommon {
protected void setupArrays() {
// Init the arrays.
klrp = new int[initialSize << 2];
- color = new boolean[initialSize];
+ this.color = new boolean[initialSize];
setLeft(NIL, NIL);
setRight(NIL, NIL);
setParent(NIL, NIL);
- color[NIL] = black;
+ this.color[NIL] = black;
}
protected void initVars() {
- root = NIL;
- greatestNode = NIL;
- next = 1;
- size = 0;
+ this.root = NIL;
+ this.greatestNode = NIL;
+ this.next = 1;
+ this.size = 0;
}
public void flush() {
@@ -218,7 +218,7 @@ public class IntArrayRBTcommon {
}
public final int size() {
- return size;
+ return this.size;
}
//@formatter:off
@@ -324,28 +324,28 @@ public class IntArrayRBTcommon {
}
}
}
- if (next >= lenKlrp) {
- ensureCapacityKlrp(next + 1);
+ if (this.next >= lenKlrp) {
+ ensureCapacityKlrp(this.next + 1);
}
- if (next >= color.length) {
- color = ensureBooleanArraySize(color, next + 1);
+ if (this.next >= this.color.length) {
+ this.color = ensureBooleanArraySize(this.color, this.next + 1);
}
// assert(key.length > next);
- final int z = next;
- ++next;
- ++size;
+ final int z = this.next;
+ ++this.next;
+ ++this.size;
setKey(z, k);
setLeft(z, NIL);
setRight(z, NIL);
- color[z] = red;
+ this.color[z] = red;
return z;
}
protected final void setAsRoot(int x) {
- root = x;
- setParent(root, NIL);
+ this.root = x;
+ setParent(this.root, NIL);
}
/**
@@ -360,13 +360,13 @@ public class IntArrayRBTcommon {
if (debug) {
System.out.format("expanding array from to %,d to %,d%n", array.length, newSize);
}
- return IntArrayUtils.ensure_size(array, newSize, growth_factor, multiplication_limit);
+ return IntArrayUtils.ensure_size(array, newSize, this.growth_factor, this.multiplication_limit);
}
// times 32 to have the same tuning for expanding that int arrays do, for booleans
private final boolean[] ensureBooleanArraySize(boolean[] array, int newSize) {
- return IntArrayUtils.ensure_size(array, newSize, growth_factor,
- multiplication_limit * 32);
+ return IntArrayUtils.ensure_size(array, newSize, this.growth_factor,
+ this.multiplication_limit * 32);
}
protected final void leftRotate(final int x) {
@@ -377,7 +377,7 @@ public class IntArrayRBTcommon {
setParent(left_of_y, x);
}
setParent(y, getParent(x));
- if (root == x) {
+ if (this.root == x) {
setAsRoot(y);
} else {
final int parent_x = getParent(x);
@@ -400,7 +400,7 @@ public class IntArrayRBTcommon {
}
final int parent_x = getParent(x);
setParent(y, parent_x);
- if (root == x) {
+ if (this.root == x) {
setAsRoot(y);
} else {
if (x == getRight(parent_x)) {
@@ -419,7 +419,7 @@ public class IntArrayRBTcommon {
* @return the first node such that k = key[node].
*/
public int findKey(final int k) {
- return findKeyDown(k, root);
+ return findKeyDown(k, this.root);
}
protected int findKeyDown(final int k, int node) {
@@ -458,7 +458,7 @@ public class IntArrayRBTcommon {
}
public int findInsertionPointCmn(final int k, boolean moveToLeftmost) {
- int node = root;
+ int node = this.root;
int found = node;
int cr = 0;
@@ -500,10 +500,10 @@ public class IntArrayRBTcommon {
// internal use, public to access by internal routine in another package
public final int getFirstNode() {
- if (root == NIL) {
+ if (this.root == NIL) {
return NIL;
}
- int node = root;
+ int node = this.root;
while (true) {
final int left_node = getLeft(node);
if (left_node == NIL) {
@@ -540,7 +540,7 @@ public class IntArrayRBTcommon {
}
while (true) {
- if (node == root) { // if initial node is the root, can't go up.
+ if (node == this.root) { // if initial node is the root, can't go up.
return NIL;
}
final int parentNode = getParent(node); // guaranteed parentNode not NIL because it's tested
@@ -549,7 +549,7 @@ public class IntArrayRBTcommon {
if (node != nextNode) {
return parentNode;
}
- if (parentNode == root) {
+ if (parentNode == this.root) {
return NIL;
}
node = parentNode;
@@ -585,7 +585,7 @@ public class IntArrayRBTcommon {
// this means the parent node's right child is this previous node.
while (true) {
- if (node == root) { // if initial node is the root, can't go up.
+ if (node == this.root) { // if initial node is the root, can't go up.
return NIL;
}
final int parentNode = getParent(node); // guaranteed parentNode not NIL because it's tested
@@ -621,11 +621,11 @@ public class IntArrayRBTcommon {
final int y = ((getLeft(z) == NIL) || (getRight(z) == NIL)) ? z : nextNode(z);
- if (y == greatestNode) {
+ if (y == this.greatestNode) {
if (y == z) {
- greatestNode = previousNode(z);
+ this.greatestNode = previousNode(z);
} else {
- greatestNode = z;
+ this.greatestNode = z;
}
}
@@ -654,66 +654,66 @@ public class IntArrayRBTcommon {
if (y != z) {
setKey(z, getKey(y));
}
- if (color[y] == black) {
+ if (this.color[y] == black) {
deleteFixup(x);
}
}
protected void deleteFixup(int x) {
int w;
- while ((x != root) && (color[x] == black)) {
+ while ((x != this.root) && (this.color[x] == black)) {
final int parent_x = getParent(x);
if (x == getLeft(parent_x)) {
w = getRight(parent_x);
- if (color[w] == red) {
- color[w] = black;
- color[parent_x] = red;
+ if (this.color[w] == red) {
+ this.color[w] = black;
+ this.color[parent_x] = red;
leftRotate(parent_x);
w = getRight(parent_x);
}
- if ((color[getLeft(w)] == black) && (color[getRight(w)] == black)) {
- color[w] = red;
+ if ((this.color[getLeft(w)] == black) && (this.color[getRight(w)] == black)) {
+ this.color[w] = red;
x = parent_x;
} else {
- if (color[getRight(w)] == black) {
- color[getLeft(w)] = black;
- color[w] = red;
+ if (this.color[getRight(w)] == black) {
+ this.color[getLeft(w)] = black;
+ this.color[w] = red;
rightRotate(w);
w = getRight(parent_x);
}
- color[w] = color[parent_x];
- color[parent_x] = black;
- color[getRight(w)] = black;
+ this.color[w] = this.color[parent_x];
+ this.color[parent_x] = black;
+ this.color[getRight(w)] = black;
leftRotate(parent_x);
- x = root;
+ x = this.root;
}
} else {
w = getLeft(parent_x);
- if (color[w] == red) {
- color[w] = black;
- color[parent_x] = red;
+ if (this.color[w] == red) {
+ this.color[w] = black;
+ this.color[parent_x] = red;
rightRotate(parent_x);
w = getLeft(parent_x);
}
- if ((color[getLeft(w)] == black) && (color[getRight(w)] == black)) {
- color[w] = red;
+ if ((this.color[getLeft(w)] == black) && (this.color[getRight(w)] == black)) {
+ this.color[w] = red;
x = getParent(x);
} else {
- if (color[getLeft(w)] == black) {
- color[getRight(w)] = black;
- color[w] = red;
+ if (this.color[getLeft(w)] == black) {
+ this.color[getRight(w)] = black;
+ this.color[w] = red;
leftRotate(w);
w = getLeft(getParent(x));
}
- color[w] = color[parent_x];
- color[parent_x] = black;
- color[getLeft(w)] = black;
+ this.color[w] = this.color[parent_x];
+ this.color[parent_x] = black;
+ this.color[getLeft(w)] = black;
rightRotate(parent_x);
- x = root;
+ x = this.root;
}
}
}
- color[x] = black;
+ this.color[x] = black;
}
protected int compare(int v1, int v2) {
@@ -725,23 +725,23 @@ public class IntArrayRBTcommon {
public boolean satisfiesRedBlackProperties() {
// Compute depth of black nodes.
- int node = root;
+ int node = this.root;
int blackDepth = 0;
while (node != NIL) {
- if (color[node] == black) {
+ if (this.color[node] == black) {
++blackDepth;
}
node = getLeft(node);
}
- return satisfiesRBProps(root, blackDepth, 0);
+ return satisfiesRBProps(this.root, blackDepth, 0);
}
protected boolean satisfiesRBProps(int node, final int blackDepth, int currentBlack) {
if (node == NIL) {
return (currentBlack == blackDepth);
}
- if (color[node] == red) {
- if (color[getLeft(node)] == red || color[getRight(node)] == red) {
+ if (this.color[node] == red) {
+ if (this.color[getLeft(node)] == red || this.color[getRight(node)] == red) {
return false;
}
} else {
@@ -752,15 +752,15 @@ public class IntArrayRBTcommon {
}
public int maxDepth() {
- return maxDepth(root, 0);
+ return maxDepth(this.root, 0);
}
public int minDepth() {
- return minDepth(root, 0);
+ return minDepth(this.root, 0);
}
public int nodeDepth(int k) {
- return nodeDepth(root, 1, k);
+ return nodeDepth(this.root, 1, k);
}
protected int nodeDepth(int node, int depth, int k) {
@@ -795,12 +795,12 @@ public class IntArrayRBTcommon {
}
public final void printKeys() {
- if (size() == 0) {
+ if (this.size() == 0) {
System.out.println("Tree is empty.");
return;
}
StringBuilder buf = new StringBuilder();
- printKeys(root, 0, buf);
+ printKeys(this.root, 0, buf);
System.out.println(buf);
}
@@ -812,7 +812,7 @@ public class IntArrayRBTcommon {
}
StringUtils.printSpaces(offset, buf);
buf.append(Integer.toString(getKey(node)));
- if (color[node] == black) {
+ if (this.color[node] == black) {
buf.append(" BLACK");
}
buf.append('\n');
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRBTArray.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRBTArray.java
index ba3a57262..651dea360 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRBTArray.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRBTArray.java
@@ -84,7 +84,7 @@ public class IntRBTArray {
* The array containing the search tree.
*/
public IntRBTArray(int[] array, int start) {
- offset = start;
+ this.offset = start;
this.array = array;
}
@@ -104,7 +104,7 @@ public class IntRBTArray {
* @return The internal array.
*/
public int[] toArray() {
- return array;
+ return this.array;
}
/**
@@ -114,7 +114,7 @@ public class IntRBTArray {
* the address.
*/
public void setRootAddress(int start) {
- offset = start;
+ this.offset = start;
}
/**
@@ -129,7 +129,7 @@ public class IntRBTArray {
public int get(int i) throws NoSuchElementException {
int pos = getPosition(i);
if (pos >= 0) {
- return array[pos];
+ return this.array[pos];
}
throw new NoSuchElementException();
}
@@ -148,15 +148,15 @@ public class IntRBTArray {
public int getPosition(int i) throws NoSuchElementException {
// See the comments about the memory layout of the array at the
// top of the file.
- int current = offset;
- if (array == null || array.length < (current + 3)) {
+ int current = this.offset;
+ if (this.array == null || this.array.length < (current + 3)) {
return -1;
}
int key;
int dtrCode;
- while (current >= 0 && array.length >= (current + 3)) {
- key = array[current];
- dtrCode = array[current + 2];
+ while (current >= 0 && this.array.length >= (current + 3)) {
+ key = this.array[current];
+ dtrCode = this.array[current + 2];
if (key > i) {
switch (dtrCode) {
case TERMINAL:
@@ -180,10 +180,10 @@ public class IntRBTArray {
current += 3;
break;
case TWODTRS:
- if ((current + 3) > array.length) {
+ if ((current + 3) > this.array.length) {
return -1;
}
- current = array[current + 3];
+ current = this.array[current + 3];
break;
}
} else { // key == i
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRBTNode.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRBTNode.java
index c26508eb3..7810f1afc 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRBTNode.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRBTNode.java
@@ -199,41 +199,41 @@ class IntRBTNode {
/** Left rotation, used to keep the tree balanced. See CLR. */
private final void leftRotate(IntRedBlackTree tree) {
- IntRBTNode y = right;
- right = y.left;
+ IntRBTNode y = this.right;
+ this.right = y.left;
if (y.left != null) {
y.left.parent = this;
}
- y.parent = parent;
- if (parent == null) {
+ y.parent = this.parent;
+ if (this.parent == null) {
tree.root = y;
- } else if (this == parent.left) {
- parent.left = y;
+ } else if (this == this.parent.left) {
+ this.parent.left = y;
} else {
- parent.right = y;
+ this.parent.right = y;
}
y.left = this;
- parent = y;
+ this.parent = y;
return;
}
/** Right rotation, used to keep the tree balanced. See CLR. */
private final void rightRotate(IntRedBlackTree tree) {
- IntRBTNode y = left;
- left = y.right;
+ IntRBTNode y = this.left;
+ this.left = y.right;
if (y.right != null) {
y.right.parent = this;
}
- y.parent = parent;
- if (parent == null) {
+ y.parent = this.parent;
+ if (this.parent == null) {
tree.root = y;
- } else if (this == parent.right) {
- parent.right = y;
+ } else if (this == this.parent.right) {
+ this.parent.right = y;
} else {
- parent.left = y;
+ this.parent.left = y;
}
y.right = this;
- parent = y;
+ this.parent = y;
return;
}
@@ -465,13 +465,13 @@ class IntRBTNode {
*/
int keys(int pos, int[] keys) {
int cur = pos;
- if (left != null) {
- cur = left.keys(cur, keys);
+ if (this.left != null) {
+ cur = this.left.keys(cur, keys);
}
- keys[cur] = key;
+ keys[cur] = this.key;
++cur;
- if (right != null) {
- cur = right.keys(cur, keys);
+ if (this.right != null) {
+ cur = this.right.keys(cur, keys);
}
return cur;
}
@@ -563,19 +563,19 @@ class IntRBTNode {
for (int i = 0; i < indent; i++) {
System.out.print(' ');
}
- System.out.print(key);
+ System.out.print(this.key);
System.out.print(':');
- if (color == RED) {
+ if (this.color == RED) {
System.out.println("red");
} else {
System.out.println("black");
}
indent += indentInc;
- if (left != null) {
- left.printKeys(indent);
+ if (this.left != null) {
+ this.left.printKeys(indent);
}
- if (right != null) {
- right.printKeys(indent);
+ if (this.right != null) {
+ this.right.printKeys(indent);
}
return;
}
@@ -585,13 +585,13 @@ class IntRBTNode {
for (int i = 0; i < indent; i++) {
System.out.print(' ');
}
- System.out.println(element);
+ System.out.println(this.element);
indent += indentInc;
- if (left != null) {
- left.printElements(indent);
+ if (this.left != null) {
+ this.left.printElements(indent);
}
- if (right != null) {
- right.printElements(indent);
+ if (this.right != null) {
+ this.right.printElements(indent);
}
return;
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRedBlackTree.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRedBlackTree.java
index de21d279d..ad4382c69 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRedBlackTree.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRedBlackTree.java
@@ -49,7 +49,7 @@ public class IntRedBlackTree {
}
public final int size() {
- return size;
+ return this.size;
}
// ////////////////////////////////////////////////////////////////
@@ -57,16 +57,16 @@ public class IntRedBlackTree {
// ////////////////////////////////////////////////////////////////
public final void clear() {
- root = null;
- size = 0;
+ this.root = null;
+ this.size = 0;
}
public final boolean containsKey(int key) {
- return (IntRBTNode.find(root, key) == null) ? false : true;
+ return (IntRBTNode.find(this.root, key) == null) ? false : true;
}
public final boolean containsValue(int o) {
- IntRBTIterator it = iterator();
+ IntRBTIterator it = this.iterator();
while (it.hasNext()) {
if (o == it.next()) {
return true;
@@ -87,7 +87,7 @@ public class IntRedBlackTree {
*/
public final boolean put(int key, int el) {
if (put(new IntRBTNode(key, el))) {
- size++;
+ this.size++;
return true;
}
return false;
@@ -101,11 +101,11 @@ public class IntRedBlackTree {
* @return -
*/
public final int remove(int key) throws java.util.NoSuchElementException {
- IntRBTNode node = IntRBTNode.find(root, key);
+ IntRBTNode node = IntRBTNode.find(this.root, key);
int ret;
if (node != null) {
ret = node.element;
- size--;
+ this.size--;
IntRBTNode.delete(this, node);
} else {
throw new java.util.NoSuchElementException();
@@ -114,10 +114,10 @@ public class IntRedBlackTree {
}
public final int get(int key) throws java.util.NoSuchElementException {
- if (root == null) {
+ if (this.root == null) {
throw new java.util.NoSuchElementException();
}
- IntRBTNode node = IntRBTNode.find(root, key);
+ IntRBTNode node = IntRBTNode.find(this.root, key);
if (node == null) {
throw new java.util.NoSuchElementException();
}
@@ -125,13 +125,13 @@ public class IntRedBlackTree {
}
public final boolean isEmpty() {
- return (root == null);
+ return (this.root == null);
}
public final int[] keySet() {
- int[] set = new int[size];
- if (root != null) {
- root.keys(0, set);
+ int[] set = new int[this.size];
+ if (this.root != null) {
+ this.root.keys(0, set);
}
return set;
}
@@ -142,14 +142,14 @@ public class IntRedBlackTree {
}
public final int getFirst() {
- return getFirstNode().element;
+ return this.getFirstNode().element;
}
private final IntRBTNode getFirstNode() {
- if (root == null) {
+ if (this.root == null) {
return null;
}
- IntRBTNode x = root;
+ IntRBTNode x = this.root;
while (x.left != null) {
x = x.left;
}
@@ -165,19 +165,19 @@ public class IntRedBlackTree {
IntRBTNode current;
IntRBTIterator(IntRedBlackTree tree) {
- current = tree.getFirstNode();
+ this.current = tree.getFirstNode();
}
public boolean hasNext() {
- return (current != null);
+ return (this.current != null);
}
public int next() {
- if (current == null) {
+ if (this.current == null) {
throw new java.util.NoSuchElementException();
}
- int ret = current.element;
- current = current.successor();
+ int ret = this.current.element;
+ this.current = this.current.successor();
return ret;
}
@@ -188,10 +188,10 @@ public class IntRedBlackTree {
/** Debugging aid. */
public void printKeys() {
- if (root != null) {
- root.printKeys(0);
+ if (this.root != null) {
+ this.root.printKeys(0);
}
- System.out.println("Size: " + size);
+ System.out.println("Size: " + this.size);
}
/**
@@ -209,10 +209,10 @@ public class IntRedBlackTree {
* @return The resulting array representation.
*/
public int[] toArray(int offset) {
- if (root == null) {
+ if (this.root == null) {
return Constants.EMPTY_INT_ARRAY;
}
- return root.toArray(offset);
+ return this.root.toArray(offset);
}
public IntRedBlackTree copy() {
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RBTKeyValuePair.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RBTKeyValuePair.java
index 2e010c178..2249cf7bb 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RBTKeyValuePair.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RBTKeyValuePair.java
@@ -38,11 +38,11 @@ public class RBTKeyValuePair {
}
public int getKey() {
- return key;
+ return this.key;
}
public Object getValue() {
- return value;
+ return this.value;
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RBTNode.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RBTNode.java
index 8d7f4a4bb..a18bec2f2 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RBTNode.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RBTNode.java
@@ -199,41 +199,41 @@ class RBTNode<T> {
/** Left rotation, used to keep the tree balanced. See CLR. */
private final void leftRotate(RedBlackTree<T> tree) {
- RBTNode<T> y = right;
- right = y.left;
+ RBTNode<T> y = this.right;
+ this.right = y.left;
if (y.left != null) {
y.left.parent = this;
}
- y.parent = parent;
- if (parent == null) {
+ y.parent = this.parent;
+ if (this.parent == null) {
tree.root = y;
- } else if (this == parent.left) {
- parent.left = y;
+ } else if (this == this.parent.left) {
+ this.parent.left = y;
} else {
- parent.right = y;
+ this.parent.right = y;
}
y.left = this;
- parent = y;
+ this.parent = y;
return;
}
/** Right rotation, used to keep the tree balanced. See CLR. */
private final void rightRotate(RedBlackTree<T> tree) {
- RBTNode<T> y = left;
- left = y.right;
+ RBTNode<T> y = this.left;
+ this.left = y.right;
if (y.right != null) {
y.right.parent = this;
}
- y.parent = parent;
- if (parent == null) {
+ y.parent = this.parent;
+ if (this.parent == null) {
tree.root = y;
- } else if (this == parent.right) {
- parent.right = y;
+ } else if (this == this.parent.right) {
+ this.parent.right = y;
} else {
- parent.left = y;
+ this.parent.left = y;
}
y.right = this;
- parent = y;
+ this.parent = y;
return;
}
@@ -467,13 +467,13 @@ class RBTNode<T> {
*/
int keys(int pos, int[] keys) {
int cur = pos;
- if (left != null) {
- cur = left.keys(cur, keys);
+ if (this.left != null) {
+ cur = this.left.keys(cur, keys);
}
- keys[cur] = key;
+ keys[cur] = this.key;
++cur;
- if (right != null) {
- cur = right.keys(cur, keys);
+ if (this.right != null) {
+ cur = this.right.keys(cur, keys);
}
return cur;
}
@@ -508,19 +508,19 @@ class RBTNode<T> {
for (int i = 0; i < indent; i++) {
System.out.print(' ');
}
- System.out.print(key);
+ System.out.print(this.key);
System.out.print(':');
- if (color == RED) {
+ if (this.color == RED) {
System.out.println("red");
} else {
System.out.println("black");
}
indent += indentInc;
- if (left != null) {
- left.printKeys(indent);
+ if (this.left != null) {
+ this.left.printKeys(indent);
}
- if (right != null) {
- right.printKeys(indent);
+ if (this.right != null) {
+ this.right.printKeys(indent);
}
return;
}
@@ -530,26 +530,26 @@ class RBTNode<T> {
for (int i = 0; i < indent; i++) {
System.out.print(' ');
}
- System.out.println(element.toString());
+ System.out.println(this.element.toString());
indent += indentInc;
- if (left != null) {
- left.printElements(indent);
+ if (this.left != null) {
+ this.left.printElements(indent);
}
- if (right != null) {
- right.printElements(indent);
+ if (this.right != null) {
+ this.right.printElements(indent);
}
return;
}
void getBinaryTree(BinaryTree tree) {
- tree.setValue(new RBTKeyValuePair(key, element));
- if (left != null) {
+ tree.setValue(new RBTKeyValuePair(this.key, this.element));
+ if (this.left != null) {
BinaryTree newLeft = tree.newLeftDtr();
- left.getBinaryTree(newLeft);
+ this.left.getBinaryTree(newLeft);
}
- if (right != null) {
+ if (this.right != null) {
BinaryTree newRight = tree.newRightDtr();
- right.getBinaryTree(newRight);
+ this.right.getBinaryTree(newRight);
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RedBlackTree.java b/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RedBlackTree.java
index 4f3152220..d33381f00 100644
--- a/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RedBlackTree.java
+++ b/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RedBlackTree.java
@@ -73,7 +73,7 @@ public class RedBlackTree<T> implements Iterable<T> {
* @return The number of key/value pairs in the tree.
*/
public final int size() {
- return size;
+ return this.size;
}
// //////////////////////////////////////////////////////////////////
@@ -84,8 +84,8 @@ public class RedBlackTree<T> implements Iterable<T> {
* Remove all elements from the tree.
*/
public final void clear() {
- root = null;
- size = 0;
+ this.root = null;
+ this.size = 0;
}
/**
@@ -96,7 +96,7 @@ public class RedBlackTree<T> implements Iterable<T> {
* @return <code>true</code>, if key is defined; <code>false</code>, else.
*/
public final boolean containsKey(int key) {
- return (RBTNode.find(root, key) == null) ? false : true;
+ return (RBTNode.find(this.root, key) == null) ? false : true;
}
/**
@@ -129,7 +129,7 @@ public class RedBlackTree<T> implements Iterable<T> {
*/
public final boolean put(int key, T el) {
if (put(new RBTNode<>(key, el))) {
- size++;
+ this.size++;
return true;
}
return false;
@@ -143,11 +143,11 @@ public class RedBlackTree<T> implements Iterable<T> {
* @return -
*/
public final T remove(int key) {
- RBTNode<T> node = RBTNode.find(root, key);
+ RBTNode<T> node = RBTNode.find(this.root, key);
T ret = null;
if (node != null) {
ret = node.element;
- size--;
+ this.size--;
RBTNode.delete(this, node);
}
return ret;
@@ -164,10 +164,10 @@ public class RedBlackTree<T> implements Iterable<T> {
* @return The corresponding element, or <code>null</code> if key is not defined.
*/
public final T get(int key) {
- if (root == null) {
+ if (this.root == null) {
return null;
}
- RBTNode<T> node = RBTNode.find(root, key);
+ RBTNode<T> node = RBTNode.find(this.root, key);
if (node == null) {
return null;
}
@@ -180,7 +180,7 @@ public class RedBlackTree<T> implements Iterable<T> {
* @return <code>true</code> if map is empty; <code>false</code>, else.
*/
public final boolean isEmpty() {
- return (root == null);
+ return (this.root == null);
}
/**
@@ -189,9 +189,9 @@ public class RedBlackTree<T> implements Iterable<T> {
* @return A sorted array of the keys.
*/
public final int[] keySet() {
- int[] set = new int[size];
- if (root != null) {
- root.keys(0, set);
+ int[] set = new int[this.size];
+ if (this.root != null) {
+ this.root.keys(0, set);
}
return set;
}
@@ -209,10 +209,10 @@ public class RedBlackTree<T> implements Iterable<T> {
}
private final RBTNode<T> getFirstNode() {
- if (root == null) {
+ if (this.root == null) {
return null;
}
- RBTNode<T> x = root;
+ RBTNode<T> x = this.root;
while (x.left != null) {
x = x.left;
}
@@ -234,21 +234,21 @@ public class RedBlackTree<T> implements Iterable<T> {
RBTNode<T> current;
RBTIterator(RedBlackTree<T> tree) {
- current = tree.getFirstNode();
+ this.current = tree.getFirstNode();
}
@Override
public boolean hasNext() {
- return (current != null);
+ return (this.current != null);
}
@Override
public T next() {
- if (current == null) {
+ if (this.current == null) {
throw new java.util.NoSuchElementException();
}
- T ret = current.element;
- current = current.successor();
+ T ret = this.current.element;
+ this.current = this.current.successor();
return ret;
}
@@ -263,11 +263,11 @@ public class RedBlackTree<T> implements Iterable<T> {
* (RBTKeyValuePair).
*/
public BinaryTree getBinaryTree() {
- if (root == null) {
+ if (this.root == null) {
return null;
}
BinaryTree tree = new BinaryTree();
- root.getBinaryTree(tree);
+ this.root.getBinaryTree(tree);
return tree;
}
@@ -281,10 +281,10 @@ public class RedBlackTree<T> implements Iterable<T> {
/** Debugging aid. */
public void printKeys() {
- if (root != null) {
- root.printKeys(0);
+ if (this.root != null) {
+ this.root.printKeys(0);
}
- System.out.println("Size: " + size);
+ System.out.println("Size: " + this.size);
}
public static void main(String[] args) {
diff --git a/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java b/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java
index c2546f1c8..ac9408f8b 100644
--- a/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java
+++ b/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java
@@ -291,7 +291,7 @@ public interface JCas extends AbstractCas {
*/
@Deprecated
default StringArray getStringArray0L() {
- return getCas().emptyStringArray();
+ return this.getCas().emptyStringArray();
}
/**
@@ -303,7 +303,7 @@ public interface JCas extends AbstractCas {
* @return 0-length instance of a StringArray
*/
default StringArray emptyStringArray() {
- return getCas().emptyStringArray();
+ return this.getCas().emptyStringArray();
}
/**
@@ -317,7 +317,7 @@ public interface JCas extends AbstractCas {
*/
@Deprecated
default IntegerArray getIntegerArray0L() {
- return getCas().emptyIntegerArray();
+ return this.getCas().emptyIntegerArray();
}
/**
@@ -329,7 +329,7 @@ public interface JCas extends AbstractCas {
* @return 0-length instance of an IntegerArray
*/
default IntegerArray emptyIntegerArray() {
- return getCas().emptyIntegerArray();
+ return this.getCas().emptyIntegerArray();
}
/**
@@ -343,7 +343,7 @@ public interface JCas extends AbstractCas {
*/
@Deprecated
default FloatArray getFloatArray0L() {
- return getCas().emptyFloatArray();
+ return this.getCas().emptyFloatArray();
}
/**
@@ -355,7 +355,7 @@ public interface JCas extends AbstractCas {
* @return 0-length instance of a FloatArray
*/
default FloatArray emptyFloatArray() {
- return getCas().emptyFloatArray();
+ return this.getCas().emptyFloatArray();
}
/**
@@ -371,7 +371,7 @@ public interface JCas extends AbstractCas {
*/
@Deprecated
default FSArray getFSArray0L() {
- return getCas().emptyFSArray();
+ return this.getCas().emptyFSArray();
}
/**
@@ -385,7 +385,7 @@ public interface JCas extends AbstractCas {
* @return 0-length instance of a FSArray
*/
default FSArray emptyFSArray() {
- return getCas().emptyFSArray();
+ return this.getCas().emptyFSArray();
}
/**
@@ -403,7 +403,7 @@ public interface JCas extends AbstractCas {
* the particular FeatureStructure type
*/
default <T extends TOP> FSArray<T> emptyFSArray(Class<T> clazz) {
- return getCas().emptyFSArray(((JCasImpl) this).getCasType(clazz));
+ return this.getCas().emptyFSArray(((JCasImpl) this).getCasType(clazz));
}
/**
@@ -415,7 +415,7 @@ public interface JCas extends AbstractCas {
* @return 0-length instance of a ByteArray
*/
default ByteArray emptyByteArray() {
- return getCas().emptyByteArray();
+ return this.getCas().emptyByteArray();
}
/**
@@ -427,7 +427,7 @@ public interface JCas extends AbstractCas {
* @return 0-length instance of a ShortArray
*/
default ShortArray emptyShortArray() {
- return getCas().emptyShortArray();
+ return this.getCas().emptyShortArray();
}
/**
@@ -439,7 +439,7 @@ public interface JCas extends AbstractCas {
* @return 0-length instance of a LongArray
*/
default LongArray emptyLongArray() {
- return getCas().emptyLongArray();
+ return this.getCas().emptyLongArray();
}
/**
@@ -451,7 +451,7 @@ public interface JCas extends AbstractCas {
* @return 0-length instance of a DoubleArray
*/
default DoubleArray emptyDoubleArray() {
- return getCas().emptyDoubleArray();
+ return this.getCas().emptyDoubleArray();
}
/**
@@ -463,7 +463,7 @@ public interface JCas extends AbstractCas {
* @return 0-length instance of a DoubleArray
*/
default BooleanArray emptyBooleanArray() {
- return getCas().emptyBooleanArray();
+ return this.getCas().emptyBooleanArray();
}
/**
@@ -920,7 +920,7 @@ public interface JCas extends AbstractCas {
* of the specified type (including subtypes)
*/
default <T extends TOP> Collection<T> getIndexedFSs(Type type) {
- return getIndexRepository().getIndexedFSs(type);
+ return this.getIndexRepository().getIndexedFSs(type);
}
/**
@@ -935,7 +935,7 @@ public interface JCas extends AbstractCas {
* of the specified type (including subtypes)
*/
default <T extends TOP> Collection<T> getIndexedFSs(Class<T> clazz) {
- return getIndexRepository().getIndexedFSs(clazz);
+ return this.getIndexRepository().getIndexedFSs(clazz);
}
/**
@@ -946,7 +946,7 @@ public interface JCas extends AbstractCas {
* of the specified type (including subtypes)
*/
default Collection<TOP> getIndexedFSs() {
- return getIndexRepository().getIndexedFSs();
+ return this.getIndexRepository().getIndexedFSs();
}
/**
@@ -1097,7 +1097,7 @@ public interface JCas extends AbstractCas {
* @return - the shared (in this CAS) instance of the empty list (immutable)
*/
default <T extends TOP> EmptyList emptyList(Class<T> clazz) {
- return getCasImpl().emptyListFromTypeCode(((TypeImpl) getCasType(clazz)).getCode());
+ return this.getCasImpl().emptyListFromTypeCode(((TypeImpl) getCasType(clazz)).getCode());
}
/**
@@ -1138,6 +1138,6 @@ public interface JCas extends AbstractCas {
* @return a shared (in this CAS) instance of the empty array (immutable)
*/
default <T extends TOP> CommonArrayFS emptyArray(Class<T> clazz) {
- return getCasImpl().emptyArray(getCasType(clazz));
+ return this.getCasImpl().emptyArray(getCasType(clazz));
}
}
\ No newline at end of file
diff --git a/uimaj-core/src/main/java/org/apache/uima/jcas/cas/CommonList.java b/uimaj-core/src/main/java/org/apache/uima/jcas/cas/CommonList.java
index 0d9803af6..a064f2983 100644
--- a/uimaj-core/src/main/java/org/apache/uima/jcas/cas/CommonList.java
+++ b/uimaj-core/src/main/java/org/apache/uima/jcas/cas/CommonList.java
@@ -276,7 +276,11 @@ public interface CommonList extends FeatureStructure {
CommonList curNode = this;
while (curNode != null) {
- if ((curNode instanceof EmptyList) || !visited.add(curNode)) {
+ if (curNode instanceof EmptyList) {
+ break; // would be the end element.
+ }
+
+ if (!visited.add(curNode)) {
break; // hit loop
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArrayList.java b/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArrayList.java
index 8ee2880b2..5f6a60d0e 100644
--- a/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArrayList.java
+++ b/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArrayList.java
@@ -294,7 +294,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.lang.Iterable#forEach(java.util.function.Consumer)
*/
- @Override
public void forEach(Consumer<? super T> action) {
baseItems.forEach(item -> {
T pearedItem = _maybeGetPearFs((T) item);
@@ -305,7 +304,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.List#size()
*/
- @Override
public int size() {
return baseItems.size();
}
@@ -313,7 +311,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.List#isEmpty()
*/
- @Override
public boolean isEmpty() {
return baseItems.isEmpty();
}
@@ -321,7 +318,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.List#contains(java.lang.Object)
*/
- @Override
public boolean contains(Object o) {
return (o instanceof TOP)
? baseItems.contains(_maybeGetBaseForPearFs((TOP)o))
@@ -331,7 +327,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.List#iterator()
*/
- @Override
public Iterator<T> iterator() {
return new Iterator<T>() {
@@ -340,7 +335,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.Iterator#hasNext()
*/
- @Override
public boolean hasNext() {
return outerIt.hasNext();
}
@@ -348,7 +342,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.Iterator#next()
*/
- @Override
public T next() {
return _maybeGetPearFs(outerIt.next());
}
@@ -359,7 +352,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.List#toArray()
*/
- @Override
public Object[] toArray() {
Object[] a = baseItems.toArray();
FSArrayList.this._casView.swapInPearVersion(a);
@@ -369,7 +361,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.List#toArray(java.lang.Object[])
*/
- @Override
public <U> U[] toArray(U[] a) {
U[] aa = baseItems.toArray(a);
FSArrayList.this._casView.swapInPearVersion(aa);
@@ -379,7 +370,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.List#add(java.lang.Object)
*/
- @Override
public boolean add(T e) {
throw new UnsupportedOperationException();
}
@@ -387,7 +377,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.List#remove(java.lang.Object)
*/
- @Override
public boolean remove(Object o) {
throw new UnsupportedOperationException();
}
@@ -395,7 +384,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.List#containsAll(java.util.Collection)
*/
- @Override
public boolean containsAll(Collection<?> c) {
for (Object item : c) {
if (!contains(item)) {
@@ -408,7 +396,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.List#addAll(java.util.Collection)
*/
- @Override
public boolean addAll(Collection<? extends T> c) {
throw new UnsupportedOperationException();
}
@@ -416,7 +403,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.List#addAll(int, java.util.Collection)
*/
- @Override
public boolean addAll(int index, Collection<? extends T> c) {
throw new UnsupportedOperationException();
}
@@ -424,7 +410,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.List#removeAll(java.util.Collection)
*/
- @Override
public boolean removeAll(Collection<?> c) {
throw new UnsupportedOperationException();
}
@@ -432,7 +417,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.List#retainAll(java.util.Collection)
*/
- @Override
public boolean retainAll(Collection<?> c) {
throw new UnsupportedOperationException();
}
@@ -440,7 +424,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.List#replaceAll(java.util.function.UnaryOperator)
*/
- @Override
public void replaceAll(UnaryOperator<T> operator) {
for (int i = size() - 1; i >= 0; i--) {
baseItems.set(i, _maybeGetBaseForPearFs(
@@ -451,7 +434,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.Collection#removeIf(java.util.function.Predicate)
*/
- @Override
public boolean removeIf(Predicate<? super T> filter) {
throw new UnsupportedOperationException();
}
@@ -459,7 +441,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.List#sort(java.util.Comparator)
*/
- @Override
public void sort(Comparator<? super T> c) {
baseItems.sort((o1, o2) -> c.compare(_maybeGetPearFs(o1), _maybeGetPearFs(o2)));
}
@@ -467,7 +448,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.List#clear()
*/
- @Override
public void clear() {
throw new UnsupportedOperationException();
}
@@ -475,7 +455,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.List#equals(java.lang.Object)
*/
- @Override
public boolean equals(Object o) {
return baseItems.equals(o);
}
@@ -483,7 +462,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.List#hashCode()
*/
- @Override
public int hashCode() {
return baseItems.hashCode();
}
@@ -491,7 +469,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.List#get(int)
*/
- @Override
public T get(int index) {
return _maybeGetPearFs(baseItems.get(index));
}
@@ -499,7 +476,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.List#set(int, java.lang.Object)
*/
- @Override
public T set(int index, T element) {
return baseItems.set(index, _maybeGetBaseForPearFs(element));
}
@@ -507,7 +483,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.List#add(int, java.lang.Object)
*/
- @Override
public void add(int index, T element) {
throw new UnsupportedOperationException();
}
@@ -515,7 +490,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.Collection#stream()
*/
- @Override
public Stream<T> stream() {
return baseItems.stream().map(item -> _maybeGetPearFs(item));
}
@@ -523,7 +497,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.List#remove(int)
*/
- @Override
public T remove(int index) {
throw new UnsupportedOperationException();
}
@@ -531,7 +504,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.Collection#parallelStream()
*/
- @Override
public Stream<T> parallelStream() {
return baseItems.parallelStream().map(item -> _maybeGetPearFs(item));
}
@@ -539,7 +511,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.List#indexOf(java.lang.Object)
*/
- @Override
public int indexOf(Object o) {
return baseItems.indexOf((o instanceof TOP) ? _maybeGetBaseForPearFs((TOP)o) : o);
}
@@ -547,7 +518,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.List#lastIndexOf(java.lang.Object)
*/
- @Override
public int lastIndexOf(Object o) {
return baseItems.lastIndexOf((o instanceof TOP) ? _maybeGetBaseForPearFs((TOP)o) : o);
}
@@ -555,7 +525,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.List#listIterator()
*/
- @Override
public ListIterator<T> listIterator() {
return listIterator(0);
}
@@ -563,7 +532,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.List#listIterator(int)
*/
- @Override
public ListIterator<T> listIterator(int index) {
return new ListIterator<T>() {
@@ -572,7 +540,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.ListIterator#hasNext()
*/
- @Override
public boolean hasNext() {
return baseIt.hasNext();
}
@@ -581,7 +548,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
* @return
* @see java.util.ListIterator#next()
*/
- @Override
public T next() {
return _maybeGetPearFs(baseIt.next());
}
@@ -589,7 +555,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.ListIterator#hasPrevious()
*/
- @Override
public boolean hasPrevious() {
return baseIt.hasPrevious();
}
@@ -597,7 +562,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.Iterator#forEachRemaining(java.util.function.Consumer)
*/
- @Override
public void forEachRemaining(Consumer<? super T> action) {
baseIt.forEachRemaining(item -> action.accept(_maybeGetPearFs(item)));
}
@@ -606,7 +570,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
* @return
* @see java.util.ListIterator#previous()
*/
- @Override
public T previous() {
return baseIt.previous();
}
@@ -615,7 +578,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
* @return
* @see java.util.ListIterator#nextIndex()
*/
- @Override
public int nextIndex() {
return baseIt.nextIndex();
}
@@ -624,7 +586,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
* @return
* @see java.util.ListIterator#previousIndex()
*/
- @Override
public int previousIndex() {
return baseIt.previousIndex();
}
@@ -633,7 +594,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
*
* @see java.util.ListIterator#remove()
*/
- @Override
public void remove() {
throw new UnsupportedOperationException();
}
@@ -642,7 +602,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
* @param e
* @see java.util.ListIterator#set(java.lang.Object)
*/
- @Override
public void set(T e) {
baseIt.set(_maybeGetBaseForPearFs(e));
}
@@ -651,7 +610,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
* @param e
* @see java.util.ListIterator#add(java.lang.Object)
*/
- @Override
public void add(T e) {
throw new UnsupportedOperationException();
}
@@ -661,7 +619,6 @@ public class FSArrayList <T extends TOP> extends TOP implements
/*
* @see java.util.List#subList(int, int)
*/
- @Override
public List<T> subList(int fromIndex, int toIndex) {
return gl_read_pear(baseItems.subList(fromIndex, toIndex));
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSLinkedHashSet.java b/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSLinkedHashSet.java
index 933dc1444..b17a321df 100644
--- a/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSLinkedHashSet.java
+++ b/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSLinkedHashSet.java
@@ -61,6 +61,7 @@ public class FSLinkedHashSet <T extends TOP> extends FSHashSet<T> {
/** Never called. Disable default constructor
* @generated */
protected FSLinkedHashSet() {
+ super();
}
/** Internal - constructor used by generator
diff --git a/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSList.java b/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSList.java
index 79c4925d7..afcc3d704 100644
--- a/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSList.java
+++ b/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSList.java
@@ -74,7 +74,7 @@ public abstract class FSList<T extends TOP> extends TOP implements CommonList, I
@Override
public NonEmptyFSList<T> createNonEmptyNode() {
- return new NonEmptyFSList<>(_casView.getJCasImpl());
+ return new NonEmptyFSList<>(this._casView.getJCasImpl());
}
@Override
@@ -204,7 +204,7 @@ public abstract class FSList<T extends TOP> extends TOP implements CommonList, I
@Override
public EmptyFSList emptyList() {
- return _casView.emptyFSList();
+ return this._casView.emptyFSList();
}
public boolean contains(T v) {
diff --git a/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatList.java b/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatList.java
index f0b79585b..33e890fa5 100644
--- a/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatList.java
+++ b/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatList.java
@@ -57,7 +57,7 @@ public abstract class FloatList extends TOP implements CommonList, Iterable<Floa
@Override
public NonEmptyFloatList createNonEmptyNode() {
- return new NonEmptyFloatList(_casView.getJCasImpl());
+ return new NonEmptyFloatList(this._casView.getJCasImpl());
}
/**
@@ -83,7 +83,7 @@ public abstract class FloatList extends TOP implements CommonList, Iterable<Floa
@Override
public EmptyFloatList emptyList() {
- return _casView.emptyFloatList();
+ return this._casView.emptyFloatList();
}
/**
diff --git a/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArrayList.java b/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArrayList.java
index 475d1157b..fd4e6060a 100644
--- a/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArrayList.java
+++ b/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArrayList.java
@@ -308,7 +308,6 @@ public class IntegerArrayList extends TOP implements
* @param destPos -
* @param length -
*/
- @Override
public void copyFromArray(String[] src, int srcPos, int destPos, int length) {
throw new UnsupportedOperationException();
}
@@ -329,7 +328,6 @@ public class IntegerArrayList extends TOP implements
* <code>length &gt; size()</code> or
* <code>destPos + length &gt; destArray.length</code>.
*/
- @Override
public void copyToArray(int srcPos, String[] dest, int destPos, int length) {
_casView.checkArrayBounds(size(), srcPos, length);
for (int i = 0; i < length; i++) {
@@ -541,7 +539,6 @@ public class IntegerArrayList extends TOP implements
}
}
- @Override
public Spliterator.OfInt spliterator() {
return (null == intArrayAsList)
? Arrays.spliterator(intArrayList.toIntArray())
diff --git a/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerList.java b/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerList.java
index b3eaf71a1..b4add6eb3 100644
--- a/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerList.java
+++ b/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerList.java
@@ -73,7 +73,7 @@ public abstract class IntegerList extends TOP implements CommonList, Iterable<In
@Override
public NonEmptyIntegerList createNonEmptyNode() {
NonEmptyIntegerList node = new NonEmptyIntegerList(
- _casView.getTypeSystemImpl().intNeListType, _casView);
+ this._casView.getTypeSystemImpl().intNeListType, this._casView);
return node;
}
@@ -107,7 +107,7 @@ public abstract class IntegerList extends TOP implements CommonList, Iterable<In
@Override
public EmptyIntegerList emptyList() {
- return _casView.emptyIntegerList();
+ return this._casView.emptyIntegerList();
}
/**
diff --git a/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFloatList.java b/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFloatList.java
index 17bbb893f..c3179041d 100644
--- a/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFloatList.java
+++ b/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFloatList.java
@@ -120,7 +120,7 @@ public class NonEmptyFloatList extends FloatList implements NonEmptyList {
/* setter for head * */
public void setHead(float v) {
- _setFloatValueNfc(wrapGetIntCatchException(_FH_head), v);
+ this._setFloatValueNfc(wrapGetIntCatchException(_FH_head), v);
}
// public void _setHeadNcNj(float v) {
diff --git a/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringList.java b/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringList.java
index 42d3b284f..5a08efec6 100644
--- a/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringList.java
+++ b/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringList.java
@@ -69,17 +69,17 @@ public abstract class StringList extends TOP implements CommonList, Iterable<Str
@Override
public NonEmptyStringList createNonEmptyNode() {
NonEmptyStringList node = new NonEmptyStringList(
- _casView.getTypeSystemImpl().stringNeListType, _casView);
+ this._casView.getTypeSystemImpl().stringNeListType, this._casView);
return node;
}
public NonEmptyStringList push(String item) {
- return new NonEmptyStringList(_casView.getJCasImpl(), item, this);
+ return new NonEmptyStringList(this._casView.getJCasImpl(), item, this);
}
@Override
public EmptyStringList emptyList() {
- return _casView.emptyStringList();
+ return this._casView.emptyStringList();
}
/**
diff --git a/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP_Type.java b/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP_Type.java
index e9c0552e4..5e7eea663 100644
--- a/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP_Type.java
+++ b/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP_Type.java
@@ -154,14 +154,14 @@ public class TOP_Type {
// constructor execution order: 1: super, 2: instance expr, 3: body
protected TOP_Type(JCas jcas, Type casType, boolean installGenerator) {
this.jcas = jcas;
- casImpl = jcas.getCasImpl();
- ll_cas = casImpl;
+ this.casImpl = jcas.getCasImpl();
+ this.ll_cas = this.casImpl;
this.casType = casType;
- instanceOf_Type = this;
- casTypeCode = ((TypeImpl) this.casType).getCode();
- lowLevelTypeChecks = false;
- lowLevelArrayBoundChecks = false;
- useExistingInstance = true;
+ this.instanceOf_Type = this;
+ this.casTypeCode = ((TypeImpl) this.casType).getCode();
+ this.lowLevelTypeChecks = false;
+ this.lowLevelArrayBoundChecks = false;
+ this.useExistingInstance = true;
// Add generator to CASImpl for this type
// NOTE Getter used for FSGenerator to get the subtype instance value
diff --git a/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java b/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java
index 06c79e23d..5ad04c7ea 100644
--- a/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java
@@ -294,10 +294,10 @@ public class JCasImpl extends AbstractCas_ImplBase implements AbstractCas, JCas
// * the typeArray needs to be big enough to hold all the types
// * that will be loaded.
- casImpl = cas;
+ this.casImpl = cas;
- ll_IndexRepository = casImpl.ll_getIndexRepository();
- jfsIndexRepository = new JFSIndexRepositoryImpl(this, cas.getIndexRepository());
+ this.ll_IndexRepository = casImpl.ll_getIndexRepository();
+ this.jfsIndexRepository = new JFSIndexRepositoryImpl(this, cas.getIndexRepository());
}
public TOP createFS(Type type) {
@@ -907,7 +907,7 @@ public class JCasImpl extends AbstractCas_ImplBase implements AbstractCas, JCas
@Override
@Deprecated
public StringArray getStringArray0L() {
- return getCas().emptyStringArray();
+ return this.getCas().emptyStringArray();
}
/*
@@ -920,7 +920,7 @@ public class JCasImpl extends AbstractCas_ImplBase implements AbstractCas, JCas
@Override
@Deprecated
public IntegerArray getIntegerArray0L() {
- return getCas().emptyIntegerArray();
+ return this.getCas().emptyIntegerArray();
}
/*
@@ -933,7 +933,7 @@ public class JCasImpl extends AbstractCas_ImplBase implements AbstractCas, JCas
@Override
@Deprecated
public FloatArray getFloatArray0L() {
- return getCas().emptyFloatArray();
+ return this.getCas().emptyFloatArray();
}
/*
@@ -946,7 +946,7 @@ public class JCasImpl extends AbstractCas_ImplBase implements AbstractCas, JCas
@Override
@Deprecated
public FSArray getFSArray0L() {
- return getCas().emptyFSArray();
+ return this.getCas().emptyFSArray();
}
/*
diff --git a/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JFSIndexRepositoryImpl.java b/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JFSIndexRepositoryImpl.java
index d44923e07..c68515df5 100644
--- a/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JFSIndexRepositoryImpl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JFSIndexRepositoryImpl.java
@@ -73,7 +73,7 @@ public class JFSIndexRepositoryImpl implements JFSIndexRepository {
*/
@Override
public AnnotationIndex<Annotation> getAnnotationIndex() {
- return jcas.getCas().getAnnotationIndex();
+ return this.jcas.getCas().getAnnotationIndex();
}
/*
@@ -83,7 +83,7 @@ public class JFSIndexRepositoryImpl implements JFSIndexRepository {
*/
@Override
public <T extends Annotation> AnnotationIndex<T> getAnnotationIndex(int type) {
- return jcas.getCas().getAnnotationIndex(jcas.getCasType(type));
+ return this.jcas.getCas().getAnnotationIndex(this.jcas.getCasType(type));
}
/*
diff --git a/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation.java b/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation.java
index 47cb64ec0..7c67f97eb 100644
--- a/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation.java
+++ b/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation.java
@@ -154,7 +154,7 @@ public class Annotation extends AnnotationBase implements AnnotationImpl {
@Override
public final void setEnd(int v) {
try {
- _setIntValueNfc((int) _FH_end.invokeExact(), v);
+ this._setIntValueNfc((int) _FH_end.invokeExact(), v);
} catch (Throwable e) {
throw new RuntimeException(e); // never happen
}
@@ -173,8 +173,8 @@ public class Annotation extends AnnotationBase implements AnnotationImpl {
*/
public Annotation(JCas jcas, int begin, int end) {
super(jcas); // forward to constructor
- setBegin(begin);
- setEnd(end);
+ this.setBegin(begin);
+ this.setEnd(end);
}
/**
diff --git a/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationController.java b/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationController.java
index ddb4c8c5f..85d846d2d 100644
--- a/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationController.java
+++ b/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationController.java
@@ -202,7 +202,7 @@ public class InstallationController {
* @return the message
*/
public String getMessage() {
- return message;
+ return this.message;
}
/**
@@ -217,7 +217,7 @@ public class InstallationController {
* @return the retCode
*/
public int getRetCode() {
- return retCode;
+ return this.retCode;
}
/**
@@ -1676,9 +1676,9 @@ public class InstallationController {
if (componentRootPath == null) {
// install next separate delegate component
InstallationController dlgController = new InstallationController(componentId,
- _installationDirPath, false, _msgRouter, _defaultMsgListener,
+ _installationDirPath, false, this._msgRouter, this._defaultMsgListener,
_cleanInstallDir);
- dlgController.setPackageSelector(_packageSelector);
+ dlgController.setPackageSelector(this._packageSelector);
InstallationDescriptor dlgInsdObject = dlgController.installComponent();
if (dlgInsdObject == null) {
getErrMsgWriter().println(
@@ -1716,9 +1716,9 @@ public class InstallationController {
String componentId = dlgList.nextElement();
// install XML descriptors of the next delegate component
InstallationController dlgController = new InstallationController(componentId,
- _installationDirPath, false, _msgRouter, _defaultMsgListener,
+ _installationDirPath, false, this._msgRouter, this._defaultMsgListener,
_cleanInstallDir);
- dlgController.setPackageSelector(_packageSelector);
+ dlgController.setPackageSelector(this._packageSelector);
InstallationDescriptor dlgInsdObject = dlgController.installComponentDescriptors();
if (dlgInsdObject == null) {
getErrMsgWriter().println("[InstallationController]: "
@@ -1960,7 +1960,7 @@ public class InstallationController {
_installationMonitor.setInstallationStatus(_mainComponentId, VERIFICATION_IN_PROGRESS);
// create PackageBrowser object for the installed PEAR
- PackageBrowser installedPear = new PackageBrowser(_mainComponentRoot);
+ PackageBrowser installedPear = new PackageBrowser(this._mainComponentRoot);
TestStatus status = verifyComponentInstallation(installedPear);
if (status.getRetCode() == TestStatus.TEST_SUCCESSFUL) {
// verification successful
diff --git a/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationTester.java b/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationTester.java
index 6c9519ddd..c092b522b 100644
--- a/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationTester.java
+++ b/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationTester.java
@@ -91,12 +91,12 @@ public class InstallationTester {
this.pkgBrowser = pkgBrowser;
// save System properties
- systemProps = System.getProperties();
+ this.systemProps = System.getProperties();
// check UIMA category of the main component
File compDescFile = new File(
this.pkgBrowser.getInstallationDescriptor().getMainComponentDesc());
- uimaCategory = UIMAUtil.identifyUimaComponentCategory(compDescFile);
+ this.uimaCategory = UIMAUtil.identifyUimaComponentCategory(compDescFile);
if (uimaCategory == null) {
Exception err = UIMAUtil.getLastErrorForXmlDesc(compDescFile);
if (err != null) {
@@ -124,14 +124,14 @@ public class InstallationTester {
TestStatus status = new TestStatus();
status.setMessage(I18nUtil.localizeMessage(PEAR_MESSAGE_RESOURCE_BUNDLE,
"installation_verification_type_not_detected",
- new Object[] { pkgBrowser.getInstallationDescriptor().getMainComponentId() },
+ new Object[] { this.pkgBrowser.getInstallationDescriptor().getMainComponentId() },
null));
return status;
}
// set system properties
- setSystemProperties(pkgBrowser);
+ setSystemProperties(this.pkgBrowser);
// create analysis engine
XMLInputSource xmlIn = null;
@@ -139,10 +139,10 @@ public class InstallationTester {
try {
xmlIn = new XMLInputSource(
- pkgBrowser.getInstallationDescriptor().getMainComponentDesc());
+ this.pkgBrowser.getInstallationDescriptor().getMainComponentDesc());
ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(xmlIn);
- resource_manager = getResourceManager(pkgBrowser);
+ resource_manager = getResourceManager(this.pkgBrowser);
TestStatus status = new TestStatus();
@@ -227,7 +227,7 @@ public class InstallationTester {
*/
private void resetSystemProperties() {
// reset system properties
- System.setProperties(systemProps);
+ System.setProperties(this.systemProps);
}
/**
@@ -268,7 +268,7 @@ public class InstallationTester {
status.setRetCode(TestStatus.TEST_NOT_SUCCESSFUL);
status.setMessage(I18nUtil.localizeMessage(PEAR_MESSAGE_RESOURCE_BUNDLE,
"installation_verification_ae_not_created",
- new Object[] { pkgBrowser.getInstallationDescriptor().getMainComponentId() },
+ new Object[] { this.pkgBrowser.getInstallationDescriptor().getMainComponentId() },
null));
}
}
@@ -303,7 +303,7 @@ public class InstallationTester {
status.setRetCode(TestStatus.TEST_NOT_SUCCESSFUL);
status.setMessage(I18nUtil.localizeMessage(PEAR_MESSAGE_RESOURCE_BUNDLE,
"installation_verification_cc_not_created",
- new Object[] { pkgBrowser.getInstallationDescriptor().getMainComponentId() },
+ new Object[] { this.pkgBrowser.getInstallationDescriptor().getMainComponentId() },
null));
}
}
@@ -338,7 +338,7 @@ public class InstallationTester {
status.setRetCode(TestStatus.TEST_NOT_SUCCESSFUL);
status.setMessage(I18nUtil.localizeMessage(PEAR_MESSAGE_RESOURCE_BUNDLE,
"installation_verification_ci_not_created",
- new Object[] { pkgBrowser.getInstallationDescriptor().getMainComponentId() },
+ new Object[] { this.pkgBrowser.getInstallationDescriptor().getMainComponentId() },
null));
}
}
@@ -372,7 +372,7 @@ public class InstallationTester {
status.setRetCode(TestStatus.TEST_NOT_SUCCESSFUL);
status.setMessage(I18nUtil.localizeMessage(PEAR_MESSAGE_RESOURCE_BUNDLE,
"installation_verification_cr_not_created",
- new Object[] { pkgBrowser.getInstallationDescriptor().getMainComponentId() },
+ new Object[] { this.pkgBrowser.getInstallationDescriptor().getMainComponentId() },
null));
}
}
@@ -408,7 +408,7 @@ public class InstallationTester {
status.setRetCode(TestStatus.TEST_NOT_SUCCESSFUL);
status.setMessage(I18nUtil.localizeMessage(PEAR_MESSAGE_RESOURCE_BUNDLE,
"installation_verification_cpe_not_created",
- new Object[] { pkgBrowser.getInstallationDescriptor().getMainComponentId() },
+ new Object[] { this.pkgBrowser.getInstallationDescriptor().getMainComponentId() },
null));
}
@@ -429,13 +429,13 @@ public class InstallationTester {
private TestStatus testTypeSystem()
throws IOException, InvalidXMLException, ResourceInitializationException {
// set system properties
- setSystemProperties(pkgBrowser);
+ setSystemProperties(this.pkgBrowser);
XMLInputSource xmlIn = null;
try {
xmlIn = new XMLInputSource(
- pkgBrowser.getInstallationDescriptor().getMainComponentDesc());
+ this.pkgBrowser.getInstallationDescriptor().getMainComponentDesc());
TypeSystemDescription tsDescription = UIMAFramework.getXMLParser()
.parseTypeSystemDescription(xmlIn);
@@ -453,12 +453,12 @@ public class InstallationTester {
status.setRetCode(TestStatus.TEST_NOT_SUCCESSFUL);
status.setMessage(I18nUtil.localizeMessage(PEAR_MESSAGE_RESOURCE_BUNDLE,
"installation_verification_cas_not_created",
- new Object[] { pkgBrowser.getInstallationDescriptor().getMainComponentId() },
+ new Object[] { this.pkgBrowser.getInstallationDescriptor().getMainComponentId() },
null));
}
// reset system properties
- resetSystemProperties();
+ this.resetSystemProperties();
// return status object
return status;
diff --git a/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageBrowser.java b/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageBrowser.java
index 036445146..49a6f3388 100644
--- a/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageBrowser.java
+++ b/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageBrowser.java
@@ -419,8 +419,8 @@ public class PackageBrowser {
return null;
} else {
// get pear descriptor file and return it as file path
- File pearDescFile = new File(_rootDir,
- getInstallationDescriptor().getMainComponentId()
+ File pearDescFile = new File(this._rootDir,
+ this.getInstallationDescriptor().getMainComponentId()
+ InstallationController.PEAR_DESC_FILE_POSTFIX);
return pearDescFile.getAbsolutePath();
}
@@ -441,7 +441,7 @@ public class PackageBrowser {
// get all environment variables that are specified for the current pear file
Properties pearEnvProps = InstallationController
- .buildTableOfEnvVars(getInstallationDescriptor());
+ .buildTableOfEnvVars(this.getInstallationDescriptor());
// return the uima datapath setting if available. If not return null
return (String) pearEnvProps.get(RelativePathResolver.UIMA_DATAPATH_PROP);
@@ -460,7 +460,7 @@ public class PackageBrowser {
public Properties getComponentEnvVars() throws IOException {
// get all environment variables that are specified for the current pear file
Properties pearEnvProps = InstallationController
- .buildTableOfEnvVars(getInstallationDescriptor());
+ .buildTableOfEnvVars(this.getInstallationDescriptor());
// removes the UIMA datapath setting if available since it is already returned with the
// getComponentDataPath() method.
diff --git a/uimaj-core/src/main/java/org/apache/uima/pear/util/FileUtil.java b/uimaj-core/src/main/java/org/apache/uima/pear/util/FileUtil.java
index 2a121ce7f..50a8ff970 100644
--- a/uimaj-core/src/main/java/org/apache/uima/pear/util/FileUtil.java
+++ b/uimaj-core/src/main/java/org/apache/uima/pear/util/FileUtil.java
@@ -775,8 +775,12 @@ public class FileUtil {
Enumeration<JarEntry> jarList = jarFile.entries();
while (jarList.hasMoreElements()) {
JarEntry jarEntry = jarList.nextElement();
+ if (jarEntry.isDirectory()) {
+ continue;
+ }
+
// check that file is accepted
- if (jarEntry.isDirectory() || (filter != null && !filter.accept(new File(jarEntry.getName())))) {
+ if (filter != null && !filter.accept(new File(jarEntry.getName()))) {
continue;
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/pear/util/ProcessUtil.java b/uimaj-core/src/main/java/org/apache/uima/pear/util/ProcessUtil.java
index a41bb4f31..8be97e523 100644
--- a/uimaj-core/src/main/java/org/apache/uima/pear/util/ProcessUtil.java
+++ b/uimaj-core/src/main/java/org/apache/uima/pear/util/ProcessUtil.java
@@ -252,7 +252,7 @@ public class ProcessUtil {
}
}
synchronized (this) {
- notifyAll();
+ this.notifyAll();
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/resource/CasDefinition.java b/uimaj-core/src/main/java/org/apache/uima/resource/CasDefinition.java
index f3641a5e9..dc1504282 100644
--- a/uimaj-core/src/main/java/org/apache/uima/resource/CasDefinition.java
+++ b/uimaj-core/src/main/java/org/apache/uima/resource/CasDefinition.java
@@ -51,10 +51,10 @@ public class CasDefinition {
public CasDefinition(TypeSystemDescription aTypeSystem, TypePriorities aTypePriorities,
FsIndexDescription[] aFsIndexes, ResourceManager aResourceManager,
Properties aPerformanceTuningSettings) {
- typeSystemDescription = aTypeSystem;
- typePriorities = aTypePriorities;
- fsIndexDescriptions = aFsIndexes;
- resourceManager = aResourceManager;
+ this.typeSystemDescription = aTypeSystem;
+ this.typePriorities = aTypePriorities;
+ this.fsIndexDescriptions = aFsIndexes;
+ this.resourceManager = aResourceManager;
}
public CasDefinition(Collection<? extends ProcessingResourceMetaData> aMetaDataToMerge,
@@ -81,10 +81,10 @@ public class CasDefinition {
TypeSystemDescription aggTypeDesc = CasCreationUtils.mergeTypeSystems(typeSystems,
aResourceManager);
- typeSystemDescription = aggTypeDesc;
- typePriorities = aggTypePriorities;
- fsIndexDescriptions = aggIndexColl.getFsIndexes();
- resourceManager = aResourceManager;
+ this.typeSystemDescription = aggTypeDesc;
+ this.typePriorities = aggTypePriorities;
+ this.fsIndexDescriptions = aggIndexColl.getFsIndexes();
+ this.resourceManager = aResourceManager;
}
/**
@@ -153,8 +153,8 @@ public class CasDefinition {
* @return this CAS Definition's CasManager
*/
public CasManager getCasManager() {
- if (resourceManager != null) {
- return resourceManager.getCasManager();
+ if (this.resourceManager != null) {
+ return this.resourceManager.getCasManager();
} else {
return null;
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurableDataResource_impl.java b/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurableDataResource_impl.java
index c88e88e1a..e470bb68f 100644
--- a/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurableDataResource_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurableDataResource_impl.java
@@ -82,7 +82,7 @@ public class ConfigurableDataResource_impl extends Resource_ImplBase implements
}
// set metadata
- setMetaData(spec.getMetaData());
+ this.setMetaData(spec.getMetaData());
// now attempt to create a URL, which can actually be used to access the data
// Get Relative Path Resolver
@@ -158,12 +158,15 @@ public class ConfigurableDataResource_impl extends Resource_ImplBase implements
// URIs must be the same
URI uri = ((ConfigurableDataResource_impl) obj).getUri();
- if (uri == null || !uri.equals(getUri()))
+ if (uri == null || !uri.equals(this.getUri()))
return false;
// Local Cache Files must be the same
File localCache = ((ConfigurableDataResource_impl) obj).getLocalCache();
- if ((localCache == null && getLocalCache() != null) || (localCache != null && !localCache.equals(getLocalCache())))
+ if (localCache == null && this.getLocalCache() != null)
+ return false;
+
+ if (localCache != null && !localCache.equals(this.getLocalCache()))
return false;
return true;
diff --git a/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManagerImplBase.java b/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManagerImplBase.java
index 3629ab801..a0f2cb443 100644
--- a/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManagerImplBase.java
+++ b/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManagerImplBase.java
@@ -437,8 +437,8 @@ public abstract class ConfigurationManagerImplBase implements ConfigurationManag
NameValuePair nvp = UIMAFramework.getResourceSpecifierFactory().createNameValuePair();
nvp.setName(param.getName());
// look up value in context
- String qualifiedName = makeQualifiedName(aContextName, param.getName(), aGroupName);
- nvp.setValue(lookup(qualifiedName));
+ String qualifiedName = this.makeQualifiedName(aContextName, param.getName(), aGroupName);
+ nvp.setValue(this.lookup(qualifiedName));
result.add(nvp);
}
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/resource/impl/DataResource_impl.java b/uimaj-core/src/main/java/org/apache/uima/resource/impl/DataResource_impl.java
index b2ada38da..3fecee996 100644
--- a/uimaj-core/src/main/java/org/apache/uima/resource/impl/DataResource_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/resource/impl/DataResource_impl.java
@@ -181,12 +181,15 @@ public class DataResource_impl extends Resource_ImplBase implements DataResource
// URLs must be the same (but don't use URL.equals(), which does DNS resolution!)
URL url = ((DataResource_impl) obj).getUrl();
- if (url == null || !url.toString().equals(getUrl().toString()))
+ if (url == null || !url.toString().equals(this.getUrl().toString()))
return false;
// Local Cache Files must be the same
File localCache = ((DataResource_impl) obj).getLocalCache();
- if ((localCache == null && getLocalCache() != null) || (localCache != null && !localCache.equals(getLocalCache())))
+ if (localCache == null && this.getLocalCache() != null)
+ return false;
+
+ if (localCache != null && !localCache.equals(this.getLocalCache()))
return false;
return true;
diff --git a/uimaj-core/src/main/java/org/apache/uima/resource/impl/Parameter_impl.java b/uimaj-core/src/main/java/org/apache/uima/resource/impl/Parameter_impl.java
index 351dac900..6a3b5af2e 100644
--- a/uimaj-core/src/main/java/org/apache/uima/resource/impl/Parameter_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/resource/impl/Parameter_impl.java
@@ -52,7 +52,7 @@ public class Parameter_impl extends MetaDataObject_impl implements Parameter {
@Override
public void setName(String aName) {
- name = aName;
+ this.name = aName;
}
@Override
@@ -62,7 +62,7 @@ public class Parameter_impl extends MetaDataObject_impl implements Parameter {
@Override
public void setValue(String aValue) {
- value = aValue;
+ this.value = aValue;
}
/**
diff --git a/uimaj-core/src/main/java/org/apache/uima/resource/impl/PearSpecifier_impl.java b/uimaj-core/src/main/java/org/apache/uima/resource/impl/PearSpecifier_impl.java
index 9ea623da1..2985eaefb 100644
--- a/uimaj-core/src/main/java/org/apache/uima/resource/impl/PearSpecifier_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/resource/impl/PearSpecifier_impl.java
@@ -50,41 +50,41 @@ public class PearSpecifier_impl extends MetaDataObject_impl implements PearSpeci
@Override
@Deprecated
public Parameter[] getParameters() {
- if (mParameters == null) {
+ if (this.mParameters == null) {
return new Parameter[0];
}
- return mParameters;
+ return this.mParameters;
}
@Override
public NameValuePair[] getPearParameters() {
- if (mPearParameters == null) {
+ if (this.mPearParameters == null) {
return new NameValuePair[0];
}
- return mPearParameters;
+ return this.mPearParameters;
}
@Override
@Deprecated
public void setParameters(Parameter... parameters) {
- mParameters = parameters;
+ this.mParameters = parameters;
}
@Override
public void setPearParameters(NameValuePair... pearParameters) {
- mPearParameters = pearParameters;
+ this.mPearParameters = pearParameters;
}
@Override
public String getPearPath() {
- return mPearPath;
+ return this.mPearPath;
}
@Override
public void setPearPath(String aPearPath) {
- mPearPath = aPearPath;
+ this.mPearPath = aPearPath;
}
@Override
diff --git a/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java b/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java
index 098a9d4b4..55131cf20 100644
--- a/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java
@@ -192,17 +192,17 @@ public class RelativePathResolver_impl implements RelativePathResolver {
URL absURL = null;
if (mClassLoader != null) {
absURL = mClassLoader.getResource(f);
- }
-
+ }
+
// fallback on TCCL
if (absURL == null) {
- ClassLoader tccl = Thread.currentThread().getContextClassLoader();
- absURL = tccl.getResource(f);
+ ClassLoader tccl = Thread.currentThread().getContextClassLoader();
+ absURL = tccl.getResource(f);
}
// if no ClassLoader specified (could be the bootstrap classloader), try the system classloader
if (absURL == null && mClassLoader == null) {
- absURL = ClassLoader.getSystemClassLoader().getResource(f);
+ absURL = ClassLoader.getSystemClassLoader().getResource(f);
}
return absURL;
diff --git a/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java b/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java
index 3a07103b7..4cc3edd16 100644
--- a/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java
@@ -99,7 +99,7 @@ public class ResourceManager_impl implements ResourceManager {
public ResourceRegistration(Object resourceOrImplementation,
ExternalResourceDescription description, String definingContext) {
- resource = resourceOrImplementation;
+ this.resource = resourceOrImplementation;
this.description = description;
this.definingContext = definingContext;
}
@@ -277,14 +277,14 @@ public class ResourceManager_impl implements ResourceManager {
}
public ResourceManager_impl copy() {
- ResourceManager_impl rm = new ResourceManager_impl(mResourceMap,
- mInternalResourceRegistrationMap, mParameterizedResourceImplClassMap,
- mInternalParameterizedResourceImplClassMap,
- mParameterizedResourceInstanceMap);
+ ResourceManager_impl rm = new ResourceManager_impl(this.mResourceMap,
+ this.mInternalResourceRegistrationMap, this.mParameterizedResourceImplClassMap,
+ this.mInternalParameterizedResourceImplClassMap,
+ this.mParameterizedResourceInstanceMap);
// non-final fields init
- rm.uimaCL = uimaCL;
- rm.importCache = importCache;
- rm.importUrlsCache = importUrlsCache;
+ rm.uimaCL = this.uimaCL;
+ rm.importCache = this.importCache;
+ rm.importUrlsCache = this.importUrlsCache;
return rm;
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterSettings_impl.java b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterSettings_impl.java
index ebabc6ddc..7aba4e9f4 100644
--- a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterSettings_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterSettings_impl.java
@@ -316,7 +316,7 @@ public class ConfigurationParameterSettings_impl extends MetaDataObject_impl
protected void writePropertyAsElement(PropertyXmlInfo aPropInfo, String aNamespace)
throws SAXException {
if ("settingsForGroups".equals(aPropInfo.propertyName)) {
- writeMapPropertyToXml("settingsForGroups", null, "name", "settingsForGroup", true,
+ this.writeMapPropertyToXml("settingsForGroups", null, "name", "settingsForGroup", true,
aNamespace);
} else {
super.writePropertyAsElement(aPropInfo, aNamespace);
diff --git a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameter_impl.java b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameter_impl.java
index 8efb205e1..4f317e760 100644
--- a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameter_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameter_impl.java
@@ -366,7 +366,7 @@ public class ConfigurationParameter_impl extends MetaDataObject_impl
// set property
String[] overridesArray = new String[valueList.size()];
valueList.toArray(overridesArray);
- setOverrides(overridesArray);
+ this.setOverrides(overridesArray);
} else {
super.readArrayPropertyValueFromXMLElement(aPropXmlInfo, aPropClass, aElement, aParser,
aOptions);
diff --git a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ImportResolver.java b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ImportResolver.java
index c2e561c08..35d5380ed 100644
--- a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ImportResolver.java
+++ b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ImportResolver.java
@@ -271,7 +271,10 @@ class ImportResolver<DESCRIPTOR extends MetaDataObject, COLLECTIBLE extends Meta
if (this == obj) {
return true;
}
- if ((obj == null) || (getClass() != obj.getClass())) {
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
return false;
}
Key other = (Key) obj;
diff --git a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/Import_impl.java b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/Import_impl.java
index 73a19a12f..4bc6e7f41 100644
--- a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/Import_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/Import_impl.java
@@ -129,7 +129,7 @@ public class Import_impl extends MetaDataObject_impl implements Import {
String location, name;
if ((location = getLocation()) != null) {
try {
- URL url = new URL(getRelativePathBase(), location);
+ URL url = new URL(this.getRelativePathBase(), location);
UIMAFramework.getLogger(this.getClass()).logrb(Level.CONFIG, this.getClass().getName(),
"findAbsoluteUrl", LOG_RESOURCE_BUNDLE, "UIMA_import_by__CONFIG",
new Object[] { "location", url });
diff --git a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/LanguagePrecondition_impl.java b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/LanguagePrecondition_impl.java
index 918986ff4..801c40828 100644
--- a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/LanguagePrecondition_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/LanguagePrecondition_impl.java
@@ -138,7 +138,9 @@ public class LanguagePrecondition_impl extends SimplePrecondition_impl
if (cv1.equals(cv2))
return true;
if (cv1 instanceof Object[]) {
- if (!(cv2 instanceof Object[]) || !Arrays.equals((Object[]) cv1, (Object[]) cv2))
+ if (!(cv2 instanceof Object[]))
+ return false;
+ if (!Arrays.equals((Object[]) cv1, (Object[]) cv2))
return false;
}
return true;
diff --git a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObject_impl.java b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObject_impl.java
index 5c31a296e..209d0a370 100644
--- a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObject_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObject_impl.java
@@ -133,7 +133,9 @@ public abstract class MetaDataObject_impl implements MetaDataObject {
public boolean equals(Object obj) {
if (this == obj)
return true;
- if ((obj == null) || (getClass() != obj.getClass()))
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
return false;
MetaDataAttr other = (MetaDataAttr) obj;
if (clazz == null) {
@@ -696,7 +698,7 @@ public abstract class MetaDataObject_impl implements MetaDataObject {
MetaDataObject_impl mdo = (MetaDataObject_impl) aObj;
// get the attributes (and classes) for the two objects
- MetaDataAttr[] theseAttrs = getAttributes();
+ MetaDataAttr[] theseAttrs = this.getAttributes();
MetaDataAttr[] thoseAttrs = mdo.getAttributes();
// attribute lists must be same length
if (theseAttrs.length != thoseAttrs.length) {
@@ -767,7 +769,14 @@ public abstract class MetaDataObject_impl implements MetaDataObject {
}
if (val1 instanceof Map) {// only need this to handle Maps w/ array vals
- if (!(val2 instanceof Map) || (((Map) val1).size() != ((Map) val2).size()) || (val1.getClass() != val2.getClass())) {
+ if (!(val2 instanceof Map)) {
+ return false;
+ }
+ if (((Map) val1).size() != ((Map) val2).size()) {
+ return false;
+ }
+
+ if (val1.getClass() != val2.getClass()) {
return false;
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceManagerConfiguration_impl.java b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceManagerConfiguration_impl.java
index 1f5985e6d..82dcccd6d 100644
--- a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceManagerConfiguration_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceManagerConfiguration_impl.java
@@ -329,7 +329,7 @@ public class ResourceManagerConfiguration_impl extends MetaDataObject_impl
// make sure Import's relative path base is set, to allow for users who create
// new import objects
if (imports[i] instanceof Import_impl) {
- ((Import_impl) imports[i]).setSourceUrlIfNull(getSourceUrl());
+ ((Import_impl) imports[i]).setSourceUrlIfNull(this.getSourceUrl());
}
URL url = imports[i].findAbsoluteUrl(aResourceManager);
if (!aAlreadyImportedURLs.contains(url.toString())) {
@@ -346,9 +346,9 @@ public class ResourceManagerConfiguration_impl extends MetaDataObject_impl
}
// update this object
- ExternalResourceDescription[] existingResources = getExternalResources();
+ ExternalResourceDescription[] existingResources = this.getExternalResources();
if (existingResources == null) {
- setExternalResources(
+ this.setExternalResources(
existingResources = ExternalResourceDescription.EMPTY_EXTERNAL_RESORUCE_DESCRIPTIONS);
}
if (importedResources != null) {
@@ -358,12 +358,12 @@ public class ResourceManagerConfiguration_impl extends MetaDataObject_impl
for (int i = 0; i < importedResources.size(); i++) {
newResources[existingResources.length + i] = importedResources.get(i);
}
- setExternalResources(newResources);
+ this.setExternalResources(newResources);
}
- ExternalResourceBinding[] existingBindings = getExternalResourceBindings();
+ ExternalResourceBinding[] existingBindings = this.getExternalResourceBindings();
if (existingBindings == null) {
- setExternalResourceBindings(
+ this.setExternalResourceBindings(
existingBindings = ExternalResourceBinding.EMPTY_RESOURCE_BINDINGS);
}
if (null != importedBindings) {
@@ -373,10 +373,10 @@ public class ResourceManagerConfiguration_impl extends MetaDataObject_impl
for (int i = 0; i < importedBindings.size(); i++) {
newBindings[existingBindings.length + i] = importedBindings.get(i);
}
- setExternalResourceBindings(newBindings);
+ this.setExternalResourceBindings(newBindings);
}
// clear imports
- setImports(Import.EMPTY_IMPORTS);
+ this.setImports(Import.EMPTY_IMPORTS);
}
private void resolveImport(URL aURL, Collection<String> aAlreadyImportedURLs,
diff --git a/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisComponent.java b/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisComponent.java
index 2823f3594..51959819e 100644
--- a/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisComponent.java
+++ b/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisComponent.java
@@ -83,10 +83,10 @@ public class UimacppAnalysisComponent extends AnalysisComponent_ImplBase {
// because the index definitions are transmitted with the serialized CAS. So we can
// just null it out.
// BUT do this in a clone, so we don't affect Java!
- resourceDescription = (ResourceCreationSpecifier) aeDescription.clone();
- ((ProcessingResourceMetaData) resourceDescription.getMetaData())
+ this.resourceDescription = (ResourceCreationSpecifier) aeDescription.clone();
+ ((ProcessingResourceMetaData) this.resourceDescription.getMetaData())
.setFsIndexCollection(null);
- tsReinit = true;
+ this.tsReinit = true;
// System.out.println("Data path: " + dataPath);
}
@@ -100,7 +100,7 @@ public class UimacppAnalysisComponent extends AnalysisComponent_ImplBase {
@Override
public void initialize(UimaContext context) throws ResourceInitializationException {
try {
- uimaContext = context;
+ this.uimaContext = context;
// update the sofa mappings in the AE descriptor with the mappings
// specified in the context if the AE descriptor is for an aggregate
// Ae and contains sofa mappings
@@ -118,7 +118,7 @@ public class UimacppAnalysisComponent extends AnalysisComponent_ImplBase {
}
}
}
- log = context.getLogger();
+ this.log = context.getLogger();
/*
* set the configuration parameters into the parsed resourceDescription
@@ -193,7 +193,7 @@ public class UimacppAnalysisComponent extends AnalysisComponent_ImplBase {
public void typeSystemInit(TypeSystem ts)
throws AnnotatorConfigurationException, AnnotatorInitializationException {
// set flag to update TAF type system on next call to process
- tsReinit = true;
+ this.tsReinit = true;
}
/**
@@ -230,10 +230,10 @@ public class UimacppAnalysisComponent extends AnalysisComponent_ImplBase {
resourceDescription.toXML(strWriter);
strWriter.close();
engine = UimacppEngine.createJTafTAE(strWriter.getBuffer().toString());
- tsReinit = true;
+ this.tsReinit = true;
}
- if (tsReinit) {
- tsReinit = false;
+ if (this.tsReinit) {
+ this.tsReinit = false;
CASMgrSerializer serializer = Serialization.serializeCASMgr((CASMgr) cas);
engine.typeSystemInit(serializer);
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java b/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java
index 90971f4cd..e3af0d23e 100644
--- a/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java
+++ b/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java
@@ -1813,9 +1813,9 @@ public class CasCreationUtils {
MetaDataCacheKey(ResourceSpecifier resourceSpecifier, ResourceManager resourceManager) {
this.resourceSpecifier = resourceSpecifier;
- rmClassLoader = (null == resourceManager) ? null
+ this.rmClassLoader = (null == resourceManager) ? null
: resourceManager.getExtensionClassLoader(); // can be null
- rmDataPath = (null == resourceManager) ? null : resourceManager.getDataPath();
+ this.rmDataPath = (null == resourceManager) ? null : resourceManager.getDataPath();
}
@Override
diff --git a/uimaj-core/src/main/java/org/apache/uima/util/CasIOUtils.java b/uimaj-core/src/main/java/org/apache/uima/util/CasIOUtils.java
index 0f2ec9a8c..25657138c 100644
--- a/uimaj-core/src/main/java/org/apache/uima/util/CasIOUtils.java
+++ b/uimaj-core/src/main/java/org/apache/uima/util/CasIOUtils.java
@@ -20,12 +20,13 @@ package org.apache.uima.util;
import static org.apache.uima.cas.impl.Serialization.serializeCAS;
import static org.apache.uima.cas.impl.Serialization.serializeWithCompression;
-import static org.apache.uima.internal.util.SerializationUtils.deserializeCASSerializerOrCASCompleteSerializer;
import java.io.BufferedInputStream;
+import java.io.Closeable;
import java.io.DataInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.OutputStream;
import java.net.URL;
@@ -50,7 +51,6 @@ import org.apache.uima.cas.impl.Serialization;
import org.apache.uima.cas.impl.TypeSystemImpl;
import org.apache.uima.cas.impl.XCASSerializer;
import org.apache.uima.cas.impl.XmiCasSerializer;
-import org.apache.uima.internal.util.SerializationUtils;
import org.xml.sax.SAXException;
/**
@@ -236,10 +236,13 @@ public class CasIOUtils {
*/
public static SerialFormat load(URL casUrl, URL tsiUrl, CAS aCAS, CasLoadMode casLoadMode)
throws IOException {
-
- try (var casIS = new BufferedInputStream(casUrl.openStream());
- var tsIS = (tsiUrl == null) ? null : new BufferedInputStream(tsiUrl.openStream());) {
+ InputStream casIS = new BufferedInputStream(casUrl.openStream());
+ InputStream tsIS = (tsiUrl == null) ? null : new BufferedInputStream(tsiUrl.openStream());
+ try {
return load(casIS, tsIS, aCAS, casLoadMode);
+ } finally {
+ closeQuitely(casIS);
+ closeQuitely(tsIS);
}
}
@@ -296,12 +299,12 @@ public class CasIOUtils {
* The CasLoadMode is DEFAULT.
*
* @param casInputStream
- * The input stream containing the CAS. Caller should buffer this appropriately.
+ * -
* @param tsiInputStream
* -
* @param aCAS
- * The CAS that should be filled
- * @return the SerialFormat of the loaded CAS
+ * -
+ * @return -
* @throws IOException
* -
*/
@@ -318,24 +321,23 @@ public class CasIOUtils {
* is passed for tsiInputStream.
*
* If TSI information is available, the CAS's type system and indexes definition are replaced,
- * except for SerialFormats {@link SerialFormat#COMPRESSED_FILTERED},
- * {@link SerialFormat#COMPRESSED_FILTERED_TS}, and {@link SerialFormat#COMPRESSED_FILTERED_TSI}.
+ * except for SerialFormats COMPRESSED_FILTERED, COMPRESSED_FILTERED_TS, and
+ * COMPRESSED_FILTERED_TSI.
*
- * The CasLoadMode is set to {@link CasLoadMode#LENIENT} if the leniently flag is true; otherwise
- * it is set to {@link CasLoadMode#DEFAULT}.
+ * The CasLoadMode is set to LENIENT if the leniently flag is true; otherwise it is set to
+ * DEFAULT.
*
* @param casInputStream
- * the stream to load the CAS from
+ * -
* @param tsiInputStream
- * an optional stream to read the type system and index information from
+ * -
* @param aCAS
- * the target CAS
+ * -
* @param leniently
- * if true, missing types in the target CAS will be ignored instead of leading to an
- * exception
- * @return the format that was detected in the CAS input stream
+ * -
+ * @return -
* @throws IOException
- * if the data could not be loaded
+ * -
*/
public static SerialFormat load(InputStream casInputStream, InputStream tsiInputStream, CAS aCAS,
boolean leniently) throws IOException {
@@ -353,8 +355,8 @@ public class CasIOUtils {
* read from that source.
*
* If TSI information is available, the CAS's type system and indexes definition are replaced,
- * except for SerialFormats {@link SerialFormat#COMPRESSED_FILTERED},
- * {@link SerialFormat#COMPRESSED_FILTERED_TS}, and {@link SerialFormat#COMPRESSED_FILTERED_TSI}.
+ * except for SerialFormats COMPRESSED_FILTERED, COMPRESSED_FILTERED_TS, and
+ * COMPRESSED_FILTERED_TSI.
*
* If the CasLoadMode == REINIT, then the TSI information is also used for these 3 formats to
* replace the CAS's definitions.
@@ -372,7 +374,7 @@ public class CasIOUtils {
* specifies loading alternative like lenient and reinit, see CasLoadMode.
* @return the SerialFormat of the loaded CAS
* @throws IOException
- * if the data could not be loaded
+ * - Problem loading from given InputStream
*/
//@formatter:on
public static SerialFormat load(InputStream casInputStream, InputStream tsiInputStream, CAS aCAS,
@@ -392,12 +394,12 @@ public class CasIOUtils {
* For COMPRESSED_FILTERED_xxx formats, if the typeSystem is not null, the typeSystem is used for
* decoding.
*
- * If TSI information is available, the CAS's type system and indexes definition are replaced,
- * except for SerialFormats {@link SerialFormat#COMPRESSED_FILTERED},
- * {@link SerialFormat#COMPRESSED_FILTERED_TS}, and {@link SerialFormat#COMPRESSED_FILTERED_TSI}.
+ * If embedded TSI information is available, the CAS's type system and indexes definition are
+ * replaced, except for SerialFormats COMPRESSED_FILTERED, COMPRESSED_FILTERED_TS, and
+ * COMPRESSED_FILTERED_TSI.
*
* To replace the CAS's type system and indexes definition for these, use a load form which has
- * the CasLoadMode argument, and set this to {@link CasLoadMode#REINIT}.
+ * the CasLoadMode argument, and set this to REINIT.
*
* @param casInputStream
* The input stream containing the CAS, appropriately buffered.
@@ -459,8 +461,9 @@ public class CasIOUtils {
/******************************
* Java Object loading
******************************/
+ ObjectInputStream ois = new ObjectInputStream(casInputStream);
try {
- Object o = deserializeCASSerializerOrCASCompleteSerializer(casInputStream);
+ Object o = ois.readObject();
if (o instanceof CASSerializer) {
bcsd.setupCasFromCasMgrSerializer(readCasManager(tsiInputStream));
bcsd.reinit((CASSerializer) o); // deserialize from object
@@ -473,7 +476,7 @@ public class CasIOUtils {
/** Unrecognized serialized CAS format */
throw new CASRuntimeException(CASRuntimeException.UNRECOGNIZED_SERIALIZED_CAS_FORMAT);
}
- } catch (IOException e) {
+ } catch (ClassNotFoundException e) {
/** Unrecognized serialized CAS format */
throw new CASRuntimeException(CASRuntimeException.UNRECOGNIZED_SERIALIZED_CAS_FORMAT);
}
@@ -590,10 +593,15 @@ public class CasIOUtils {
}
private static CASMgrSerializer readCasManager(InputStream tsiInputStream) throws IOException {
- if (null == tsiInputStream) {
- return null;
+ try {
+ if (null == tsiInputStream) {
+ return null;
+ }
+ ObjectInputStream is = new ObjectInputStream(tsiInputStream);
+ return (CASMgrSerializer) is.readObject();
+ } catch (ClassNotFoundException e) {
+ throw new IOException(e);
}
- return SerializationUtils.deserializeCASMgrSerializer(tsiInputStream);
}
private static void writeJavaObject(Object o, OutputStream aOS) throws IOException {
@@ -607,4 +615,14 @@ public class CasIOUtils {
writeJavaObject(includeIndexDefs ? Serialization.serializeCASMgr((CASImpl) aCas)
: Serialization.serializeCASMgrTypeSystemOnly((CASImpl) aCas), aOS);
}
+
+ private static void closeQuitely(Closeable closeable) {
+ if (closeable != null) {
+ try {
+ closeable.close();
+ } catch (IOException e) {
+ // do nothing
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/uimaj-core/src/main/java/org/apache/uima/util/CasLoadMode.java b/uimaj-core/src/main/java/org/apache/uima/util/CasLoadMode.java
index 3f38b06c1..a43077d9a 100644
--- a/uimaj-core/src/main/java/org/apache/uima/util/CasLoadMode.java
+++ b/uimaj-core/src/main/java/org/apache/uima/util/CasLoadMode.java
@@ -49,7 +49,7 @@ package org.apache.uima.util;
//@formatter:on
public enum CasLoadMode {
- // @formatter:off
+ // @formatter:off
/**
* Default operation:
*
@@ -87,7 +87,7 @@ public enum CasLoadMode {
* load will not indicate an error if the incoming data has types and/or features not in the
* receiving CAS, but will instead silently ignore these.
*/
- //@formatter:on
+//@formatter:on
LENIENT,
//@formatter:off
@@ -104,6 +104,6 @@ public enum CasLoadMode {
*
* Error if no TSI information available
*/
- //@formatter:on
+//@formatter:on
REINIT;
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/util/IntEntry.java b/uimaj-core/src/main/java/org/apache/uima/util/IntEntry.java
index be8c8d702..15090f997 100644
--- a/uimaj-core/src/main/java/org/apache/uima/util/IntEntry.java
+++ b/uimaj-core/src/main/java/org/apache/uima/util/IntEntry.java
@@ -29,8 +29,8 @@ public class IntEntry<T> {
private T value;
public IntEntry(int i, T v) {
- key = i;
- value = v;
+ this.key = i;
+ this.value = v;
}
/**
@@ -72,7 +72,9 @@ public class IntEntry<T> {
public boolean equals(Object obj) {
if (this == obj)
return true;
- if ((obj == null) || (getClass() != obj.getClass()))
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
return false;
IntEntry other = (IntEntry) obj;
if (key != other.key)
diff --git a/uimaj-core/src/main/java/org/apache/uima/util/Level.java b/uimaj-core/src/main/java/org/apache/uima/util/Level.java
index 45568e34b..f36ffd9b4 100644
--- a/uimaj-core/src/main/java/org/apache/uima/util/Level.java
+++ b/uimaj-core/src/main/java/org/apache/uima/util/Level.java
@@ -121,7 +121,7 @@ public class Level {
// cast Object to Level
Level r = (Level) o;
// return true if both levels are the same
- return (level == r.level);
+ return (this.level == r.level);
} else // if o is no instance of Level return false
{
return false;
@@ -133,7 +133,7 @@ public class Level {
*/
@Override
public int hashCode() {
- return level;
+ return this.level;
}
/**
diff --git a/uimaj-core/src/main/java/org/apache/uima/util/NameClassPair.java b/uimaj-core/src/main/java/org/apache/uima/util/NameClassPair.java
index 7305935ed..b8d6b0c59 100644
--- a/uimaj-core/src/main/java/org/apache/uima/util/NameClassPair.java
+++ b/uimaj-core/src/main/java/org/apache/uima/util/NameClassPair.java
@@ -81,11 +81,11 @@ public class NameClassPair implements java.io.Serializable {
}
NameClassPair that = (NameClassPair) aObj;
- boolean nameMatch = getName() == null ? that.getName() == null
- : getName().equals(that.getName());
+ boolean nameMatch = this.getName() == null ? that.getName() == null
+ : this.getName().equals(that.getName());
- boolean classNameMatch = getClassName() == null ? that.getClassName() == null
- : getClassName().equals(that.getClassName());
+ boolean classNameMatch = this.getClassName() == null ? that.getClassName() == null
+ : this.getClassName().equals(that.getClassName());
return nameMatch && classNameMatch;
}
diff --git a/uimaj-core/src/main/java/org/apache/uima/util/XMLInputSource.java b/uimaj-core/src/main/java/org/apache/uima/util/XMLInputSource.java
index 6375688b0..087ac4624 100644
--- a/uimaj-core/src/main/java/org/apache/uima/util/XMLInputSource.java
+++ b/uimaj-core/src/main/java/org/apache/uima/util/XMLInputSource.java
@@ -82,23 +82,13 @@ public class XMLInputSource {
mInputStream = mURL.openStream();
}
- /**
- * Creates an XMLInputSource from an existing InputStream.
- *
- * @param aInputStream
- * input stream from which to read
- */
- public XMLInputSource(InputStream aInputStream) {
- this(aInputStream, null);
- }
-
/**
* Creates an XMLInputSource from an existing InputStream.
*
* @param aInputStream
* input stream from which to read
* @param aRelativePathBase
- * (optional) base for resolving relative paths. This must be a directory.
+ * base for resolving relative paths. This must be a directory.
*/
public XMLInputSource(InputStream aInputStream, File aRelativePathBase) {
mInputStream = aInputStream;
diff --git a/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java b/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java
index 624a0e4d8..31acbe920 100644
--- a/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java
@@ -62,7 +62,7 @@ public class JSR47Logger_impl extends Logger_common_impl {
private JSR47Logger_impl(JSR47Logger_impl l, int limit) {
super(l, limit);
- logger = l.logger;
+ this.logger = l.logger;
}
/**
@@ -95,7 +95,7 @@ public class JSR47Logger_impl extends Logger_common_impl {
@Override
public JSR47Logger_impl getLimitedLogger(int limit) {
- if (limit == Integer.MAX_VALUE || limit == limit_common) {
+ if (limit == Integer.MAX_VALUE || limit == this.limit_common) {
return this;
}
return new JSR47Logger_impl(this, limit);
diff --git a/uimaj-core/src/main/java/org/apache/uima/util/impl/Log4jLogger_impl.java b/uimaj-core/src/main/java/org/apache/uima/util/impl/Log4jLogger_impl.java
index 6b8f1bd44..1f3f0e9da 100644
--- a/uimaj-core/src/main/java/org/apache/uima/util/impl/Log4jLogger_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/util/impl/Log4jLogger_impl.java
@@ -168,9 +168,9 @@ public class Log4jLogger_impl extends Logger_common_impl {
private Log4jLogger_impl(Log4jLogger_impl l, int limit) {
super(l, limit);
- logger = l.logger;
- coreLogger = l.coreLogger;
- mf = l.mf;
+ this.logger = l.logger;
+ this.coreLogger = l.coreLogger;
+ this.mf = l.mf;
}
/**
@@ -195,7 +195,7 @@ public class Log4jLogger_impl extends Logger_common_impl {
@Override
public Log4jLogger_impl getLimitedLogger(int aLimit) {
- if (aLimit == Integer.MAX_VALUE || aLimit == limit_common) {
+ if (aLimit == Integer.MAX_VALUE || aLimit == this.limit_common) {
return this;
}
return new Log4jLogger_impl(this, aLimit);
diff --git a/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_common_impl.java b/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_common_impl.java
index 44b3a0a5e..1d4c86b6d 100644
--- a/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_common_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_common_impl.java
@@ -118,8 +118,8 @@ public abstract class Logger_common_impl implements Logger {
private boolean isAnnotatorLogger;
protected Logger_common_impl(Class<?> component) {
- limit_common = Integer.MAX_VALUE;
- isLimited = false;
+ this.limit_common = Integer.MAX_VALUE;
+ this.isLimited = false;
}
/**
@@ -131,10 +131,10 @@ public abstract class Logger_common_impl implements Logger {
* the limit
*/
protected Logger_common_impl(Logger_common_impl lci, int limit) {
- limit_common = limit;
- isLimited = true;
- isAnnotatorLogger = true;
- mResourceManager = lci.mResourceManager;
+ this.limit_common = limit;
+ this.isLimited = true;
+ this.isAnnotatorLogger = true;
+ this.mResourceManager = lci.mResourceManager;
}
/*********************************************
diff --git a/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_impl.java b/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_impl.java
index 330d9c78a..5137630bf 100644
--- a/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_impl.java
@@ -74,8 +74,8 @@ public class Logger_impl extends Logger_common_impl {
private Logger_impl(Logger_impl l, int limit) {
super(l, limit);
- mOut = l.mOut;
- loggerName = l.loggerName;
+ this.mOut = l.mOut;
+ this.loggerName = l.loggerName;
}
/**
@@ -101,7 +101,7 @@ public class Logger_impl extends Logger_common_impl {
@Override
public Logger_impl getLimitedLogger(int aLimit) {
- if (aLimit == Integer.MAX_VALUE || aLimit == limit_common) {
+ if (aLimit == Integer.MAX_VALUE || aLimit == this.limit_common) {
return this;
}
return new Logger_impl(this, aLimit);
diff --git a/uimaj-core/src/main/java/org/apache/uima/util/impl/Slf4jLogger_impl.java b/uimaj-core/src/main/java/org/apache/uima/util/impl/Slf4jLogger_impl.java
index d7f688e2b..9136e9ed0 100644
--- a/uimaj-core/src/main/java/org/apache/uima/util/impl/Slf4jLogger_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/util/impl/Slf4jLogger_impl.java
@@ -107,7 +107,7 @@ public class Slf4jLogger_impl extends Logger_common_impl {
private Slf4jLogger_impl(Slf4jLogger_impl l, int limit) {
super(l, limit);
- logger = l.logger;
+ this.logger = l.logger;
isLocationCapable = logger instanceof org.slf4j.spi.LocationAwareLogger;
}
@@ -140,7 +140,7 @@ public class Slf4jLogger_impl extends Logger_common_impl {
@Override
public Slf4jLogger_impl getLimitedLogger(int aLimit) {
- if (aLimit == Integer.MAX_VALUE || aLimit == limit_common) {
+ if (aLimit == Integer.MAX_VALUE || aLimit == this.limit_common) {
return this;
}
return new Slf4jLogger_impl(this, aLimit);
diff --git a/uimaj-core/src/test/java/org/apache/uima/ae/multiplier/SimpleCasGenerator.java b/uimaj-core/src/test/java/org/apache/uima/ae/multiplier/SimpleCasGenerator.java
index e576ef61b..abb7e0a6f 100644
--- a/uimaj-core/src/test/java/org/apache/uima/ae/multiplier/SimpleCasGenerator.java
+++ b/uimaj-core/src/test/java/org/apache/uima/ae/multiplier/SimpleCasGenerator.java
@@ -88,7 +88,7 @@ public class SimpleCasGenerator extends CasMultiplier_ImplBase {
lastDocument = null;
lastResultSpec = null;
- nToGen = (Integer) aContext.getConfigParameterValue("NumberToGenerate");
+ this.nToGen = (Integer) aContext.getConfigParameterValue("NumberToGenerate");
FileInputStream fis = null;
try {
String filename = ((String) aContext.getConfigParameterValue("InputFile")).trim();
@@ -129,8 +129,8 @@ public class SimpleCasGenerator extends CasMultiplier_ImplBase {
// and value of StringParam configuration parameter.
lastDocument = aCas.getDocumentText();
lastResultSpec = getResultSpecification();
- mCount = 0;
- docCount = 0;
+ this.mCount = 0;
+ this.docCount = 0;
}
/*
@@ -140,7 +140,7 @@ public class SimpleCasGenerator extends CasMultiplier_ImplBase {
*/
@Override
public boolean hasNext() throws AnalysisEngineProcessException {
- return mCount < nToGen;
+ return this.mCount < this.nToGen;
}
/*
@@ -162,8 +162,8 @@ public class SimpleCasGenerator extends CasMultiplier_ImplBase {
docCount++;
if (UIMAFramework.getLogger().isLoggable(Level.FINE))
System.out.println("CasMult creating document#" + docCount);
- cas.setDocumentText(text);
- mCount++;
+ cas.setDocumentText(this.text);
+ this.mCount++;
return cas;
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java b/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java
index 7a48148a1..e5735b2d6 100644
--- a/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java
@@ -18,15 +18,10 @@
*/
package org.apache.uima.analysis_engine.impl;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.uima.Constants.JAVA_FRAMEWORK_NAME;
import static org.apache.uima.UIMAFramework.newConfigurationManager;
import static org.apache.uima.UIMAFramework.newDefaultResourceManager;
import static org.apache.uima.analysis_engine.impl.metadata.MetaDataObjectAssert.assertFieldAsEqualButNotSameValue;
import static org.apache.uima.resource.ResourceInitializationException.UNDEFINED_KEY_IN_FLOW;
-import static org.apache.uima.resource.metadata.ConfigurationParameter.TYPE_FLOAT;
-import static org.apache.uima.resource.metadata.ConfigurationParameter.TYPE_INTEGER;
-import static org.apache.uima.resource.metadata.ConfigurationParameter.TYPE_STRING;
import static org.apache.uima.test.junit_extension.JUnitExtension.getFile;
import static org.apache.uima.util.CasCreationUtils.createCas;
import static org.assertj.core.api.Assertions.as;
@@ -36,16 +31,21 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
import java.io.StringWriter;
-import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import java.util.Map;
import java.util.Random;
+import org.apache.uima.Constants;
import org.apache.uima.ResourceSpecifierFactory;
import org.apache.uima.UIMAFramework;
+import org.apache.uima.UimaContext;
import org.apache.uima.analysis_engine.AnalysisEngine;
import org.apache.uima.analysis_engine.AnalysisEngineDescription;
+import org.apache.uima.analysis_engine.metadata.AnalysisEngineMetaData;
+import org.apache.uima.analysis_engine.metadata.FixedFlow;
+import org.apache.uima.analysis_engine.metadata.FlowControllerDeclaration;
import org.apache.uima.analysis_engine.metadata.impl.FixedFlow_impl;
import org.apache.uima.analysis_engine.metadata.impl.FlowControllerDeclaration_impl;
import org.apache.uima.cas.CAS;
@@ -53,6 +53,8 @@ import org.apache.uima.flow.FlowControllerDescription;
import org.apache.uima.flow.impl.FlowControllerDescription_impl;
import org.apache.uima.internal.util.Misc;
import org.apache.uima.internal.util.MultiThreadUtils;
+import org.apache.uima.internal.util.SerializationUtils;
+import org.apache.uima.resource.ConfigurationManager;
import org.apache.uima.resource.ExternalResourceDependency;
import org.apache.uima.resource.ExternalResourceDescription;
import org.apache.uima.resource.FileResourceSpecifier;
@@ -65,6 +67,7 @@ import org.apache.uima.resource.metadata.AllowedValue;
import org.apache.uima.resource.metadata.Capability;
import org.apache.uima.resource.metadata.ConfigurationGroup;
import org.apache.uima.resource.metadata.ConfigurationParameter;
+import org.apache.uima.resource.metadata.ConfigurationParameterSettings;
import org.apache.uima.resource.metadata.ExternalResourceBinding;
import org.apache.uima.resource.metadata.FsIndexDescription;
import org.apache.uima.resource.metadata.FsIndexKeyDescription;
@@ -72,6 +75,10 @@ import org.apache.uima.resource.metadata.Import;
import org.apache.uima.resource.metadata.MetaDataObject;
import org.apache.uima.resource.metadata.NameValuePair;
import org.apache.uima.resource.metadata.OperationalProperties;
+import org.apache.uima.resource.metadata.ResourceManagerConfiguration;
+import org.apache.uima.resource.metadata.TypeDescription;
+import org.apache.uima.resource.metadata.TypePriorities;
+import org.apache.uima.resource.metadata.TypePriorityList;
import org.apache.uima.resource.metadata.TypeSystemDescription;
import org.apache.uima.resource.metadata.impl.AllowedValue_impl;
import org.apache.uima.resource.metadata.impl.Capability_impl;
@@ -85,6 +92,7 @@ import org.apache.uima.resource.metadata.impl.TypePriorities_impl;
import org.apache.uima.resource.metadata.impl.TypeSystemDescription_impl;
import org.apache.uima.test.junit_extension.JUnitExtension;
import org.apache.uima.util.InvalidXMLException;
+import org.apache.uima.util.Logger;
import org.apache.uima.util.XMLInputSource;
import org.apache.uima.util.XMLParser;
import org.apache.uima.util.XMLizable;
@@ -92,8 +100,6 @@ import org.assertj.core.api.InstanceOfAssertFactories;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.xml.sax.SAXException;
/**
@@ -101,7 +107,12 @@ import org.xml.sax.SAXException;
*/
public class AnalysisEngineDescription_implTest {
- private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ // Text encoding to use for the various byte/character conversions happening in this test case.
+ // Public because also used by other test cases.
+ public static final String encoding = "utf-8";
+
+ private static final File TEST_DATA_FILE = JUnitExtension
+ .getFile("ResourceTest/ResourceManager_implTest_tempDataFile.dat");
private XMLParser xmlParser;
private AnalysisEngineDescription primitiveDesc;
@@ -112,54 +123,62 @@ public class AnalysisEngineDescription_implTest {
xmlParser = UIMAFramework.getXMLParser();
xmlParser.enableSchemaValidation(true);
- var typeSystem = new TypeSystemDescription_impl();
-
- var fakeType = typeSystem.addType("Fake", "<b>Fake</b> Type", "Annotation");
- var fakeTypeFeature = fakeType.addFeature("TestFeature", "For Testing Only",
- CAS.TYPE_NAME_STRING);
-
- var enumType = typeSystem.addType("EnumType", "Test Enumerated Type", "uima.cas.String");
- enumType.setAllowedValues(new AllowedValue[] { //
- new AllowedValue_impl("One", "First Value"), //
+ TypeSystemDescription typeSystem = new TypeSystemDescription_impl();
+ TypeDescription type1 = typeSystem.addType("Fake", "<b>Fake</b> Type", "Annotation");
+ type1.addFeature("TestFeature", "For Testing Only", CAS.TYPE_NAME_STRING);
+ TypeDescription enumType = typeSystem.addType("EnumType", "Test Enumerated Type",
+ "uima.cas.String");
+ enumType.setAllowedValues(new AllowedValue[] { new AllowedValue_impl("One", "First Value"),
new AllowedValue_impl("Two", "Second Value") });
- var typePriorities = new TypePriorities_impl();
- var priorityList = typePriorities.addPriorityList();
- priorityList.addType(fakeType.getName());
- priorityList.addType(enumType.getName());
-
- var index1 = new FsIndexDescription_impl();
- index1.setLabel("testIndex");
- index1.setTypeName("Fake");
- var index1_key1 = new FsIndexKeyDescription_impl();
- index1_key1.setFeatureName(fakeTypeFeature.getName());
- index1_key1.setComparator(1);
- var index1_key2 = new FsIndexKeyDescription_impl();
- index1_key2.setFeatureName("Start");
- index1_key2.setComparator(0);
- var index1_key3 = new FsIndexKeyDescription_impl();
- index1_key3.setTypePriority(true);
- index1.setKeys(new FsIndexKeyDescription[] { index1_key1, index1_key2, index1_key3 });
-
- var index2 = new FsIndexDescription_impl();
+ TypePriorities typePriorities = new TypePriorities_impl();
+ TypePriorityList priorityList = typePriorities.addPriorityList();
+ priorityList.addType("Fake");
+ priorityList.addType("EnumType");
+
+ FsIndexDescription index = new FsIndexDescription_impl();
+ index.setLabel("testIndex");
+ index.setTypeName("Fake");
+ FsIndexKeyDescription key1 = new FsIndexKeyDescription_impl();
+ key1.setFeatureName("TestFeature");
+ key1.setComparator(1);
+ FsIndexKeyDescription key2 = new FsIndexKeyDescription_impl();
+ key2.setFeatureName("Start");
+ key2.setComparator(0);
+ FsIndexKeyDescription key3 = new FsIndexKeyDescription_impl();
+ key3.setTypePriority(true);
+ index.setKeys(new FsIndexKeyDescription[] { key1, key2, key3 });
+
+ FsIndexDescription index2 = new FsIndexDescription_impl();
index2.setLabel("testIndex2");
index2.setTypeName("Fake");
index2.setKind(FsIndexDescription.KIND_SET);
- var index2_key1 = new FsIndexKeyDescription_impl();
- index2_key1.setFeatureName("TestFeature");
- index2_key1.setComparator(1);
- index2.setKeys(new FsIndexKeyDescription[] { index2_key1 });
+ FsIndexKeyDescription key1a = new FsIndexKeyDescription_impl();
+ key1a.setFeatureName("TestFeature");
+ key1a.setComparator(1);
+ index2.setKeys(new FsIndexKeyDescription[] { key1a });
// create primitive AE description
primitiveDesc = new AnalysisEngineDescription_impl();
- primitiveDesc.setFrameworkImplementation(JAVA_FRAMEWORK_NAME);
+ primitiveDesc.setFrameworkImplementation(Constants.JAVA_FRAMEWORK_NAME);
primitiveDesc.setPrimitive(true);
- primitiveDesc.setAnnotatorImplementationName(TestAnnotator.class.getName());
-
- var cap1 = new Capability_impl();
+ primitiveDesc
+ .setAnnotatorImplementationName("org.apache.uima.analysis_engine.impl.TestAnnotator");
+ AnalysisEngineMetaData md = primitiveDesc.getAnalysisEngineMetaData();
+ md.setName("Test TAE");
+ md.setDescription("Does not do anything useful.");
+ md.setVersion("1.0");
+ md.setTypeSystem(typeSystem);
+ md.setTypePriorities(typePriorities);
+ md.setFsIndexes(new FsIndexDescription[] { index, index2 });
+ Capability cap1 = new Capability_impl();
cap1.setDescription("First fake capability");
- cap1.addOutputType(fakeType.getName(), false);
+ cap1.addOutputType("Fake", false);
cap1.addOutputFeature("Fake:TestFeature");
+ Capability cap2 = new Capability_impl();
+ cap2.setDescription("Second fake capability");
+ cap2.addInputType("Fake", true);
+ cap2.addOutputType("Fake", true);
// SimplePrecondition precond1 = new SimplePrecondition_impl();
// precond1.setFeatureDescription(feature1);
// precond1.setComparisonValue(new String[]{"en,de"});
@@ -167,67 +186,46 @@ public class AnalysisEngineDescription_implTest {
// cap1.setPreconditions(new Precondition[]{precond1});
cap1.setLanguagesSupported(new String[] { "en", "de" });
cap1.setMimeTypesSupported(new String[] { "text/plain" });
-
- var cap2 = new Capability_impl();
- cap2.setDescription("Second fake capability");
- cap2.addInputType(fakeType.getName(), true);
- cap2.addOutputType(fakeType.getName(), true);
-
- var cfgParam1 = new ConfigurationParameter_impl();
+ md.setCapabilities(new Capability[] { cap1, cap2 });
+ ConfigurationParameter cfgParam1 = new ConfigurationParameter_impl();
cfgParam1.setName("param1");
cfgParam1.setDescription("Test Parameter 1");
- cfgParam1.setType(TYPE_STRING);
-
- var cfgParam2 = new ConfigurationParameter_impl();
+ cfgParam1.setType("String");
+ ConfigurationParameter cfgParam2 = new ConfigurationParameter_impl();
cfgParam2.setName("param2");
cfgParam2.setDescription("Test Parameter 2");
- cfgParam2.setType(TYPE_INTEGER);
-
- var cfgGrp1 = new ConfigurationGroup_impl();
+ cfgParam2.setType("Integer");
+ ConfigurationGroup cfgGrp1 = new ConfigurationGroup_impl();
cfgGrp1.setNames(new String[] { "cfgGrp1" });
cfgGrp1.setConfigurationParameters(new ConfigurationParameter[] { cfgParam1, cfgParam2 });
-
- var cfgParam3 = new ConfigurationParameter_impl();
+ ConfigurationParameter cfgParam3 = new ConfigurationParameter_impl();
cfgParam3.setName("param3");
cfgParam3.setDescription("Test Parameter 3");
- cfgParam3.setType(TYPE_FLOAT);
-
- var cfgGrp2 = new ConfigurationGroup_impl();
+ cfgParam3.setType("Float");
+ ConfigurationGroup cfgGrp2 = new ConfigurationGroup_impl();
cfgGrp2.setNames(new String[] { "cfgGrp2a", "cfgGrp2b" });
cfgGrp2.setConfigurationParameters(new ConfigurationParameter[] { cfgParam3 });
-
- var md = primitiveDesc.getAnalysisEngineMetaData();
- md.setName("Test TAE");
- md.setDescription("Does not do anything useful.");
- md.setVersion("1.0");
- md.setTypeSystem(typeSystem);
- md.setTypePriorities(typePriorities);
- md.setFsIndexes(new FsIndexDescription[] { index1, index2 });
- md.setCapabilities(new Capability[] { cap1, cap2 });
md.getConfigurationParameterDeclarations()
.setConfigurationGroups(new ConfigurationGroup[] { cfgGrp1, cfgGrp2 });
- var nvp1 = new NameValuePair_impl("param1", "test");
- var nvp2 = new NameValuePair_impl("param2", Integer.valueOf("42"));
- var nvp3a = new NameValuePair_impl("param3", Float.valueOf("2.718281828459045"));
- var nvp3b = new NameValuePair_impl("param3", Float.valueOf("3.1415927"));
-
- var settings = md.getConfigurationParameterSettings();
+ NameValuePair nvp1 = new NameValuePair_impl("param1", "test");
+ NameValuePair nvp2 = new NameValuePair_impl("param2", Integer.valueOf("42"));
+ NameValuePair nvp3a = new NameValuePair_impl("param3", Float.valueOf("2.718281828459045"));
+ NameValuePair nvp3b = new NameValuePair_impl("param3", Float.valueOf("3.1415927"));
+ ConfigurationParameterSettings settings = md.getConfigurationParameterSettings();
settings.getSettingsForGroups().put("cfgGrp1", new NameValuePair[] { nvp1, nvp2 });
settings.getSettingsForGroups().put("cfgGrp2a", new NameValuePair[] { nvp3a });
settings.getSettingsForGroups().put("cfgGrp2b", new NameValuePair[] { nvp3b });
// create aggregate AE description
aggregateDesc = new AnalysisEngineDescription_impl();
- aggregateDesc.setFrameworkImplementation(JAVA_FRAMEWORK_NAME);
+ aggregateDesc.setFrameworkImplementation(Constants.JAVA_FRAMEWORK_NAME);
aggregateDesc.setPrimitive(false);
-
Map<String, MetaDataObject> delegateTaeMap = aggregateDesc
.getDelegateAnalysisEngineSpecifiersWithImports();
delegateTaeMap.put("Test", primitiveDesc);
-
- var primDesc2 = new AnalysisEngineDescription_impl();
- primDesc2.setFrameworkImplementation(JAVA_FRAMEWORK_NAME);
+ AnalysisEngineDescription_impl primDesc2 = new AnalysisEngineDescription_impl();
+ primDesc2.setFrameworkImplementation(Constants.JAVA_FRAMEWORK_NAME);
primDesc2.setPrimitive(true);
primDesc2.setAnnotatorImplementationName("org.apache.uima.analysis_engine.impl.TestAnnotator");
primDesc2.getAnalysisEngineMetaData().setName("fakeAnnotator");
@@ -235,46 +233,46 @@ public class AnalysisEngineDescription_implTest {
.setCapabilities(new Capability[] { new Capability_impl() });
delegateTaeMap.put("Empty", primDesc2);
FileResourceSpecifier fileResSpec = new FileResourceSpecifier_impl();
- fileResSpec.setFileUrl(getClass()
- .getResource("/ResourceTest/ResourceManager_implTest_tempDataFile.dat").toString());
-
- var fcDecl = new FlowControllerDeclaration_impl();
+ fileResSpec.setFileUrl(TEST_DATA_FILE.toURL().toString());
+ FlowControllerDeclaration fcDecl = new FlowControllerDeclaration_impl();
fcDecl.setKey("TestFlowController");
- var fcDesc = new FlowControllerDescription_impl();
+ FlowControllerDescription fcDesc = new FlowControllerDescription_impl();
fcDesc.getMetaData().setName("MyTestFlowController");
fcDesc.setImplementationName("org.apache.uima.analysis_engine.impl.FlowControllerForErrorTest");
fcDecl.setSpecifier(fcDesc);
aggregateDesc.setFlowControllerDeclaration(fcDecl);
- var dep = UIMAFramework.getResourceSpecifierFactory().createExternalResourceDependency();
+ ExternalResourceDependency dep = UIMAFramework.getResourceSpecifierFactory()
+ .createExternalResourceDependency();
dep.setKey("ResourceKey");
dep.setDescription("Test");
aggregateDesc.setExternalResourceDependencies(new ExternalResourceDependency[] { dep });
- var resMgrCfg = UIMAFramework.getResourceSpecifierFactory()
+ ResourceManagerConfiguration resMgrCfg = UIMAFramework.getResourceSpecifierFactory()
.createResourceManagerConfiguration();
- var extRes = UIMAFramework.getResourceSpecifierFactory().createExternalResourceDescription();
+ ExternalResourceDescription extRes = UIMAFramework.getResourceSpecifierFactory()
+ .createExternalResourceDescription();
extRes.setResourceSpecifier(fileResSpec);
extRes.setName("Resource1");
extRes.setDescription("Test");
resMgrCfg.setExternalResources(new ExternalResourceDescription[] { extRes });
- var binding = UIMAFramework.getResourceSpecifierFactory().createExternalResourceBinding();
+ ExternalResourceBinding binding = UIMAFramework.getResourceSpecifierFactory()
+ .createExternalResourceBinding();
binding.setKey("ResourceKey");
binding.setResourceName("Resource1");
resMgrCfg.setExternalResourceBindings(new ExternalResourceBinding[] { binding });
aggregateDesc.setResourceManagerConfiguration(resMgrCfg);
- var fixedFlow = new FixedFlow_impl();
+ md = aggregateDesc.getAnalysisEngineMetaData();
+ md.setName("Test Aggregate TAE");
+ md.setDescription("Does not do anything useful.");
+ md.setVersion("1.0");
+ // md.setTypeSystem(typeSystem);
+ // md.setFsIndexes(new FsIndexDescription[]{index});
+ md.setCapabilities(primitiveDesc.getAnalysisEngineMetaData().getCapabilities());
+ FixedFlow fixedFlow = new FixedFlow_impl();
fixedFlow.setFixedFlow(new String[] { "Test", "Empty" });
-
- var md2 = aggregateDesc.getAnalysisEngineMetaData();
- md2.setName("Test Aggregate TAE");
- md2.setDescription("Does not do anything useful.");
- md2.setVersion("1.0");
- // md2.setTypeSystem(typeSystem);
- // md2.setFsIndexes(new FsIndexDescription[]{index});
- md2.setCapabilities(primitiveDesc.getAnalysisEngineMetaData().getCapabilities());
- md2.setFlowConstraints(fixedFlow);
+ md.setFlowConstraints(fixedFlow);
}
@AfterEach
@@ -288,21 +286,19 @@ public class AnalysisEngineDescription_implTest {
@Test
public void testMulticoreInitialize() throws Exception {
- var resourceManager = newDefaultResourceManager();
- var configManager = newConfigurationManager();
- var logger = UIMAFramework.getLogger(this.getClass());
+ ResourceManager resourceManager = newDefaultResourceManager();
+ ConfigurationManager configManager = newConfigurationManager();
+ Logger logger = UIMAFramework.getLogger(this.getClass());
- var uimaContext = UIMAFramework.newUimaContext(logger, resourceManager, configManager);
-
- final var p = new HashMap<String, Object>();
+ UimaContext uimaContext = UIMAFramework.newUimaContext(logger, resourceManager, configManager);
+ final Map<String, Object> p = new HashMap<>();
p.put(UIMAFramework.CAS_INITIAL_HEAP_SIZE, 200);
p.put(Resource.PARAM_CONFIG_MANAGER, configManager);
p.put(Resource.PARAM_RESOURCE_MANAGER, newDefaultResourceManager());
p.put(Resource.PARAM_UIMA_CONTEXT, uimaContext);
-
int numberOfThreads = Math.min(50, Misc.numberOfCores * 5);
final AnalysisEngine[] aes = new AnalysisEngine[numberOfThreads];
- LOG.info("test multicore initialize with {} threads", numberOfThreads);
+ System.out.format("test multicore initialize with %d threads%n", numberOfThreads);
MultiThreadUtils.Run2isb run2isb = new MultiThreadUtils.Run2isb() {
@Override
@@ -318,7 +314,6 @@ public class AnalysisEngineDescription_implTest {
}
}
};
-
MultiThreadUtils.tstMultiThread("MultiCoreInitialize", numberOfThreads, 100, run2isb,
MultiThreadUtils.emptyReset);
assertThat(aes[0]).isNotEqualTo(aes[1]);
@@ -347,16 +342,17 @@ public class AnalysisEngineDescription_implTest {
@Test
public void thatComplexDescriptorCanBeXMLized() throws Exception {
// test a complex descriptor
- var desc = xmlParser.parseAnalysisEngineDescription(new XMLInputSource(
+ AnalysisEngineDescription desc = xmlParser.parseAnalysisEngineDescription(new XMLInputSource(
getFile("AnnotatorContextTest/AnnotatorWithGroupsAndNonGroupParams.xml")));
- var opProps = desc.getAnalysisEngineMetaData().getOperationalProperties();
+ OperationalProperties opProps = desc.getAnalysisEngineMetaData().getOperationalProperties();
assertThat(opProps).isNotNull();
assertThat(opProps.getModifiesCas()).isTrue();
assertThat(opProps.isMultipleDeploymentAllowed()).isTrue();
- try (var is = new ByteArrayInputStream(toXmlString(desc).getBytes(UTF_8))) {
- var newDesc = xmlParser.parseAnalysisEngineDescription(new XMLInputSource(is, null));
+ try (InputStream is = new ByteArrayInputStream(toXmlString(desc).getBytes(encoding))) {
+ AnalysisEngineDescription newDesc = xmlParser
+ .parseAnalysisEngineDescription(new XMLInputSource(is, null));
assertThat(newDesc).isEqualTo(desc);
}
}
@@ -364,10 +360,11 @@ public class AnalysisEngineDescription_implTest {
@Test
public void thatDescriptorWithCasConsumerCanBeXMLized() throws Exception {
// test a descriptor that includes a CasConsumer
- var desc = xmlParser.parseAnalysisEngineDescription(new XMLInputSource(
+ AnalysisEngineDescription desc = xmlParser.parseAnalysisEngineDescription(new XMLInputSource(
getFile("TextAnalysisEngineImplTest/AggregateTaeWithCasConsumer.xml")));
- try (var is = new ByteArrayInputStream(toXmlString(desc).getBytes(UTF_8))) {
- var newDesc = xmlParser.parseAnalysisEngineDescription(new XMLInputSource(is));
+ try (InputStream is = new ByteArrayInputStream(toXmlString(desc).getBytes(encoding))) {
+ AnalysisEngineDescription newDesc = xmlParser
+ .parseAnalysisEngineDescription(new XMLInputSource(is, null));
assertThat(newDesc).isEqualTo(desc);
}
}
@@ -378,8 +375,9 @@ public class AnalysisEngineDescription_implTest {
String primitiveDescXml = toXmlString(primitiveDesc);
// parse objects from XML
- try (var is = new ByteArrayInputStream(primitiveDescXml.getBytes(UTF_8))) {
- var newPrimitiveDesc = xmlParser.parseAnalysisEngineDescription(new XMLInputSource(is));
+ try (InputStream is = new ByteArrayInputStream(primitiveDescXml.getBytes(encoding))) {
+ AnalysisEngineDescription newPrimitiveDesc = xmlParser
+ .parseAnalysisEngineDescription(new XMLInputSource(is, null));
assertThat(newPrimitiveDesc).isEqualTo(primitiveDesc);
}
}
@@ -387,15 +385,16 @@ public class AnalysisEngineDescription_implTest {
@Test
public void thatAggregateDescriptorCanBeXMLized() throws Exception {
String aggregateDescXml = toXmlString(aggregateDesc);
- try (var is = new ByteArrayInputStream(aggregateDescXml.getBytes(UTF_8))) {
- var newAggregateDesc = xmlParser.parseAnalysisEngineDescription(new XMLInputSource(is));
+ try (InputStream is = new ByteArrayInputStream(aggregateDescXml.getBytes(encoding))) {
+ AnalysisEngineDescription newAggregateDesc = xmlParser
+ .parseAnalysisEngineDescription(new XMLInputSource(is, null));
assertThat(newAggregateDesc).isEqualTo(aggregateDesc);
}
}
@Test
public void testDefaultingOperationalParameters() throws Exception {
- var in = new XMLInputSource(JUnitExtension
+ XMLInputSource in = new XMLInputSource(JUnitExtension
.getFile("TextAnalysisEngineImplTest/TestPrimitiveOperationalParmsDefaults.xml"));
AnalysisEngineDescription desc = xmlParser.parseAnalysisEngineDescription(in);
OperationalProperties opProps = desc.getAnalysisEngineMetaData().getOperationalProperties();
@@ -405,6 +404,22 @@ public class AnalysisEngineDescription_implTest {
assertThat(opProps.isMultipleDeploymentAllowed()).isFalse();
}
+ @Test
+ public void thatPrimitiveDescriptionCanBeSerialized() throws Exception {
+ byte[] primitiveDescBytes = SerializationUtils.serialize(primitiveDesc);
+ AnalysisEngineDescription newPrimitiveDesc = (AnalysisEngineDescription) SerializationUtils
+ .deserialize(primitiveDescBytes);
+ assertThat(newPrimitiveDesc).isEqualTo(primitiveDesc);
+ }
+
+ @Test
+ public void thatAggregateDescriptionCanBeSerialized() throws Exception {
+ byte[] aggregateDescBytes = SerializationUtils.serialize(aggregateDesc);
+ AnalysisEngineDescription newAggregateDesc = (AnalysisEngineDescription) SerializationUtils
+ .deserialize(aggregateDescBytes);
+ assertThat(newAggregateDesc).isEqualTo(aggregateDesc);
+ }
+
@Test
public void testDelegateImports() throws Exception {
// create aggregate TAE description and add delegate AE import
@@ -655,6 +670,6 @@ public class AnalysisEngineDescription_implTest {
private String toXmlString(XMLizable aObject) throws IOException, SAXException {
StringWriter writer = new StringWriter();
aObject.toXML(writer);
- return writer.toString();
+ return writer.getBuffer().toString();
}
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotationWriter.java b/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotationWriter.java
index 1af2a71c1..f883d4a6c 100644
--- a/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotationWriter.java
+++ b/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotationWriter.java
@@ -63,10 +63,10 @@ public class AnnotationWriter extends CasConsumer_ImplBase implements CasConsume
public void initialize() throws ResourceInitializationException {
File testBaseDir = JUnitExtension.getFile("TextAnalysisEngineImplTest").getParentFile();
- outFile = new File(testBaseDir, "CpmOutput.txt");
+ this.outFile = new File(testBaseDir, "CpmOutput.txt");
try {
- fileWriter = new OutputStreamWriter(new FileOutputStream(outFile, false),
+ this.fileWriter = new OutputStreamWriter(new FileOutputStream(this.outFile, false),
StandardCharsets.UTF_8);
} catch (Exception e) {
throw new ResourceInitializationException(e);
@@ -106,11 +106,11 @@ public class AnnotationWriter extends CasConsumer_ImplBase implements CasConsume
for (typeIterator.moveToFirst(); typeIterator.isValid(); typeIterator.moveToNext()) {
AnnotationFS annot = typeIterator.get();
- fileWriter.write(annot.getCoveredText());
- fileWriter.write(System.getProperty("line.separator"));
- fileWriter.write(annot.toString());
+ this.fileWriter.write(annot.getCoveredText());
+ this.fileWriter.write(System.getProperty("line.separator"));
+ this.fileWriter.write(annot.toString());
}
- fileWriter.flush();
+ this.fileWriter.flush();
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -149,8 +149,8 @@ public class AnnotationWriter extends CasConsumer_ImplBase implements CasConsume
@Override
public void collectionProcessComplete(ProcessTrace aTrace)
throws ResourceProcessException, IOException {
- if (fileWriter != null) {
- fileWriter.close();
+ if (this.fileWriter != null) {
+ this.fileWriter.close();
}
}
@@ -176,9 +176,9 @@ public class AnnotationWriter extends CasConsumer_ImplBase implements CasConsume
*/
@Override
public void destroy() {
- if (fileWriter != null) {
+ if (this.fileWriter != null) {
try {
- fileWriter.close();
+ this.fileWriter.close();
} catch (IOException e) {
// ignore IOException on destroy
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_implTest.java b/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_implTest.java
index 6db758f99..8326a97b2 100644
--- a/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_implTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_implTest.java
@@ -333,8 +333,7 @@ public class AnnotatorContext_implTest {
assertThat(mAC3.getResourceURL("Unknown")).isNull();
// passthrough to class loader
- assertThat(mAC3.getResourceURL("org/apache/uima/analysis_engine/impl/testDataFile3.dat"))
- .isNotNull();
+ assertThat(mAC3.getResourceURL("org/apache/uima/analysis_engine/impl/testDataFile3.dat")).isNotNull();
// passthrough to data path
assertThat(mAC1.getResourceURL("testDataFile.dat")).isNotNull();
@@ -383,8 +382,7 @@ public class AnnotatorContext_implTest {
assertThat(mAC3.getResourceURI("Unknown")).isNull();
// passthrough to class loader
- assertThat(mAC3.getResourceURI("org/apache/uima/analysis_engine/impl/testDataFile3.dat"))
- .isNotNull();
+ assertThat(mAC3.getResourceURI("org/apache/uima/analysis_engine/impl/testDataFile3.dat")).isNotNull();
// passthrough to data path
assertThat(mAC1.getResourceURI("testDataFile.dat")).isNotNull();
diff --git a/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapperTest.java b/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapperTest.java
index 0f4b7131d..300e3973d 100644
--- a/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapperTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapperTest.java
@@ -54,27 +54,27 @@ public class PearAnalysisEngineWrapperTest {
@BeforeEach
public void setUp() throws Exception {
- pearAnalysisEngineWrapper = new PearAnalysisEngineWrapper();
+ this.pearAnalysisEngineWrapper = new PearAnalysisEngineWrapper();
- tempInstallDirectory = createInstallationDirectory();
+ this.tempInstallDirectory = this.createInstallationDirectory();
- installedPearPackage = installPearPackage();
+ this.installedPearPackage = this.installPearPackage();
}
@AfterEach
public void tearDown() throws Exception {
- removeInstallationDirectory();
+ this.removeInstallationDirectory();
}
@Test
public void testInitializeWithOverride() throws Exception {
PearSpecifier_impl pearSpecifier = new PearSpecifier_impl();
- pearSpecifier.setPearPath(installedPearPackage.getRootDirectory().toString());
+ pearSpecifier.setPearPath(this.installedPearPackage.getRootDirectory().toString());
pearSpecifier
.setPearParameters(new NameValuePair_impl(PARAMETER_NAME, PARAMETER_VALUE_OVERRIDE));
- boolean initialized = pearAnalysisEngineWrapper.initialize(pearSpecifier, new HashMap<>());
+ boolean initialized = this.pearAnalysisEngineWrapper.initialize(pearSpecifier, new HashMap<>());
assertThat(initialized).isTrue().as("Pear was initialized");
assertThat(pearAnalysisEngineWrapper.getConfigParameterValue(PARAMETER_NAME))
@@ -85,10 +85,10 @@ public class PearAnalysisEngineWrapperTest {
public void testInitializeWithOverrideLegacy() throws Exception {
PearSpecifier_impl pearSpecifier = new PearSpecifier_impl();
- pearSpecifier.setPearPath(installedPearPackage.getRootDirectory().toString());
+ pearSpecifier.setPearPath(this.installedPearPackage.getRootDirectory().toString());
pearSpecifier.setParameters(new Parameter_impl(PARAMETER_NAME, PARAMETER_VALUE_OVERRIDE));
- boolean initialized = pearAnalysisEngineWrapper.initialize(pearSpecifier, new HashMap<>());
+ boolean initialized = this.pearAnalysisEngineWrapper.initialize(pearSpecifier, new HashMap<>());
assertThat(initialized).isTrue().as("Pear was initialized");
assertThat(pearAnalysisEngineWrapper.getConfigParameterValue(PARAMETER_NAME))
@@ -99,11 +99,11 @@ public class PearAnalysisEngineWrapperTest {
public void testInitializeWithOverrideModernTakingPrecedenceOverLegacy() throws Exception {
PearSpecifier_impl pearSpecifier = new PearSpecifier_impl();
- pearSpecifier.setPearPath(installedPearPackage.getRootDirectory().toString());
+ pearSpecifier.setPearPath(this.installedPearPackage.getRootDirectory().toString());
pearSpecifier.setParameters(new Parameter_impl(PARAMETER_NAME, "legacy"));
pearSpecifier.setPearParameters(new NameValuePair_impl(PARAMETER_NAME, "modern"));
- boolean initialized = pearAnalysisEngineWrapper.initialize(pearSpecifier, new HashMap<>());
+ boolean initialized = this.pearAnalysisEngineWrapper.initialize(pearSpecifier, new HashMap<>());
assertThat(initialized).isTrue().as("Pear was initialized");
assertThat(pearAnalysisEngineWrapper.getConfigParameterValue(PARAMETER_NAME))
@@ -113,13 +113,13 @@ public class PearAnalysisEngineWrapperTest {
@Test
public void testInitializeWithoutOverride() throws Exception {
- PearSpecifier pearSpecifier = createPearSpecifierWithoutParameters();
+ PearSpecifier pearSpecifier = this.createPearSpecifierWithoutParameters();
- boolean initialized = pearAnalysisEngineWrapper.initialize(pearSpecifier, new HashMap<>());
+ boolean initialized = this.pearAnalysisEngineWrapper.initialize(pearSpecifier, new HashMap<>());
assertThat(initialized).as("Pear was not initialized").isTrue();
- String stringParamValue = (String) pearAnalysisEngineWrapper
+ String stringParamValue = (String) this.pearAnalysisEngineWrapper
.getConfigParameterValue(PearAnalysisEngineWrapperTest.PARAMETER_NAME);
assertThat(stringParamValue).as("The value of StringParam has changed")
@@ -129,7 +129,7 @@ public class PearAnalysisEngineWrapperTest {
private PearSpecifier createPearSpecifierWithoutParameters() {
PearSpecifier_impl pearSpecifier_impl = new PearSpecifier_impl();
- pearSpecifier_impl.setPearPath(installedPearPackage.getRootDirectory().toString());
+ pearSpecifier_impl.setPearPath(this.installedPearPackage.getRootDirectory().toString());
return pearSpecifier_impl;
}
@@ -151,12 +151,12 @@ public class PearAnalysisEngineWrapperTest {
File pearFile = JUnitExtension.getFile("pearTests/analysisEngineWithParameters.pear");
assertThat(pearFile).as("analysisEngine.pear file not found").isNotNull();
- return PackageInstaller.installPackage(tempInstallDirectory, pearFile, false);
+ return PackageInstaller.installPackage(this.tempInstallDirectory, pearFile, false);
}
private void removeInstallationDirectory() throws IOException {
- if (tempInstallDirectory != null) {
- FileUtil.deleteDirectory(tempInstallDirectory);
+ if (this.tempInstallDirectory != null) {
+ FileUtil.deleteDirectory(this.tempInstallDirectory);
}
}
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecification_implTest.java b/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecification_implTest.java
index d5a3656e3..f78c93721 100644
--- a/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecification_implTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecification_implTest.java
@@ -19,7 +19,7 @@
package org.apache.uima.analysis_engine.impl;
-import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.apache.uima.analysis_engine.impl.AnalysisEngineDescription_implTest.encoding;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertTrue;
@@ -565,7 +565,7 @@ public class ResultSpecification_implTest {
// System.out.println(rsXml);
// parse object back from XML
- InputStream is = new ByteArrayInputStream(rsXml.getBytes(UTF_8));
+ InputStream is = new ByteArrayInputStream(rsXml.getBytes(encoding));
ResultSpecification newRS = UIMAFramework.getXMLParser()
.parseResultSpecification(new XMLInputSource(is, null));
TypeOrFeature[] tofs = newRS.getResultTypesAndFeatures();
diff --git a/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/SegmentDroppingFlowController.java b/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/SegmentDroppingFlowController.java
index 6bea9d6a9..3dce59e62 100644
--- a/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/SegmentDroppingFlowController.java
+++ b/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/SegmentDroppingFlowController.java
@@ -89,9 +89,12 @@ public class SegmentDroppingFlowController extends CasFlowController_ImplBase {
return new FinalStep(true);
}
+ if (currentStep >= mSequence.length) {
+ return new FinalStep(); // this CAS has finished the sequence
+ }
// If CAS was segmented, do not continue with flow. The individual segments
// are processed further but the original CAS is not.
- if ((currentStep >= mSequence.length) || wasSegmented) {
+ if (wasSegmented) {
return new FinalStep();
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TaeDescription_implTest.java b/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TaeDescription_implTest.java
index 8159d92ee..8875e1ac4 100644
--- a/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TaeDescription_implTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TaeDescription_implTest.java
@@ -19,7 +19,7 @@
package org.apache.uima.analysis_engine.impl;
-import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.apache.uima.analysis_engine.impl.AnalysisEngineDescription_implTest.encoding;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.ByteArrayInputStream;
@@ -34,6 +34,7 @@ import org.apache.uima.analysis_engine.metadata.AnalysisEngineMetaData;
import org.apache.uima.analysis_engine.metadata.FixedFlow;
import org.apache.uima.analysis_engine.metadata.impl.FixedFlow_impl;
import org.apache.uima.cas.CAS;
+import org.apache.uima.internal.util.SerializationUtils;
import org.apache.uima.resource.ExternalResourceDependency;
import org.apache.uima.resource.ExternalResourceDescription;
import org.apache.uima.resource.URISpecifier;
@@ -245,10 +246,10 @@ public class TaeDescription_implTest {
// System.out.println(aggregateDescXml);
// parse objects back from XML
- InputStream is = new ByteArrayInputStream(primitiveDescXml.getBytes(UTF_8));
+ InputStream is = new ByteArrayInputStream(primitiveDescXml.getBytes(encoding));
AnalysisEngineDescription newPrimitiveDesc = UIMAFramework.getXMLParser()
.parseAnalysisEngineDescription(new XMLInputSource(is, null));
- is = new ByteArrayInputStream(aggregateDescXml.getBytes(UTF_8));
+ is = new ByteArrayInputStream(aggregateDescXml.getBytes(encoding));
AnalysisEngineDescription newAggregateDesc = UIMAFramework.getXMLParser()
.parseAnalysisEngineDescription(new XMLInputSource(is, null));
@@ -258,4 +259,38 @@ public class TaeDescription_implTest {
JUnitExtension.handleException(e);
}
}
+
+ @Test
+ public void testSerialization() throws Exception {
+ try {
+ byte[] primitiveDescBytes = SerializationUtils.serialize(primitiveDesc);
+ AnalysisEngineDescription_impl primitiveDesc2 = (AnalysisEngineDescription_impl) SerializationUtils
+ .deserialize(primitiveDescBytes);
+ assertThat(primitiveDesc2).isEqualTo(primitiveDesc);
+
+ byte[] aggregateDescBytes = SerializationUtils.serialize(aggregateDesc);
+ AnalysisEngineDescription_impl aggregateDesc2 = (AnalysisEngineDescription_impl) SerializationUtils
+ .deserialize(aggregateDescBytes);
+ assertThat(aggregateDesc2).isEqualTo(aggregateDesc);
+
+ // make sure XMLization still works
+ StringWriter writer = new StringWriter();
+ primitiveDesc.toXML(writer);
+ String primitiveDescXml = writer.getBuffer().toString();
+ writer = new StringWriter();
+ primitiveDesc2.toXML(writer);
+ String primitiveDesc2xml = writer.getBuffer().toString();
+ assertThat(primitiveDesc2).isEqualTo(primitiveDesc);
+
+ writer = new StringWriter();
+ aggregateDesc.toXML(writer);
+ String aggregateDescXml = writer.getBuffer().toString();
+ writer = new StringWriter();
+ aggregateDesc2.toXML(writer);
+ String aggregateDesc2xml = writer.getBuffer().toString();
+ assertThat(aggregateDesc2).isEqualTo(aggregateDesc);
+ } catch (Exception e) {
+ JUnitExtension.handleException(e);
+ }
+ }
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/metadata/SofaMapping_implTest.java b/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/metadata/SofaMapping_implTest.java
index b9e033c32..3c39bf24d 100644
--- a/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/metadata/SofaMapping_implTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/metadata/SofaMapping_implTest.java
@@ -19,13 +19,14 @@
package org.apache.uima.analysis_engine.impl.metadata;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.uima.UIMAFramework.getXMLParser;
+import static org.apache.uima.analysis_engine.impl.AnalysisEngineDescription_implTest.encoding;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.ByteArrayInputStream;
+import java.io.InputStream;
import java.io.StringWriter;
+import org.apache.uima.UIMAFramework;
import org.apache.uima.analysis_engine.metadata.impl.SofaMapping_impl;
import org.apache.uima.util.XMLInputSource;
import org.junit.jupiter.api.BeforeEach;
@@ -36,8 +37,13 @@ public class SofaMapping_implTest {
SofaMapping_impl sm2;
+ /*
+ * (non-Javadoc)
+ *
+ * @see junit.framework.TestCase#setUp()
+ */
@BeforeEach
- void setUp() throws Exception {
+ public void setUp() throws Exception {
sm1 = new SofaMapping_impl();
sm1.setAggregateSofaName("aggSofa");
sm1.setComponentKey("myAnnotator");
@@ -49,25 +55,23 @@ public class SofaMapping_implTest {
}
@Test
- void testXmlization() throws Exception {
+ public void testXmlization() throws Exception {
// write to XML
- var writer = new StringWriter();
+ StringWriter writer = new StringWriter();
sm1.toXML(writer);
- var sm1Xml = writer.toString();
-
+ String sm1Xml = writer.getBuffer().toString();
writer = new StringWriter();
sm2.toXML(writer);
- var sm2Xml = writer.toString();
-
+ String sm2Xml = writer.getBuffer().toString();
// parse from XML
- try (var is = new ByteArrayInputStream(sm1Xml.getBytes(UTF_8))) {
- var newSm1 = (SofaMapping_impl) getXMLParser().parse(new XMLInputSource(is));
- assertThat(newSm1).isEqualTo(sm1);
- }
+ InputStream is = new ByteArrayInputStream(sm1Xml.getBytes(encoding));
+ SofaMapping_impl newSm1 = (SofaMapping_impl) UIMAFramework.getXMLParser()
+ .parse(new XMLInputSource(is, null));
+ is = new ByteArrayInputStream(sm2Xml.getBytes(encoding));
+ SofaMapping_impl newSm2 = (SofaMapping_impl) UIMAFramework.getXMLParser()
+ .parse(new XMLInputSource(is, null));
- try (var is = new ByteArrayInputStream(sm2Xml.getBytes(UTF_8))) {
- var newSm2 = (SofaMapping_impl) getXMLParser().parse(new XMLInputSource(is));
- assertThat(newSm2).isEqualTo(sm2);
- }
+ assertThat(newSm1).isEqualTo(sm1);
+ assertThat(newSm2).isEqualTo(sm2);
}
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerCapabilityLanguageTest.java b/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerCapabilityLanguageTest.java
index f01b425b6..b73b81395 100644
--- a/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerCapabilityLanguageTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerCapabilityLanguageTest.java
@@ -44,7 +44,7 @@ public class SequencerCapabilityLanguageTest {
@BeforeEach
public void setUp() throws Exception {
- testBaseDir = JUnitExtension.getFile("SequencerTest");
+ this.testBaseDir = JUnitExtension.getFile("SequencerTest");
}
public void runTest(String desc, String language, String refFile, boolean doResultSpec)
@@ -52,7 +52,7 @@ public class SequencerCapabilityLanguageTest {
AnalysisEngine ae = null;
try {
// create TempFile for test
- File outputReferenceFile = new File(testBaseDir, "SequencerTest.txt");
+ File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
outputReferenceFile.delete(); // delete file if exist
outputReferenceFile.createNewFile(); // create new file
diff --git a/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerFixedTest.java b/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerFixedTest.java
index f751c5771..0572ec47c 100644
--- a/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerFixedTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerFixedTest.java
@@ -47,7 +47,7 @@ public class SequencerFixedTest {
@BeforeEach
public void setUp() throws Exception {
// get test base path
- testBaseDir = JUnitExtension.getFile("SequencerTest");
+ this.testBaseDir = JUnitExtension.getFile("SequencerTest");
}
@Test
@@ -55,7 +55,7 @@ public class SequencerFixedTest {
AnalysisEngine ae = null;
try {
// create TempFile for test
- File outputReferenceFile = new File(testBaseDir, "SequencerTest.txt");
+ File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
outputReferenceFile.delete(); // delete file if exist
outputReferenceFile.createNewFile(); // create new file
outputReferenceFile.deleteOnExit(); // delete file after closing VM
@@ -100,7 +100,7 @@ public class SequencerFixedTest {
AnalysisEngine ae = null;
try {
// create TempFile for test
- File outputReferenceFile = new File(testBaseDir, "SequencerTest.txt");
+ File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
outputReferenceFile.delete(); // delete file if exist
outputReferenceFile.createNewFile(); // create new file
outputReferenceFile.deleteOnExit(); // delete file after closing VM
@@ -145,7 +145,7 @@ public class SequencerFixedTest {
AnalysisEngine ae = null;
try {
// create TempFile for test
- File outputReferenceFile = new File(testBaseDir, "SequencerTest.txt");
+ File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
outputReferenceFile.delete(); // delete file if exist
outputReferenceFile.createNewFile(); // create new file
outputReferenceFile.deleteOnExit(); // delete file after closing VM
@@ -190,7 +190,7 @@ public class SequencerFixedTest {
AnalysisEngine ae = null;
try {
// create TempFile for test
- File outputReferenceFile = new File(testBaseDir, "SequencerTest.txt");
+ File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
outputReferenceFile.delete(); // delete file if exist
outputReferenceFile.createNewFile(); // create new file
outputReferenceFile.deleteOnExit(); // delete file after closing VM
@@ -235,7 +235,7 @@ public class SequencerFixedTest {
AnalysisEngine ae = null;
try {
// create TempFile for test
- File outputReferenceFile = new File(testBaseDir, "SequencerTest.txt");
+ File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
outputReferenceFile.delete(); // delete file if exist
outputReferenceFile.createNewFile(); // create new file
outputReferenceFile.deleteOnExit(); // delete file after closing VM
@@ -280,7 +280,7 @@ public class SequencerFixedTest {
AnalysisEngine ae = null;
try {
// create TempFile for test
- File outputReferenceFile = new File(testBaseDir, "SequencerTest.txt");
+ File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
outputReferenceFile.delete(); // delete file if exist
outputReferenceFile.createNewFile(); // create new file
outputReferenceFile.deleteOnExit(); // delete file after closing VM
@@ -325,7 +325,7 @@ public class SequencerFixedTest {
AnalysisEngine ae = null;
try {
// create TempFile for test
- File outputReferenceFile = new File(testBaseDir, "SequencerTest.txt");
+ File outputReferenceFile = new File(this.testBaseDir, "SequencerTest.txt");
outputReferenceFile.delete(); // delete file if exist
outputReferenceFile.createNewFile(); // create new file
outputReferenceFile.deleteOnExit(); // delete file after closing VM
diff --git a/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerTestAnnotator.java b/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerTestAnnotator.java
index 4b58f7824..37d277700 100644
--- a/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerTestAnnotator.java
+++ b/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerTestAnnotator.java
@@ -51,7 +51,7 @@ public class SequencerTestAnnotator extends Annotator_ImplBase implements TextAn
private File testBaseDir;
public SequencerTestAnnotator() {
- testBaseDir = JUnitExtension.getFile("SequencerTest");
+ this.testBaseDir = JUnitExtension.getFile("SequencerTest");
}
/**
@@ -75,7 +75,7 @@ public class SequencerTestAnnotator extends Annotator_ImplBase implements TextAn
try {
// read annotator name from configuration parameter 'AnnotatorName'
- name = secureGetConfigParameterValue(context, "AnnotatorName", "defaultName");
+ this.name = secureGetConfigParameterValue(context, "AnnotatorName", "defaultName");
} catch (AnnotatorContextException e) {
throw new AnnotatorConfigurationException(e);
}
@@ -91,7 +91,7 @@ public class SequencerTestAnnotator extends Annotator_ImplBase implements TextAn
if (true) {
try {
// use standard output file
- File fp = new File(testBaseDir, "SequencerTest.txt");
+ File fp = new File(this.testBaseDir, "SequencerTest.txt");
if (!fp.exists()) {
fp.createNewFile();
}
@@ -99,7 +99,7 @@ public class SequencerTestAnnotator extends Annotator_ImplBase implements TextAn
// write result specification to the output file
OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(fp, true),
StandardCharsets.UTF_8);
- writer.write("\nResultSpec for annotator " + name + ":\n");
+ writer.write("\nResultSpec for annotator " + this.name + ":\n");
TypeOrFeature[] tofs = resultSpec.getResultTypesAndFeatures();
// sort by name to ensure consistent output for testing purposes
Arrays.sort(tofs, new Comparator<TypeOrFeature>() {
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/impl/AnnotationIteratorTest.java b/uimaj-core/src/test/java/org/apache/uima/cas/impl/AnnotationIteratorTest.java
index ef42e29c5..364e1a8e6 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/impl/AnnotationIteratorTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/impl/AnnotationIteratorTest.java
@@ -112,39 +112,39 @@ public class AnnotationIteratorTest {
// make a cas with various types, fairly complex -- see CASTestSetup class
cas = CASInitializer.initCas(new CASTestSetup(), null);
assertTrue(cas != null);
- ts = cas.getTypeSystem();
- assertTrue(ts != null);
-
- stringType = ts.getType(CAS.TYPE_NAME_STRING);
- assertTrue(stringType != null);
- tokenType = ts.getType(CASTestSetup.TOKEN_TYPE);
- assertTrue(stringType != null);
- intType = ts.getType(CAS.TYPE_NAME_INTEGER);
- assertTrue(intType != null);
- tokenTypeType = ts.getType(CASTestSetup.TOKEN_TYPE_TYPE);
- assertTrue(tokenTypeType != null);
- wordType = ts.getType(CASTestSetup.WORD_TYPE);
- assertTrue(wordType != null);
- sepType = ts.getType(CASTestSetup.SEP_TYPE);
- assertTrue(sepType != null);
- eosType = ts.getType(CASTestSetup.EOS_TYPE);
- assertTrue(eosType != null);
- tokenTypeFeat = ts.getFeatureByFullName(CASTestSetup.TOKEN_TYPE_FEAT_Q);
- assertTrue(tokenTypeFeat != null);
- lemmaFeat = ts.getFeatureByFullName(CASTestSetup.LEMMA_FEAT_Q);
- assertTrue(lemmaFeat != null);
- sentLenFeat = ts.getFeatureByFullName(CASTestSetup.SENT_LEN_FEAT_Q);
- assertTrue(sentLenFeat != null);
- tokenFloatFeat = ts.getFeatureByFullName(CASTestSetup.TOKEN_FLOAT_FEAT_Q);
- assertTrue(tokenFloatFeat != null);
- startFeature = ts.getFeatureByFullName(CAS.FEATURE_FULL_NAME_BEGIN);
- assertTrue(startFeature != null);
- endFeature = ts.getFeatureByFullName(CAS.FEATURE_FULL_NAME_END);
- assertTrue(endFeature != null);
- sentenceType = ts.getType(CASTestSetup.SENT_TYPE);
- assertTrue(sentenceType != null);
- phraseType = ts.getType(CASTestSetup.PHRASE_TYPE);
- assertTrue(phraseType != null);
+ this.ts = cas.getTypeSystem();
+ assertTrue(this.ts != null);
+
+ this.stringType = this.ts.getType(CAS.TYPE_NAME_STRING);
+ assertTrue(this.stringType != null);
+ this.tokenType = this.ts.getType(CASTestSetup.TOKEN_TYPE);
+ assertTrue(this.stringType != null);
+ this.intType = this.ts.getType(CAS.TYPE_NAME_INTEGER);
+ assertTrue(this.intType != null);
+ this.tokenTypeType = this.ts.getType(CASTestSetup.TOKEN_TYPE_TYPE);
+ assertTrue(this.tokenTypeType != null);
+ this.wordType = this.ts.getType(CASTestSetup.WORD_TYPE);
+ assertTrue(this.wordType != null);
+ this.sepType = this.ts.getType(CASTestSetup.SEP_TYPE);
+ assertTrue(this.sepType != null);
+ this.eosType = this.ts.getType(CASTestSetup.EOS_TYPE);
+ assertTrue(this.eosType != null);
+ this.tokenTypeFeat = this.ts.getFeatureByFullName(CASTestSetup.TOKEN_TYPE_FEAT_Q);
+ assertTrue(this.tokenTypeFeat != null);
+ this.lemmaFeat = this.ts.getFeatureByFullName(CASTestSetup.LEMMA_FEAT_Q);
+ assertTrue(this.lemmaFeat != null);
+ this.sentLenFeat = this.ts.getFeatureByFullName(CASTestSetup.SENT_LEN_FEAT_Q);
+ assertTrue(this.sentLenFeat != null);
+ this.tokenFloatFeat = this.ts.getFeatureByFullName(CASTestSetup.TOKEN_FLOAT_FEAT_Q);
+ assertTrue(this.tokenFloatFeat != null);
+ this.startFeature = this.ts.getFeatureByFullName(CAS.FEATURE_FULL_NAME_BEGIN);
+ assertTrue(this.startFeature != null);
+ this.endFeature = this.ts.getFeatureByFullName(CAS.FEATURE_FULL_NAME_END);
+ assertTrue(this.endFeature != null);
+ this.sentenceType = this.ts.getType(CASTestSetup.SENT_TYPE);
+ assertTrue(this.sentenceType != null);
+ this.phraseType = this.ts.getType(CASTestSetup.PHRASE_TYPE);
+ assertTrue(this.phraseType != null);
types[0] = sentenceType;
types[1] = phraseType;
types[2] = tokenType;
@@ -153,20 +153,20 @@ public class AnnotationIteratorTest {
@AfterEach
public void tearDown() {
cas = null;
- ts = null;
- tokenType = null;
- intType = null;
- tokenTypeType = null;
- wordType = null;
- sepType = null;
- eosType = null;
- tokenTypeFeat = null;
- lemmaFeat = null;
- sentLenFeat = null;
- tokenFloatFeat = null;
- startFeature = null;
- endFeature = null;
- sentenceType = null;
+ this.ts = null;
+ this.tokenType = null;
+ this.intType = null;
+ this.tokenTypeType = null;
+ this.wordType = null;
+ this.sepType = null;
+ this.eosType = null;
+ this.tokenTypeFeat = null;
+ this.lemmaFeat = null;
+ this.sentLenFeat = null;
+ this.tokenFloatFeat = null;
+ this.startFeature = null;
+ this.endFeature = null;
+ this.sentenceType = null;
}
// //debug
@@ -209,11 +209,11 @@ public class AnnotationIteratorTest {
fss.clear();
isSave = true;
- AnnotationFS a1 = cas.createAnnotation(tokenType, 1, 6);
+ AnnotationFS a1 = cas.createAnnotation(this.tokenType, 1, 6);
a1.setStringValue(lemmaFeat, "lemma1");
indexRepository.addFS(a1);
- AnnotationFS a2 = cas.createAnnotation(tokenType, 1, 6);
+ AnnotationFS a2 = cas.createAnnotation(this.tokenType, 1, 6);
a2.setStringValue(lemmaFeat, "lemma2");
indexRepository.addFS(a2);
@@ -249,7 +249,7 @@ public class AnnotationIteratorTest {
// called twice, the 2nd time should be with flattened indexes (List afss non empty the 2nd time)
private void iterateOverAnnotations(final int annotCount, List<Annotation> afss)
throws Exception {
- fss = afss;
+ this.fss = afss;
isSave = fss.size() == 0; // on first call is 0, so save on first call
JCas jcas = cas.getJCas();
@@ -312,7 +312,7 @@ public class AnnotationIteratorTest {
assertCount("Unambigous select sentence iterator (type priorities)", 5,
sentIndex.select().typePriority().nonOverlapping());
- AnnotationFS bigBound = cas.createAnnotation(sentenceType, 10, 41);
+ AnnotationFS bigBound = cas.createAnnotation(this.sentenceType, 10, 41);
// ambiguous, and strict
assertThat(annotIndex.subiterator(bigBound, true, true)).toIterable().hasSize(38);
assertCount("Subiterator over annot with big bound, strict", 38,
@@ -433,7 +433,7 @@ public class AnnotationIteratorTest {
annotIndex.select().typePriority().nonOverlapping().coveredBy(bigBound)
.includeAnnotationsWithEndBeyondBounds(true));
- AnnotationFS sent = cas.getAnnotationIndex(sentenceType).iterator().get();
+ AnnotationFS sent = cas.getAnnotationIndex(this.sentenceType).iterator().get();
assertThat(annotIndex.subiterator(sent, false, true)).toIterable()
.as("Subiterator over annot unambiguous strict")
.extracting(a -> a.getType(), a -> a.getBegin(), a -> a.getEnd()).containsExactly( //
@@ -453,7 +453,7 @@ public class AnnotationIteratorTest {
annotIndex.select().typePriority().nonOverlapping().coveredBy(sent));
// strict skips first item
- bigBound = cas.createAnnotation(sentenceType, 11, 30);
+ bigBound = cas.createAnnotation(this.sentenceType, 11, 30);
assertCount("Subiteratover over sent ambiguous strict", 4,
sentIndex.subiterator(bigBound, true, true));
assertCount("Subiteratover over sent ambiguous", 9,
@@ -684,7 +684,7 @@ public class AnnotationIteratorTest {
public void testIncorrectIndexTypeException() {
boolean caughtException = false;
try {
- cas.getAnnotationIndex(stringType);
+ cas.getAnnotationIndex(this.stringType);
} catch (CASRuntimeException e) {
// e.printStackTrace();
caughtException = true;
@@ -699,7 +699,7 @@ public class AnnotationIteratorTest {
}
assertTrue(caughtException);
try {
- cas.getAnnotationIndex(tokenType);
+ cas.getAnnotationIndex(this.tokenType);
} catch (CASRuntimeException e) {
assertTrue(false);
}
@@ -726,13 +726,13 @@ public class AnnotationIteratorTest {
}
AnnotationIndex<Annotation> ai = cas.getAnnotationIndex();
- cas.addFsToIndexes(cas.createAnnotation(sentenceType, 0, 25));
- cas.addFsToIndexes(cas.createAnnotation(sentenceType, 26, 52));
- cas.addFsToIndexes(cas.createAnnotation(tokenType, 48, 51));
- AnnotationIndex<Annotation> tokenIdx = cas.getAnnotationIndex(tokenType);
+ cas.addFsToIndexes(cas.createAnnotation(this.sentenceType, 0, 25));
+ cas.addFsToIndexes(cas.createAnnotation(this.sentenceType, 26, 52));
+ cas.addFsToIndexes(cas.createAnnotation(this.tokenType, 48, 51));
+ AnnotationIndex<Annotation> tokenIdx = cas.getAnnotationIndex(this.tokenType);
// AnnotationIndex<AnnotationFS> si = cas.getAnnotationIndex(this.sentenceType);
- for (Annotation sa : ai.select(sentenceType)) {
+ for (Annotation sa : ai.select(this.sentenceType)) {
FSIterator<Annotation> ti2 = tokenIdx.subiterator(sa, false, false);
while (ti2.hasNext()) {
@@ -742,7 +742,7 @@ public class AnnotationIteratorTest {
}
}
- SelectFSs<Annotation> ssi = ai.select(sentenceType);
+ SelectFSs<Annotation> ssi = ai.select(this.sentenceType);
for (AnnotationFS sa : ssi) {
FSIterator<Annotation> ti2 = tokenIdx.select().coveredBy(sa)
@@ -922,7 +922,7 @@ public class AnnotationIteratorTest {
AnnotationFS fs;
for (int i = 0; i < text.length() - 5; i++) {
++annotCount;
- ir.addFS(fs = cas.createAnnotation(tokenType, i, i + 5));
+ ir.addFS(fs = cas.createAnnotation(this.tokenType, i, i + 5));
annotationList.add(fs);
if (showFSs) {
System.out.format("creating: %d begin: %d end: %d type: %s%n", annotCount, fs.getBegin(),
@@ -939,7 +939,7 @@ public class AnnotationIteratorTest {
// non-overlapping: 0-10, 10-20, etc.
for (int i = 0; i < text.length() - 10; i += 5) {
++annotCount;
- ir.addFS(fs = cas.createAnnotation(sentenceType, i, i + 10));
+ ir.addFS(fs = cas.createAnnotation(this.sentenceType, i, i + 10));
annotationList.add(fs);
if (showFSs) {
System.out.format("creating: %d begin: %d end: %d type: %s%n", annotCount, fs.getBegin(),
@@ -954,7 +954,7 @@ public class AnnotationIteratorTest {
int beginAlt = 0, endAlt = 0;
for (int i = 0; i < text.length() - 10; i += 5) {
++annotCount;
- ir.addFS(fs = cas.createAnnotation(phraseType, i + beginAlt, i + 5 + endAlt));
+ ir.addFS(fs = cas.createAnnotation(this.phraseType, i + beginAlt, i + 5 + endAlt));
annotationList.add(fs);
beginAlt = (beginAlt == 1) ? -1 : beginAlt + 1; // sequence: start @ 0, then 1, -1, 0, 1, ...
endAlt = (endAlt == -1) ? 1 : endAlt - 1; // sequence: start At 0, then -1, 1, 0, -1, ...
@@ -965,7 +965,7 @@ public class AnnotationIteratorTest {
}
++annotCount;
- ir.addFS(fs = cas.createAnnotation(sentenceType, 12, 31));
+ ir.addFS(fs = cas.createAnnotation(this.sentenceType, 12, 31));
annotationList.add(fs);
if (showFSs) {
System.out.format("creating: %d begin: %d end: %d type: %s%n", annotCount, fs.getBegin(),
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasTypeSystemMapperTest.java b/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasTypeSystemMapperTest.java
index f8f4dfbe5..d7acd28fc 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasTypeSystemMapperTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasTypeSystemMapperTest.java
@@ -495,9 +495,9 @@ public class CasTypeSystemMapperTest {
* @param feats2
*/
CASTestSetup(int types, int feats1, int feats2) {
- typesToGenerate = types;
- featsToInclude1 = feats1;
- featsToInclude2 = feats2;
+ this.typesToGenerate = types;
+ this.featsToInclude1 = feats1;
+ this.featsToInclude2 = feats2;
ttgb = new boolean[2];
ttgb[0] = (1 == (typesToGenerate & 1));
ttgb[1] = (2 == (typesToGenerate & 2));
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/impl/ConcurrentBinarySerializationTest.java b/uimaj-core/src/test/java/org/apache/uima/cas/impl/ConcurrentBinarySerializationTest.java
index 9ebcea502..806188b20 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/impl/ConcurrentBinarySerializationTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/impl/ConcurrentBinarySerializationTest.java
@@ -114,7 +114,7 @@ public class ConcurrentBinarySerializationTest {
// All futures must complete without returning an exception
assertTrue(results.stream().allMatch(r -> {
try {
- return r.get();
+ return r.get() == true;
} catch (Exception e) {
return false;
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/impl/Id2FSTest.java b/uimaj-core/src/test/java/org/apache/uima/cas/impl/Id2FSTest.java
index c71620949..52ba50e61 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/impl/Id2FSTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/impl/Id2FSTest.java
@@ -38,9 +38,9 @@ public class Id2FSTest {
@BeforeEach
public void setUp() {
try {
- cas = (CASImpl) CASInitializer.initCas(new CASTestSetup(), null);
- jcas = cas.getJCas();
- ts = cas.getTypeSystem();
+ this.cas = (CASImpl) CASInitializer.initCas(new CASTestSetup(), null);
+ this.jcas = cas.getJCas();
+ this.ts = this.cas.getTypeSystem();
} catch (Exception e) {
assertTrue(false);
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesForm4Test.java b/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesForm4Test.java
index bbdf9d926..738cbe05e 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesForm4Test.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesForm4Test.java
@@ -212,7 +212,7 @@ public class SerDesForm4Test extends SerDesTstCommon {
CASTestSetup cts = new CASTestSetup();
cas = (CASImpl) CASInitializer.initCas(cts, t -> cts.reinitTypeSystem(t));
- ts = (TypeSystemImpl) cas.getTypeSystem();
+ ts = (TypeSystemImpl) this.cas.getTypeSystem();
cas2 = (CASImpl) CasCreationUtils.createCas(ts, null, null, null);
deserCas = (CASImpl) CasCreationUtils.createCas(ts, null, null, null);
deltaCas = (CASImpl) CasCreationUtils.createCas(ts, null, null, null);
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesForm6Test.java b/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesForm6Test.java
index 0ea18d0c3..5b963b694 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesForm6Test.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesForm6Test.java
@@ -208,7 +208,7 @@ public class SerDesForm6Test extends SerDesTstCommon {
public TTypeSystem(TypeSystemMgr tsm, TypeSystems kind) {
this.tsm = tsm;
this.kind = kind;
- ts = (TypeSystemImpl) tsm;
+ this.ts = (TypeSystemImpl) tsm;
}
/** add existing type by short name to the map, e.g. Aint -> array of int */
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasSerializerTest.java b/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasSerializerTest.java
index e4ddf8784..435b4c010 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasSerializerTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasSerializerTest.java
@@ -71,18 +71,18 @@ public class XmiCasSerializerTest {
public void setUp() throws Exception {
File typeSystemFile = JUnitExtension.getFile("ExampleCas/testTypeSystem.xml");
// Temp output file, deleted on exit.
- outputFile = new File(JUnitExtension.getFile("ExampleCas"),
+ this.outputFile = new File(JUnitExtension.getFile("ExampleCas"),
"xmiSerializerInvalidCharsTestOutput.xmi");
- typeSystemDesc = UIMAFramework.getXMLParser()
+ this.typeSystemDesc = UIMAFramework.getXMLParser()
.parseTypeSystemDescription(new XMLInputSource(typeSystemFile));
}
@Test
public void testInvalidCharsInDocumentText() throws Exception {
- CAS cas = CasCreationUtils.createCas(typeSystemDesc, null, null);
+ CAS cas = CasCreationUtils.createCas(this.typeSystemDesc, null, null);
char badChar = 0x1A;
cas.setDocumentText("Text with bad char: " + badChar);
- OutputStream out = new FileOutputStream(outputFile);
+ OutputStream out = new FileOutputStream(this.outputFile);
XMLSerializer xmlSerializer = new XMLSerializer(out);
XmiCasSerializer xmiCasSerializer = new XmiCasSerializer(cas.getTypeSystem());
boolean caughtException = false;
@@ -98,7 +98,7 @@ public class XmiCasSerializerTest {
// but when XML 1.1 output is being generated, don't fail on control characters which are valid
// in 1.1.
if (XML1_1_SUPPORTED) {
- out = new FileOutputStream(outputFile);
+ out = new FileOutputStream(this.outputFile);
try {
XMLSerializer xml11Serializer = new XMLSerializer(out);
xml11Serializer.setOutputProperty(OutputKeys.VERSION, "1.1");
@@ -107,18 +107,18 @@ public class XmiCasSerializerTest {
out.close();
}
- outputFile.delete();
- out = new FileOutputStream(outputFile);
+ this.outputFile.delete();
+ out = new FileOutputStream(this.outputFile);
CasIOUtils.save(cas, out, SerialFormat.XMI_1_1);
}
}
@Test
public void testInvalidCharsInFeatureValue() throws Exception {
- CAS cas = CasCreationUtils.createCas(typeSystemDesc, null, null);
+ CAS cas = CasCreationUtils.createCas(this.typeSystemDesc, null, null);
char badChar = 0x1A;
cas.setDocumentLanguage("a" + badChar);
- OutputStream out = new FileOutputStream(outputFile);
+ OutputStream out = new FileOutputStream(this.outputFile);
XMLSerializer xmlSerializer = new XMLSerializer(out);
XmiCasSerializer xmiCasSerializer = new XmiCasSerializer(cas.getTypeSystem());
boolean caughtException = false;
@@ -134,7 +134,7 @@ public class XmiCasSerializerTest {
// but when XML 1.1 output is being generated, don't fail on control characters which are valid
// in 1.1.
if (XML1_1_SUPPORTED) {
- out = new FileOutputStream(outputFile);
+ out = new FileOutputStream(this.outputFile);
try {
XMLSerializer xml11Serializer = new XMLSerializer(out);
xml11Serializer.setOutputProperty(OutputKeys.VERSION, "1.1");
@@ -152,8 +152,8 @@ public class XmiCasSerializerTest {
*/
@AfterEach
public void tearDown() throws Exception {
- if ((outputFile != null) && outputFile.exists()) {
- outputFile.delete();
+ if ((this.outputFile != null) && this.outputFile.exists()) {
+ this.outputFile.delete();
}
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasToComparableText.java b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasToComparableText.java
index c74760689..6d8a0475f 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasToComparableText.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasToComparableText.java
@@ -558,7 +558,11 @@ public class CasToComparableText {
}
private String renderStringValue(String aString) {
- if ((aString == null) || (treatEmptyStringsAsNull && aString.isEmpty())) {
+ if (aString == null) {
+ return nullValue;
+ }
+
+ if (treatEmptyStringsAsNull && aString.isEmpty()) {
return nullValue;
}
@@ -715,10 +719,16 @@ public class CasToComparableText {
}
} else {
for (Feature feature : fs.getType().getFeatures()) {
-
+ if (feature.getRange().isPrimitive()) {
+ continue;
+ }
// Check if the feature is excluded
- if (feature.getRange().isPrimitive() || isExcluded(feature) || CAS.FEATURE_BASE_NAME_SOFA.equals(feature.getShortName())) {
+ if (isExcluded(feature)) {
+ continue;
+ }
+
+ if (CAS.FEATURE_BASE_NAME_SOFA.equals(feature.getShortName())) {
continue;
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/PerformanceTestRunner.java b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/PerformanceTestRunner.java
index 5595aafd1..8d5c81702 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/PerformanceTestRunner.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/PerformanceTestRunner.java
@@ -47,11 +47,11 @@ public class PerformanceTestRunner {
private byte[] randomizedCasBytes;
private PerformanceTestRunner(Builder builder) {
- iterations = builder.iterations;
- warmUpIterations = builder.warmUpIterations;
- generator = builder.generator;
- serializer = builder.serializer;
- deserializer = builder.deserializer;
+ this.iterations = builder.iterations;
+ this.warmUpIterations = builder.warmUpIterations;
+ this.generator = builder.generator;
+ this.serializer = builder.serializer;
+ this.deserializer = builder.deserializer;
try {
TypeSystemDescription tsd = generator.generateTypeSystem();
@@ -135,12 +135,12 @@ public class PerformanceTestRunner {
}
public Builder withSerializer(FailableBiConsumer<CAS, OutputStream, Exception> aSerializer) {
- serializer = aSerializer;
+ this.serializer = aSerializer;
return this;
}
public Builder withDeserializer(FailableBiConsumer<InputStream, CAS, Exception> aDeserializer) {
- deserializer = aDeserializer;
+ this.deserializer = aDeserializer;
return this;
}
@@ -150,7 +150,7 @@ public class PerformanceTestRunner {
}
public Builder withWarmUpIterations(int iterations) {
- warmUpIterations = iterations;
+ this.warmUpIterations = iterations;
return this;
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/SerDesCasIOTestUtils.java b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/SerDesCasIOTestUtils.java
index 09a211cdc..dd5a13e30 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/SerDesCasIOTestUtils.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/SerDesCasIOTestUtils.java
@@ -35,6 +35,7 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.ObjectInputStream;
import java.io.OutputStream;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -57,7 +58,6 @@ import org.apache.uima.cas.serdes.scenario.SerDesTestScenario;
import org.apache.uima.cas.serdes.scenario.SerRefTestScenario;
import org.apache.uima.cas.serdes.transitions.CasDesSerCycleConfiguration;
import org.apache.uima.cas.serdes.transitions.CasSerDesCycleConfiguration;
-import org.apache.uima.internal.util.SerializationUtils;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.metadata.TypeSystemDescription;
import org.apache.uima.util.CasCreationUtils;
@@ -277,10 +277,15 @@ public class SerDesCasIOTestUtils {
}
private static CASMgrSerializer readCasManager(InputStream tsiInputStream) throws IOException {
- if (null == tsiInputStream) {
- return null;
+ try {
+ if (null == tsiInputStream) {
+ return null;
+ }
+ ObjectInputStream is = new ObjectInputStream(tsiInputStream);
+ return (CASMgrSerializer) is.readObject();
+ } catch (ClassNotFoundException e) {
+ throw new IOException(e);
}
- return SerializationUtils.deserializeCASMgrSerializer(tsiInputStream);
}
public static void writeXmi(CAS aCas, Path aTarget) {
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/datasuites/MultiTypeRandomCasDataSuite.java b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/datasuites/MultiTypeRandomCasDataSuite.java
index 3a1b3725a..49818983b 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/datasuites/MultiTypeRandomCasDataSuite.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/datasuites/MultiTypeRandomCasDataSuite.java
@@ -96,17 +96,17 @@ public class MultiTypeRandomCasDataSuite extends AbstractCollection<CasSourceTar
}
public Builder withSizeFactor(int aSizeFactor) {
- sizeFactor = aSizeFactor;
+ this.sizeFactor = aSizeFactor;
return this;
}
public Builder withMinimumAnnotationLength(int aMinimumAnnotationLength) {
- minimumAnnotationLength = aMinimumAnnotationLength;
+ this.minimumAnnotationLength = aMinimumAnnotationLength;
return this;
}
public Builder withRandomSeed(long aRandomSeed) {
- randomSeed = aRandomSeed;
+ this.randomSeed = aRandomSeed;
return this;
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/generators/MultiTypeRandomCasGenerator.java b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/generators/MultiTypeRandomCasGenerator.java
index 8c2276add..e743880ce 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/generators/MultiTypeRandomCasGenerator.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/generators/MultiTypeRandomCasGenerator.java
@@ -45,12 +45,12 @@ public class MultiTypeRandomCasGenerator implements CasGenerator {
private final int typeCount;
private MultiTypeRandomCasGenerator(Builder builder) {
- seed = builder.seed;
- rnd = builder.randomizer != null ? builder.randomizer : new Random(seed);
- size = builder.size;
- minimumWidth = builder.minimumWidth;
- writeLog = builder.writeLog;
- typeCount = builder.typeCount;
+ this.seed = builder.seed;
+ this.rnd = builder.randomizer != null ? builder.randomizer : new Random(seed);
+ this.size = builder.size;
+ this.minimumWidth = builder.minimumWidth;
+ this.writeLog = builder.writeLog;
+ this.typeCount = builder.typeCount;
}
public OptionalLong getSeed() {
@@ -151,7 +151,7 @@ public class MultiTypeRandomCasGenerator implements CasGenerator {
if (randomizer != null) {
throw new IllegalStateException("Can either set a random seed or a randomizer");
}
- seed = aSeed;
+ this.seed = aSeed;
return this;
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/scenario/DesSerTestScenario.java b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/scenario/DesSerTestScenario.java
index d939a6804..bf8c7f54e 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/scenario/DesSerTestScenario.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/scenario/DesSerTestScenario.java
@@ -43,12 +43,12 @@ public class DesSerTestScenario implements Runnable {
private final FailableBiConsumer<Path, Path, ?> assertion;
private DesSerTestScenario(Builder builder) {
- title = builder.title;
- sourceCasFile = builder.sourceCasFile;
- referenceCasFile = builder.referenceCasFile;
- targetBasePath = builder.targetBasePath;
- cycle = builder.cycle;
- assertion = builder.assertion;
+ this.title = builder.title;
+ this.sourceCasFile = builder.sourceCasFile;
+ this.referenceCasFile = builder.referenceCasFile;
+ this.targetBasePath = builder.targetBasePath;
+ this.cycle = builder.cycle;
+ this.assertion = builder.assertion;
}
public Path getSourceCasFile() {
@@ -150,7 +150,7 @@ public class DesSerTestScenario implements Runnable {
public Builder withCasFile(Path sourceCasFile) {
this.sourceCasFile = sourceCasFile;
- referenceCasFile = sourceCasFile;
+ this.referenceCasFile = sourceCasFile;
return this;
}
@@ -175,7 +175,7 @@ public class DesSerTestScenario implements Runnable {
}
public Builder withAssertion(FailableBiConsumer<Path, Path, ?> aAssertion) {
- assertion = aAssertion;
+ this.assertion = aAssertion;
return this;
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/scenario/SerRefTestScenario.java b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/scenario/SerRefTestScenario.java
index bde7d96bf..6d9eed47a 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/scenario/SerRefTestScenario.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/scenario/SerRefTestScenario.java
@@ -54,12 +54,12 @@ public class SerRefTestScenario implements Runnable {
private final FailableBiConsumer<Path, Path, ?> assertion;
private SerRefTestScenario(Builder builder) {
- title = builder.title;
- sourceCasSupplier = builder.sourceCasSupplier;
- referenceCasFile = builder.referenceCasFile;
- targetCasFile = builder.targetCasFile;
- serializer = builder.serializer;
- assertion = builder.assertion;
+ this.title = builder.title;
+ this.sourceCasSupplier = builder.sourceCasSupplier;
+ this.referenceCasFile = builder.referenceCasFile;
+ this.targetCasFile = builder.targetCasFile;
+ this.serializer = builder.serializer;
+ this.assertion = builder.assertion;
}
public CAS createSourceCas() {
@@ -207,7 +207,7 @@ public class SerRefTestScenario implements Runnable {
}
public Builder withAssertion(FailableBiConsumer<Path, Path, ?> aAssertion) {
- assertion = aAssertion;
+ this.assertion = aAssertion;
return this;
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/transitions/CasSourceTargetConfiguration.java b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/transitions/CasSourceTargetConfiguration.java
index 3ec206920..b02f605b0 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/transitions/CasSourceTargetConfiguration.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/transitions/CasSourceTargetConfiguration.java
@@ -29,10 +29,10 @@ public class CasSourceTargetConfiguration {
private final FailableSupplier<CAS, ?> targetCasSupplier;
private CasSourceTargetConfiguration(Builder builder) {
- title = builder.title;
- debugInfo = builder.debugInfo;
- sourceCasSupplier = builder.sourceCasSupplier;
- targetCasSupplier = builder.targetCasSupplier;
+ this.title = builder.title;
+ this.debugInfo = builder.debugInfo;
+ this.sourceCasSupplier = builder.sourceCasSupplier;
+ this.targetCasSupplier = builder.targetCasSupplier;
}
public CAS createSourceCas() {
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/ArrayFSTest.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/ArrayFSTest.java
index 662a46132..91c2b61fd 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/ArrayFSTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/ArrayFSTest.java
@@ -44,8 +44,8 @@ public class ArrayFSTest {
@BeforeEach
public void setUp() {
try {
- cas = CASInitializer.initCas(new CASTestSetup(), null);
- ts = cas.getTypeSystem();
+ this.cas = CASInitializer.initCas(new CASTestSetup(), null);
+ this.ts = this.cas.getTypeSystem();
} catch (Exception e) {
assertTrue(false);
}
@@ -53,8 +53,8 @@ public class ArrayFSTest {
@AfterEach
public void tearDown() {
- cas = null;
- ts = null;
+ this.cas = null;
+ this.ts = null;
}
@Test
@@ -62,14 +62,14 @@ public class ArrayFSTest {
// Check that we can't create arrays of size smaller than 0.
boolean exceptionCaught = false;
try {
- ArrayFS array = cas.createArrayFS(-1);
+ ArrayFS array = this.cas.createArrayFS(-1);
assertTrue(array != null);
} catch (CASRuntimeException e) {
exceptionCaught = true;
assertTrue(e.getMessageKey().equals(CASRuntimeException.ILLEGAL_ARRAY_SIZE));
}
assertTrue(exceptionCaught);
- ArrayFS array = cas.createArrayFS(0);
+ ArrayFS array = this.cas.createArrayFS(0);
assertTrue(array.size() == 0);
assertTrue(array != null);
assertTrue(array.size() == 0);
@@ -80,10 +80,10 @@ public class ArrayFSTest {
exceptionCaught = true;
}
assertTrue(exceptionCaught);
- FeatureStructure fs1 = cas.createFS(ts.getType(CAS.TYPE_NAME_ANNOTATION));
- FeatureStructure fs2 = cas.createFS(ts.getType(CAS.TYPE_NAME_TOP));
- FeatureStructure fs3 = cas.createFS(ts.getType(CASTestSetup.TOKEN_TYPE));
- array = cas.createArrayFS(3);
+ FeatureStructure fs1 = this.cas.createFS(this.ts.getType(CAS.TYPE_NAME_ANNOTATION));
+ FeatureStructure fs2 = this.cas.createFS(this.ts.getType(CAS.TYPE_NAME_TOP));
+ FeatureStructure fs3 = this.cas.createFS(this.ts.getType(CASTestSetup.TOKEN_TYPE));
+ array = this.cas.createArrayFS(3);
try {
array.set(0, fs1);
array.set(1, fs2);
@@ -132,10 +132,10 @@ public class ArrayFSTest {
@Test
public void testToArray() {
// From CAS array to Java array.
- FeatureStructure fs1 = cas.createFS(ts.getType(CAS.TYPE_NAME_ANNOTATION));
- FeatureStructure fs2 = cas.createFS(ts.getType(CAS.TYPE_NAME_TOP));
- FeatureStructure fs3 = cas.createFS(ts.getType(CASTestSetup.TOKEN_TYPE));
- ArrayFS array = cas.createArrayFS(3);
+ FeatureStructure fs1 = this.cas.createFS(this.ts.getType(CAS.TYPE_NAME_ANNOTATION));
+ FeatureStructure fs2 = this.cas.createFS(this.ts.getType(CAS.TYPE_NAME_TOP));
+ FeatureStructure fs3 = this.cas.createFS(this.ts.getType(CASTestSetup.TOKEN_TYPE));
+ ArrayFS array = this.cas.createArrayFS(3);
FeatureStructure[] fsArray = array.toArray();
for (int i = 0; i < 3; i++) {
assertTrue(fsArray[i] == null);
@@ -150,7 +150,7 @@ public class ArrayFSTest {
assertTrue(fsArray[2].equals(fs3));
// From Java array to CAS array.
- array = cas.createArrayFS(3);
+ array = this.cas.createArrayFS(3);
assertTrue(array.get(0) == null);
assertTrue(array.get(1) == null);
assertTrue(array.get(2) == null);
@@ -166,10 +166,10 @@ public class ArrayFSTest {
@Test
public void testCopyToArray() {
- FeatureStructure fs1 = cas.createFS(ts.getType(CAS.TYPE_NAME_ANNOTATION));
- FeatureStructure fs2 = cas.createFS(ts.getType(CAS.TYPE_NAME_TOP));
- FeatureStructure fs3 = cas.createFS(ts.getType(CASTestSetup.TOKEN_TYPE));
- ArrayFS array = cas.createArrayFS(4);
+ FeatureStructure fs1 = this.cas.createFS(this.ts.getType(CAS.TYPE_NAME_ANNOTATION));
+ FeatureStructure fs2 = this.cas.createFS(this.ts.getType(CAS.TYPE_NAME_TOP));
+ FeatureStructure fs3 = this.cas.createFS(this.ts.getType(CASTestSetup.TOKEN_TYPE));
+ ArrayFS array = this.cas.createArrayFS(4);
array.set(0, fs1);
array.set(1, fs2);
array.set(2, fs3);
@@ -198,17 +198,17 @@ public class ArrayFSTest {
@Test
public void testArraysOfArrays() {
- Type annotationType = ts.getType(CAS.TYPE_NAME_ANNOTATION);
- AnnotationFS annot = cas.createAnnotation(annotationType, 0, 5);
- IntArrayFS intArray = cas.createIntArrayFS(3);
+ Type annotationType = this.ts.getType(CAS.TYPE_NAME_ANNOTATION);
+ AnnotationFS annot = this.cas.createAnnotation(annotationType, 0, 5);
+ IntArrayFS intArray = this.cas.createIntArrayFS(3);
intArray.set(0, 1);
intArray.set(1, 2);
intArray.set(2, -10);
- ArrayFS subArray1 = cas.createArrayFS(1);
- ArrayFS subArray2 = cas.createArrayFS(2);
+ ArrayFS subArray1 = this.cas.createArrayFS(1);
+ ArrayFS subArray2 = this.cas.createArrayFS(2);
subArray1.set(0, subArray2);
subArray2.set(1, annot);
- ArrayFS superArray = cas.createArrayFS(3);
+ ArrayFS superArray = this.cas.createArrayFS(3);
superArray.set(0, subArray1);
superArray.set(1, subArray2);
superArray.set(2, intArray);
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/ArrayIndexTest.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/ArrayIndexTest.java
index 91fbf3695..1cc629600 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/ArrayIndexTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/ArrayIndexTest.java
@@ -59,14 +59,14 @@ public class ArrayIndexTest implements TextAnnotator {
JUnitExtension.getFile("CASTests/desc/ArrayIndexTest.xml"));
AnalysisEngineDescription desc = UIMAFramework.getXMLParser()
.parseAnalysisEngineDescription(input);
- ae = UIMAFramework.produceAnalysisEngine(desc);
+ this.ae = UIMAFramework.produceAnalysisEngine(desc);
}
@Test
public void testArrayIndex() {
try {
- CAS cas = ae.newCAS();
+ CAS cas = this.ae.newCAS();
FSIndexRepository ir = cas.getIndexRepository();
TypeSystem ts = cas.getTypeSystem();
Type annotationType = ts.getType(CAS.TYPE_NAME_ANNOTATION);
@@ -95,7 +95,7 @@ public class ArrayIndexTest implements TextAnnotator {
@AfterEach
public void tearDown() throws Exception {
- ae.destroy();
+ this.ae.destroy();
}
@Override
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/CASTest.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/CASTest.java
index 74d6ff6fc..349474853 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/CASTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/CASTest.java
@@ -46,8 +46,8 @@ public class CASTest {
@BeforeEach
public void setUp() {
try {
- cas = CASInitializer.initCas(new CASTestSetup(), null);
- ts = cas.getTypeSystem();
+ this.cas = CASInitializer.initCas(new CASTestSetup(), null);
+ this.ts = this.cas.getTypeSystem();
} catch (Exception e) {
assertTrue(false);
}
@@ -55,23 +55,23 @@ public class CASTest {
@AfterEach
public void tearDown() {
- cas = null;
- ts = null;
+ this.cas = null;
+ this.ts = null;
}
@Test
public void testGetTypeSystem() {
- assertTrue(cas.getTypeSystem() != null);
+ assertTrue(this.cas.getTypeSystem() != null);
}
@Test
public void testGetAnnotationIndex() {
- AnnotationIndex index = cas.getAnnotationIndex();
+ AnnotationIndex index = this.cas.getAnnotationIndex();
assertNotNull(index);
assertTrue(index.iterator() != null);
boolean caughtException = false;
try {
- cas.getAnnotationIndex(cas.getTypeSystem().getType(CAS.TYPE_NAME_TOP));
+ this.cas.getAnnotationIndex(this.cas.getTypeSystem().getType(CAS.TYPE_NAME_TOP));
} catch (CASRuntimeException e) {
caughtException = true;
}
@@ -81,11 +81,11 @@ public class CASTest {
@Test
public void testCreateFS() {
// Can create FS of type "Top"
- assertTrue(cas.createFS(ts.getType(CAS.TYPE_NAME_TOP)) != null);
+ assertTrue(this.cas.createFS(this.ts.getType(CAS.TYPE_NAME_TOP)) != null);
boolean caughtExc = false;
// Can't create int FS.
try {
- cas.createFS(ts.getType(CAS.TYPE_NAME_INTEGER));
+ this.cas.createFS(this.ts.getType(CAS.TYPE_NAME_INTEGER));
} catch (CASRuntimeException e) {
caughtExc = true;
assertTrue(e.getMessageKey().equals(CASRuntimeException.NON_CREATABLE_TYPE));
@@ -94,7 +94,7 @@ public class CASTest {
caughtExc = false;
// Can't create array with CAS.createFS().
try {
- cas.createFS(ts.getType(CAS.TYPE_NAME_FS_ARRAY));
+ this.cas.createFS(this.ts.getType(CAS.TYPE_NAME_FS_ARRAY));
} catch (CASRuntimeException e) {
caughtExc = true;
assertTrue(e.getMessageKey().equals(CASRuntimeException.NON_CREATABLE_TYPE));
@@ -110,7 +110,7 @@ public class CASTest {
// assertTrue(arraySize > Heap.DEFAULT_SIZE);
IntArrayFS array = null;
try {
- array = cas.createIntArrayFS(arraySize);
+ array = this.cas.createIntArrayFS(arraySize);
} catch (CASRuntimeException e) {
assertTrue(false);
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/FeatureMap.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/FeatureMap.java
index efdd3e06a..0e1b47c2a 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/FeatureMap.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/FeatureMap.java
@@ -227,7 +227,7 @@ public class FeatureMap extends TOP implements UimaSerializableFSs {
FSArray<FeatureRecord> records = null;
int featureCount = _features.size();
if(featureCount > 0) {
- records = new FSArray(getJCas(), featureCount);
+ records = new FSArray(this.getJCas(), featureCount);
int i = 0;
for (FeatureRecord record : _features.values()) {
records.set(i++, record);
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/FilteredIteratorTest.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/FilteredIteratorTest.java
index 5662c10e6..191e8e2c6 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/FilteredIteratorTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/FilteredIteratorTest.java
@@ -83,62 +83,62 @@ public class FilteredIteratorTest {
@BeforeEach
public void setUp() {
try {
- cas = CASInitializer.initCas(new CASTestSetup(), null);
+ this.cas = CASInitializer.initCas(new CASTestSetup(), null);
assertTrue(cas != null);
- ts = cas.getTypeSystem();
+ this.ts = this.cas.getTypeSystem();
assertTrue(ts != null);
} catch (Exception e) {
e.printStackTrace();
assertTrue(false);
}
- stringType = ts.getType(CAS.TYPE_NAME_STRING);
+ this.stringType = ts.getType(CAS.TYPE_NAME_STRING);
assertTrue(stringType != null);
- tokenType = ts.getType(CASTestSetup.TOKEN_TYPE);
+ this.tokenType = ts.getType(CASTestSetup.TOKEN_TYPE);
assertTrue(stringType != null);
- intType = ts.getType(CAS.TYPE_NAME_INTEGER);
+ this.intType = ts.getType(CAS.TYPE_NAME_INTEGER);
assertTrue(intType != null);
- tokenTypeType = ts.getType(CASTestSetup.TOKEN_TYPE_TYPE);
+ this.tokenTypeType = ts.getType(CASTestSetup.TOKEN_TYPE_TYPE);
assertTrue(tokenTypeType != null);
- wordType = ts.getType(CASTestSetup.WORD_TYPE);
+ this.wordType = ts.getType(CASTestSetup.WORD_TYPE);
assertTrue(wordType != null);
- sepType = ts.getType(CASTestSetup.SEP_TYPE);
+ this.sepType = ts.getType(CASTestSetup.SEP_TYPE);
assertTrue(sepType != null);
- eosType = ts.getType(CASTestSetup.EOS_TYPE);
+ this.eosType = ts.getType(CASTestSetup.EOS_TYPE);
assertTrue(eosType != null);
- tokenTypeFeat = ts.getFeatureByFullName(CASTestSetup.TOKEN_TYPE_FEAT_Q);
+ this.tokenTypeFeat = ts.getFeatureByFullName(CASTestSetup.TOKEN_TYPE_FEAT_Q);
assertTrue(tokenTypeFeat != null);
- lemmaFeat = ts.getFeatureByFullName(CASTestSetup.LEMMA_FEAT_Q);
+ this.lemmaFeat = ts.getFeatureByFullName(CASTestSetup.LEMMA_FEAT_Q);
assertTrue(lemmaFeat != null);
- sentLenFeat = ts.getFeatureByFullName(CASTestSetup.SENT_LEN_FEAT_Q);
+ this.sentLenFeat = ts.getFeatureByFullName(CASTestSetup.SENT_LEN_FEAT_Q);
assertTrue(sentLenFeat != null);
- tokenFloatFeat = ts.getFeatureByFullName(CASTestSetup.TOKEN_FLOAT_FEAT_Q);
+ this.tokenFloatFeat = ts.getFeatureByFullName(CASTestSetup.TOKEN_FLOAT_FEAT_Q);
assertTrue(tokenFloatFeat != null);
- startFeature = ts.getFeatureByFullName(CAS.FEATURE_FULL_NAME_BEGIN);
+ this.startFeature = ts.getFeatureByFullName(CAS.FEATURE_FULL_NAME_BEGIN);
assertTrue(startFeature != null);
- sentenceType = ts.getType(CASTestSetup.SENT_TYPE);
+ this.sentenceType = ts.getType(CASTestSetup.SENT_TYPE);
assertTrue(sentenceType != null);
- annotationType = ts.getType(CAS.TYPE_NAME_ANNOTATION);
+ this.annotationType = ts.getType(CAS.TYPE_NAME_ANNOTATION);
assertTrue(annotationType != null);
}
@AfterEach
public void tearDown() {
- cas = null;
- ts = null;
- stringType = null;
- tokenType = null;
- intType = null;
- tokenTypeType = null;
- wordType = null;
- sepType = null;
- eosType = null;
- tokenTypeFeat = null;
- lemmaFeat = null;
- sentLenFeat = null;
- tokenFloatFeat = null;
- startFeature = null;
- sentenceType = null;
- annotationType = null;
+ this.cas = null;
+ this.ts = null;
+ this.stringType = null;
+ this.tokenType = null;
+ this.intType = null;
+ this.tokenTypeType = null;
+ this.wordType = null;
+ this.sepType = null;
+ this.eosType = null;
+ this.tokenTypeFeat = null;
+ this.lemmaFeat = null;
+ this.sentLenFeat = null;
+ this.tokenFloatFeat = null;
+ this.startFeature = null;
+ this.sentenceType = null;
+ this.annotationType = null;
}
@Test
@@ -466,9 +466,9 @@ public class FilteredIteratorTest {
try {
cas.setDocumentText("This is a test with the word \"the\" in it.");
- FeatureStructure wordFS = cas.createFS(wordType);
- FeatureStructure sepFS = cas.createFS(sepType);
- FeatureStructure eosFS = cas.createFS(eosType);
+ FeatureStructure wordFS = this.cas.createFS(wordType);
+ FeatureStructure sepFS = this.cas.createFS(sepType);
+ FeatureStructure eosFS = this.cas.createFS(eosType);
// create token and sentence annotations
String type1 = "type1";
@@ -513,14 +513,14 @@ public class FilteredIteratorTest {
private void iterAndCount2b() {
FSIterator<AnnotationFS> it = cas.getAnnotationIndex(tokenType).iterator();
- ConstraintFactory cf = cas.getConstraintFactory();
+ ConstraintFactory cf = this.cas.getConstraintFactory();
FSTypeConstraint tc = cf.createTypeConstraint();
tc.add(sepType);
tc.add(eosType.getName());
ArrayList<String> path = new ArrayList<>();
path.add(tokenTypeFeat.getShortName());
FSMatchConstraint cons = cf.embedConstraint(path, tc);
- it = cas.createFilteredIterator(it, cons);
+ it = this.cas.createFilteredIterator(it, cons);
int count = 0;
for (it.moveToFirst(); it.isValid(); it.moveToNext()) {
++count;
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/FloatArrayFSTest.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/FloatArrayFSTest.java
index 55e9f2c1b..1b9bd8d09 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/FloatArrayFSTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/FloatArrayFSTest.java
@@ -35,7 +35,7 @@ public class FloatArrayFSTest {
@BeforeEach
public void setUp() {
try {
- cas = CASInitializer.initCas(new CASTestSetup(), null);
+ this.cas = CASInitializer.initCas(new CASTestSetup(), null);
} catch (Exception e) {
assertTrue(false);
}
@@ -43,12 +43,12 @@ public class FloatArrayFSTest {
@AfterEach
public void tearDown() {
- cas = null;
+ this.cas = null;
}
@Test
public void testSet() {
- FloatArrayFS array = cas.createFloatArrayFS(0);
+ FloatArrayFS array = this.cas.createFloatArrayFS(0);
assertTrue(array != null);
assertTrue(array.size() == 0);
boolean exceptionCaught = false;
@@ -58,7 +58,7 @@ public class FloatArrayFSTest {
exceptionCaught = true;
}
assertTrue(exceptionCaught);
- array = cas.createFloatArrayFS(3);
+ array = this.cas.createFloatArrayFS(3);
try {
array.set(0, 1.0f);
array.set(1, 2.0f);
@@ -100,7 +100,7 @@ public class FloatArrayFSTest {
// Check that we can't create arrays smaller than 0.
exceptionCaught = false;
try {
- array = cas.createFloatArrayFS(-1);
+ array = this.cas.createFloatArrayFS(-1);
} catch (CASRuntimeException e) {
exceptionCaught = true;
assertTrue(e.getMessageKey().equals(CASRuntimeException.ILLEGAL_ARRAY_SIZE));
@@ -111,7 +111,7 @@ public class FloatArrayFSTest {
@Test
public void testToArray() {
// From CAS array to Java array.
- FloatArrayFS array = cas.createFloatArrayFS(3);
+ FloatArrayFS array = this.cas.createFloatArrayFS(3);
float[] fsArray = array.toArray();
for (int i = 0; i < 3; i++) {
assertTrue(fsArray[i] == 0f);
@@ -126,7 +126,7 @@ public class FloatArrayFSTest {
assertTrue(fsArray[2] == 3f);
// From Java array to CAS array.
- array = cas.createFloatArrayFS(3);
+ array = this.cas.createFloatArrayFS(3);
assertTrue(array.get(0) == 0f);
assertTrue(array.get(1) == 0f);
assertTrue(array.get(2) == 0f);
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/GetAllIndexedTest.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/GetAllIndexedTest.java
index ba1f0a47d..c0917a712 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/GetAllIndexedTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/GetAllIndexedTest.java
@@ -99,8 +99,8 @@ public class GetAllIndexedTest {
XMLParser parser = UIMAFramework.getXMLParser();
ResourceSpecifier spec = (ResourceSpecifier) parser.parse(new XMLInputSource(descriptorFile));
AnalysisEngine ae = UIMAFramework.produceAnalysisEngine(spec);
- cas = ae.newCAS();
- assertTrue(cas != null);
+ this.cas = ae.newCAS();
+ assertTrue(this.cas != null);
} catch (IOException e) {
e.printStackTrace();
assertTrue(false);
@@ -112,34 +112,34 @@ public class GetAllIndexedTest {
assertTrue(false);
}
- TypeSystem ts = cas.getTypeSystem();
+ TypeSystem ts = this.cas.getTypeSystem();
// assert(wordType != null);
// this.tokenType = ts.getType(TOKEN_TYPE);
// this.sentenceType = ts.getType(SENT_TYPE);
- annotationType = ts.getType(CAS.TYPE_NAME_ANNOTATION);
- assertTrue(annotationType != null);
- otherAnnotationType = ts.getType(OTHER_ANNOT_TYPE);
- assertTrue(otherAnnotationType != null);
- annotationBaseType = ts.getType(CAS.TYPE_NAME_ANNOTATION_BASE);
- assertTrue(annotationBaseType != null);
+ this.annotationType = ts.getType(CAS.TYPE_NAME_ANNOTATION);
+ assertTrue(this.annotationType != null);
+ this.otherAnnotationType = ts.getType(OTHER_ANNOT_TYPE);
+ assertTrue(this.otherAnnotationType != null);
+ this.annotationBaseType = ts.getType(CAS.TYPE_NAME_ANNOTATION_BASE);
+ assertTrue(this.annotationBaseType != null);
}
@AfterEach
public void tearDown() {
- cas = null;
+ this.cas = null;
// this.tokenType = null;
// this.sentenceType = null;
- annotationType = null;
- annotationBaseType = null;
- otherAnnotationType = null;
+ this.annotationType = null;
+ this.annotationBaseType = null;
+ this.otherAnnotationType = null;
}
private final FSIterator<FeatureStructure> getAllIndexed() {
- return getAllIndexed(cas.getTypeSystem().getTopType());
+ return getAllIndexed(this.cas.getTypeSystem().getTopType());
}
private final FSIterator<FeatureStructure> getAllIndexed(Type type) {
- return cas.getIndexRepository().getAllIndexedFS(type);
+ return this.cas.getIndexRepository().getAllIndexedFS(type);
}
private final int getIteratorSize(FSIterator<? extends FeatureStructure> it) {
@@ -151,18 +151,18 @@ public class GetAllIndexedTest {
}
private final void addFS(FeatureStructure fs) {
- cas.getIndexRepository().addFS(fs);
- ++fsCount;
- assertTrue(getIteratorSize(getAllIndexed()) == fsCount);
+ this.cas.getIndexRepository().addFS(fs);
+ ++this.fsCount;
+ assertTrue(getIteratorSize(getAllIndexed()) == this.fsCount);
}
private final FeatureStructure createAnnot(int from, int to) {
- return cas.createAnnotation(annotationType, from, to);
+ return this.cas.createAnnotation(this.annotationType, from, to);
}
private final void initTest() {
- cas.reset();
- fsCount = 0;
+ this.cas.reset();
+ this.fsCount = 0;
}
/**
@@ -171,18 +171,18 @@ public class GetAllIndexedTest {
@Test
public void testGetAllIndexed() throws Exception {
initTest();
- FeatureStructure docAnnotation = cas.getDocumentAnnotation();
+ FeatureStructure docAnnotation = this.cas.getDocumentAnnotation();
assertNotNull(docAnnotation);
- ++fsCount;
- assertTrue(getIteratorSize(getAllIndexed()) == fsCount);
- final FeatureStructure otherAnnotationFS = cas.createFS(otherAnnotationType);
- FeatureStructure annotationFS = cas.createFS(annotationType);
- final FeatureStructure annotationBaseFS = cas.createFS(annotationBaseType);
+ ++this.fsCount;
+ assertTrue(getIteratorSize(getAllIndexed()) == this.fsCount);
+ final FeatureStructure otherAnnotationFS = this.cas.createFS(this.otherAnnotationType);
+ FeatureStructure annotationFS = this.cas.createFS(this.annotationType);
+ final FeatureStructure annotationBaseFS = this.cas.createFS(this.annotationBaseType);
addFS(annotationFS);
addFS(otherAnnotationFS);
addFS(annotationBaseFS);
- addFS(cas.createFS(cas.getTypeSystem().getTopType()));
- assertTrue(getIteratorSize(cas.getAnnotationIndex().iterator()) == 2);
+ addFS(this.cas.createFS(this.cas.getTypeSystem().getTopType()));
+ assertTrue(getIteratorSize(this.cas.getAnnotationIndex().iterator()) == 2);
addFS(createAnnot(0, 1));
addFS(createAnnot(1, 2));
addFS(createAnnot(2, 3));
@@ -190,7 +190,7 @@ public class GetAllIndexedTest {
// Iterate backwards, check only that it returns correct number of FSs
FSIterator<FeatureStructure> it = getAllIndexed();
- int down = fsCount;
+ int down = this.fsCount;
for (it.moveToLast(); it.isValid(); it.moveToPrevious()) {
--down;
}
@@ -217,12 +217,12 @@ public class GetAllIndexedTest {
assertFalse(copy.isValid());
// test getAllIndexed(Type)
- Type tokenType = cas.getTypeSystem().getType(TOKEN_TYPE);
+ Type tokenType = this.cas.getTypeSystem().getType(TOKEN_TYPE);
assertNotNull(tokenType);
- FSIterator<FeatureStructure> tokenIter = cas.getIndexRepository()
+ FSIterator<FeatureStructure> tokenIter = this.cas.getIndexRepository()
.getAllIndexedFS(tokenType);
assertFalse(tokenIter.hasNext());
- Iterator<TOP> tokenIter2 = cas.getIndexedFSs(tokenType).iterator();
+ Iterator<TOP> tokenIter2 = this.cas.getIndexedFSs(tokenType).iterator();
assertFalse(tokenIter2.hasNext());
}
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/GrowingTheCasNoJcasCacheTest.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/GrowingTheCasNoJcasCacheTest.java
index 170a0c556..ffe27ec2e 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/GrowingTheCasNoJcasCacheTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/GrowingTheCasNoJcasCacheTest.java
@@ -79,8 +79,8 @@ public class GrowingTheCasNoJcasCacheTest {
// Create the analysis engine with the parameters.
// The second, unused argument here is a custom
// resource manager.
- ae = UIMAFramework.produceAnalysisEngine(spec, null, additionalParams);
- smallHeapCas = ae.newJCas();
+ this.ae = UIMAFramework.produceAnalysisEngine(spec, null, additionalParams);
+ this.smallHeapCas = this.ae.newJCas();
} catch (IOException e) {
e.printStackTrace();
assertTrue(false);
@@ -96,9 +96,9 @@ public class GrowingTheCasNoJcasCacheTest {
@AfterEach
public void tearDown() {
- if (ae != null) {
- ae.destroy();
- ae = null;
+ if (this.ae != null) {
+ this.ae.destroy();
+ this.ae = null;
}
}
@@ -118,7 +118,7 @@ public class GrowingTheCasNoJcasCacheTest {
}
JCas jcas = null;
try {
- jcas = ae.newJCas();
+ jcas = this.ae.newJCas();
} catch (ResourceInitializationException e) {
e.printStackTrace();
assertTrue(false);
@@ -129,13 +129,13 @@ public class GrowingTheCasNoJcasCacheTest {
int numberOfTokens = 0;
for (int i = 0; i < REPETITIONS; i++) {
jcas.reset();
- smallHeapCas.reset();
+ this.smallHeapCas.reset();
jcas.setDocumentText(text);
numberOfSentences = 0;
numberOfTokens = 0;
try {
// long time = System.currentTimeMillis();
- ae.process(jcas);
+ this.ae.process(jcas);
// time = System.currentTimeMillis() - time;
// System.out.println("Time for large CAS: " + new TimeSpan(time));
numberOfSentences = jcas.getAnnotationIndex(Sentence.type).size();
@@ -146,16 +146,16 @@ public class GrowingTheCasNoJcasCacheTest {
e.printStackTrace();
assertTrue(false);
}
- smallHeapCas.setDocumentText(text);
+ this.smallHeapCas.setDocumentText(text);
try {
// long time = System.currentTimeMillis();
- ae.process(smallHeapCas);
+ this.ae.process(this.smallHeapCas);
// time = System.currentTimeMillis() - time;
// System.out.println("Time for small CAS: " + new TimeSpan(time));
assertTrue(this.getClass().toString() + ": number of sentences does not match",
- numberOfSentences == smallHeapCas.getAnnotationIndex(Sentence.type).size());
+ numberOfSentences == this.smallHeapCas.getAnnotationIndex(Sentence.type).size());
assertTrue(this.getClass().toString() + ": number of tokens does not match",
- numberOfTokens == smallHeapCas.getAnnotationIndex(Token.type).size());
+ numberOfTokens == this.smallHeapCas.getAnnotationIndex(Token.type).size());
} catch (AnalysisEngineProcessException e) {
e.printStackTrace();
assertTrue(false);
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/GrowingTheCasTest.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/GrowingTheCasTest.java
index cf1fa9da4..81b7c3f5c 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/GrowingTheCasTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/GrowingTheCasTest.java
@@ -69,10 +69,10 @@ public class GrowingTheCasTest {
XMLParser parser = UIMAFramework.getXMLParser();
AnalysisEngineDescription spec = (AnalysisEngineDescription) parser
.parse(new XMLInputSource(descriptorFile));
- ae = UIMAFramework.produceAnalysisEngine(spec);
+ this.ae = UIMAFramework.produceAnalysisEngine(spec);
Properties props = new Properties();
props.setProperty(UIMAFramework.CAS_INITIAL_HEAP_SIZE, "0");
- smallHeapCas = CasCreationUtils.createCas(spec, props).getJCas();
+ this.smallHeapCas = CasCreationUtils.createCas(spec, props).getJCas();
} catch (IOException e) {
e.printStackTrace();
assertTrue(false);
@@ -91,9 +91,9 @@ public class GrowingTheCasTest {
@AfterEach
public void tearDown() {
- if (ae != null) {
- ae.destroy();
- ae = null;
+ if (this.ae != null) {
+ this.ae.destroy();
+ this.ae = null;
}
}
@@ -120,7 +120,7 @@ public class GrowingTheCasTest {
}
jcas = null;
try {
- jcas = ae.newJCas();
+ jcas = this.ae.newJCas();
} catch (ResourceInitializationException e) {
e.printStackTrace();
assertTrue(false);
@@ -131,7 +131,7 @@ public class GrowingTheCasTest {
int numberOfTokens = 0;
try {
// long time = System.currentTimeMillis();
- ae.process(jcas);
+ this.ae.process(jcas);
// time = System.currentTimeMillis() - time;
// System.out.println("Time for large CAS: " + new TimeSpan(time));
numberOfSentences = jcas.getAnnotationIndex(Sentence.type).size();
@@ -153,7 +153,7 @@ public class GrowingTheCasTest {
// create a destination CAS
CAS destCas;
try {
- destCas = ae.newCAS();
+ destCas = this.ae.newCAS();
} catch (ResourceInitializationException e) {
e.printStackTrace();
assertTrue(false);
@@ -207,7 +207,7 @@ public class GrowingTheCasTest {
}
jcas = null;
try {
- jcas = ae.newJCas();
+ jcas = this.ae.newJCas();
} catch (ResourceInitializationException e) {
e.printStackTrace();
assertTrue(false);
@@ -218,7 +218,7 @@ public class GrowingTheCasTest {
int numberOfTokens = 0;
try {
// long time = System.currentTimeMillis();
- ae.process(jcas);
+ this.ae.process(jcas);
// time = System.currentTimeMillis() - time;
// System.out.println("Time for large CAS: " + new TimeSpan(time));
numberOfSentences = jcas.getAnnotationIndex(Sentence.type).size();
@@ -240,7 +240,7 @@ public class GrowingTheCasTest {
// create a destination CAS
CAS destCas;
try {
- destCas = ae.newCAS();
+ destCas = this.ae.newCAS();
} catch (ResourceInitializationException e) {
e.printStackTrace();
assertTrue(false);
@@ -307,7 +307,7 @@ public class GrowingTheCasTest {
}
JCas jcas = null;
try {
- jcas = ae.newJCas();
+ jcas = this.ae.newJCas();
} catch (ResourceInitializationException e) {
e.printStackTrace();
assertTrue(false);
@@ -321,7 +321,7 @@ public class GrowingTheCasTest {
numberOfSentences = 0;
numberOfTokens = 0;
// long time = System.currentTimeMillis();
- ae.process(jcas);
+ this.ae.process(jcas);
// time = System.currentTimeMillis() - time;
// System.out.println("Time for large CAS: " + new TimeSpan(time));
numberOfSentences = jcas.getAnnotationIndex(Sentence.type).size();
@@ -337,16 +337,16 @@ public class GrowingTheCasTest {
}
jcas = null;
- smallHeapCas.setDocumentText(text);
+ this.smallHeapCas.setDocumentText(text);
try {
// long time = System.currentTimeMillis();
- ae.process(smallHeapCas);
+ this.ae.process(this.smallHeapCas);
// time = System.currentTimeMillis() - time;
// System.out.println("Time for small CAS: " + new TimeSpan(time));
assertTrue(this.getClass().toString() + ": number of sentences does not match",
- numberOfSentences == smallHeapCas.getAnnotationIndex(Sentence.type).size());
+ numberOfSentences == this.smallHeapCas.getAnnotationIndex(Sentence.type).size());
assertTrue(this.getClass().toString() + ": number of tokens does not match",
- numberOfTokens == smallHeapCas.getAnnotationIndex(Token.type).size());
+ numberOfTokens == this.smallHeapCas.getAnnotationIndex(Token.type).size());
// try { // uncomment for memory use profiling
// Thread.sleep(10000000);
// } catch (InterruptedException e) {
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexComparitorTest.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexComparitorTest.java
index f505ed251..1636a12b0 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexComparitorTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexComparitorTest.java
@@ -195,8 +195,8 @@ public class IndexComparitorTest {
@Override
public void initIndexes(FSIndexRepositoryMgr parmIrm, TypeSystem parmTs) {
- ts = parmTs;
- irm = parmIrm;
+ IndexComparitorTest.this.ts = parmTs;
+ IndexComparitorTest.this.irm = parmIrm;
parmIrm.createIndex(newComparator(type1), "SortedType1", FSIndex.SORTED_INDEX);
parmIrm.createIndex(newComparator(type1), "SetType1", FSIndex.SET_INDEX);
parmIrm.createIndex(newComparator(type1), "BagType1", FSIndex.BAG_INDEX);
@@ -252,7 +252,7 @@ public class IndexComparitorTest {
@BeforeEach
public void setUp() throws Exception {
try {
- cas = CASInitializer.initCas(new SetupForIndexCompareTesting(), ts -> reinitTypes(ts));
+ this.cas = CASInitializer.initCas(new SetupForIndexCompareTesting(), ts -> reinitTypes(ts));
assertNotNull(cas);
ir = cas.getIndexRepository();
sortedType1 = ir.getIndex("SortedType1");
@@ -332,8 +332,8 @@ public class IndexComparitorTest {
@AfterEach
public void tearDown() {
fss = null;
- cas = null;
- ts = null;
+ this.cas = null;
+ this.ts = null;
topType = null;
integerType = null;
type1 = null;
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexRepositoryMergingTest.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexRepositoryMergingTest.java
index 6d84ea956..32e44c975 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexRepositoryMergingTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexRepositoryMergingTest.java
@@ -64,17 +64,17 @@ public class IndexRepositoryMergingTest {
public void setUp() throws Exception {
cas = (CASImpl) CASFactory.createCAS();
- TypeSystemImpl ts = typeSystem = cas.getTypeSystemImpl();
+ TypeSystemImpl ts = this.typeSystem = cas.getTypeSystemImpl();
annotSubtype = ts.addType("annotSubtype", ts.annotType);
ts.addFeature("x", annotSubtype, ts.intType);
cas.commitTypeSystem(); // also creates the initial indexrepository
// handle type system reuse
- ts = typeSystem = cas.getTypeSystemImpl();
+ ts = this.typeSystem = cas.getTypeSystemImpl();
annotSubtype = ts.getType("annotSubtype");
cas.initCASIndexes(); // requires committed type system
- ir = (FSIndexRepositoryImpl) cas.getIndexRepositoryMgr();
+ ir = (FSIndexRepositoryImpl) this.cas.getIndexRepositoryMgr();
FSIndexComparator comp = ir.createComparator();
Type annotation = ts.getType(CAS.TYPE_NAME_ANNOTATION);
comp.setType(annotation);
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexRepositoryTest.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexRepositoryTest.java
index e7faaf05a..7388276ca 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexRepositoryTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexRepositoryTest.java
@@ -60,9 +60,9 @@ public class IndexRepositoryTest {
*/
@BeforeEach
public void setUp() throws Exception {
- cas = CASInitializer.initCas(new CASTestSetup(), null);
- typeSystem = cas.getTypeSystem();
- indexRep = cas.getIndexRepository();
+ this.cas = CASInitializer.initCas(new CASTestSetup(), null);
+ this.typeSystem = this.cas.getTypeSystem();
+ this.indexRep = this.cas.getIndexRepository();
}
@AfterEach
@@ -91,26 +91,26 @@ public class IndexRepositoryTest {
@Test
public void testDefaultBagIndex() throws Exception {
// create an instance of a non-annotation type
- Type tokenTypeType = typeSystem.getType(CASTestSetup.TOKEN_TYPE_TYPE);
- FeatureStructure tokenTypeFs1 = cas.createFS(tokenTypeType);
+ Type tokenTypeType = this.typeSystem.getType(CASTestSetup.TOKEN_TYPE_TYPE);
+ FeatureStructure tokenTypeFs1 = this.cas.createFS(tokenTypeType);
assertFalse(tokenTypeFs1 instanceof AnnotationFS);
// add to indexes
- indexRep.addFS(tokenTypeFs1);
+ this.indexRep.addFS(tokenTypeFs1);
// now try to retrieve
- FSIterator<FeatureStructure> iter = indexRep.getAllIndexedFS(tokenTypeType);
+ FSIterator<FeatureStructure> iter = this.indexRep.getAllIndexedFS(tokenTypeType);
assertTrue(iter.hasNext());
assertEquals(tokenTypeFs1, iter.next());
assertFalse(iter.hasNext());
// add a second instance
- FeatureStructure tokenTypeFs2 = cas.createFS(tokenTypeType);
+ FeatureStructure tokenTypeFs2 = this.cas.createFS(tokenTypeType);
assertFalse(tokenTypeFs2 instanceof AnnotationFS);
- indexRep.addFS(tokenTypeFs2);
+ this.indexRep.addFS(tokenTypeFs2);
// now there should be two instances in the index
- FSIterator<FeatureStructure> iter2 = indexRep.getAllIndexedFS(tokenTypeType);
+ FSIterator<FeatureStructure> iter2 = this.indexRep.getAllIndexedFS(tokenTypeType);
assertTrue(iter2.hasNext());
iter2.next();
assertTrue(iter2.hasNext());
@@ -120,14 +120,14 @@ public class IndexRepositoryTest {
@Test
public void testSetIndex() throws Exception {
- Feature beginFeat = typeSystem.getFeatureByFullName(CASTestSetup.TOKEN_TYPE + ":begin");
+ Feature beginFeat = this.typeSystem.getFeatureByFullName(CASTestSetup.TOKEN_TYPE + ":begin");
// create an instance of an annotation type
- Type tokenTypeType = typeSystem.getType(CASTestSetup.TOKEN_TYPE);
- FeatureStructure tokenTypeFs1 = cas.createFS(tokenTypeType);
+ Type tokenTypeType = this.typeSystem.getType(CASTestSetup.TOKEN_TYPE);
+ FeatureStructure tokenTypeFs1 = this.cas.createFS(tokenTypeType);
assertTrue(tokenTypeFs1 instanceof AnnotationFS);
tokenTypeFs1.setIntValue(beginFeat, 17);
- FeatureStructure tokenTypeFs2 = cas.createFS(tokenTypeType);
+ FeatureStructure tokenTypeFs2 = this.cas.createFS(tokenTypeType);
assertTrue(tokenTypeFs2 instanceof AnnotationFS);
tokenTypeFs2.setIntValue(beginFeat, 17);
@@ -143,12 +143,12 @@ public class IndexRepositoryTest {
// Annotation is supertype of token
// test if set observes implicit key of type
- Type annotType = typeSystem.getType(CAS.TYPE_NAME_ANNOTATION);
- Feature annotBeginFeat = typeSystem
+ Type annotType = this.typeSystem.getType(CAS.TYPE_NAME_ANNOTATION);
+ Feature annotBeginFeat = this.typeSystem
.getFeatureByFullName(CAS.TYPE_NAME_ANNOTATION + ":begin");
cas.getIndexRepository().removeAllIncludingSubtypes(annotType);
- FeatureStructure annotTypeFs3 = cas.createFS(annotType);
+ FeatureStructure annotTypeFs3 = this.cas.createFS(annotType);
annotTypeFs3.setIntValue(annotBeginFeat, 17);
cas.addFsToIndexes(tokenTypeFs1);
@@ -189,12 +189,12 @@ public class IndexRepositoryTest {
@Test
public void testRemovalSpeed() throws Exception {
// create an instance of an annotation type
- Feature beginFeat = typeSystem.getFeatureByFullName(CASTestSetup.TOKEN_TYPE + ":begin");
- Type fsType = typeSystem.getType(CASTestSetup.TOKEN_TYPE);
+ Feature beginFeat = this.typeSystem.getFeatureByFullName(CASTestSetup.TOKEN_TYPE + ":begin");
+ Type fsType = this.typeSystem.getType(CASTestSetup.TOKEN_TYPE);
FeatureStructure[] fsa = new FeatureStructure[NBR_ITEMS];
// create 40000 tokens
for (int i = 0; i < fsa.length; i++) {
- fsa[i] = cas.createFS(fsType);
+ fsa[i] = this.cas.createFS(fsType);
fsa[i].setIntValue(beginFeat, i);
}
@@ -238,12 +238,12 @@ public class IndexRepositoryTest {
private void runAddSpeed() {
// create an instance of an annotation type
- Feature beginFeat = typeSystem.getFeatureByFullName(CASTestSetup.TOKEN_TYPE + ":begin");
- Type fsType = typeSystem.getType(CASTestSetup.TOKEN_TYPE);
+ Feature beginFeat = this.typeSystem.getFeatureByFullName(CASTestSetup.TOKEN_TYPE + ":begin");
+ Type fsType = this.typeSystem.getType(CASTestSetup.TOKEN_TYPE);
FeatureStructure[] fsa = new FeatureStructure[NBR_ITEMS];
// create 40000 tokens
for (int i = 0; i < fsa.length; i++) {
- fsa[i] = cas.createFS(fsType);
+ fsa[i] = this.cas.createFS(fsType);
fsa[i].setIntValue(beginFeat, i);
}
@@ -282,11 +282,11 @@ public class IndexRepositoryTest {
ir.removeIndex(CAS.STD_ANNOTATION_INDEX);
// create 40000 token-types
- Type fsType = typeSystem.getType(CASTestSetup.TOKEN_TYPE_TYPE);
+ Type fsType = this.typeSystem.getType(CASTestSetup.TOKEN_TYPE_TYPE);
// Feature beginFeat = typeSystem.getFeatureByFullName("Token:begin");
FeatureStructure[] fsa = new FeatureStructure[NBR_ITEMS];
for (int i = 0; i < fsa.length; i++) {
- fsa[i] = cas.createFS(fsType);
+ fsa[i] = this.cas.createFS(fsType);
// fsa[i].setIntValue(beginFeat, i);
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/IntArrayFSTest.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/IntArrayFSTest.java
index d00c62c73..5ea06a904 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/IntArrayFSTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/IntArrayFSTest.java
@@ -35,7 +35,7 @@ public class IntArrayFSTest {
@BeforeEach
public void setUp() {
try {
- cas = CASInitializer.initCas(new CASTestSetup(), null);
+ this.cas = CASInitializer.initCas(new CASTestSetup(), null);
} catch (Exception e) {
assertTrue(false);
}
@@ -43,12 +43,12 @@ public class IntArrayFSTest {
@AfterEach
public void tearDown() {
- cas = null;
+ this.cas = null;
}
@Test
public void testSet() {
- IntArrayFS array = cas.createIntArrayFS(0);
+ IntArrayFS array = this.cas.createIntArrayFS(0);
assertTrue(array != null);
assertTrue(array.size() == 0);
boolean exceptionCaught = false;
@@ -58,7 +58,7 @@ public class IntArrayFSTest {
exceptionCaught = true;
}
assertTrue(exceptionCaught);
- array = cas.createIntArrayFS(3);
+ array = this.cas.createIntArrayFS(3);
try {
array.set(0, 1);
array.set(1, 2);
@@ -100,7 +100,7 @@ public class IntArrayFSTest {
// Check that we can't create arrays smaller than 0.
exceptionCaught = false;
try {
- array = cas.createIntArrayFS(-1);
+ array = this.cas.createIntArrayFS(-1);
} catch (CASRuntimeException e) {
exceptionCaught = true;
assertTrue(e.getMessageKey().equals(CASRuntimeException.ILLEGAL_ARRAY_SIZE));
@@ -111,7 +111,7 @@ public class IntArrayFSTest {
@Test
public void testToArray() {
// From CAS array to Java array.
- IntArrayFS array = cas.createIntArrayFS(3);
+ IntArrayFS array = this.cas.createIntArrayFS(3);
int[] fsArray = array.toArray();
for (int i = 0; i < 3; i++) {
assertTrue(fsArray[i] == 0);
@@ -126,7 +126,7 @@ public class IntArrayFSTest {
assertTrue(fsArray[2] == 3);
// From Java array to CAS array.
- array = cas.createIntArrayFS(3);
+ array = this.cas.createIntArrayFS(3);
assertTrue(array.get(0) == 0);
assertTrue(array.get(1) == 0);
assertTrue(array.get(2) == 0);
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTest.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTest.java
index e228af64d..9e324cd79 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTest.java
@@ -159,11 +159,11 @@ public class IteratorTest {
XMLParser parser = UIMAFramework.getXMLParser();
ResourceSpecifier spec = (ResourceSpecifier) parser.parse(new XMLInputSource(descriptorFile));
AnalysisEngine ae = UIMAFramework.produceAnalysisEngine(spec);
- cas = (CASImpl) ae.newCAS();
- jcas = cas.getJCas();
- assertTrue(cas != null);
- ts = cas.getTypeSystem();
- assertTrue(ts != null);
+ this.cas = (CASImpl) ae.newCAS();
+ this.jcas = cas.getJCas();
+ assertTrue(this.cas != null);
+ this.ts = this.cas.getTypeSystem();
+ assertTrue(this.ts != null);
} catch (IOException e) {
e.printStackTrace();
assertTrue(false);
@@ -175,64 +175,64 @@ public class IteratorTest {
assertTrue(false);
}
- stringType = ts.getType(CAS.TYPE_NAME_STRING);
- assertTrue(stringType != null);
- tokenType = ts.getType(CASTestSetup.TOKEN_TYPE);
- assertTrue(stringType != null);
- intType = ts.getType(CAS.TYPE_NAME_INTEGER);
- assertTrue(intType != null);
- tokenTypeType = ts.getType(CASTestSetup.TOKEN_TYPE_TYPE);
- assertTrue(tokenTypeType != null);
- wordType = ts.getType(CASTestSetup.WORD_TYPE);
- assertTrue(wordType != null);
- tokenTypeFeat = ts.getFeatureByFullName(CASTestSetup.TOKEN_TYPE_FEAT_Q);
- assertTrue(tokenTypeFeat != null);
- lemmaFeat = ts.getFeatureByFullName(CASTestSetup.LEMMA_FEAT_Q);
- assertTrue(lemmaFeat != null);
- sentLenFeat = ts.getFeatureByFullName(CASTestSetup.SENT_LEN_FEAT_Q);
- assertTrue(sentLenFeat != null);
- tokenFloatFeat = ts.getFeatureByFullName(CASTestSetup.TOKEN_FLOAT_FEAT_Q);
- assertTrue(tokenFloatFeat != null);
- startFeature = ts.getFeatureByFullName(CAS.FEATURE_FULL_NAME_BEGIN);
- assertTrue(startFeature != null);
- sentenceType = ts.getType(CASTestSetup.SENT_TYPE);
- assertTrue(sentenceType != null);
- annotationType = ts.getType(CAS.TYPE_NAME_ANNOTATION);
- assertTrue(annotationType != null);
- subsentenceType = ts.getType("SubTypeOfSentence");
- assertTrue(subsentenceType != null);
+ this.stringType = this.ts.getType(CAS.TYPE_NAME_STRING);
+ assertTrue(this.stringType != null);
+ this.tokenType = this.ts.getType(CASTestSetup.TOKEN_TYPE);
+ assertTrue(this.stringType != null);
+ this.intType = this.ts.getType(CAS.TYPE_NAME_INTEGER);
+ assertTrue(this.intType != null);
+ this.tokenTypeType = this.ts.getType(CASTestSetup.TOKEN_TYPE_TYPE);
+ assertTrue(this.tokenTypeType != null);
+ this.wordType = this.ts.getType(CASTestSetup.WORD_TYPE);
+ assertTrue(this.wordType != null);
+ this.tokenTypeFeat = this.ts.getFeatureByFullName(CASTestSetup.TOKEN_TYPE_FEAT_Q);
+ assertTrue(this.tokenTypeFeat != null);
+ this.lemmaFeat = this.ts.getFeatureByFullName(CASTestSetup.LEMMA_FEAT_Q);
+ assertTrue(this.lemmaFeat != null);
+ this.sentLenFeat = this.ts.getFeatureByFullName(CASTestSetup.SENT_LEN_FEAT_Q);
+ assertTrue(this.sentLenFeat != null);
+ this.tokenFloatFeat = this.ts.getFeatureByFullName(CASTestSetup.TOKEN_FLOAT_FEAT_Q);
+ assertTrue(this.tokenFloatFeat != null);
+ this.startFeature = this.ts.getFeatureByFullName(CAS.FEATURE_FULL_NAME_BEGIN);
+ assertTrue(this.startFeature != null);
+ this.sentenceType = this.ts.getType(CASTestSetup.SENT_TYPE);
+ assertTrue(this.sentenceType != null);
+ this.annotationType = this.ts.getType(CAS.TYPE_NAME_ANNOTATION);
+ assertTrue(this.annotationType != null);
+ this.subsentenceType = this.ts.getType("SubTypeOfSentence");
+ assertTrue(this.subsentenceType != null);
}
@AfterEach
public void tearDown() {
- cas = null;
- ts = null;
- stringType = null;
- tokenType = null;
- intType = null;
- tokenTypeType = null;
- wordType = null;
- tokenTypeFeat = null;
- lemmaFeat = null;
- sentLenFeat = null;
- tokenFloatFeat = null;
- startFeature = null;
- sentenceType = null;
- annotationType = null;
+ this.cas = null;
+ this.ts = null;
+ this.stringType = null;
+ this.tokenType = null;
+ this.intType = null;
+ this.tokenTypeType = null;
+ this.wordType = null;
+ this.tokenTypeFeat = null;
+ this.lemmaFeat = null;
+ this.sentLenFeat = null;
+ this.tokenFloatFeat = null;
+ this.startFeature = null;
+ this.sentenceType = null;
+ this.annotationType = null;
}
private void setupindexes() {
- bagIndex = cas.getIndexRepository().getIndex(CASTestSetup.ANNOT_BAG_INDEX);
- setIndex = cas.getIndexRepository().getIndex(CASTestSetup.ANNOT_SET_INDEX);
- sortedIndex = cas.getIndexRepository().getIndex(CASTestSetup.ANNOT_SORT_INDEX);
+ bagIndex = this.cas.getIndexRepository().getIndex(CASTestSetup.ANNOT_BAG_INDEX);
+ setIndex = this.cas.getIndexRepository().getIndex(CASTestSetup.ANNOT_SET_INDEX);
+ sortedIndex = this.cas.getIndexRepository().getIndex(CASTestSetup.ANNOT_SORT_INDEX);
ssBagIndex = bagIndex.withSnapshotIterators();
ssSetIndex = setIndex.withSnapshotIterators();
ssSortedIndex = sortedIndex.withSnapshotIterators();
- jcasBagIndex = jcas.getIndexRepository().getIndex(CASTestSetup.ANNOT_BAG_INDEX);
- jcasSetIndex = jcas.getIndexRepository().getIndex(CASTestSetup.ANNOT_SET_INDEX);
- jcasSortedIndex = jcas.getIndexRepository().getIndex(CASTestSetup.ANNOT_SORT_INDEX);
+ jcasBagIndex = this.jcas.getIndexRepository().getIndex(CASTestSetup.ANNOT_BAG_INDEX);
+ jcasSetIndex = this.jcas.getIndexRepository().getIndex(CASTestSetup.ANNOT_SET_INDEX);
+ jcasSortedIndex = this.jcas.getIndexRepository().getIndex(CASTestSetup.ANNOT_SORT_INDEX);
jcasSsBagIndex = jcasBagIndex.withSnapshotIterators();
jcasSsSetIndex = jcasSetIndex.withSnapshotIterators();
@@ -268,7 +268,7 @@ public class IteratorTest {
@Test
public void testGetIndexes() {
- Iterator<FSIndex<FeatureStructure>> it = cas.getIndexRepository().getIndexes();
+ Iterator<FSIndex<FeatureStructure>> it = this.cas.getIndexRepository().getIndexes();
while (it.hasNext()) {
assertNotNull(it.next());
}
@@ -282,14 +282,14 @@ public class IteratorTest {
}
final int start = 5;
final int end = 7;
- FSIndexRepository repo = cas.getIndexRepository();
+ FSIndexRepository repo = this.cas.getIndexRepository();
for (int i = 0; i < 10; i++) {
// add 10 annotations with start 5, end 7
- AnnotationFS annotation = cas.createAnnotation(annotationType, start, end);
+ AnnotationFS annotation = this.cas.createAnnotation(this.annotationType, start, end);
repo.addFS(annotation);
}
- AnnotationFS match = cas.createAnnotation(annotationType, start, end);
- FSIndex<AnnotationFS> index = cas.getAnnotationIndex();
+ AnnotationFS match = this.cas.createAnnotation(this.annotationType, start, end);
+ FSIndex<AnnotationFS> index = this.cas.getAnnotationIndex();
FSIndex<AnnotationFS> ssIndex = index.withSnapshotIterators();
FSIterator<AnnotationFS> it = index.iterator();
assertEquals(60, it.size());
@@ -309,10 +309,10 @@ public class IteratorTest {
@Test
public void testMoveToPastEnd() { // https://issues.apache.org/jira/browse/UIMA-4094
- cas.getIndexRepository().addFS(cas.createAnnotation(annotationType, 1, 2));
+ this.cas.getIndexRepository().addFS(this.cas.createAnnotation(this.annotationType, 1, 2));
- AnnotationFS pastEnd = cas.createAnnotation(annotationType, 2, 3);
- FSIndex<AnnotationFS> index = cas.getAnnotationIndex();
+ AnnotationFS pastEnd = this.cas.createAnnotation(this.annotationType, 2, 3);
+ FSIndex<AnnotationFS> index = this.cas.getAnnotationIndex();
FSIterator<AnnotationFS> it = index.iterator();
it.moveTo(pastEnd);
assertFalse(it.isValid());
@@ -330,25 +330,25 @@ public class IteratorTest {
for (int i = 0; i < 2; i++) {
cas.reset();
if (i == 0) {
- cas.getIndexRepository().addFS(cas.createAnnotation(subsentenceType, 0, 1));
+ this.cas.getIndexRepository().addFS(this.cas.createAnnotation(this.subsentenceType, 0, 1));
}
- cas.getIndexRepository().addFS(cas.createAnnotation(subsentenceType, 1, 2));
- cas.getIndexRepository().addFS(cas.createAnnotation(subsentenceType, 1, 2));
- cas.getIndexRepository().addFS(cas.createAnnotation(subsentenceType, 1, 3));
- cas.getIndexRepository().addFS(cas.createAnnotation(subsentenceType, 2, 2));
- cas.getIndexRepository().addFS(cas.createAnnotation(subsentenceType, 2, 5));
+ this.cas.getIndexRepository().addFS(this.cas.createAnnotation(this.subsentenceType, 1, 2));
+ this.cas.getIndexRepository().addFS(this.cas.createAnnotation(this.subsentenceType, 1, 2));
+ this.cas.getIndexRepository().addFS(this.cas.createAnnotation(this.subsentenceType, 1, 3));
+ this.cas.getIndexRepository().addFS(this.cas.createAnnotation(this.subsentenceType, 2, 2));
+ this.cas.getIndexRepository().addFS(this.cas.createAnnotation(this.subsentenceType, 2, 5));
- AnnotationFS testAnnot = cas.createAnnotation(subsentenceType, 1, 2);
+ AnnotationFS testAnnot = this.cas.createAnnotation(this.subsentenceType, 1, 2);
- FSIndex<AnnotationFS> index = cas.getAnnotationIndex(subsentenceType);
+ FSIndex<AnnotationFS> index = this.cas.getAnnotationIndex(this.subsentenceType);
FSIterator<AnnotationFS> it = index.iterator();
assertEquals((i == 0) ? 6 : 5, it.size());
it.moveTo(testAnnot);
for (int j = 0; j < 2; j++) {
assertTrue(it.isValid());
AnnotationFS fs = it.get();
- cas.getIndexRepository().addFS(testAnnot);
- cas.getIndexRepository().removeFS(testAnnot);
+ this.cas.getIndexRepository().addFS(testAnnot);
+ this.cas.getIndexRepository().removeFS(testAnnot);
assertEquals(1, fs.getBegin());
assertEquals(2, fs.getEnd());
it.moveToNext();
@@ -373,26 +373,26 @@ public class IteratorTest {
private void createFSs(int i) {
FeatureStructureImplC fsi;
- cas.getIndexRepository()
- .addFS(cas.createAnnotation(annotationType, i * 2, (i * 2) + 1));
- cas.getIndexRepository()
- .addFS(cas.createAnnotation(sentenceType, i * 2, (i * 2) + 1));
- cas.getIndexRepository()
- .addFS(fsi = cas.createAnnotation(tokenType, i * 2, (i * 2) + 1));
- cas.getIndexRepository()
- .addFS(cas.createAnnotation(tokenType, i * 2, (i * 2) + 1));
- cas.getIndexRepository()
- .addFS(cas.createAnnotation(tokenType, i * 2, (i * 2) + 1));
+ this.cas.getIndexRepository()
+ .addFS(this.cas.createAnnotation(this.annotationType, i * 2, (i * 2) + 1));
+ this.cas.getIndexRepository()
+ .addFS(this.cas.createAnnotation(this.sentenceType, i * 2, (i * 2) + 1));
+ this.cas.getIndexRepository()
+ .addFS(fsi = this.cas.createAnnotation(this.tokenType, i * 2, (i * 2) + 1));
+ this.cas.getIndexRepository()
+ .addFS(this.cas.createAnnotation(this.tokenType, i * 2, (i * 2) + 1));
+ this.cas.getIndexRepository()
+ .addFS(this.cas.createAnnotation(this.tokenType, i * 2, (i * 2) + 1));
// //debug
// System.out.format("Token at %,d %n", fsi.getAddress());
}
private void createFSsU() {
- cas.getIndexRepository().removeAllIncludingSubtypes(TOP.class);
+ this.cas.getIndexRepository().removeAllIncludingSubtypes(TOP.class);
for (int i = 0; i < 5; i++) {
- cas.getIndexRepository()
- .addFS(cas.createAnnotation(annotationType, i * 2, (i * 2) + 1));
+ this.cas.getIndexRepository()
+ .addFS(this.cas.createAnnotation(this.annotationType, i * 2, (i * 2) + 1));
}
}
@@ -406,7 +406,7 @@ public class IteratorTest {
// }
private void setupFSs() {
- cas.getIndexRepository().removeAllIncludingSubtypes(TOP.class);
+ this.cas.getIndexRepository().removeAllIncludingSubtypes(TOP.class);
for (int i = 0; i < 10; i++) {
createFSs(i); // i = 0 .. 9, 5 annot per: annotation, sentence, token, token, token
@@ -419,11 +419,11 @@ public class IteratorTest {
@Test
public void testMultithreadedIterator() {
setupFSs();
- final FSIndex<FeatureStructure> bagIndex = cas.getIndexRepository()
+ final FSIndex<FeatureStructure> bagIndex = this.cas.getIndexRepository()
.getIndex(CASTestSetup.ANNOT_BAG_INDEX);
- final FSIndex<FeatureStructure> setIndex = cas.getIndexRepository()
+ final FSIndex<FeatureStructure> setIndex = this.cas.getIndexRepository()
.getIndex(CASTestSetup.ANNOT_SET_INDEX);
- final FSIndex<FeatureStructure> sortedIndex = cas.getIndexRepository()
+ final FSIndex<FeatureStructure> sortedIndex = this.cas.getIndexRepository()
.getIndex(CASTestSetup.ANNOT_SORT_INDEX);
int numberOfCores = Math.min(50, Runtime.getRuntime().availableProcessors() * 5);
@@ -563,7 +563,7 @@ public class IteratorTest {
expected[i++] = fs._id();
}
- LowLevelIndexRepository llir = cas.ll_getIndexRepository();
+ LowLevelIndexRepository llir = this.cas.ll_getIndexRepository();
LowLevelIndex setIndexForType = llir.ll_getIndex(CASTestSetup.ANNOT_SET_INDEX,
((TypeImpl) tokenType).getCode());
// int[] expected = {17, 53, 89, 125, 161, 197, 233, 269, 305, 341, 701, 665, 629, 593, 557,
@@ -848,17 +848,17 @@ public class IteratorTest {
}
private void setupWords() {
- wType = cas.getTypeSystem().getType("org.apache.uima.cas.test.types.Word");
+ wType = this.cas.getTypeSystem().getType("org.apache.uima.cas.test.types.Word");
wordFeat = wType.getFeatureByBaseName("word");
for (int i = 0; i < 20; i++) {
- FeatureStructure fs = cas.createFS(wType);
+ FeatureStructure fs = this.cas.createFS(wType);
fs.setStringValue(wordFeat, "word" + i);
- cas.getIndexRepository().addFS(fs);
+ this.cas.getIndexRepository().addFS(fs);
}
- wordSetIndex = cas.getIndexRepository().getIndex("Word Set Index");
+ wordSetIndex = this.cas.getIndexRepository().getIndex("Word Set Index");
ssWordSetIndex = wordSetIndex.withSnapshotIterators();
}
@@ -868,7 +868,7 @@ public class IteratorTest {
assertEquals(20, it.size()); // test size
it.moveToLast();
- FeatureStructure fs = cas.createFS(wType);
+ FeatureStructure fs = this.cas.createFS(wType);
fs.setStringValue(wordFeat, "word1");
// TEST moveTo() and get()
@@ -888,13 +888,13 @@ public class IteratorTest {
// System.out.println("debug");
// }
assertNotNull(index.find(annot));
- assertNull(index.find(cas.createAnnotation(annotationType, -1, -1)));
+ assertNull(index.find(this.cas.createAnnotation(this.annotationType, -1, -1)));
}
private void findTestJCas(FSIndex<?> index) {
Annotation annot = (Annotation) index.iterator().get(); // first element
assertNotNull(index.find(annot));
- assertNull(index.find(cas.createAnnotation(annotationType, -1, -1)));
+ assertNull(index.find(this.cas.createAnnotation(this.annotationType, -1, -1)));
}
private void sortedIteratorWithoutMods(FSIndex<FeatureStructure> sortedIndex) {
@@ -935,7 +935,7 @@ public class IteratorTest {
// Test moveTo()
List<AnnotationFS> list = new ArrayList<>();
- FSIterator<AnnotationFS> it2 = cas.getAnnotationIndex().iterator();
+ FSIterator<AnnotationFS> it2 = this.cas.getAnnotationIndex().iterator();
for (it2.moveToFirst(); it2.isValid(); it2.moveToNext()) {
list.add(it2.get());
}
@@ -1064,7 +1064,7 @@ public class IteratorTest {
// Test iterator copy.
FSIterator<AnnotationFS> source, copy;
- source = cas.getAnnotationIndex().iterator();
+ source = this.cas.getAnnotationIndex().iterator();
// Count items.
int count = 0;
for (source.moveToFirst(); source.isValid(); source.moveToNext()) {
@@ -1091,7 +1091,7 @@ public class IteratorTest {
}
private void addAnnotations(AnnotationFS[] fsArray, Type type) {
- FSIndexRepository ir = cas.getIndexRepository();
+ FSIndexRepository ir = this.cas.getIndexRepository();
for (int i = 0; i < fsArray.length; i++) {
// key order:
// 0 ... 50 200 ... 160 66 66 66 ..
@@ -1100,7 +1100,7 @@ public class IteratorTest {
int j = (i >= 90) ? 66 : // some constant keys
(i > 50) ? 200 - i : // some decreasing keys
i; // some increasing keys
- fsArray[i] = cas.createAnnotation(type, j * 5, (j * 5) + 4);
+ fsArray[i] = this.cas.createAnnotation(type, j * 5, (j * 5) + 4);
ir.addFS(fsArray[i]);
}
}
@@ -1114,17 +1114,17 @@ public class IteratorTest {
// have 10% of them be the same key
// have the order be scrambled somewhat, not strictly increasing
AnnotationFS[] fsArray = new AnnotationFS[100];
- FSIndexRepository ir = cas.getIndexRepository();
- addAnnotations(fsArray, tokenType);
+ FSIndexRepository ir = this.cas.getIndexRepository();
+ addAnnotations(fsArray, this.tokenType);
- FSIndex<FeatureStructure> setIndex = cas.getIndexRepository()
- .getIndex(CASTestSetup.ANNOT_SET_INDEX, tokenType);
+ FSIndex<FeatureStructure> setIndex = this.cas.getIndexRepository()
+ .getIndex(CASTestSetup.ANNOT_SET_INDEX, this.tokenType);
FSIterator<FeatureStructure> set_iterator = setIndex.iterator();
- FSIndex<AnnotationFS> sortedIndex = cas.getAnnotationIndex(tokenType);
+ FSIndex<AnnotationFS> sortedIndex = this.cas.getAnnotationIndex(this.tokenType);
FSIterator<AnnotationFS> sortedIt = sortedIndex.iterator();
- FSIndex<FeatureStructure> bagIndex = ir.getIndex(CASTestSetup.ANNOT_BAG_INDEX, tokenType);
+ FSIndex<FeatureStructure> bagIndex = ir.getIndex(CASTestSetup.ANNOT_BAG_INDEX, this.tokenType);
FSIterator<FeatureStructure> bagIt = bagIndex.iterator();
// verify that the index is the right type https://issues.apache.org/jira/browse/UIMA-2883
@@ -1168,8 +1168,8 @@ public class IteratorTest {
set_iterator = setIndex.iterator();
set_iterator.moveTo(fsArray[i]);
if (set_iterator.isValid()) {
- int oldRef = cas.ll_getFSRef(fsArray[i]);
- int newRef = cas.ll_getFSRef(set_iterator.get());
+ int oldRef = this.cas.ll_getFSRef(fsArray[i]);
+ int newRef = this.cas.ll_getFSRef(set_iterator.get());
assertTrue(oldRef != newRef);
assertTrue(!set_iterator.get().equals(fsArray[i]));
}
@@ -1232,22 +1232,22 @@ public class IteratorTest {
public void testRemoveAll() {
AnnotationFS[] fsArray = new AnnotationFS[100];
AnnotationFS[] subFsArray = new AnnotationFS[100];
- FSIndexRepository ir = cas.getIndexRepository();
+ FSIndexRepository ir = this.cas.getIndexRepository();
addAnnotations(fsArray, ts.getType("Sentence"));
addAnnotations(subFsArray, ts.getType("SubTypeOfSentence"));
FSIndex<FeatureStructure> setIndex = ir.getIndex(CASTestSetup.ANNOT_SET_INDEX,
- sentenceType);
+ this.sentenceType);
FSIndex<FeatureStructure> bagIndex = ir.getIndex(CASTestSetup.ANNOT_BAG_INDEX,
- sentenceType);
- FSIndex<AnnotationFS> sortedIndex = cas.getAnnotationIndex(sentenceType);
+ this.sentenceType);
+ FSIndex<AnnotationFS> sortedIndex = this.cas.getAnnotationIndex(this.sentenceType);
FSIndex<FeatureStructure> subsetIndex = ir.getIndex(CASTestSetup.ANNOT_SET_INDEX,
- subsentenceType);
+ this.subsentenceType);
FSIndex<FeatureStructure> subbagIndex = ir.getIndex(CASTestSetup.ANNOT_BAG_INDEX,
- subsentenceType);
- FSIndex<AnnotationFS> subsortedIndex = cas.getAnnotationIndex(subsentenceType);
+ this.subsentenceType);
+ FSIndex<AnnotationFS> subsortedIndex = this.cas.getAnnotationIndex(this.subsentenceType);
FSIterator<FeatureStructure> setIt = setIndex.iterator();
FSIterator<FeatureStructure> bagIt = bagIndex.iterator();
@@ -1330,7 +1330,7 @@ public class IteratorTest {
verifyMoveToFirst(subbagIt, true);
verifyMoveToFirst(subsortedIt, true);
- ir.removeAllExcludingSubtypes(sentenceType);
+ ir.removeAllExcludingSubtypes(this.sentenceType);
// due to copy on write, need to get new iterators
setIt = setIndex.iterator();
@@ -1394,7 +1394,7 @@ public class IteratorTest {
public void testInvalidIndexRequest() {
boolean exc = false;
try {
- cas.getIndexRepository().getIndex(CASTestSetup.ANNOT_BAG_INDEX, stringType);
+ this.cas.getIndexRepository().getIndex(CASTestSetup.ANNOT_BAG_INDEX, this.stringType);
} catch (CASRuntimeException e) {
exc = true;
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/SofaTest.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/SofaTest.java
index 0d2f0b53a..be1b2a1a5 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/SofaTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/SofaTest.java
@@ -99,37 +99,37 @@ public class SofaTest {
@BeforeEach
public void setUp() throws Exception {
try {
- casMgr = CASFactory.createCAS();
- CasCreationUtils.setupTypeSystem(casMgr, (TypeSystemDescription) null);
+ this.casMgr = CASFactory.createCAS();
+ CasCreationUtils.setupTypeSystem(this.casMgr, (TypeSystemDescription) null);
// Create a writable type system.
- TypeSystemMgr tsa = casMgr.getTypeSystemMgr();
+ TypeSystemMgr tsa = this.casMgr.getTypeSystemMgr();
// Add new types and features.
// Type topType = tsa.getTopType();
- annotationType = tsa.getType(CAS.TYPE_NAME_ANNOTATION);
+ this.annotationType = tsa.getType(CAS.TYPE_NAME_ANNOTATION);
// annotSofaFeat = annotationType.getFeatureByBaseName(CAS.FEATURE_BASE_NAME_SOFA);
- docAnnotationType = tsa.getType(CAS.TYPE_NAME_DOCUMENT_ANNOTATION);
- assertTrue(annotationType != null);
- crossType = tsa.addType("sofa.test.CrossAnnotation", annotationType);
- otherFeat = tsa.addFeature("otherAnnotation", crossType, annotationType);
+ this.docAnnotationType = tsa.getType(CAS.TYPE_NAME_DOCUMENT_ANNOTATION);
+ assertTrue(this.annotationType != null);
+ this.crossType = tsa.addType("sofa.test.CrossAnnotation", this.annotationType);
+ this.otherFeat = tsa.addFeature("otherAnnotation", this.crossType, this.annotationType);
// Commit the type system.
- ((CASImpl) casMgr).commitTypeSystem();
+ ((CASImpl) this.casMgr).commitTypeSystem();
// reinit type system values because the commit might reuse an existing one
- tsa = casMgr.getTypeSystemMgr();
- annotationType = tsa.getType(CAS.TYPE_NAME_ANNOTATION);
- docAnnotationType = tsa.getType(CAS.TYPE_NAME_DOCUMENT_ANNOTATION);
- crossType = tsa.getType("sofa.test.CrossAnnotation");
- otherFeat = crossType.getFeatureByBaseName("otherAnnotation");
+ tsa = this.casMgr.getTypeSystemMgr();
+ this.annotationType = tsa.getType(CAS.TYPE_NAME_ANNOTATION);
+ this.docAnnotationType = tsa.getType(CAS.TYPE_NAME_DOCUMENT_ANNOTATION);
+ this.crossType = tsa.getType("sofa.test.CrossAnnotation");
+ this.otherFeat = crossType.getFeatureByBaseName("otherAnnotation");
// Create the Base indexes.
- casMgr.initCASIndexes();
- FSIndexRepositoryMgr irm = casMgr.getIndexRepositoryMgr();
+ this.casMgr.initCASIndexes();
+ FSIndexRepositoryMgr irm = this.casMgr.getIndexRepositoryMgr();
// init.initIndexes(irm, casMgr.getTypeSystemMgr());
irm.commit();
- cas = casMgr.getCAS().getView(CAS.NAME_DEFAULT_SOFA);
- assertTrue(cas.getSofa() == null);
- assertTrue(cas.getViewName().equals(CAS.NAME_DEFAULT_SOFA));
+ this.cas = this.casMgr.getCAS().getView(CAS.NAME_DEFAULT_SOFA);
+ assertTrue(this.cas.getSofa() == null);
+ assertTrue(this.cas.getViewName().equals(CAS.NAME_DEFAULT_SOFA));
} catch (Exception e) {
JUnitExtension.handleException(e);
}
@@ -155,7 +155,7 @@ public class SofaTest {
// Create a Sofa (using old APIs for now)
SofaID_impl id = new SofaID_impl();
id.setSofaID("EnglishDocument");
- SofaFS es = cas.createSofa(id, "text");
+ SofaFS es = this.cas.createSofa(id, "text");
// Initial View is #1!!!
assertTrue(2 == es.getSofaRef());
@@ -164,7 +164,7 @@ public class SofaTest {
// Test Multiple Sofas across XCAS serialization
String xcasFilename = "Sofa.xcas";
- XCASSerializer ser = new XCASSerializer(cas.getTypeSystem());
+ XCASSerializer ser = new XCASSerializer(this.cas.getTypeSystem());
OutputStream outputXCAS = new FileOutputStream(xcasFilename);
XMLSerializer xmlSer = new XMLSerializer(outputXCAS);
try {
@@ -177,7 +177,7 @@ public class SofaTest {
}
// Deserialize XCAS
- cas.reset();
+ this.cas.reset();
InputStream inputXCAS = new FileInputStream(xcasFilename);
try {
XCASDeserializer.deserialize(inputXCAS, cas, false);
@@ -197,7 +197,7 @@ public class SofaTest {
// SofaID_impl gid = new SofaID_impl();
// gid.setSofaID("GermanDocument");
// SofaFS gs = ((CASImpl)cas).createSofa(gid,"text");
- CAS gerTcas = cas.createView("GermanDocument");
+ CAS gerTcas = this.cas.createView("GermanDocument");
assertTrue(gerTcas.getViewName().equals("GermanDocument"));
SofaFS gs = gerTcas.getSofa();
@@ -216,7 +216,7 @@ public class SofaTest {
// SofaID_impl fid = new SofaID_impl();
// fid.setSofaID("FrenchDocument");
// SofaFS fs = ((CASImpl)cas).createSofa(fid, "text");
- CAS frT = cas.createView("FrenchDocument");
+ CAS frT = this.cas.createView("FrenchDocument");
assertTrue(frT.getViewName().equals("FrenchDocument"));
SofaFS fs = frT.getSofa();
assertTrue(fs != null);
@@ -225,14 +225,14 @@ public class SofaTest {
// Test multiple Sofas across blob serialization
ByteArrayOutputStream fos = new ByteArrayOutputStream();
Serialization.serializeCAS(cas, fos);
- cas.reset();
+ this.cas.reset();
ByteArrayInputStream fis = new ByteArrayInputStream(fos.toByteArray());
Serialization.deserializeCAS(cas, fis);
// Open TCas views of some Sofas
- CAS engTcas = cas.getView(es);
+ CAS engTcas = this.cas.getView(es);
assertTrue(engTcas.getViewName().equals("EnglishDocument"));
- CAS frTcas = cas.getView("FrenchDocument");
+ CAS frTcas = this.cas.getView("FrenchDocument");
// Set the document text off SofaFS after the CAS view exists
frTcas.setSofaDataString("cette biere est bonne", "text");
@@ -279,11 +279,11 @@ public class SofaTest {
assertTrue("ANNOTATION_IN_WRONG_INDEX".equals(c.getMessageKey()));
}
- AnnotationFS frAnnot = frTcas.createAnnotation(annotationType, frBegin, frEnd);
+ AnnotationFS frAnnot = frTcas.createAnnotation(this.annotationType, frBegin, frEnd);
frTcas.getIndexRepository().addFS(frAnnot);
- AnnotationFS gerAnnot = gerTcas.createAnnotation(crossType, gerBegin, gerEnd);
- gerAnnot.setFeatureValue(otherFeat, engAnnot);
+ AnnotationFS gerAnnot = gerTcas.createAnnotation(this.crossType, gerBegin, gerEnd);
+ gerAnnot.setFeatureValue(this.otherFeat, engAnnot);
gerTcas.getIndexRepository().addFS(gerAnnot);
}
@@ -291,7 +291,7 @@ public class SofaTest {
// Sofas are indexed
// FSIndex sofaIndex =
// cas.getIndexRepository().getIndex(CAS.SOFA_INDEX_NAME);
- FSIterator<SofaFS> sofaIter = cas.getSofaIterator();
+ FSIterator<SofaFS> sofaIter = this.cas.getSofaIterator();
int numSofas = 0;
while (sofaIter.isValid()) {
numSofas++;
@@ -343,7 +343,7 @@ public class SofaTest {
// Test that annotations accessed from a reference in the base CAS
// work correctly
- ArrayFS anArray = cas.createArrayFS(3);
+ ArrayFS anArray = this.cas.createArrayFS(3);
anArray.set(0, engAnnot);
anArray.set(1, frAnnot);
anArray.set(2, gerAnnot);
@@ -372,11 +372,11 @@ public class SofaTest {
// id.setSofaID("StringSofaData");
// SofaFS strSofa = cas.createSofa(id, "text");
// strSofa.setLocalSofaData("this beer is good");
- CAS stringView = cas.createView("StringSofaData");
+ CAS stringView = this.cas.createView("StringSofaData");
stringView.setDocumentText("this beer is good");
// create a int array fs
- IntArrayFS intArrayFS = cas.createIntArrayFS(5);
+ IntArrayFS intArrayFS = this.cas.createIntArrayFS(5);
intArrayFS.set(0, 1);
intArrayFS.set(1, 2);
intArrayFS.set(2, 3);
@@ -387,21 +387,21 @@ public class SofaTest {
// id.setSofaID("intArraySofaData");
// SofaFS intarraySofaFS = cas.createSofa(id, "text");
// intarraySofaFS.setLocalSofaData(intArrayFS);
- CAS intArrayView = cas.createView("intArraySofaData");
+ CAS intArrayView = this.cas.createView("intArraySofaData");
intArrayView.setSofaDataArray(intArrayFS, "integers");
// create a string array fs
- StringArrayFS stringArrayFS = cas.createStringArrayFS(5);
+ StringArrayFS stringArrayFS = this.cas.createStringArrayFS(5);
stringArrayFS.set(0, "This");
stringArrayFS.set(1, "beer");
stringArrayFS.set(2, "is");
stringArrayFS.set(3, "really");
stringArrayFS.set(4, "good");
- CAS stringArrayView = cas.createView("stringArraySofaData");
+ CAS stringArrayView = this.cas.createView("stringArraySofaData");
stringArrayView.setSofaDataArray(stringArrayFS, "strings");
// create a float array fs
- FloatArrayFS floatArrayFS = cas.createFloatArrayFS(5);
+ FloatArrayFS floatArrayFS = this.cas.createFloatArrayFS(5);
floatArrayFS.set(0, (float) 0.1);
floatArrayFS.set(1, (float) 0.2);
floatArrayFS.set(2, (float) 0.3);
@@ -412,11 +412,11 @@ public class SofaTest {
// id.setSofaID("floatArraySofaData");
// SofaFS floatarraySofaFS = cas.createSofa(id,"text");
// floatarraySofaFS.setLocalSofaData(floatArrayFS);
- CAS floatArrayView = cas.createView("floatArraySofaData");
+ CAS floatArrayView = this.cas.createView("floatArraySofaData");
floatArrayView.setSofaDataArray(floatArrayFS, "floats");
// create a short array fs
- ShortArrayFS shortArrayFS = cas.createShortArrayFS(5);
+ ShortArrayFS shortArrayFS = this.cas.createShortArrayFS(5);
shortArrayFS.set(0, (short) 128);
shortArrayFS.set(1, (short) 127);
shortArrayFS.set(2, (short) 126);
@@ -427,11 +427,11 @@ public class SofaTest {
// id.setSofaID("shortArraySofaData");
// SofaFS shortarraySofaFS = cas.createSofa(id, "text");
// shortarraySofaFS.setLocalSofaData(shortArrayFS);
- CAS shortArrayView = cas.createView("shortArraySofaData");
+ CAS shortArrayView = this.cas.createView("shortArraySofaData");
shortArrayView.setSofaDataArray(shortArrayFS, "shorts");
// create a byte array fs
- ByteArrayFS byteArrayFS = cas.createByteArrayFS(5);
+ ByteArrayFS byteArrayFS = this.cas.createByteArrayFS(5);
byteArrayFS.set(0, (byte) 8);
byteArrayFS.set(1, (byte) 16);
byteArrayFS.set(2, (byte) 64);
@@ -442,11 +442,11 @@ public class SofaTest {
// id.setSofaID("byteArraySofaData");
// SofaFS bytearraySofaFS = cas.createSofa(id, "text");
// bytearraySofaFS.setLocalSofaData(byteArrayFS);
- CAS byteArrayView = cas.createView("byteArraySofaData");
+ CAS byteArrayView = this.cas.createView("byteArraySofaData");
byteArrayView.setSofaDataArray(byteArrayFS, "bytes");
// create a long array fs
- LongArrayFS longArrayFS = cas.createLongArrayFS(5);
+ LongArrayFS longArrayFS = this.cas.createLongArrayFS(5);
longArrayFS.set(0, Long.MAX_VALUE);
longArrayFS.set(1, Long.MAX_VALUE - 1);
longArrayFS.set(2, Long.MAX_VALUE - 2);
@@ -457,10 +457,10 @@ public class SofaTest {
// id.setSofaID("longArraySofaData");
// SofaFS longarraySofaFS = cas.createSofa(id, "text");
// longarraySofaFS.setLocalSofaData(longArrayFS);
- CAS longArrayView = cas.createView("longArraySofaData");
+ CAS longArrayView = this.cas.createView("longArraySofaData");
longArrayView.setSofaDataArray(longArrayFS, "longs");
- DoubleArrayFS doubleArrayFS = cas.createDoubleArrayFS(5);
+ DoubleArrayFS doubleArrayFS = this.cas.createDoubleArrayFS(5);
doubleArrayFS.set(0, Double.MAX_VALUE);
doubleArrayFS.set(1, Double.MIN_VALUE);
doubleArrayFS.set(2, Double.parseDouble("1.5555"));
@@ -471,7 +471,7 @@ public class SofaTest {
// id.setSofaID("doubleArraySofaData");
// SofaFS doublearraySofaFS = cas.createSofa(id, "text");
// doublearraySofaFS.setLocalSofaData(doubleArrayFS);
- CAS doubleArrayView = cas.createView("doubleArraySofaData");
+ CAS doubleArrayView = this.cas.createView("doubleArraySofaData");
doubleArrayView.setSofaDataArray(doubleArrayFS, "doubles");
// create remote sofa and set the SofaURI feature
@@ -479,7 +479,7 @@ public class SofaTest {
// id.setSofaID("remoteSofaData");
// SofaFS remoteSofa = cas.createSofa(id, "text");
// remoteSofa.setRemoteSofaURI("file:.\\Sofa.xcas");
- CAS remoteView = cas.createView("remoteSofaData");
+ CAS remoteView = this.cas.createView("remoteSofaData");
String sofaFileName = "./Sofa.xcas";
remoteView.setSofaDataURI("file:" + sofaFileName, "text");
PrintWriter out = new PrintWriter(sofaFileName);
@@ -591,7 +591,7 @@ public class SofaTest {
public void testSetSofaDataString() {
final String TEST_TEXT = "this is a test";
final String TEST_MIME = "text/plain";
- CAS testView = cas.createView("TestView");
+ CAS testView = this.cas.createView("TestView");
testView.setSofaDataString(TEST_TEXT, TEST_MIME);
assertEquals(TEST_TEXT, testView.getSofa().getLocalStringData());
assertEquals(TEST_MIME, testView.getSofa().getSofaMime());
@@ -602,17 +602,17 @@ public class SofaTest {
public void testSetSofaDataStringOnInitialView() {
final String TEST_TEXT = "this is a test";
final String TEST_MIME = "text/plain";
- cas.setSofaDataString(TEST_TEXT, TEST_MIME);
- assertEquals(TEST_TEXT, cas.getSofa().getLocalStringData());
- assertEquals(TEST_MIME, cas.getSofa().getSofaMime());
- assertEquals(TEST_TEXT, cas.getSofaDataString());
+ this.cas.setSofaDataString(TEST_TEXT, TEST_MIME);
+ assertEquals(TEST_TEXT, this.cas.getSofa().getLocalStringData());
+ assertEquals(TEST_MIME, this.cas.getSofa().getSofaMime());
+ assertEquals(TEST_TEXT, this.cas.getSofaDataString());
}
@Test
public void testSetSofaDataURI() {
final String TEST_URI = "file:/test";
final String TEST_MIME = "text/plain";
- CAS testView = cas.createView("TestView");
+ CAS testView = this.cas.createView("TestView");
testView.setSofaDataURI(TEST_URI, TEST_MIME);
assertEquals(TEST_URI, testView.getSofa().getSofaURI());
assertEquals(TEST_MIME, testView.getSofa().getSofaMime());
@@ -629,11 +629,11 @@ public class SofaTest {
final String TEST_URI = "file:" + someTextFile;
final String TEST_MIME = "text/plain";
- cas.setSofaDataURI(TEST_URI, TEST_MIME);
- assertEquals(TEST_URI, cas.getSofa().getSofaURI());
- assertEquals(TEST_MIME, cas.getSofa().getSofaMime());
+ this.cas.setSofaDataURI(TEST_URI, TEST_MIME);
+ assertEquals(TEST_URI, this.cas.getSofa().getSofaURI());
+ assertEquals(TEST_MIME, this.cas.getSofa().getSofaMime());
- InputStream is = cas.getSofaDataStream();
+ InputStream is = this.cas.getSofaDataStream();
assertTrue(is != null);
// This obviously can't work on all platforms
@@ -656,7 +656,7 @@ public class SofaTest {
@Test
public void testSetSofaDataArray() {
final String TEST_MIME = "text/plain";
- CAS testView = cas.createView("TestView");
+ CAS testView = this.cas.createView("TestView");
ByteArrayFS sofaDataArray = testView.createByteArrayFS(2);
sofaDataArray.set(0, (byte) 0);
sofaDataArray.set(1, (byte) 42);
@@ -668,28 +668,28 @@ public class SofaTest {
@Test
public void testSetSofaDataArrayOnInitialView() {
final String TEST_MIME = "text/plain";
- ByteArrayFS sofaDataArray = cas.createByteArrayFS(2);
+ ByteArrayFS sofaDataArray = this.cas.createByteArrayFS(2);
sofaDataArray.set(0, (byte) 0);
sofaDataArray.set(1, (byte) 42);
- cas.setSofaDataArray(sofaDataArray, TEST_MIME);
- assertEquals(sofaDataArray, cas.getSofa().getLocalFSData());
- assertEquals(TEST_MIME, cas.getSofa().getSofaMime());
+ this.cas.setSofaDataArray(sofaDataArray, TEST_MIME);
+ assertEquals(sofaDataArray, this.cas.getSofa().getLocalFSData());
+ assertEquals(TEST_MIME, this.cas.getSofa().getSofaMime());
}
@Test
public void testReset() {
- cas.reset();
- cas.setDocumentText("setDocumentText creates the _InitialView Sofa");
- CAS testView = cas.createView("TestView");
+ this.cas.reset();
+ this.cas.setDocumentText("setDocumentText creates the _InitialView Sofa");
+ CAS testView = this.cas.createView("TestView");
testView.setDocumentText("create a 2nd Sofa");
- assertTrue(cas.getViewName().equals("_InitialView"));
+ assertTrue(this.cas.getViewName().equals("_InitialView"));
assertTrue(testView.getViewName().equals("TestView"));
- cas.reset();
+ this.cas.reset();
SofaID_impl id = new SofaID_impl();
id.setSofaID("TestView");
- SofaFS testSofa = cas.createSofa(id, "text");
- CAS newView = cas.getView(testSofa);
+ SofaFS testSofa = this.cas.createSofa(id, "text");
+ CAS newView = this.cas.getView(testSofa);
assertTrue(newView.getViewName().equals("TestView"));
}
@@ -705,14 +705,14 @@ public class SofaTest {
@Test
public void testGetViewIterator() throws Exception {
- cas.reset();
- CAS view1 = cas.createView("View1");
- CAS view2 = cas.createView("View2");
- checkViewsExist(cas.getViewIterator(), cas, view1, view2);
+ this.cas.reset();
+ CAS view1 = this.cas.createView("View1");
+ CAS view2 = this.cas.createView("View2");
+ checkViewsExist(this.cas.getViewIterator(), cas, view1, view2);
- CAS viewE1 = cas.createView("EnglishDocument");
- CAS viewE2 = cas.createView("EnglishDocument.2");
- checkViewsExist(cas.getViewIterator("EnglishDocument"), viewE1, viewE2);
+ CAS viewE1 = this.cas.createView("EnglishDocument");
+ CAS viewE2 = this.cas.createView("EnglishDocument.2");
+ checkViewsExist(this.cas.getViewIterator("EnglishDocument"), viewE1, viewE2);
// try with Sofa mappings
UimaContextAdmin rootCtxt = UIMAFramework.newUimaContext(UIMAFramework.getLogger(),
@@ -721,13 +721,13 @@ public class SofaTest {
sofamap.put("SourceDocument", "EnglishDocument");
UimaContextAdmin childCtxt = rootCtxt.createChild("test", sofamap);
cas.setCurrentComponentInfo(childCtxt.getComponentInfo());
- checkViewsExist(cas.getViewIterator("SourceDocument"), viewE1, viewE2);
+ checkViewsExist(this.cas.getViewIterator("SourceDocument"), viewE1, viewE2);
- cas.setCurrentComponentInfo(null);
+ this.cas.setCurrentComponentInfo(null);
// repeat with JCas
- cas.reset();
- JCas jcas = cas.getJCas();
+ this.cas.reset();
+ JCas jcas = this.cas.getJCas();
JCas jview1 = jcas.createView("View1");
JCas jview2 = jcas.createView("View2");
checkViewsExist(jcas.getViewIterator(), jcas, jview1, jview2);
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/StringArrayTest.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/StringArrayTest.java
index d802139f7..0561c8967 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/StringArrayTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/StringArrayTest.java
@@ -49,25 +49,25 @@ public class StringArrayTest {
@BeforeEach
public void setUp() throws Exception {
- cas = CASInitializer.initCas(new CASTestSetup(), null);
- ts = cas.getTypeSystem();
+ this.cas = CASInitializer.initCas(new CASTestSetup(), null);
+ this.ts = this.cas.getTypeSystem();
}
@AfterEach
public void tearDown() {
- cas = null;
- ts = null;
+ this.cas = null;
+ this.ts = null;
}
@Test
public void testSet() {
- StringArrayFS array = cas.createStringArrayFS(0);
+ StringArrayFS array = this.cas.createStringArrayFS(0);
assertTrue(array != null);
assertTrue(array.size() == 0);
assertThatExceptionOfType(ArrayIndexOutOfBoundsException.class) //
.isThrownBy(() -> array.get(0));
- StringArrayFS array2 = cas.createStringArrayFS(3);
+ StringArrayFS array2 = this.cas.createStringArrayFS(3);
array2.set(0, "1");
array2.set(1, "2");
array2.set(2, "3");
@@ -99,7 +99,7 @@ public class StringArrayTest {
assertThatExceptionOfType(CASRuntimeException.class) //
.as("We can't create arrays smaller than 0")
- .isThrownBy(() -> cas.createStringArrayFS(-1)) //
+ .isThrownBy(() -> this.cas.createStringArrayFS(-1)) //
.extracting(CASRuntimeException::getMessageKey) //
.isEqualTo(CASRuntimeException.ILLEGAL_ARRAY_SIZE);
}
@@ -107,7 +107,7 @@ public class StringArrayTest {
@Test
public void testToArray() {
// From CAS array to Java array.
- StringArrayFS array = cas.createStringArrayFS(3);
+ StringArrayFS array = this.cas.createStringArrayFS(3);
String[] fsArray = array.toArray();
for (int i = 0; i < 3; i++) {
assertTrue(fsArray[i] == null);
@@ -122,7 +122,7 @@ public class StringArrayTest {
assertTrue(fsArray[2].equals("3"));
// From Java array to CAS array.
- array = cas.createStringArrayFS(3);
+ array = this.cas.createStringArrayFS(3);
assertTrue(array.get(0) == null);
assertTrue(array.get(1) == null);
assertTrue(array.get(2) == null);
@@ -139,12 +139,12 @@ public class StringArrayTest {
@Test
public void testStringArrayValue() {
String lemmaListName = TOKEN_TYPE + FEATURE_SEPARATOR + LEMMA_LIST_FEAT;
- final Feature lemmaList = ts.getFeatureByFullName(lemmaListName);
+ final Feature lemmaList = this.ts.getFeatureByFullName(lemmaListName);
assertTrue(lemmaList != null);
String[] javaArray = { "1", "2", "3" };
- StringArrayFS casArray = cas.createStringArrayFS(3);
+ StringArrayFS casArray = this.cas.createStringArrayFS(3);
casArray.copyFromArray(javaArray, 0, 0, 3);
- FeatureStructure token = cas.createFS(ts.getType(CASTestSetup.TOKEN_TYPE));
+ FeatureStructure token = this.cas.createFS(this.ts.getType(CASTestSetup.TOKEN_TYPE));
assertTrue(token.getFeatureValue(lemmaList) == null);
token.setFeatureValue(lemmaList, casArray);
assertTrue(((StringArrayFS) token.getFeatureValue(lemmaList)).get(0) == "1");
@@ -156,17 +156,17 @@ public class StringArrayTest {
@Test
public void testStringArrayNullValue() throws Exception {
String lemmaListName = TOKEN_TYPE + FEATURE_SEPARATOR + LEMMA_LIST_FEAT;
- final Feature lemmaList = ts.getFeatureByFullName(lemmaListName);
+ final Feature lemmaList = this.ts.getFeatureByFullName(lemmaListName);
assertTrue(lemmaList != null);
- StringArrayFS casArray = cas.createStringArrayFS(3);
+ StringArrayFS casArray = this.cas.createStringArrayFS(3);
((CASImpl) (casArray.getCAS())).setId2FSsMaybeUnconditionally(casArray);
casArray.set(0, "1");
casArray.set(1, null);
casArray.set(2, "3");
- FeatureStructure token = cas.createFS(ts.getType(CASTestSetup.TOKEN_TYPE));
+ FeatureStructure token = this.cas.createFS(this.ts.getType(CASTestSetup.TOKEN_TYPE));
assertTrue(token.getFeatureValue(lemmaList) == null);
token.setFeatureValue(lemmaList, casArray);
- cas.addFsToIndexes(token);
+ this.cas.addFsToIndexes(token);
assertTrue(((StringArrayFS) token.getFeatureValue(lemmaList)).get(0) == "1");
assertTrue(((StringArrayFS) token.getFeatureValue(lemmaList)).get(1) == null);
LowLevelCAS llc = casArray.getCAS().getLowLevelCAS();
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeTest.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeTest.java
index 3b27eba44..70b387099 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeTest.java
@@ -76,19 +76,19 @@ public class StringSubtypeTest {
File specifierFile = JUnitExtension.getFile(specifier);
XMLInputSource in = new XMLInputSource(specifierFile);
ResourceSpecifier resourceSpecifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
- ae = UIMAFramework.produceAnalysisEngine(resourceSpecifier);
- jcas = ae.newJCas();
+ this.ae = UIMAFramework.produceAnalysisEngine(resourceSpecifier);
+ this.jcas = this.ae.newJCas();
}
@AfterEach
public void tearDown() throws Exception {
- ae.destroy();
- jcas = null;
+ this.ae.destroy();
+ this.jcas = null;
}
@Test
public void testJcas() {
- StringSubtypeAnnotation annot = new StringSubtypeAnnotation(jcas);
+ StringSubtypeAnnotation annot = new StringSubtypeAnnotation(this.jcas);
annot.setStringSetFeature(definedValue1);
annot.setStringSetFeature(definedValue2);
annot.setStringSetFeature(definedValue3);
@@ -103,7 +103,7 @@ public class StringSubtypeTest {
@Test
public void testLowLevelCas() {
- LowLevelCAS cas = jcas.getLowLevelCas();
+ LowLevelCAS cas = this.jcas.getLowLevelCas();
LowLevelTypeSystem ts = cas.ll_getTypeSystem();
final int annotType = ts.ll_getCodeForTypeName(annotationTypeName);
final int addr = cas.ll_createFS(annotType);
@@ -125,7 +125,7 @@ public class StringSubtypeTest {
@Test
public void testCas() {
- CAS cas = jcas.getCas();
+ CAS cas = this.jcas.getCas();
TypeSystem ts = cas.getTypeSystem();
Type annotType = ts.getType(annotationTypeName);
FeatureStructure fs = cas.createFS(annotType);
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeOrderTest.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeOrderTest.java
index 7eb5028db..b2d2dff24 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeOrderTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeOrderTest.java
@@ -102,8 +102,8 @@ public class TypeOrderTest {
XMLParser parser = UIMAFramework.getXMLParser();
ResourceSpecifier spec = (ResourceSpecifier) parser.parse(new XMLInputSource(descriptorFile));
AnalysisEngine ae = UIMAFramework.produceAnalysisEngine(spec);
- cas = ae.newCAS();
- assertTrue(cas != null);
+ this.cas = ae.newCAS();
+ assertTrue(this.cas != null);
} catch (IOException e) {
e.printStackTrace();
assertTrue(false);
@@ -115,21 +115,21 @@ public class TypeOrderTest {
assertTrue(false);
}
- TypeSystem ts = cas.getTypeSystem();
+ TypeSystem ts = this.cas.getTypeSystem();
// assert(wordType != null);
- tokenType = ts.getType(TOKEN_TYPE);
- sentenceType = ts.getType(SENT_TYPE);
- annotationType = ts.getType(CAS.TYPE_NAME_ANNOTATION);
- assertTrue(annotationType != null);
+ this.tokenType = ts.getType(TOKEN_TYPE);
+ this.sentenceType = ts.getType(SENT_TYPE);
+ this.annotationType = ts.getType(CAS.TYPE_NAME_ANNOTATION);
+ assertTrue(this.annotationType != null);
}
@AfterEach
public void tearDown() {
// this.casMgr = null;
- cas = null;
- tokenType = null;
- sentenceType = null;
- annotationType = null;
+ this.cas = null;
+ this.tokenType = null;
+ this.sentenceType = null;
+ this.annotationType = null;
}
// Initialize the first CAS.
@@ -197,31 +197,31 @@ public class TypeOrderTest {
UTF_8);
for (int i = 0; i < 10; i++) {
- cas.getIndexRepository()
- .addFS(cas.createAnnotation(annotationType, i * 2, (i * 2) + 1));
- cas.getIndexRepository()
- .addFS(cas.createAnnotation(sentenceType, i * 2, (i * 2) + 1));
- cas.getIndexRepository()
- .addFS(cas.createAnnotation(tokenType, i * 2, (i * 2) + 1));
- cas.getIndexRepository()
- .addFS(cas.createAnnotation(tokenType, i * 2, (i * 2) + 1));
- cas.getIndexRepository()
- .addFS(cas.createAnnotation(tokenType, i * 2, (i * 2) + 1));
+ this.cas.getIndexRepository()
+ .addFS(this.cas.createAnnotation(this.annotationType, i * 2, (i * 2) + 1));
+ this.cas.getIndexRepository()
+ .addFS(this.cas.createAnnotation(this.sentenceType, i * 2, (i * 2) + 1));
+ this.cas.getIndexRepository()
+ .addFS(this.cas.createAnnotation(this.tokenType, i * 2, (i * 2) + 1));
+ this.cas.getIndexRepository()
+ .addFS(this.cas.createAnnotation(this.tokenType, i * 2, (i * 2) + 1));
+ this.cas.getIndexRepository()
+ .addFS(this.cas.createAnnotation(this.tokenType, i * 2, (i * 2) + 1));
}
for (int i = 19; i >= 10; i--) {
- cas.getIndexRepository()
- .addFS(cas.createAnnotation(annotationType, i * 2, (i * 2) + 1));
- cas.getIndexRepository()
- .addFS(cas.createAnnotation(sentenceType, i * 2, (i * 2) + 1));
- cas.getIndexRepository()
- .addFS(cas.createAnnotation(tokenType, i * 2, (i * 2) + 1));
- cas.getIndexRepository()
- .addFS(cas.createAnnotation(tokenType, i * 2, (i * 2) + 1));
- cas.getIndexRepository()
- .addFS(cas.createAnnotation(tokenType, i * 2, (i * 2) + 1));
+ this.cas.getIndexRepository()
+ .addFS(this.cas.createAnnotation(this.annotationType, i * 2, (i * 2) + 1));
+ this.cas.getIndexRepository()
+ .addFS(this.cas.createAnnotation(this.sentenceType, i * 2, (i * 2) + 1));
+ this.cas.getIndexRepository()
+ .addFS(this.cas.createAnnotation(this.tokenType, i * 2, (i * 2) + 1));
+ this.cas.getIndexRepository()
+ .addFS(this.cas.createAnnotation(this.tokenType, i * 2, (i * 2) + 1));
+ this.cas.getIndexRepository()
+ .addFS(this.cas.createAnnotation(this.tokenType, i * 2, (i * 2) + 1));
}
- FSIterator<FeatureStructure> it = cas.getIndexRepository().getIndex(TYPE_ORDER_INDEX)
+ FSIterator<FeatureStructure> it = this.cas.getIndexRepository().getIndex(TYPE_ORDER_INDEX)
.iterator();
// it = cas.getAnnotationIndex().iterator();
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemTest.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemTest.java
index 4e01873f0..1369f20f7 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemTest.java
@@ -301,8 +301,8 @@ public class TypeSystemTest {
@BeforeEach
public void setUp() throws Exception {
try {
- cas = CASInitializer.initCas(new CASTestSetup(), null);
- ts = cas.getTypeSystem();
+ this.cas = CASInitializer.initCas(new CASTestSetup(), null);
+ this.ts = this.cas.getTypeSystem();
} catch (Exception e) {
e.printStackTrace();
assertTrue(false);
@@ -311,8 +311,8 @@ public class TypeSystemTest {
@AfterEach
public void tearDown() {
- cas = null;
- ts = null;
+ this.cas = null;
+ this.ts = null;
}
@Test
@@ -331,22 +331,22 @@ public class TypeSystemTest {
@Test
public void testGetParent() {
- assertTrue(ts.getParent(ts.getType(CAS.TYPE_NAME_TOP)) == null);
- Type annotBase = ts.getType(CAS.TYPE_NAME_ANNOTATION_BASE);
- assertTrue(ts.getParent(annotBase) == ts.getTopType());
- Type annot = ts.getType(CAS.TYPE_NAME_ANNOTATION);
- assertTrue(ts.getParent(annot) == ts.getType(CAS.TYPE_NAME_ANNOTATION_BASE));
- assertTrue(ts.getParent(ts.getType(CASTestSetup.TOKEN_TYPE)) == annot);
+ assertTrue(this.ts.getParent(this.ts.getType(CAS.TYPE_NAME_TOP)) == null);
+ Type annotBase = this.ts.getType(CAS.TYPE_NAME_ANNOTATION_BASE);
+ assertTrue(this.ts.getParent(annotBase) == this.ts.getTopType());
+ Type annot = this.ts.getType(CAS.TYPE_NAME_ANNOTATION);
+ assertTrue(this.ts.getParent(annot) == this.ts.getType(CAS.TYPE_NAME_ANNOTATION_BASE));
+ assertTrue(this.ts.getParent(this.ts.getType(CASTestSetup.TOKEN_TYPE)) == annot);
}
@Test
public void testGetType() {
- Type top = ts.getTopType();
+ Type top = this.ts.getTopType();
assertTrue(top != null);
assertTrue(top.getName().equals(CAS.TYPE_NAME_TOP));
- Type annot = ts.getType(CAS.TYPE_NAME_ANNOTATION);
+ Type annot = this.ts.getType(CAS.TYPE_NAME_ANNOTATION);
assertTrue(annot != null);
- Type token = ts.getType(CASTestSetup.TOKEN_TYPE);
+ Type token = this.ts.getType(CASTestSetup.TOKEN_TYPE);
assertTrue(token != null);
}
@@ -355,24 +355,24 @@ public class TypeSystemTest {
*/
@Test
public void testGetFeature() {
- Type annot = ts.getType(CAS.TYPE_NAME_ANNOTATION);
- Feature start = ts.getFeatureByFullName(CAS.FEATURE_FULL_NAME_BEGIN);
- Feature end = ts.getFeatureByFullName(CAS.FEATURE_FULL_NAME_END);
- Type integer = ts.getType(CAS.TYPE_NAME_INTEGER);
+ Type annot = this.ts.getType(CAS.TYPE_NAME_ANNOTATION);
+ Feature start = this.ts.getFeatureByFullName(CAS.FEATURE_FULL_NAME_BEGIN);
+ Feature end = this.ts.getFeatureByFullName(CAS.FEATURE_FULL_NAME_END);
+ Type integer = this.ts.getType(CAS.TYPE_NAME_INTEGER);
assertTrue(start.getDomain() == annot);
assertTrue(end.getDomain() == annot);
assertTrue(start.getRange() == integer);
assertTrue(end.getRange() == integer);
Feature start1 = annot.getFeatureByBaseName(CAS.FEATURE_BASE_NAME_BEGIN);
assertTrue(start == start1);
- Feature start2 = ts.getType(CASTestSetup.TOKEN_TYPE)
+ Feature start2 = this.ts.getType(CASTestSetup.TOKEN_TYPE)
.getFeatureByBaseName(CAS.FEATURE_BASE_NAME_BEGIN);
assertTrue(start == start2);
}
@Test
public void testGetTypeIterator() {
- Iterator<Type> it = ts.getTypeIterator();
+ Iterator<Type> it = this.ts.getTypeIterator();
// Put the type names in a vector and do some spot checks.
List<String> v = new ArrayList<>();
while (it.hasNext()) {
@@ -387,7 +387,7 @@ public class TypeSystemTest {
@Test
public void testGetFeatures() {
- Iterator<Feature> it = ts.getFeatures();
+ Iterator<Feature> it = this.ts.getFeatures();
// Put feature names in vector and test for some known features.
List<String> v = new ArrayList<>();
while (it.hasNext()) {
@@ -405,21 +405,21 @@ public class TypeSystemTest {
@Test
public void testGetTopType() {
- Type top = ts.getTopType();
+ Type top = this.ts.getTopType();
assertTrue(top != null);
assertTrue(top.getName().equals(CAS.TYPE_NAME_TOP));
}
@Test
public void testGetDirectlySubsumedTypes() {
- List<Type> subTypes = ts.getDirectSubtypes(ts.getType(CAS.TYPE_NAME_TOP));
- Type intType = ts.getType(CAS.TYPE_NAME_INTEGER);
+ List<Type> subTypes = this.ts.getDirectSubtypes(this.ts.getType(CAS.TYPE_NAME_TOP));
+ Type intType = this.ts.getType(CAS.TYPE_NAME_INTEGER);
assertTrue(subTypes.contains(intType));
- Type annotBaseType = ts.getType(CAS.TYPE_NAME_ANNOTATION_BASE);
+ Type annotBaseType = this.ts.getType(CAS.TYPE_NAME_ANNOTATION_BASE);
assertTrue(subTypes.contains(annotBaseType));
- Type annotType = ts.getType(CAS.TYPE_NAME_ANNOTATION);
+ Type annotType = this.ts.getType(CAS.TYPE_NAME_ANNOTATION);
assertTrue(!subTypes.contains(annotType));
- Type tokenType = ts.getType(CASTestSetup.TOKEN_TYPE);
+ Type tokenType = this.ts.getType(CASTestSetup.TOKEN_TYPE);
assertTrue(!subTypes.contains(tokenType));
}
@@ -428,20 +428,20 @@ public class TypeSystemTest {
*/
@Test
public void testSubsumes() {
- Type top = ts.getTopType();
- Type intType = ts.getType(CAS.TYPE_NAME_INTEGER);
- Type annotType = ts.getType(CAS.TYPE_NAME_ANNOTATION);
- Type tokenType = ts.getType(CASTestSetup.TOKEN_TYPE);
- assertTrue(ts.subsumes(top, intType));
- assertTrue(ts.subsumes(top, annotType));
- assertTrue(ts.subsumes(top, tokenType));
- assertTrue(ts.subsumes(annotType, tokenType));
- assertTrue(!ts.subsumes(tokenType, annotType));
- assertTrue(!ts.subsumes(tokenType, top));
-
- Type stringType = ts.getType(CAS.TYPE_NAME_STRING);
- Type substringType = ts.getType(CASTestSetup.GROUP_1);
- assertTrue(ts.subsumes(stringType, substringType));
+ Type top = this.ts.getTopType();
+ Type intType = this.ts.getType(CAS.TYPE_NAME_INTEGER);
+ Type annotType = this.ts.getType(CAS.TYPE_NAME_ANNOTATION);
+ Type tokenType = this.ts.getType(CASTestSetup.TOKEN_TYPE);
+ assertTrue(this.ts.subsumes(top, intType));
+ assertTrue(this.ts.subsumes(top, annotType));
+ assertTrue(this.ts.subsumes(top, tokenType));
+ assertTrue(this.ts.subsumes(annotType, tokenType));
+ assertTrue(!this.ts.subsumes(tokenType, annotType));
+ assertTrue(!this.ts.subsumes(tokenType, top));
+
+ Type stringType = this.ts.getType(CAS.TYPE_NAME_STRING);
+ Type substringType = this.ts.getType(CASTestSetup.GROUP_1);
+ assertTrue(this.ts.subsumes(stringType, substringType));
}
/**
@@ -449,10 +449,10 @@ public class TypeSystemTest {
*/
@Test
public void testBuiltinTypes() {
- assertTrue(cas.getTypeSystem().getType(CAS.TYPE_NAME_FLOAT).isInheritanceFinal());
- assertTrue(cas.getTypeSystem().getType(CAS.TYPE_NAME_FLOAT).isFeatureFinal());
- assertTrue(cas.getTypeSystem().getTopType().isFeatureFinal());
- assertFalse(cas.getTypeSystem().getTopType().isInheritanceFinal());
+ assertTrue(this.cas.getTypeSystem().getType(CAS.TYPE_NAME_FLOAT).isInheritanceFinal());
+ assertTrue(this.cas.getTypeSystem().getType(CAS.TYPE_NAME_FLOAT).isFeatureFinal());
+ assertTrue(this.cas.getTypeSystem().getTopType().isFeatureFinal());
+ assertFalse(this.cas.getTypeSystem().getTopType().isInheritanceFinal());
}
/**
@@ -481,34 +481,34 @@ public class TypeSystemTest {
public void testArrayTypes() {
// Our version of object arrays. Type is built-in and has special name,
// for backwards compatibility.
- Type fsArrayType = ts.getType(CAS.TYPE_NAME_FS_ARRAY);
+ Type fsArrayType = this.ts.getType(CAS.TYPE_NAME_FS_ARRAY);
assertNotNull(fsArrayType);
assertTrue(fsArrayType.isArray());
assertNotNull(fsArrayType.getComponentType());
- assertTrue(fsArrayType.getComponentType().equals(ts.getTopType()));
- assertTrue(fsArrayType.equals(ts.getArrayType(ts.getTopType())));
+ assertTrue(fsArrayType.getComponentType().equals(this.ts.getTopType()));
+ assertTrue(fsArrayType.equals(this.ts.getArrayType(this.ts.getTopType())));
// Int arrays are also built-in, but are primitive-valued.
- Type intArrayType = ts.getType(CAS.TYPE_NAME_INTEGER_ARRAY);
+ Type intArrayType = this.ts.getType(CAS.TYPE_NAME_INTEGER_ARRAY);
assertNotNull(intArrayType);
assertTrue(intArrayType.isArray());
assertNotNull(intArrayType.getComponentType());
- assertTrue(intArrayType.getComponentType().equals(ts.getType(CAS.TYPE_NAME_INTEGER)));
- assertTrue(intArrayType.equals(ts.getArrayType(ts.getType(CAS.TYPE_NAME_INTEGER))));
+ assertTrue(intArrayType.getComponentType().equals(this.ts.getType(CAS.TYPE_NAME_INTEGER)));
+ assertTrue(intArrayType.equals(this.ts.getArrayType(this.ts.getType(CAS.TYPE_NAME_INTEGER))));
// Negative tests: make sure regular types are not classified as arrays.
- Type stringType = ts.getType(CAS.TYPE_NAME_STRING);
+ Type stringType = this.ts.getType(CAS.TYPE_NAME_STRING);
assertFalse(stringType.isArray());
assertNull(stringType.getComponentType());
- Type topType = ts.getTopType();
+ Type topType = this.ts.getTopType();
assertFalse(topType.isArray());
assertNull(topType.getComponentType());
// Create an array of arrays.
- Type intMatrix = ts.getArrayType(intArrayType);
+ Type intMatrix = this.ts.getArrayType(intArrayType);
assertNotNull(intMatrix);
assertTrue(intMatrix.isArray());
assertTrue(intMatrix.getComponentType().equals(intArrayType));
// Check array inheritance.
- Type annotationArray = ts.getArrayType(ts.getType(CAS.TYPE_NAME_ANNOTATION));
- assertTrue(ts.subsumes(fsArrayType, annotationArray));
+ Type annotationArray = this.ts.getArrayType(this.ts.getType(CAS.TYPE_NAME_ANNOTATION));
+ assertTrue(this.ts.subsumes(fsArrayType, annotationArray));
// assertFalse(this.ts.subsumes(annotationArray, fsArrayType));
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemUtilsTest.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemUtilsTest.java
index 41d380d65..997ba84e5 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemUtilsTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeSystemUtilsTest.java
@@ -62,7 +62,7 @@ public class TypeSystemUtilsTest {
XMLParser parser = UIMAFramework.getXMLParser();
TypeSystemDescription spec = (TypeSystemDescription) parser
.parse(new XMLInputSource(descriptorFile));
- cas = CasCreationUtils.createCas(spec, null, new FsIndexDescription[] {});
+ this.cas = CasCreationUtils.createCas(spec, null, new FsIndexDescription[] {});
} catch (ResourceInitializationException e) {
e.printStackTrace();
assertTrue(false);
@@ -78,7 +78,7 @@ public class TypeSystemUtilsTest {
@Test
public void testPathValidation() {
- Type type1 = cas.getTypeSystem().getType("Type1");
+ Type type1 = this.cas.getTypeSystem().getType("Type1");
// Type1, f0/begin, always
List<String> path = new ArrayList<>();
path.add("f0");
@@ -106,7 +106,7 @@ public class TypeSystemUtilsTest {
path = new ArrayList<>();
assertTrue(TypeSystemUtils.isPathValid(type1, path) == PathValid.ALWAYS);
// t1, f1/f2/f3, always
- Type t1 = cas.getTypeSystem().getType("t1");
+ Type t1 = this.cas.getTypeSystem().getType("t1");
path = new ArrayList<>();
path.add("f1");
path.add("f2");
@@ -116,6 +116,6 @@ public class TypeSystemUtilsTest {
@AfterEach
public void tearDown() {
- cas = null;
+ this.cas = null;
}
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/UimacppDeserializationTest.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/UimacppDeserializationTest.java
new file mode 100644
index 000000000..1db998c49
--- /dev/null
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/UimacppDeserializationTest.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.uima.cas.test;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+/**
+ * Class comment for UimacppDeserializationTest.java goes here.
+ *
+ */
+public class UimacppDeserializationTest {
+ // Test case does not work: need serialized TAF form
+ // keep a null test here to avoid having suite complain there are no tests here
+ @Test
+ public void testNothing() {
+ assertTrue(true);
+ }
+
+ /*
+ * public void testDeserialization() { // Get file handle to serialized CAS. File dataDir = new
+ * File(TestPropertyReader.getJUnitTestBasePath()); assertTrue(dataDir.exists());
+ * assertTrue(dataDir.isDirectory()); File serializedForm = new File(dataDir, "cascomplete.ser");
+ * // Deserialize ObjectInputStream ois = null; CASCompleteSerializer ser = null; try { ois = new
+ * ObjectInputStream(new FileInputStream(serializedForm)); ser = (CASCompleteSerializer)
+ * ois.readObject(); ois.close(); } catch (IOException e) { e.printStackTrace();
+ * assertTrue(false); } catch (ClassNotFoundException e) { assertTrue(false); } CAS cas = null;
+ * try { CASMgr casMgr = CASFactory.createCAS(); Serialization.deserializeCASComplete(ser,
+ * casMgr); cas = casMgr.getCurrentView(); } catch (CASException e) { assertTrue(false); }
+ * assertTrue(cas != null); System.out.println("Document text:");
+ * System.out.println(cas.getDocumentText());
+ *
+ * System.out.println("Type system:\n" + cas.getTypeSystem().toString());
+ *
+ * TypeSystem ts = cas.getTypeSystem(); Type ttDocType = ts.getType("uima.tt.DocumentAnnotation");
+ * assertTrue(ttDocType != null); Type annotType = ts.getType(CAS.TYPE_NAME_ANNOTATION);
+ * assertTrue(annotType != null); assertTrue(ts.subsumes(annotType, ttDocType)); Feature beginFeat
+ * = ts.getFeatureByFullName(CAS.FEATURE_FULL_NAME_BEGIN);
+ * assertTrue(ttDocType.getAppropriateFeatures().contains(beginFeat)); Vector feats =
+ * ttDocType.getAppropriateFeatures(); System.out.println("Features defined for " +
+ * ttDocType.getName()); for (int i = 0; i < feats.size(); i++) { System.out.println(" " +
+ * ((Feature)feats.get(i)).getName()); }
+ *
+ * FSIndex annotationIndex = cas.getAnnotationIndex(); assertTrue(annotationIndex != null);
+ * System.out.println( "Number of annotations in index: " + annotationIndex.size()); Feature
+ * markupFeat = cas.getTypeSystem().getFeatureByFullName(
+ * "uima.tt.DocStructureAnnotation:markupTag"); System.out.println("Annotations: "); FSIterator it
+ * = annotationIndex.iterator(); AnnotationFS annot; for (it.moveToFirst(); it.isValid();
+ * it.moveToNext()) { annot = (AnnotationFS) it.get(); System.out.println( annot.getType() + ": "
+ * + annot.getBegin() + " - " + annot.getEnd() + ": " + annot.getCoveredText()); }
+ *
+ * FSIndexRepository ir = cas.getIndexRepository(); Iterator labelIt = ir.getLabels();
+ * System.out.println("Index labels: "); while (labelIt.hasNext()) { System.out.println(" " +
+ * (String) labelIt.next()); }
+ *
+ * Type docType = cas.getTypeSystem().getType(CASMgr.DOCUMENT_TYPE); FSIndex docIndex =
+ * cas.getAnnotationIndex(docType); Vector featVector = docType.getAppropriateFeatures();
+ * System.out.println("Features defined for docType: "); for (int i = 0; i < featVector.size();
+ * i++) { System.out.println(" " + ((Feature)featVector.get(i)).getShortName()); }
+ * assertTrue(docIndex != null); it = docIndex.iterator(); for (it.moveToFirst(); it.isValid();
+ * it.moveToNext()) { annot = (AnnotationFS) it.get(); System.out.println( annot.getType() + ": "
+ * + annot.getBegin() + " - " + annot.getEnd()); System.out.println(" " + annot.getCoveredText());
+ * } // String text = null; // try { // text = cas.getDocumentText(); // } catch (CASException e)
+ * { // assertTrue(false); // } // assertTrue(text != null); }
+ */
+}
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasDataToXCasTest.java b/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasDataToXCasTest.java
index ad5b49b0d..dce43665f 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasDataToXCasTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasDataToXCasTest.java
@@ -94,10 +94,10 @@ public class CasDataToXCasTest {
@Override
public void startElement(String arg0, String arg1, String arg2, Attributes arg3)
throws SAXException {
- inElement = arg1;
- buf = new StringBuffer();
+ this.inElement = arg1;
+ this.buf = new StringBuffer();
- if (testElementName.equals(arg1)) {
+ if (this.testElementName.equals(arg1)) {
foundTestElement = true;
assertThat(arg3.getValue("myFeature")).isEqualTo("myValue");
}
@@ -121,7 +121,7 @@ public class CasDataToXCasTest {
*/
@Override
public void endElement(String arg0, String arg1, String arg2) throws SAXException {
- if (testElementName.equals(arg1)) {
+ if (this.testElementName.equals(arg1)) {
assertThat(buf.toString()).isEqualTo("this should show up in XML content");
}
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/collection/impl/CasConsumerDescription_implTest.java b/uimaj-core/src/test/java/org/apache/uima/collection/impl/CasConsumerDescription_implTest.java
index bca6c21ca..13f36ccd2 100644
--- a/uimaj-core/src/test/java/org/apache/uima/collection/impl/CasConsumerDescription_implTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/collection/impl/CasConsumerDescription_implTest.java
@@ -19,27 +19,37 @@
package org.apache.uima.collection.impl;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.uima.UIMAFramework.getResourceSpecifierFactory;
+import static org.apache.uima.analysis_engine.impl.AnalysisEngineDescription_implTest.encoding;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.ByteArrayInputStream;
+import java.io.InputStream;
import java.io.StringWriter;
import org.apache.uima.Constants;
import org.apache.uima.UIMAFramework;
import org.apache.uima.cas.CAS;
import org.apache.uima.collection.CasConsumerDescription;
+import org.apache.uima.internal.util.SerializationUtils;
import org.apache.uima.resource.ExternalResourceDependency;
import org.apache.uima.resource.ExternalResourceDescription;
+import org.apache.uima.resource.URISpecifier;
import org.apache.uima.resource.impl.URISpecifier_impl;
import org.apache.uima.resource.metadata.AllowedValue;
import org.apache.uima.resource.metadata.Capability;
import org.apache.uima.resource.metadata.ConfigurationGroup;
import org.apache.uima.resource.metadata.ConfigurationParameter;
+import org.apache.uima.resource.metadata.ConfigurationParameterSettings;
+import org.apache.uima.resource.metadata.ExternalResourceBinding;
import org.apache.uima.resource.metadata.FsIndexDescription;
import org.apache.uima.resource.metadata.FsIndexKeyDescription;
import org.apache.uima.resource.metadata.NameValuePair;
+import org.apache.uima.resource.metadata.ProcessingResourceMetaData;
+import org.apache.uima.resource.metadata.ResourceManagerConfiguration;
+import org.apache.uima.resource.metadata.TypeDescription;
+import org.apache.uima.resource.metadata.TypePriorities;
+import org.apache.uima.resource.metadata.TypePriorityList;
+import org.apache.uima.resource.metadata.TypeSystemDescription;
import org.apache.uima.resource.metadata.impl.AllowedValue_impl;
import org.apache.uima.resource.metadata.impl.Capability_impl;
import org.apache.uima.resource.metadata.impl.ConfigurationGroup_impl;
@@ -49,6 +59,7 @@ import org.apache.uima.resource.metadata.impl.FsIndexKeyDescription_impl;
import org.apache.uima.resource.metadata.impl.NameValuePair_impl;
import org.apache.uima.resource.metadata.impl.TypePriorities_impl;
import org.apache.uima.resource.metadata.impl.TypeSystemDescription_impl;
+import org.apache.uima.test.junit_extension.JUnitExtension;
import org.apache.uima.util.XMLInputSource;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -58,121 +69,154 @@ public class CasConsumerDescription_implTest {
@BeforeEach
public void setUp() throws Exception {
- var typeSystem = new TypeSystemDescription_impl();
- var type1 = typeSystem.addType("Fake", "<b>Fake</b> Type", "Annotation");
- type1.addFeature("TestFeature", "For Testing Only", CAS.TYPE_NAME_STRING);
- var enumType = typeSystem.addType("EnumType", "Test Enumerated Type", "uima.cas.String");
- enumType.setAllowedValues(new AllowedValue[] { new AllowedValue_impl("One", "First Value"),
- new AllowedValue_impl("Two", "Second Value") });
-
- var typePriorities = new TypePriorities_impl();
- var priorityList = typePriorities.addPriorityList();
- priorityList.addType("Fake");
- priorityList.addType("EnumType");
-
- var index = new FsIndexDescription_impl();
- index.setLabel("testIndex");
- index.setTypeName("Fake");
- var key1 = new FsIndexKeyDescription_impl();
- key1.setFeatureName("TestFeature");
- key1.setComparator(1);
- var key2 = new FsIndexKeyDescription_impl();
- key2.setFeatureName("Start");
- key2.setComparator(0);
- var key3 = new FsIndexKeyDescription_impl();
- key3.setTypePriority(true);
- index.setKeys(new FsIndexKeyDescription[] { key1, key2, key3 });
-
- var index2 = new FsIndexDescription_impl();
- index2.setLabel("testIndex2");
- index2.setTypeName("Fake");
- index2.setKind(FsIndexDescription.KIND_SET);
- var key1a = new FsIndexKeyDescription_impl();
- key1a.setFeatureName("TestFeature");
- key1a.setComparator(1);
- index2.setKeys(new FsIndexKeyDescription[] { key1a });
-
- // create primitive TAE description
- mTestDesc = new CasConsumerDescription_impl();
- mTestDesc.setFrameworkImplementation(Constants.JAVA_FRAMEWORK_NAME);
- mTestDesc.setImplementationName("org.apache.uima.examples.TestAnnotator");
- var md = mTestDesc.getCasConsumerMetaData();
- md.setName("Test CAS Consumer");
- md.setDescription("Does not do anything useful.");
- md.setVersion("1.0");
- md.setTypeSystem(typeSystem);
- md.setTypePriorities(typePriorities);
- md.setFsIndexes(new FsIndexDescription[] { index, index2 });
- var cap1 = new Capability_impl();
- cap1.addInputType("Fake", false);
- cap1.addInputFeature("TestFeature");
- var cap2 = new Capability_impl();
- cap2.addInputType("Fake", true);
- cap1.setLanguagesSupported(new String[] { "en", "de" });
- cap1.setMimeTypesSupported(new String[] { "text/plain" });
- md.setCapabilities(new Capability[] { cap1, cap2 });
- var cfgParam1 = new ConfigurationParameter_impl();
- cfgParam1.setName("param1");
- cfgParam1.setDescription("Test Parameter 1");
- cfgParam1.setType("String");
- var cfgParam2 = new ConfigurationParameter_impl();
- cfgParam2.setName("param2");
- cfgParam2.setDescription("Test Parameter 2");
- cfgParam2.setType("Integer");
- var cfgGrp1 = new ConfigurationGroup_impl();
- cfgGrp1.setNames(new String[] { "cfgGrp1" });
- cfgGrp1.setConfigurationParameters(new ConfigurationParameter[] { cfgParam1, cfgParam2 });
- var cfgParam3 = new ConfigurationParameter_impl();
- cfgParam3.setName("param3");
- cfgParam3.setDescription("Test Parameter 3");
- cfgParam3.setType("Float");
- var cfgGrp2 = new ConfigurationGroup_impl();
- cfgGrp2.setNames(new String[] { "cfgGrp2a", "cfgGrp2b" });
- cfgGrp2.setConfigurationParameters(new ConfigurationParameter[] { cfgParam3 });
- md.getConfigurationParameterDeclarations()
- .setConfigurationGroups(new ConfigurationGroup[] { cfgGrp1, cfgGrp2 });
-
- var nvp1 = new NameValuePair_impl("param1", "test");
- var nvp2 = new NameValuePair_impl("param2", Integer.valueOf("42"));
- var nvp3a = new NameValuePair_impl("param3", Float.valueOf("2.718281828459045"));
- var nvp3b = new NameValuePair_impl("param3", Float.valueOf("3.1415927"));
- var settings = md.getConfigurationParameterSettings();
- settings.getSettingsForGroups().put("cfgGrp1", new NameValuePair[] { nvp1, nvp2 });
- settings.getSettingsForGroups().put("cfgGrp2a", new NameValuePair[] { nvp3a });
- settings.getSettingsForGroups().put("cfgGrp2b", new NameValuePair[] { nvp3b });
-
- var uriSpec = new URISpecifier_impl();
- uriSpec.setUri("http://www.incubator.apache.org/uima");
- uriSpec.setProtocol(Constants.PROTOCOL_VINCI);
- var dep = getResourceSpecifierFactory().createExternalResourceDependency();
- dep.setKey("ResourceKey");
- dep.setDescription("Test");
- mTestDesc.setExternalResourceDependencies(new ExternalResourceDependency[] { dep });
- var resMgrCfg = getResourceSpecifierFactory().createResourceManagerConfiguration();
- var extRes = getResourceSpecifierFactory().createExternalResourceDescription();
- extRes.setResourceSpecifier(uriSpec);
- extRes.setName("Resource1");
- extRes.setDescription("Test");
- resMgrCfg.setExternalResources(new ExternalResourceDescription[] { extRes });
-
- var binding = getResourceSpecifierFactory().createExternalResourceBinding();
- binding.setKey("ResourceKey");
- binding.setResourceName("Resource1");
- mTestDesc.setResourceManagerConfiguration(resMgrCfg);
+ try {
+ TypeSystemDescription typeSystem = new TypeSystemDescription_impl();
+ TypeDescription type1 = typeSystem.addType("Fake", "<b>Fake</b> Type", "Annotation");
+ type1.addFeature("TestFeature", "For Testing Only", CAS.TYPE_NAME_STRING);
+ TypeDescription enumType = typeSystem.addType("EnumType", "Test Enumerated Type",
+ "uima.cas.String");
+ enumType.setAllowedValues(new AllowedValue[] { new AllowedValue_impl("One", "First Value"),
+ new AllowedValue_impl("Two", "Second Value") });
+
+ TypePriorities typePriorities = new TypePriorities_impl();
+ TypePriorityList priorityList = typePriorities.addPriorityList();
+ priorityList.addType("Fake");
+ priorityList.addType("EnumType");
+
+ FsIndexDescription index = new FsIndexDescription_impl();
+ index.setLabel("testIndex");
+ index.setTypeName("Fake");
+ FsIndexKeyDescription key1 = new FsIndexKeyDescription_impl();
+ key1.setFeatureName("TestFeature");
+ key1.setComparator(1);
+ FsIndexKeyDescription key2 = new FsIndexKeyDescription_impl();
+ key2.setFeatureName("Start");
+ key2.setComparator(0);
+ FsIndexKeyDescription key3 = new FsIndexKeyDescription_impl();
+ key3.setTypePriority(true);
+ index.setKeys(new FsIndexKeyDescription[] { key1, key2, key3 });
+
+ FsIndexDescription index2 = new FsIndexDescription_impl();
+ index2.setLabel("testIndex2");
+ index2.setTypeName("Fake");
+ index2.setKind(FsIndexDescription.KIND_SET);
+ FsIndexKeyDescription key1a = new FsIndexKeyDescription_impl();
+ key1a.setFeatureName("TestFeature");
+ key1a.setComparator(1);
+ index2.setKeys(new FsIndexKeyDescription[] { key1a });
+
+ // create primitive TAE description
+ mTestDesc = new CasConsumerDescription_impl();
+ mTestDesc.setFrameworkImplementation(Constants.JAVA_FRAMEWORK_NAME);
+ mTestDesc.setImplementationName("org.apache.uima.examples.TestAnnotator");
+ ProcessingResourceMetaData md = mTestDesc.getCasConsumerMetaData();
+ md.setName("Test CAS Consumer");
+ md.setDescription("Does not do anything useful.");
+ md.setVersion("1.0");
+ md.setTypeSystem(typeSystem);
+ md.setTypePriorities(typePriorities);
+ md.setFsIndexes(new FsIndexDescription[] { index, index2 });
+ Capability cap1 = new Capability_impl();
+ cap1.addInputType("Fake", false);
+ cap1.addInputFeature("TestFeature");
+ Capability cap2 = new Capability_impl();
+ cap2.addInputType("Fake", true);
+ cap1.setLanguagesSupported(new String[] { "en", "de" });
+ cap1.setMimeTypesSupported(new String[] { "text/plain" });
+ md.setCapabilities(new Capability[] { cap1, cap2 });
+ ConfigurationParameter cfgParam1 = new ConfigurationParameter_impl();
+ cfgParam1.setName("param1");
+ cfgParam1.setDescription("Test Parameter 1");
+ cfgParam1.setType("String");
+ ConfigurationParameter cfgParam2 = new ConfigurationParameter_impl();
+ cfgParam2.setName("param2");
+ cfgParam2.setDescription("Test Parameter 2");
+ cfgParam2.setType("Integer");
+ ConfigurationGroup cfgGrp1 = new ConfigurationGroup_impl();
+ cfgGrp1.setNames(new String[] { "cfgGrp1" });
+ cfgGrp1.setConfigurationParameters(new ConfigurationParameter[] { cfgParam1, cfgParam2 });
+ ConfigurationParameter cfgParam3 = new ConfigurationParameter_impl();
+ cfgParam3.setName("param3");
+ cfgParam3.setDescription("Test Parameter 3");
+ cfgParam3.setType("Float");
+ ConfigurationGroup cfgGrp2 = new ConfigurationGroup_impl();
+ cfgGrp2.setNames(new String[] { "cfgGrp2a", "cfgGrp2b" });
+ cfgGrp2.setConfigurationParameters(new ConfigurationParameter[] { cfgParam3 });
+ md.getConfigurationParameterDeclarations()
+ .setConfigurationGroups(new ConfigurationGroup[] { cfgGrp1, cfgGrp2 });
+
+ NameValuePair nvp1 = new NameValuePair_impl("param1", "test");
+ NameValuePair nvp2 = new NameValuePair_impl("param2", Integer.valueOf("42"));
+ NameValuePair nvp3a = new NameValuePair_impl("param3", Float.valueOf("2.718281828459045"));
+ NameValuePair nvp3b = new NameValuePair_impl("param3", Float.valueOf("3.1415927"));
+ ConfigurationParameterSettings settings = md.getConfigurationParameterSettings();
+ settings.getSettingsForGroups().put("cfgGrp1", new NameValuePair[] { nvp1, nvp2 });
+ settings.getSettingsForGroups().put("cfgGrp2a", new NameValuePair[] { nvp3a });
+ settings.getSettingsForGroups().put("cfgGrp2b", new NameValuePair[] { nvp3b });
+
+ URISpecifier uriSpec = new URISpecifier_impl();
+ uriSpec.setUri("http://www.incubator.apache.org/uima");
+ uriSpec.setProtocol(Constants.PROTOCOL_VINCI);
+ ExternalResourceDependency dep = UIMAFramework.getResourceSpecifierFactory()
+ .createExternalResourceDependency();
+ dep.setKey("ResourceKey");
+ dep.setDescription("Test");
+ mTestDesc.setExternalResourceDependencies(new ExternalResourceDependency[] { dep });
+ ResourceManagerConfiguration resMgrCfg = UIMAFramework.getResourceSpecifierFactory()
+ .createResourceManagerConfiguration();
+ ExternalResourceDescription extRes = UIMAFramework.getResourceSpecifierFactory()
+ .createExternalResourceDescription();
+ extRes.setResourceSpecifier(uriSpec);
+ extRes.setName("Resource1");
+ extRes.setDescription("Test");
+ resMgrCfg.setExternalResources(new ExternalResourceDescription[] { extRes });
+
+ ExternalResourceBinding binding = UIMAFramework.getResourceSpecifierFactory()
+ .createExternalResourceBinding();
+ binding.setKey("ResourceKey");
+ binding.setResourceName("Resource1");
+ mTestDesc.setResourceManagerConfiguration(resMgrCfg);
+ } catch (Exception e) {
+ JUnitExtension.handleException(e);
+ }
}
@Test
public void testXMLization() throws Exception {
- StringWriter writer = new StringWriter();
- mTestDesc.toXML(writer);
- String testDescXml = writer.toString();
+ try {
+ // write objects to XML
+ StringWriter writer = new StringWriter();
+ mTestDesc.toXML(writer);
+ String testDescXml = writer.getBuffer().toString();
+ // System.out.println(testDescXml);
- try (var is = new ByteArrayInputStream(testDescXml.getBytes(UTF_8))) {
// parse objects from XML (no schema validation)
+ InputStream is = new ByteArrayInputStream(testDescXml.getBytes(encoding));
CasConsumerDescription newDesc = (CasConsumerDescription) UIMAFramework.getXMLParser()
.parse(new XMLInputSource(is, null));
+ // compare
+ assertThat(newDesc).isEqualTo(mTestDesc);
+ } catch (Exception e) {
+ JUnitExtension.handleException(e);
+ }
+ }
+
+ @Test
+ public void testSerialization() throws Exception {
+ try {
+ // serialize objects to byte array
+
+ byte[] testDescBytes = SerializationUtils.serialize(mTestDesc);
+
+ // deserialize
+ CasConsumerDescription newDesc = (CasConsumerDescription) SerializationUtils
+ .deserialize(testDescBytes);
+
assertThat(newDesc).isEqualTo(mTestDesc);
+ } catch (Exception e) {
+ JUnitExtension.handleException(e);
}
}
+
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/collection/impl/CasInitializerDescription_implTest.java b/uimaj-core/src/test/java/org/apache/uima/collection/impl/CasInitializerDescription_implTest.java
index ac27c125f..d5e5b9e0d 100644
--- a/uimaj-core/src/test/java/org/apache/uima/collection/impl/CasInitializerDescription_implTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/collection/impl/CasInitializerDescription_implTest.java
@@ -19,27 +19,37 @@
package org.apache.uima.collection.impl;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.uima.UIMAFramework.getResourceSpecifierFactory;
+import static org.apache.uima.analysis_engine.impl.AnalysisEngineDescription_implTest.encoding;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.ByteArrayInputStream;
+import java.io.InputStream;
import java.io.StringWriter;
import org.apache.uima.Constants;
import org.apache.uima.UIMAFramework;
import org.apache.uima.cas.CAS;
import org.apache.uima.collection.CasInitializerDescription;
+import org.apache.uima.internal.util.SerializationUtils;
import org.apache.uima.resource.ExternalResourceDependency;
import org.apache.uima.resource.ExternalResourceDescription;
+import org.apache.uima.resource.URISpecifier;
import org.apache.uima.resource.impl.URISpecifier_impl;
import org.apache.uima.resource.metadata.AllowedValue;
import org.apache.uima.resource.metadata.Capability;
import org.apache.uima.resource.metadata.ConfigurationGroup;
import org.apache.uima.resource.metadata.ConfigurationParameter;
+import org.apache.uima.resource.metadata.ConfigurationParameterSettings;
+import org.apache.uima.resource.metadata.ExternalResourceBinding;
import org.apache.uima.resource.metadata.FsIndexDescription;
import org.apache.uima.resource.metadata.FsIndexKeyDescription;
import org.apache.uima.resource.metadata.NameValuePair;
+import org.apache.uima.resource.metadata.ProcessingResourceMetaData;
+import org.apache.uima.resource.metadata.ResourceManagerConfiguration;
+import org.apache.uima.resource.metadata.TypeDescription;
+import org.apache.uima.resource.metadata.TypePriorities;
+import org.apache.uima.resource.metadata.TypePriorityList;
+import org.apache.uima.resource.metadata.TypeSystemDescription;
import org.apache.uima.resource.metadata.impl.AllowedValue_impl;
import org.apache.uima.resource.metadata.impl.Capability_impl;
import org.apache.uima.resource.metadata.impl.ConfigurationGroup_impl;
@@ -49,6 +59,7 @@ import org.apache.uima.resource.metadata.impl.FsIndexKeyDescription_impl;
import org.apache.uima.resource.metadata.impl.NameValuePair_impl;
import org.apache.uima.resource.metadata.impl.TypePriorities_impl;
import org.apache.uima.resource.metadata.impl.TypeSystemDescription_impl;
+import org.apache.uima.test.junit_extension.JUnitExtension;
import org.apache.uima.util.XMLInputSource;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -58,136 +69,155 @@ public class CasInitializerDescription_implTest {
@BeforeEach
public void setUp() throws Exception {
- var typeSystem = new TypeSystemDescription_impl();
-
- var type1 = typeSystem.addType("Fake", "<b>Fake</b> Type", "Annotation");
- type1.addFeature("TestFeature", "For Testing Only", CAS.TYPE_NAME_STRING);
-
- var enumType = typeSystem.addType("EnumType", "Test Enumerated Type", "uima.cas.String");
- enumType.setAllowedValues(new AllowedValue[] { new AllowedValue_impl("One", "First Value"),
- new AllowedValue_impl("Two", "Second Value") });
-
- var typePriorities = new TypePriorities_impl();
- var priorityList = typePriorities.addPriorityList();
- priorityList.addType("Fake");
- priorityList.addType("EnumType");
-
- var index = new FsIndexDescription_impl();
- index.setLabel("testIndex");
- index.setTypeName("Fake");
- var key1 = new FsIndexKeyDescription_impl();
- key1.setFeatureName("TestFeature");
- key1.setComparator(1);
- var key2 = new FsIndexKeyDescription_impl();
- key2.setFeatureName("Start");
- key2.setComparator(0);
- var key3 = new FsIndexKeyDescription_impl();
- key3.setTypePriority(true);
- index.setKeys(new FsIndexKeyDescription[] { key1, key2, key3 });
-
- var index2 = new FsIndexDescription_impl();
- index2.setLabel("testIndex2");
- index2.setTypeName("Fake");
- index2.setKind(FsIndexDescription.KIND_SET);
- var key1a = new FsIndexKeyDescription_impl();
- key1a.setFeatureName("TestFeature");
- key1a.setComparator(1);
- index2.setKeys(new FsIndexKeyDescription[] { key1a });
-
- // create primitive TAE description
- mTestDesc = new CasInitializerDescription_impl();
- mTestDesc.setFrameworkImplementation(Constants.JAVA_FRAMEWORK_NAME);
- mTestDesc.setImplementationName("org.apache.uima.examples.TestAnnotator");
-
- var md = mTestDesc.getCasInitializerMetaData();
- md.setName("Test CAS Initializer");
- md.setDescription("Does not do anything useful.");
- md.setVersion("1.0");
- md.setTypeSystem(typeSystem);
- md.setTypePriorities(typePriorities);
- md.setFsIndexes(new FsIndexDescription[] { index, index2 });
-
- var cap1 = new Capability_impl();
- cap1.addInputType("Fake", false);
- cap1.addInputFeature("TestFeature");
- cap1.setLanguagesSupported(new String[] { "en", "de" });
- cap1.setMimeTypesSupported(new String[] { "text/plain" });
-
- var cap2 = new Capability_impl();
- cap2.addInputType("Fake", true);
- md.setCapabilities(new Capability[] { cap1, cap2 });
-
- var cfgParam1 = new ConfigurationParameter_impl();
- cfgParam1.setName("param1");
- cfgParam1.setDescription("Test Parameter 1");
- cfgParam1.setType("String");
-
- var cfgParam2 = new ConfigurationParameter_impl();
- cfgParam2.setName("param2");
- cfgParam2.setDescription("Test Parameter 2");
- cfgParam2.setType("Integer");
-
- var cfgGrp1 = new ConfigurationGroup_impl();
- cfgGrp1.setNames(new String[] { "cfgGrp1" });
- cfgGrp1.setConfigurationParameters(new ConfigurationParameter[] { cfgParam1, cfgParam2 });
-
- var cfgParam3 = new ConfigurationParameter_impl();
- cfgParam3.setName("param3");
- cfgParam3.setDescription("Test Parameter 3");
- cfgParam3.setType("Float");
-
- var cfgGrp2 = new ConfigurationGroup_impl();
- cfgGrp2.setNames(new String[] { "cfgGrp2a", "cfgGrp2b" });
- cfgGrp2.setConfigurationParameters(new ConfigurationParameter[] { cfgParam3 });
- md.getConfigurationParameterDeclarations()
- .setConfigurationGroups(new ConfigurationGroup[] { cfgGrp1, cfgGrp2 });
-
- var nvp1 = new NameValuePair_impl("param1", "test");
- var nvp2 = new NameValuePair_impl("param2", Integer.valueOf("42"));
- var nvp3a = new NameValuePair_impl("param3", Float.valueOf("2.718281828459045"));
- var nvp3b = new NameValuePair_impl("param3", Float.valueOf("3.1415927"));
-
- var settings = md.getConfigurationParameterSettings();
- settings.getSettingsForGroups().put("cfgGrp1", new NameValuePair[] { nvp1, nvp2 });
- settings.getSettingsForGroups().put("cfgGrp2a", new NameValuePair[] { nvp3a });
- settings.getSettingsForGroups().put("cfgGrp2b", new NameValuePair[] { nvp3b });
-
- var uriSpec = new URISpecifier_impl();
- uriSpec.setUri("http://www.incubator.apache.org/uima");
- uriSpec.setProtocol(Constants.PROTOCOL_VINCI);
-
- var dep = getResourceSpecifierFactory().createExternalResourceDependency();
- dep.setKey("ResourceKey");
- dep.setDescription("Test");
-
- mTestDesc.setExternalResourceDependencies(new ExternalResourceDependency[] { dep });
-
- var extRes = getResourceSpecifierFactory().createExternalResourceDescription();
- extRes.setResourceSpecifier(uriSpec);
- extRes.setName("Resource1");
- extRes.setDescription("Test");
-
- var resMgrCfg = getResourceSpecifierFactory().createResourceManagerConfiguration();
- resMgrCfg.setExternalResources(new ExternalResourceDescription[] { extRes });
-
- var binding = getResourceSpecifierFactory().createExternalResourceBinding();
- binding.setKey("ResourceKey");
- binding.setResourceName("Resource1");
- mTestDesc.setResourceManagerConfiguration(resMgrCfg);
+ try {
+
+ TypeSystemDescription typeSystem = new TypeSystemDescription_impl();
+ TypeDescription type1 = typeSystem.addType("Fake", "<b>Fake</b> Type", "Annotation");
+ type1.addFeature("TestFeature", "For Testing Only", CAS.TYPE_NAME_STRING);
+ TypeDescription enumType = typeSystem.addType("EnumType", "Test Enumerated Type",
+ "uima.cas.String");
+ enumType.setAllowedValues(new AllowedValue[] { new AllowedValue_impl("One", "First Value"),
+ new AllowedValue_impl("Two", "Second Value") });
+
+ TypePriorities typePriorities = new TypePriorities_impl();
+ TypePriorityList priorityList = typePriorities.addPriorityList();
+ priorityList.addType("Fake");
+ priorityList.addType("EnumType");
+
+ FsIndexDescription index = new FsIndexDescription_impl();
+ index.setLabel("testIndex");
+ index.setTypeName("Fake");
+ FsIndexKeyDescription key1 = new FsIndexKeyDescription_impl();
+ key1.setFeatureName("TestFeature");
+ key1.setComparator(1);
+ FsIndexKeyDescription key2 = new FsIndexKeyDescription_impl();
+ key2.setFeatureName("Start");
+ key2.setComparator(0);
+ FsIndexKeyDescription key3 = new FsIndexKeyDescription_impl();
+ key3.setTypePriority(true);
+ index.setKeys(new FsIndexKeyDescription[] { key1, key2, key3 });
+
+ FsIndexDescription index2 = new FsIndexDescription_impl();
+ index2.setLabel("testIndex2");
+ index2.setTypeName("Fake");
+ index2.setKind(FsIndexDescription.KIND_SET);
+ FsIndexKeyDescription key1a = new FsIndexKeyDescription_impl();
+ key1a.setFeatureName("TestFeature");
+ key1a.setComparator(1);
+ index2.setKeys(new FsIndexKeyDescription[] { key1a });
+
+ // create primitive TAE description
+ mTestDesc = new CasInitializerDescription_impl();
+ mTestDesc.setFrameworkImplementation(Constants.JAVA_FRAMEWORK_NAME);
+ mTestDesc.setImplementationName("org.apache.uima.examples.TestAnnotator");
+ ProcessingResourceMetaData md = mTestDesc.getCasInitializerMetaData();
+ md.setName("Test CAS Initializer");
+ md.setDescription("Does not do anything useful.");
+ md.setVersion("1.0");
+ md.setTypeSystem(typeSystem);
+ md.setTypePriorities(typePriorities);
+ md.setFsIndexes(new FsIndexDescription[] { index, index2 });
+ Capability cap1 = new Capability_impl();
+ cap1.addInputType("Fake", false);
+ cap1.addInputFeature("TestFeature");
+ Capability cap2 = new Capability_impl();
+ cap2.addInputType("Fake", true);
+ cap1.setLanguagesSupported(new String[] { "en", "de" });
+ cap1.setMimeTypesSupported(new String[] { "text/plain" });
+ md.setCapabilities(new Capability[] { cap1, cap2 });
+ ConfigurationParameter cfgParam1 = new ConfigurationParameter_impl();
+ cfgParam1.setName("param1");
+ cfgParam1.setDescription("Test Parameter 1");
+ cfgParam1.setType("String");
+ ConfigurationParameter cfgParam2 = new ConfigurationParameter_impl();
+ cfgParam2.setName("param2");
+ cfgParam2.setDescription("Test Parameter 2");
+ cfgParam2.setType("Integer");
+ ConfigurationGroup cfgGrp1 = new ConfigurationGroup_impl();
+ cfgGrp1.setNames(new String[] { "cfgGrp1" });
+ cfgGrp1.setConfigurationParameters(new ConfigurationParameter[] { cfgParam1, cfgParam2 });
+ ConfigurationParameter cfgParam3 = new ConfigurationParameter_impl();
+ cfgParam3.setName("param3");
+ cfgParam3.setDescription("Test Parameter 3");
+ cfgParam3.setType("Float");
+ ConfigurationGroup cfgGrp2 = new ConfigurationGroup_impl();
+ cfgGrp2.setNames(new String[] { "cfgGrp2a", "cfgGrp2b" });
+ cfgGrp2.setConfigurationParameters(new ConfigurationParameter[] { cfgParam3 });
+ md.getConfigurationParameterDeclarations()
+ .setConfigurationGroups(new ConfigurationGroup[] { cfgGrp1, cfgGrp2 });
+
+ NameValuePair nvp1 = new NameValuePair_impl("param1", "test");
+ NameValuePair nvp2 = new NameValuePair_impl("param2", Integer.valueOf("42"));
+ NameValuePair nvp3a = new NameValuePair_impl("param3", Float.valueOf("2.718281828459045"));
+ NameValuePair nvp3b = new NameValuePair_impl("param3", Float.valueOf("3.1415927"));
+ ConfigurationParameterSettings settings = md.getConfigurationParameterSettings();
+ settings.getSettingsForGroups().put("cfgGrp1", new NameValuePair[] { nvp1, nvp2 });
+ settings.getSettingsForGroups().put("cfgGrp2a", new NameValuePair[] { nvp3a });
+ settings.getSettingsForGroups().put("cfgGrp2b", new NameValuePair[] { nvp3b });
+
+ URISpecifier uriSpec = new URISpecifier_impl();
+ uriSpec.setUri("http://www.incubator.apache.org/uima");
+ uriSpec.setProtocol(Constants.PROTOCOL_VINCI);
+ ExternalResourceDependency dep = UIMAFramework.getResourceSpecifierFactory()
+ .createExternalResourceDependency();
+ dep.setKey("ResourceKey");
+ dep.setDescription("Test");
+ mTestDesc.setExternalResourceDependencies(new ExternalResourceDependency[] { dep });
+ ResourceManagerConfiguration resMgrCfg = UIMAFramework.getResourceSpecifierFactory()
+ .createResourceManagerConfiguration();
+ ExternalResourceDescription extRes = UIMAFramework.getResourceSpecifierFactory()
+ .createExternalResourceDescription();
+ extRes.setResourceSpecifier(uriSpec);
+ extRes.setName("Resource1");
+ extRes.setDescription("Test");
+ resMgrCfg.setExternalResources(new ExternalResourceDescription[] { extRes });
+
+ ExternalResourceBinding binding = UIMAFramework.getResourceSpecifierFactory()
+ .createExternalResourceBinding();
+ binding.setKey("ResourceKey");
+ binding.setResourceName("Resource1");
+ mTestDesc.setResourceManagerConfiguration(resMgrCfg);
+ } catch (Exception e) {
+ JUnitExtension.handleException(e);
+ }
}
@Test
public void testXMLization() throws Exception {
- StringWriter writer = new StringWriter();
- mTestDesc.toXML(writer);
- String testDescXml = writer.toString();
+ try {
+ // write objects to XML
+ StringWriter writer = new StringWriter();
+ mTestDesc.toXML(writer);
+ String testDescXml = writer.getBuffer().toString();
+ // System.out.println(testDescXml);
- try (var is = new ByteArrayInputStream(testDescXml.getBytes(UTF_8))) {
// parse objects from XML (no schema validation)
+ InputStream is = new ByteArrayInputStream(testDescXml.getBytes(encoding));
CasInitializerDescription newDesc = (CasInitializerDescription) UIMAFramework.getXMLParser()
.parse(new XMLInputSource(is, null));
+ // compare
+ assertThat(newDesc).isEqualTo(mTestDesc);
+ } catch (Exception e) {
+ JUnitExtension.handleException(e);
+ }
+ }
+
+ @Test
+ public void testSerialization() throws Exception {
+ try {
+ // serialize objects to byte array
+
+ byte[] testDescBytes = SerializationUtils.serialize(mTestDesc);
+
+ // deserialize
+ CasInitializerDescription newDesc = (CasInitializerDescription) SerializationUtils
+ .deserialize(testDescBytes);
+
assertThat(newDesc).isEqualTo(mTestDesc);
+ } catch (Exception e) {
+ JUnitExtension.handleException(e);
}
}
+
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/collection/impl/CollectionReaderDescription_implTest.java b/uimaj-core/src/test/java/org/apache/uima/collection/impl/CollectionReaderDescription_implTest.java
index 810901b7b..f93bef049 100644
--- a/uimaj-core/src/test/java/org/apache/uima/collection/impl/CollectionReaderDescription_implTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/collection/impl/CollectionReaderDescription_implTest.java
@@ -19,27 +19,37 @@
package org.apache.uima.collection.impl;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.uima.UIMAFramework.getResourceSpecifierFactory;
+import static org.apache.uima.analysis_engine.impl.AnalysisEngineDescription_implTest.encoding;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.ByteArrayInputStream;
+import java.io.InputStream;
import java.io.StringWriter;
import org.apache.uima.Constants;
import org.apache.uima.UIMAFramework;
import org.apache.uima.cas.CAS;
import org.apache.uima.collection.CollectionReaderDescription;
+import org.apache.uima.internal.util.SerializationUtils;
import org.apache.uima.resource.ExternalResourceDependency;
import org.apache.uima.resource.ExternalResourceDescription;
+import org.apache.uima.resource.URISpecifier;
import org.apache.uima.resource.impl.URISpecifier_impl;
import org.apache.uima.resource.metadata.AllowedValue;
import org.apache.uima.resource.metadata.Capability;
import org.apache.uima.resource.metadata.ConfigurationGroup;
import org.apache.uima.resource.metadata.ConfigurationParameter;
+import org.apache.uima.resource.metadata.ConfigurationParameterSettings;
+import org.apache.uima.resource.metadata.ExternalResourceBinding;
import org.apache.uima.resource.metadata.FsIndexDescription;
import org.apache.uima.resource.metadata.FsIndexKeyDescription;
import org.apache.uima.resource.metadata.NameValuePair;
+import org.apache.uima.resource.metadata.ProcessingResourceMetaData;
+import org.apache.uima.resource.metadata.ResourceManagerConfiguration;
+import org.apache.uima.resource.metadata.TypeDescription;
+import org.apache.uima.resource.metadata.TypePriorities;
+import org.apache.uima.resource.metadata.TypePriorityList;
+import org.apache.uima.resource.metadata.TypeSystemDescription;
import org.apache.uima.resource.metadata.impl.AllowedValue_impl;
import org.apache.uima.resource.metadata.impl.Capability_impl;
import org.apache.uima.resource.metadata.impl.ConfigurationGroup_impl;
@@ -49,6 +59,7 @@ import org.apache.uima.resource.metadata.impl.FsIndexKeyDescription_impl;
import org.apache.uima.resource.metadata.impl.NameValuePair_impl;
import org.apache.uima.resource.metadata.impl.TypePriorities_impl;
import org.apache.uima.resource.metadata.impl.TypeSystemDescription_impl;
+import org.apache.uima.test.junit_extension.JUnitExtension;
import org.apache.uima.util.XMLInputSource;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -58,124 +69,154 @@ public class CollectionReaderDescription_implTest {
@BeforeEach
public void setUp() throws Exception {
- var typeSystem = new TypeSystemDescription_impl();
-
- var type1 = typeSystem.addType("Fake", "<b>Fake</b> Type", "Annotation");
- type1.addFeature("TestFeature", "For Testing Only", CAS.TYPE_NAME_STRING);
-
- var enumType = typeSystem.addType("EnumType", "Test Enumerated Type", "uima.cas.String");
- enumType.setAllowedValues(new AllowedValue[] { new AllowedValue_impl("One", "First Value"),
- new AllowedValue_impl("Two", "Second Value") });
-
- var typePriorities = new TypePriorities_impl();
- var priorityList = typePriorities.addPriorityList();
- priorityList.addType("Fake");
- priorityList.addType("EnumType");
-
- var index = new FsIndexDescription_impl();
- index.setLabel("testIndex");
- index.setTypeName("Fake");
- var key1 = new FsIndexKeyDescription_impl();
- key1.setFeatureName("TestFeature");
- key1.setComparator(1);
- var key2 = new FsIndexKeyDescription_impl();
- key2.setFeatureName("Start");
- key2.setComparator(0);
- var key3 = new FsIndexKeyDescription_impl();
- key3.setTypePriority(true);
- index.setKeys(new FsIndexKeyDescription[] { key1, key2, key3 });
-
- var index2 = new FsIndexDescription_impl();
- index2.setLabel("testIndex2");
- index2.setTypeName("Fake");
- index2.setKind(FsIndexDescription.KIND_SET);
- var key1a = new FsIndexKeyDescription_impl();
- key1a.setFeatureName("TestFeature");
- key1a.setComparator(1);
- index2.setKeys(new FsIndexKeyDescription[] { key1a });
-
- // create primitive TAE description
- mTestDesc = new CollectionReaderDescription_impl();
- mTestDesc.setFrameworkImplementation(Constants.JAVA_FRAMEWORK_NAME);
- mTestDesc.setImplementationName("org.apache.uima.examples.TestAnnotator");
- var md = mTestDesc.getCollectionReaderMetaData();
- md.setName("Test CAS Consumer");
- md.setDescription("Does not do anything useful.");
- md.setVersion("1.0");
- md.setTypeSystem(typeSystem);
- md.setTypePriorities(typePriorities);
- md.setFsIndexes(new FsIndexDescription[] { index, index2 });
-
- var cap1 = new Capability_impl();
- cap1.addInputType("Fake", false);
- cap1.addInputFeature("TestFeature");
- cap1.setLanguagesSupported(new String[] { "en", "de" });
- cap1.setMimeTypesSupported(new String[] { "text/plain" });
- var cap2 = new Capability_impl();
- cap2.addInputType("Fake", true);
- md.setCapabilities(new Capability[] { cap1, cap2 });
-
- var cfgParam1 = new ConfigurationParameter_impl();
- cfgParam1.setName("param1");
- cfgParam1.setDescription("Test Parameter 1");
- cfgParam1.setType("String");
- var cfgParam2 = new ConfigurationParameter_impl();
- cfgParam2.setName("param2");
- cfgParam2.setDescription("Test Parameter 2");
- cfgParam2.setType("Integer");
- var cfgGrp1 = new ConfigurationGroup_impl();
- cfgGrp1.setNames(new String[] { "cfgGrp1" });
- cfgGrp1.setConfigurationParameters(new ConfigurationParameter[] { cfgParam1, cfgParam2 });
- var cfgParam3 = new ConfigurationParameter_impl();
- cfgParam3.setName("param3");
- cfgParam3.setDescription("Test Parameter 3");
- cfgParam3.setType("Float");
- var cfgGrp2 = new ConfigurationGroup_impl();
- cfgGrp2.setNames(new String[] { "cfgGrp2a", "cfgGrp2b" });
- cfgGrp2.setConfigurationParameters(new ConfigurationParameter[] { cfgParam3 });
- md.getConfigurationParameterDeclarations()
- .setConfigurationGroups(new ConfigurationGroup[] { cfgGrp1, cfgGrp2 });
-
- var nvp1 = new NameValuePair_impl("param1", "test");
- var nvp2 = new NameValuePair_impl("param2", Integer.valueOf("42"));
- var nvp3a = new NameValuePair_impl("param3", Float.valueOf("2.718281828459045"));
- var nvp3b = new NameValuePair_impl("param3", Float.valueOf("3.1415927"));
- var settings = md.getConfigurationParameterSettings();
- settings.getSettingsForGroups().put("cfgGrp1", new NameValuePair[] { nvp1, nvp2 });
- settings.getSettingsForGroups().put("cfgGrp2a", new NameValuePair[] { nvp3a });
- settings.getSettingsForGroups().put("cfgGrp2b", new NameValuePair[] { nvp3b });
-
- var uriSpec = new URISpecifier_impl();
- uriSpec.setUri("http://incubator.apache.org/uima");
- uriSpec.setProtocol(Constants.PROTOCOL_VINCI);
- var dep = getResourceSpecifierFactory().createExternalResourceDependency();
- dep.setKey("ResourceKey");
- dep.setDescription("Test");
- mTestDesc.setExternalResourceDependencies(new ExternalResourceDependency[] { dep });
- var resMgrCfg = getResourceSpecifierFactory().createResourceManagerConfiguration();
- var extRes = getResourceSpecifierFactory().createExternalResourceDescription();
- extRes.setResourceSpecifier(uriSpec);
- extRes.setName("Resource1");
- extRes.setDescription("Test");
- resMgrCfg.setExternalResources(new ExternalResourceDescription[] { extRes });
-
- var binding = getResourceSpecifierFactory().createExternalResourceBinding();
- binding.setKey("ResourceKey");
- binding.setResourceName("Resource1");
- mTestDesc.setResourceManagerConfiguration(resMgrCfg);
+ try {
+ TypeSystemDescription typeSystem = new TypeSystemDescription_impl();
+ TypeDescription type1 = typeSystem.addType("Fake", "<b>Fake</b> Type", "Annotation");
+ type1.addFeature("TestFeature", "For Testing Only", CAS.TYPE_NAME_STRING);
+ TypeDescription enumType = typeSystem.addType("EnumType", "Test Enumerated Type",
+ "uima.cas.String");
+ enumType.setAllowedValues(new AllowedValue[] { new AllowedValue_impl("One", "First Value"),
+ new AllowedValue_impl("Two", "Second Value") });
+
+ TypePriorities typePriorities = new TypePriorities_impl();
+ TypePriorityList priorityList = typePriorities.addPriorityList();
+ priorityList.addType("Fake");
+ priorityList.addType("EnumType");
+
+ FsIndexDescription index = new FsIndexDescription_impl();
+ index.setLabel("testIndex");
+ index.setTypeName("Fake");
+ FsIndexKeyDescription key1 = new FsIndexKeyDescription_impl();
+ key1.setFeatureName("TestFeature");
+ key1.setComparator(1);
+ FsIndexKeyDescription key2 = new FsIndexKeyDescription_impl();
+ key2.setFeatureName("Start");
+ key2.setComparator(0);
+ FsIndexKeyDescription key3 = new FsIndexKeyDescription_impl();
+ key3.setTypePriority(true);
+ index.setKeys(new FsIndexKeyDescription[] { key1, key2, key3 });
+
+ FsIndexDescription index2 = new FsIndexDescription_impl();
+ index2.setLabel("testIndex2");
+ index2.setTypeName("Fake");
+ index2.setKind(FsIndexDescription.KIND_SET);
+ FsIndexKeyDescription key1a = new FsIndexKeyDescription_impl();
+ key1a.setFeatureName("TestFeature");
+ key1a.setComparator(1);
+ index2.setKeys(new FsIndexKeyDescription[] { key1a });
+
+ // create primitive TAE description
+ mTestDesc = new CollectionReaderDescription_impl();
+ mTestDesc.setFrameworkImplementation(Constants.JAVA_FRAMEWORK_NAME);
+ mTestDesc.setImplementationName("org.apache.uima.examples.TestAnnotator");
+ ProcessingResourceMetaData md = mTestDesc.getCollectionReaderMetaData();
+ md.setName("Test CAS Consumer");
+ md.setDescription("Does not do anything useful.");
+ md.setVersion("1.0");
+ md.setTypeSystem(typeSystem);
+ md.setTypePriorities(typePriorities);
+ md.setFsIndexes(new FsIndexDescription[] { index, index2 });
+ Capability cap1 = new Capability_impl();
+ cap1.addInputType("Fake", false);
+ cap1.addInputFeature("TestFeature");
+ Capability cap2 = new Capability_impl();
+ cap2.addInputType("Fake", true);
+ cap1.setLanguagesSupported(new String[] { "en", "de" });
+ cap1.setMimeTypesSupported(new String[] { "text/plain" });
+ md.setCapabilities(new Capability[] { cap1, cap2 });
+ ConfigurationParameter cfgParam1 = new ConfigurationParameter_impl();
+ cfgParam1.setName("param1");
+ cfgParam1.setDescription("Test Parameter 1");
+ cfgParam1.setType("String");
+ ConfigurationParameter cfgParam2 = new ConfigurationParameter_impl();
+ cfgParam2.setName("param2");
+ cfgParam2.setDescription("Test Parameter 2");
+ cfgParam2.setType("Integer");
+ ConfigurationGroup cfgGrp1 = new ConfigurationGroup_impl();
+ cfgGrp1.setNames(new String[] { "cfgGrp1" });
+ cfgGrp1.setConfigurationParameters(new ConfigurationParameter[] { cfgParam1, cfgParam2 });
+ ConfigurationParameter cfgParam3 = new ConfigurationParameter_impl();
+ cfgParam3.setName("param3");
+ cfgParam3.setDescription("Test Parameter 3");
+ cfgParam3.setType("Float");
+ ConfigurationGroup cfgGrp2 = new ConfigurationGroup_impl();
+ cfgGrp2.setNames(new String[] { "cfgGrp2a", "cfgGrp2b" });
+ cfgGrp2.setConfigurationParameters(new ConfigurationParameter[] { cfgParam3 });
+ md.getConfigurationParameterDeclarations()
+ .setConfigurationGroups(new ConfigurationGroup[] { cfgGrp1, cfgGrp2 });
+
+ NameValuePair nvp1 = new NameValuePair_impl("param1", "test");
+ NameValuePair nvp2 = new NameValuePair_impl("param2", Integer.valueOf("42"));
+ NameValuePair nvp3a = new NameValuePair_impl("param3", Float.valueOf("2.718281828459045"));
+ NameValuePair nvp3b = new NameValuePair_impl("param3", Float.valueOf("3.1415927"));
+ ConfigurationParameterSettings settings = md.getConfigurationParameterSettings();
+ settings.getSettingsForGroups().put("cfgGrp1", new NameValuePair[] { nvp1, nvp2 });
+ settings.getSettingsForGroups().put("cfgGrp2a", new NameValuePair[] { nvp3a });
+ settings.getSettingsForGroups().put("cfgGrp2b", new NameValuePair[] { nvp3b });
+
+ URISpecifier uriSpec = new URISpecifier_impl();
+ uriSpec.setUri("http://incubator.apache.org/uima");
+ uriSpec.setProtocol(Constants.PROTOCOL_VINCI);
+ ExternalResourceDependency dep = UIMAFramework.getResourceSpecifierFactory()
+ .createExternalResourceDependency();
+ dep.setKey("ResourceKey");
+ dep.setDescription("Test");
+ mTestDesc.setExternalResourceDependencies(new ExternalResourceDependency[] { dep });
+ ResourceManagerConfiguration resMgrCfg = UIMAFramework.getResourceSpecifierFactory()
+ .createResourceManagerConfiguration();
+ ExternalResourceDescription extRes = UIMAFramework.getResourceSpecifierFactory()
+ .createExternalResourceDescription();
+ extRes.setResourceSpecifier(uriSpec);
+ extRes.setName("Resource1");
+ extRes.setDescription("Test");
+ resMgrCfg.setExternalResources(new ExternalResourceDescription[] { extRes });
+
+ ExternalResourceBinding binding = UIMAFramework.getResourceSpecifierFactory()
+ .createExternalResourceBinding();
+ binding.setKey("ResourceKey");
+ binding.setResourceName("Resource1");
+ mTestDesc.setResourceManagerConfiguration(resMgrCfg);
+ } catch (Exception e) {
+ JUnitExtension.handleException(e);
+ }
}
@Test
public void testXMLization() throws Exception {
- StringWriter writer = new StringWriter();
- mTestDesc.toXML(writer);
- String testDescXml = writer.toString();
+ try {
+ // write objects to XML
+ StringWriter writer = new StringWriter();
+ mTestDesc.toXML(writer);
+ String testDescXml = writer.getBuffer().toString();
+ // System.out.println(testDescXml);
- try (var is = new ByteArrayInputStream(testDescXml.getBytes(UTF_8))) {
// parse objects from XML (no schema validation)
+ InputStream is = new ByteArrayInputStream(testDescXml.getBytes(encoding));
CollectionReaderDescription newDesc = (CollectionReaderDescription) UIMAFramework
.getXMLParser().parse(new XMLInputSource(is, null));
+
+ // compare
assertThat(newDesc).isEqualTo(mTestDesc);
+ } catch (Exception e) {
+ JUnitExtension.handleException(e);
}
}
+
+ @Test
+ public void testSerialization() throws Exception {
+ try {
+ // serialize objects to byte array
+
+ byte[] testDescBytes = SerializationUtils.serialize(mTestDesc);
+
+ // deserialize
+ CollectionReaderDescription newDesc = (CollectionReaderDescription) SerializationUtils
+ .deserialize(testDescBytes);
+
+ assertThat(newDesc).isEqualTo(mTestDesc);
+ } catch (Exception e) {
+ JUnitExtension.handleException(e);
+ }
+ }
+
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/internal/util/SerializationUtilsTest.java b/uimaj-core/src/test/java/org/apache/uima/internal/util/SerializationUtilsTest.java
deleted file mode 100644
index 3c429e292..000000000
--- a/uimaj-core/src/test/java/org/apache/uima/internal/util/SerializationUtilsTest.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.uima.internal.util;
-
-import static org.apache.uima.internal.util.SerializationUtils.deserialize;
-import static org.apache.uima.internal.util.SerializationUtils.deserializeCASCompleteSerializer;
-import static org.apache.uima.internal.util.SerializationUtils.deserializeCASMgrSerializer;
-import static org.apache.uima.internal.util.SerializationUtils.deserializeCASSerializer;
-import static org.apache.uima.internal.util.SerializationUtils.deserializeCASSerializerOrCASCompleteSerializer;
-import static org.apache.uima.internal.util.SerializationUtils.serialize;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.assertj.core.api.Assertions.assertThatNoException;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.Serializable;
-
-import org.apache.uima.cas.impl.CASCompleteSerializer;
-import org.apache.uima.cas.impl.CASMgrSerializer;
-import org.apache.uima.cas.impl.CASSerializer;
-import org.junit.jupiter.api.Test;
-
-class SerializationUtilsTest {
-
- @Test
- void testDeserializingExpectedClass() throws Exception {
- assertThatNoException().isThrownBy(() -> {
- deserialize(serialize(new CASCompleteSerializer()));
- deserialize(serialize(new CASSerializer()));
- deserialize(serialize(new CASMgrSerializer()));
- });
-
- assertThatNoException().isThrownBy(() -> {
- deserializeCASCompleteSerializer(serialize(new CASCompleteSerializer()));
- });
-
- assertThatNoException().isThrownBy(() -> {
- deserializeCASMgrSerializer(serialize(new CASMgrSerializer()));
- });
-
- assertThatNoException().isThrownBy(() -> {
- try (var bis = new ByteArrayInputStream(serialize(new CASMgrSerializer()))) {
- deserializeCASMgrSerializer(bis);
- }
- });
-
- assertThatNoException().isThrownBy(() -> {
- deserializeCASSerializer(serialize(new CASSerializer()));
- });
-
- assertThatNoException().isThrownBy(() -> {
- try (var bis = new ByteArrayInputStream(serialize(new CASCompleteSerializer()))) {
- deserializeCASSerializerOrCASCompleteSerializer(bis);
- }
- try (var bis = new ByteArrayInputStream(serialize(new CASSerializer()))) {
- deserializeCASSerializerOrCASCompleteSerializer(bis);
- }
- });
- }
-
- @Test
- void testDeserializingUnexpectedClass() throws Exception {
- assertThatExceptionOfType(IOException.class).isThrownBy(() -> {
- deserialize(serialize("Hello world"));
- }).withMessageContaining("Unexpected object type");
-
- assertThatExceptionOfType(IOException.class).isThrownBy(() -> {
- deserializeCASCompleteSerializer(serialize("Hello world"));
- }).withMessageContaining("Unexpected object type");
-
- assertThatExceptionOfType(IOException.class).isThrownBy(() -> {
- deserializeCASCompleteSerializer(serialize(new CASMgrSerializer()));
- }).withMessageContaining("Unexpected object type");
-
- assertThatExceptionOfType(IOException.class).isThrownBy(() -> {
- deserializeCASCompleteSerializer(serialize(new CASSerializer()));
- }).withMessageContaining("Unexpected object type");
-
- assertThatExceptionOfType(IOException.class).isThrownBy(() -> {
- deserializeCASMgrSerializer(serialize("Hello world"));
- }).withMessageContaining("Unexpected object type");
-
- assertThatExceptionOfType(IOException.class).isThrownBy(() -> {
- try (var bis = new ByteArrayInputStream(serialize("Hello world"))) {
- deserializeCASMgrSerializer(bis);
- }
- }).withMessageContaining("Unexpected object type");
-
- assertThatExceptionOfType(IOException.class).isThrownBy(() -> {
- deserializeCASSerializer(serialize("Hello world"));
- }).withMessageContaining("Unexpected object type");
-
- assertThatExceptionOfType(IOException.class).isThrownBy(() -> {
- try (var bis = new ByteArrayInputStream(serialize("Hello world"))) {
- deserializeCASSerializerOrCASCompleteSerializer(bis);
- }
- }).withMessageContaining("Unexpected object type");
-
- assertThatExceptionOfType(IOException.class).isThrownBy(() -> {
- try (var bis = new ByteArrayInputStream(serialize(new CASMgrSerializer()))) {
- deserializeCASSerializerOrCASCompleteSerializer(bis);
- }
- }).withMessageContaining("Unexpected object type");
- }
-
- @Test
- void testDeserializingIllegalClass() throws Exception {
- assertThatExceptionOfType(IOException.class).isThrownBy(() -> {
- deserialize(serialize(new IllegalClass()));
- }).withMessageContaining("filter status: REJECTED");
-
- assertThatExceptionOfType(IOException.class).isThrownBy(() -> {
- deserializeCASCompleteSerializer(serialize(new IllegalClass()));
- }).withMessageContaining("filter status: REJECTED");
-
- assertThatExceptionOfType(IOException.class).isThrownBy(() -> {
- deserializeCASMgrSerializer(serialize(new IllegalClass()));
- }).withMessageContaining("filter status: REJECTED");
-
- assertThatExceptionOfType(IOException.class).isThrownBy(() -> {
- deserializeCASMgrSerializer(serialize(new CASSerializer()));
- }).withMessageContaining("filter status: REJECTED");
-
- assertThatExceptionOfType(IOException.class).isThrownBy(() -> {
- deserializeCASMgrSerializer(serialize(new CASCompleteSerializer()));
- }).withMessageContaining("filter status: REJECTED");
-
- assertThatExceptionOfType(IOException.class).isThrownBy(() -> {
- try (var bis = new ByteArrayInputStream(serialize(new IllegalClass()))) {
- deserializeCASMgrSerializer(bis);
- }
- }).withMessageContaining("filter status: REJECTED");
-
- assertThatExceptionOfType(IOException.class).isThrownBy(() -> {
- try (var bis = new ByteArrayInputStream(serialize(new CASSerializer()))) {
- deserializeCASMgrSerializer(bis);
- }
- }).withMessageContaining("filter status: REJECTED");
-
- assertThatExceptionOfType(IOException.class).isThrownBy(() -> {
- try (var bis = new ByteArrayInputStream(serialize(new CASCompleteSerializer()))) {
- deserializeCASMgrSerializer(bis);
- }
- }).withMessageContaining("filter status: REJECTED");
-
- assertThatExceptionOfType(IOException.class).isThrownBy(() -> {
- deserializeCASSerializer(serialize(new IllegalClass()));
- }).withMessageContaining("filter status: REJECTED");
-
- assertThatExceptionOfType(IOException.class).isThrownBy(() -> {
- deserializeCASSerializer(serialize(new CASMgrSerializer()));
- }).withMessageContaining("filter status: REJECTED");
-
- assertThatExceptionOfType(IOException.class).isThrownBy(() -> {
- deserializeCASSerializer(serialize(new CASCompleteSerializer()));
- }).withMessageContaining("filter status: REJECTED");
-
- assertThatExceptionOfType(IOException.class).isThrownBy(() -> {
- try (var bis = new ByteArrayInputStream(serialize(new IllegalClass()))) {
- deserializeCASSerializerOrCASCompleteSerializer(bis);
- }
- }).withMessageContaining("filter status: REJECTED");
- }
-
- private static final class IllegalClass implements Serializable {
-
- private static final long serialVersionUID = 3043542127122574250L;
-
- // Nothing inside
- }
-}
diff --git a/uimaj-core/src/test/java/org/apache/uima/internal/util/UIMAClassLoaderTest.java b/uimaj-core/src/test/java/org/apache/uima/internal/util/UIMAClassLoaderTest.java
index 25f5f2b70..7ba61dc7e 100644
--- a/uimaj-core/src/test/java/org/apache/uima/internal/util/UIMAClassLoaderTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/internal/util/UIMAClassLoaderTest.java
@@ -45,7 +45,7 @@ public class UIMAClassLoaderTest {
@BeforeEach
public void setUp() throws Exception {
- testClassPath = JUnitExtension.getFile("ClassLoaderTest/classLoadingTest.jar")
+ this.testClassPath = JUnitExtension.getFile("ClassLoaderTest/classLoadingTest.jar")
.getAbsolutePath();
}
@@ -84,7 +84,7 @@ public class UIMAClassLoaderTest {
@Test
public void testSimpleClassloadingSampleString() throws Exception {
- UIMAClassLoader cl = new UIMAClassLoader(testClassPath, this.getClass().getClassLoader());
+ UIMAClassLoader cl = new UIMAClassLoader(this.testClassPath, this.getClass().getClassLoader());
Class testClass = null;
testClass = cl.loadClass("org.apache.uima.internal.util.ClassloadingTestClass");
@@ -100,7 +100,7 @@ public class UIMAClassLoaderTest {
@Test
public void testParallelClassLoading() throws Exception {
- final UIMAClassLoader cl = new UIMAClassLoader(testClassPath,
+ final UIMAClassLoader cl = new UIMAClassLoader(this.testClassPath,
this.getClass().getClassLoader());
final Class<?>[] loadedClasses = new Class<?>[Misc.numberOfCores];
@@ -122,7 +122,7 @@ public class UIMAClassLoaderTest {
@Test
public void testSimpleClassloadingSampleURL() throws Exception {
- URL[] urlClasspath = new URL[] { new File(testClassPath).toURL() };
+ URL[] urlClasspath = new URL[] { new File(this.testClassPath).toURL() };
UIMAClassLoader cl = new UIMAClassLoader(urlClasspath, this.getClass().getClassLoader());
Class testClass = null;
@@ -139,7 +139,7 @@ public class UIMAClassLoaderTest {
@Test
public void testAdvancedClassloadingSampleString() throws Exception {
- UIMAClassLoader cl = new UIMAClassLoader(testClassPath, this.getClass().getClassLoader());
+ UIMAClassLoader cl = new UIMAClassLoader(this.testClassPath, this.getClass().getClassLoader());
Class testClass = null;
testClass = cl.loadClass("org.apache.uima.internal.util.ClassloadingTestClass");
@@ -155,7 +155,7 @@ public class UIMAClassLoaderTest {
@Test
public void testAdvancedClassloadingSampleURL() throws Exception {
- URL[] urlClasspath = new URL[] { new File(testClassPath).toURL() };
+ URL[] urlClasspath = new URL[] { new File(this.testClassPath).toURL() };
UIMAClassLoader cl = new UIMAClassLoader(urlClasspath, this.getClass().getClassLoader());
Class testClass = null;
diff --git a/uimaj-core/src/test/java/org/apache/uima/jcas/impl/JCasHashMapTest.java b/uimaj-core/src/test/java/org/apache/uima/jcas/impl/JCasHashMapTest.java
index 9f7312c30..2cfac5f96 100644
--- a/uimaj-core/src/test/java/org/apache/uima/jcas/impl/JCasHashMapTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/jcas/impl/JCasHashMapTest.java
@@ -276,7 +276,7 @@ public class JCasHashMapTest {
try {
while (true) {
try {
- if (okToProceed.get()) {
+ if (okToProceed.get() == true) {
break;
}
Thread.sleep(5); // 5 milli
diff --git a/uimaj-core/src/test/java/org/apache/uima/jcas/test/FSArrayListTest.java b/uimaj-core/src/test/java/org/apache/uima/jcas/test/FSArrayListTest.java
index bc699eb44..9d4666889 100644
--- a/uimaj-core/src/test/java/org/apache/uima/jcas/test/FSArrayListTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/jcas/test/FSArrayListTest.java
@@ -51,7 +51,7 @@ public class FSArrayListTest {
@BeforeEach
public void setUp() throws Exception {
- cas = CASInitializer.initCas(new CASTestSetup(), null // FsArrayList type setup in
+ this.cas = CASInitializer.initCas(new CASTestSetup(), null // FsArrayList type setup in
// CASTestSetup's initTypeSystem
// (tsm -> {
// Type fsat = tsm.addType("org.apache.uima.jcas.cas.FSArrayList", tsm.getTopType());
@@ -59,8 +59,8 @@ public class FSArrayListTest {
// }
// )
);
- ts = cas.getTypeSystem();
- jcas = cas.getJCas();
+ this.ts = this.cas.getTypeSystem();
+ this.jcas = cas.getJCas();
}
@Test
diff --git a/uimaj-core/src/test/java/org/apache/uima/jcas/test/FSHashSetTest.java b/uimaj-core/src/test/java/org/apache/uima/jcas/test/FSHashSetTest.java
index 843f3a4aa..40eb2bff5 100644
--- a/uimaj-core/src/test/java/org/apache/uima/jcas/test/FSHashSetTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/jcas/test/FSHashSetTest.java
@@ -51,14 +51,14 @@ public class FSHashSetTest {
@BeforeEach
public void setUp() throws Exception {
- cas = CASInitializer.initCas(new CASTestSetup(), null
+ this.cas = CASInitializer.initCas(new CASTestSetup(), null
// (tsm -> {
// Type fsat = tsm.addType("org.apache.uima.jcas.cas.FSHashSet", tsm.getTopType());
// tsm.addFeature("fsArray", fsat, tsm.getType("uima.cas.FSArray"));
// }
// )
);
- jcas = cas.getJCas();
+ this.jcas = cas.getJCas();
}
private void basic(FSHashSet<Token> s) {
diff --git a/uimaj-core/src/test/java/org/apache/uima/jcas/test/IntegerArrayListTest.java b/uimaj-core/src/test/java/org/apache/uima/jcas/test/IntegerArrayListTest.java
index 6e968ea94..9f0c1bc68 100644
--- a/uimaj-core/src/test/java/org/apache/uima/jcas/test/IntegerArrayListTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/jcas/test/IntegerArrayListTest.java
@@ -52,15 +52,15 @@ public class IntegerArrayListTest {
@BeforeEach
public void setUp() throws Exception {
- cas = CASInitializer.initCas(new CASTestSetup(), null
+ this.cas = CASInitializer.initCas(new CASTestSetup(), null
// (tsm -> {
// Type fsat = tsm.addType("org.apache.uima.jcas.cas.FSArrayList", tsm.getTopType());
// tsm.addFeature("fsArray", fsat, tsm.getType("uima.cas.FSArray"));
// }
// )
);
- ts = cas.getTypeSystem();
- jcas = cas.getJCas();
+ this.ts = this.cas.getTypeSystem();
+ this.jcas = cas.getJCas();
}
@Test
diff --git a/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java b/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java
index 75ad7c832..78bec197e 100644
--- a/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java
@@ -96,9 +96,9 @@ public class JCasTest {
public void setUp() throws Exception {
try {
try {
- cas = CASInitializer.initCas(new CASTestSetup(), null);
+ this.cas = CASInitializer.initCas(new CASTestSetup(), null);
// this.ts = this.cas.getTypeSystem();
- jcas = cas.getJCas();
+ this.jcas = cas.getJCas();
endOfSentenceInstance = new EndOfSentence(jcas);
} catch (Exception e1) {
checkOkMissingImport(e1);
@@ -143,10 +143,10 @@ public class JCasTest {
@AfterEach
public void tearDown() {
- cas = null;
+ this.cas = null;
// this.ts = null;
- jcas = null;
- endOfSentenceInstance = null;
+ this.jcas = null;
+ this.endOfSentenceInstance = null;
}
@Test
@@ -257,11 +257,11 @@ public class JCasTest {
System.out.println(e2);
}
CAS localCas = jcas.getCas();
- assertTrue(localCas == cas);
+ assertTrue(localCas == this.cas);
LowLevelCAS ll_cas = jcas.getLowLevelCas();
- assertTrue(ll_cas == cas);
+ assertTrue(ll_cas == this.cas);
CASImpl casImpl = jcas.getCasImpl();
- assertTrue(casImpl == cas);
+ assertTrue(casImpl == this.cas);
/* Annotation a1 = */ new Annotation(jcas, 4, 5);
} catch (Exception e) {
diff --git a/uimaj-core/src/test/java/org/apache/uima/pear/util/PearInstallerTest.java b/uimaj-core/src/test/java/org/apache/uima/pear/util/PearInstallerTest.java
index 1e9527356..09629b7e1 100644
--- a/uimaj-core/src/test/java/org/apache/uima/pear/util/PearInstallerTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/pear/util/PearInstallerTest.java
@@ -58,7 +58,7 @@ public class PearInstallerTest {
if (tempFile.delete()) {
File tempDir = tempFile;
if (tempDir.mkdirs()) {
- tempInstallDir = tempDir;
+ this.tempInstallDir = tempDir;
}
}
}
@@ -68,8 +68,8 @@ public class PearInstallerTest {
*/
@AfterEach
public void tearDown() throws Exception {
- if (tempInstallDir != null) {
- FileUtil.deleteDirectory(tempInstallDir);
+ if (this.tempInstallDir != null) {
+ FileUtil.deleteDirectory(this.tempInstallDir);
}
}
@@ -77,7 +77,7 @@ public class PearInstallerTest {
public void testPearInstall() throws Exception {
// check temporary working directory
- if (tempInstallDir == null) {
+ if (this.tempInstallDir == null) {
throw new FileNotFoundException("temp directory not found");
// check sample PEAR files
}
@@ -87,7 +87,7 @@ public class PearInstallerTest {
assertThat(pearFile).isNotNull();
// Install PEAR package
- PackageBrowser instPear = PackageInstaller.installPackage(tempInstallDir, pearFile, true);
+ PackageBrowser instPear = PackageInstaller.installPackage(this.tempInstallDir, pearFile, true);
// check pear PackageBrowser object
assertThat(instPear).isNotNull();
@@ -98,7 +98,7 @@ public class PearInstallerTest {
// check PEAR datapath setting
// pear file contains (uima.datapath = $main_root/my/test/data/path)
- File datapath = new File(tempInstallDir,
+ File datapath = new File(this.tempInstallDir,
"uima.example.DateTimeAnnotator/my/test/data/path");
File pearDatapath = new File(instPear.getComponentDataPath());
assertThat(pearDatapath).isEqualTo(datapath);
diff --git a/uimaj-core/src/test/java/org/apache/uima/pear/util/PearRuntimeTest.java b/uimaj-core/src/test/java/org/apache/uima/pear/util/PearRuntimeTest.java
index 3efcc2a1e..a5830c0bc 100644
--- a/uimaj-core/src/test/java/org/apache/uima/pear/util/PearRuntimeTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/pear/util/PearRuntimeTest.java
@@ -65,7 +65,7 @@ public class PearRuntimeTest {
if (tempFile.delete()) {
File tempDir = tempFile;
if (tempDir.mkdirs())
- tempInstallDir = tempDir;
+ this.tempInstallDir = tempDir;
}
}
@@ -74,8 +74,8 @@ public class PearRuntimeTest {
*/
@AfterEach
public void tearDown() throws Exception {
- if (tempInstallDir != null) {
- FileUtil.deleteDirectory(tempInstallDir);
+ if (this.tempInstallDir != null) {
+ FileUtil.deleteDirectory(this.tempInstallDir);
}
}
@@ -108,7 +108,7 @@ public class PearRuntimeTest {
@Test
public void testPearRuntime() throws Exception {
- CAS cas = runPearRuntimeTestcase(
+ CAS cas = this.runPearRuntimeTestcase(
new String[] { "pearTests/DateTime.pear", "pearTests/RoomNumber.pear" });
// check if 3 annotations are available in the CAS index
@@ -125,7 +125,7 @@ public class PearRuntimeTest {
@Test
public void testPearRuntimeDocAnnot() throws Exception {
- CAS cas = runPearRuntimeTestcase(
+ CAS cas = this.runPearRuntimeTestcase(
new String[] { "pearTests/analysisEngine.pear", "pearTests/analysisEngine2.pear" });
// check if 3 annotations are available in the CAS index
@@ -142,7 +142,7 @@ public class PearRuntimeTest {
private Import installPear(String pear) throws IOException {
// check temporary working directory
- if (tempInstallDir == null)
+ if (this.tempInstallDir == null)
throw new FileNotFoundException("temp directory not found");
// check sample PEAR files
@@ -151,7 +151,7 @@ public class PearRuntimeTest {
assertNotNull(pearFile);
// Install PEAR packages
- PackageBrowser instPear = PackageInstaller.installPackage(tempInstallDir, pearFile, true);
+ PackageBrowser instPear = PackageInstaller.installPackage(this.tempInstallDir, pearFile, true);
// check pear PackageBrowser object
assertNotNull(instPear);
diff --git a/uimaj-core/src/test/java/org/apache/uima/resource/impl/PearSpecifier_implTest.java b/uimaj-core/src/test/java/org/apache/uima/resource/impl/PearSpecifier_implTest.java
index cfcd20b1e..cf607bce0 100644
--- a/uimaj-core/src/test/java/org/apache/uima/resource/impl/PearSpecifier_implTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/resource/impl/PearSpecifier_implTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.uima.resource.impl;
-import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.apache.uima.analysis_engine.impl.AnalysisEngineDescription_implTest.encoding;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
@@ -27,74 +27,80 @@ import java.io.StringWriter;
import org.apache.uima.UIMAFramework;
import org.apache.uima.resource.PearSpecifier;
+import org.apache.uima.resource.metadata.NameValuePair;
import org.apache.uima.resource.metadata.impl.NameValuePair_impl;
+import org.apache.uima.test.junit_extension.JUnitExtension;
import org.apache.uima.util.XMLInputSource;
import org.junit.jupiter.api.Test;
/**
* PearSpecifier creation and Xmlization test
*/
-class PearSpecifier_implTest {
+public class PearSpecifier_implTest {
+ /*
+ * pearSpecifier creation test
+ */
@Test
- void thatSerializationWorks() throws Exception {
-
- var original = makePearSpecifier();
+ public void testProducePearResource() throws Exception {
+ PearSpecifier specifier = UIMAFramework.getResourceSpecifierFactory().createPearSpecifier();
+ specifier.setPearPath("/home/user/uimaApp/installedPears/testpear");
+ specifier.setParameters(new Parameter_impl("legacyParam1", "legacyVal1"),
+ new Parameter_impl("legacyParam2", "legacyVal2"));
+ specifier.setPearParameters(new NameValuePair_impl("param1", "stringVal1"),
+ new NameValuePair_impl("param2", true));
- var copy = UIMAFramework.getXMLParser().parsePearSpecifier(
- new XMLInputSource(getClass().getResource("/XmlParserTest/TestPearSpecifier.xml")));
+ // compare created specifier with available test specifier
+ XMLInputSource in = new XMLInputSource(
+ JUnitExtension.getFile("XmlParserTest/TestPearSpecifier.xml"));
+ PearSpecifier pearSpec = UIMAFramework.getXMLParser().parsePearSpecifier(in);
- assertThat(original.getPearPath()).isEqualTo(copy.getPearPath());
+ assertThat(specifier.getPearPath()).isEqualTo(pearSpec.getPearPath());
- assertThat(original.getParameters()) //
- .usingRecursiveFieldByFieldElementComparatorOnFields("name", "value")
- .containsExactly(copy.getParameters());
+ assertThat(specifier.getParameters()).usingElementComparatorOnFields("name", "value")
+ .containsExactly(pearSpec.getParameters());
- assertThat(original.getPearParameters()) //
- .usingRecursiveFieldByFieldElementComparatorOnFields("name", "value")
- .containsExactly(copy.getPearParameters());
- }
+ assertThat(specifier.getPearParameters()).usingElementComparatorOnFields("name", "value")
+ .containsExactly(pearSpec.getPearParameters());
- @Test
- void thatComparisonAgainstManuallyCreatedSpecifierWorks() throws Exception {
- var spec1 = makePearSpecifier();
- var spec2 = makePearSpecifier();
+ // compare created specifier with a manually create pear specifier
+ PearSpecifier manPearSpec = new PearSpecifier_impl();
+ manPearSpec.setPearPath("/home/user/uimaApp/installedPears/testpear");
+ manPearSpec.setParameters(new Parameter_impl("legacyParam1", "legacyVal1"),
+ new Parameter_impl("legacyParam2", "legacyVal2"));
+ manPearSpec.setPearParameters(new NameValuePair_impl("param1", "stringVal1"),
+ new NameValuePair_impl("param2", true));
- assertThat(spec2.getParameters())
- .usingRecursiveFieldByFieldElementComparatorOnFields("name", "value")
- .containsExactly(spec1.getParameters());
+ assertThat(specifier.getParameters()).usingElementComparatorOnFields("name", "value")
+ .containsExactly(manPearSpec.getParameters());
- assertThat(spec2.getPearParameters())
- .usingRecursiveFieldByFieldElementComparatorOnFields("name", "value")
- .containsExactly(spec1.getPearParameters());
+ assertThat(specifier.getPearParameters()).usingElementComparatorOnFields("name", "value")
+ .containsExactly(manPearSpec.getPearParameters());
}
+ /*
+ * pearSpecifier xmlization test
+ */
@Test
- void testXmlization() throws Exception {
- var spec = new PearSpecifier_impl();
- spec.setPearPath("/home/user/uimaApp/installedPears/testpear");
- spec.setPearParameters( //
- new NameValuePair_impl("param1", "val1"), //
- new NameValuePair_impl("param2", "val2"));
-
- var sw = new StringWriter();
- spec.toXML(sw);
-
- try (var is = new ByteArrayInputStream(sw.toString().getBytes(UTF_8))) {
- var copy = (PearSpecifier) UIMAFramework.getXMLParser().parse(new XMLInputSource(is));
- assertEquals(spec, copy);
+ public void testXmlization() throws Exception {
+ try {
+ PearSpecifier pearSpec = new PearSpecifier_impl();
+ pearSpec.setPearPath("/home/user/uimaApp/installedPears/testpear");
+ pearSpec.setParameters(new Parameter_impl("param1", "val1"),
+ new Parameter_impl("param2", "val2"));
+ pearSpec.setPearParameters(new NameValuePair[] { new NameValuePair_impl("param1", "val1"),
+ new NameValuePair_impl("param2", "val2") });
+
+ StringWriter sw = new StringWriter();
+ pearSpec.toXML(sw);
+ PearSpecifier pearSpec2 = (PearSpecifier) UIMAFramework.getXMLParser()
+ .parse(new XMLInputSource(
+ new ByteArrayInputStream(sw.getBuffer().toString().getBytes(encoding)),
+ null));
+ assertEquals(pearSpec, pearSpec2);
+ } catch (Exception e) {
+ JUnitExtension.handleException(e);
}
}
- PearSpecifier makePearSpecifier() {
- var spec = UIMAFramework.getResourceSpecifierFactory().createPearSpecifier();
- spec.setPearPath("/home/user/uimaApp/installedPears/testpear");
- spec.setParameters( //
- new Parameter_impl("legacyParam1", "legacyVal1"), //
- new Parameter_impl("legacyParam2", "legacyVal2"));
- spec.setPearParameters( //
- new NameValuePair_impl("param1", "stringVal1"), //
- new NameValuePair_impl("param2", true));
- return spec;
- }
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/resource/impl/URISpecifier_implTest.java b/uimaj-core/src/test/java/org/apache/uima/resource/impl/URISpecifier_implTest.java
index b6dc7851e..ac828b41d 100644
--- a/uimaj-core/src/test/java/org/apache/uima/resource/impl/URISpecifier_implTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/resource/impl/URISpecifier_implTest.java
@@ -19,7 +19,7 @@
package org.apache.uima.resource.impl;
-import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.apache.uima.analysis_engine.impl.AnalysisEngineDescription_implTest.encoding;
import static org.junit.Assert.assertEquals;
import java.io.ByteArrayInputStream;
@@ -28,32 +28,33 @@ import java.io.StringWriter;
import org.apache.uima.UIMAFramework;
import org.apache.uima.resource.Parameter;
import org.apache.uima.resource.URISpecifier;
+import org.apache.uima.test.junit_extension.JUnitExtension;
import org.apache.uima.util.XMLInputSource;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-class URISpecifier_implTest {
- URISpecifier_impl sut;
+public class URISpecifier_implTest {
+ URISpecifier_impl uriSpec;
@BeforeEach
- void setUp() throws Exception {
- sut = new URISpecifier_impl();
- sut.setProtocol("Vinci");
- sut.setUri("foo.bar");
- sut.setParameters(new Parameter[] { //
- new Parameter_impl("VNS_HOST", "myhost"), //
+ public void setUp() throws Exception {
+ uriSpec = new URISpecifier_impl();
+ uriSpec.setProtocol("Vinci");
+ uriSpec.setUri("foo.bar");
+ uriSpec.setParameters(new Parameter[] { new Parameter_impl("VNS_HOST", "myhost"),
new Parameter_impl("VNS_PORT", "42") });
}
@Test
- void testXmlization() throws Exception {
- StringWriter sw = new StringWriter();
- sut.toXML(sw);
-
- try (var is = new ByteArrayInputStream(sw.toString().getBytes(UTF_8))) {
- URISpecifier uriSpec2 = (URISpecifier) UIMAFramework.getXMLParser()
- .parse(new XMLInputSource(is));
- assertEquals(sut, uriSpec2);
+ public void testXmlization() throws Exception {
+ try {
+ StringWriter sw = new StringWriter();
+ uriSpec.toXML(sw);
+ URISpecifier uriSpec2 = (URISpecifier) UIMAFramework.getXMLParser().parse(new XMLInputSource(
+ new ByteArrayInputStream(sw.getBuffer().toString().getBytes(encoding)), null));
+ assertEquals(uriSpec, uriSpec2);
+ } catch (Exception e) {
+ JUnitExtension.handleException(e);
}
}
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/Import_implTest.java b/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/Import_implTest.java
index 21c19c66e..9521afdb4 100644
--- a/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/Import_implTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/Import_implTest.java
@@ -19,132 +19,140 @@
package org.apache.uima.resource.metadata.impl;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.uima.UIMAFramework.getXMLParser;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.apache.uima.analysis_engine.impl.AnalysisEngineDescription_implTest.encoding;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import java.io.ByteArrayInputStream;
import java.io.File;
+import java.net.URL;
+import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.uima.UIMAFramework;
import org.apache.uima.analysis_engine.impl.AnalysisEngineDescription_impl;
-import org.apache.uima.resource.metadata.TypeDescription;
+import org.apache.uima.resource.ResourceManager;
import org.apache.uima.test.junit_extension.JUnitExtension;
import org.apache.uima.util.InvalidXMLException;
import org.apache.uima.util.XMLInputSource;
import org.junit.jupiter.api.Test;
+import org.w3c.dom.Document;
public class Import_implTest {
@Test
public void testBuildFromXmlElement() throws Exception {
- var docBuilderFactory = DocumentBuilderFactory.newInstance();
- var docBuilder = docBuilderFactory.newDocumentBuilder();
-
- // name import
- var importXml = "<import name=\"this.is.a.test\"/>";
- var importDoc = docBuilder.parse(new ByteArrayInputStream(importXml.getBytes(UTF_8)));
- var importObj = new Import_impl();
- importObj.buildFromXMLElement(importDoc.getDocumentElement(), null);
- assertEquals("this.is.a.test", importObj.getName());
- assertNull(importObj.getLocation());
-
- // location import
- importXml = "<import location=\"foo/bar/MyFile.xml\"/>";
- importDoc = docBuilder.parse(new ByteArrayInputStream(importXml.getBytes(UTF_8)));
- importObj = new Import_impl();
- importObj.buildFromXMLElement(importDoc.getDocumentElement(), null);
- assertEquals("foo/bar/MyFile.xml", importObj.getLocation());
- assertNull(importObj.getName());
-
- // invalid - both location and name
- importXml = "<import name=\"this.is.a.test\" location=\"foo/bar/MyFile.xml\"/>";
- importDoc = docBuilder.parse(new ByteArrayInputStream(importXml.getBytes(UTF_8)));
- importObj = new Import_impl();
- InvalidXMLException ex = null;
try {
+ DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
+ DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
+
+ // name import
+ String importXml = "<import name=\"this.is.a.test\"/>";
+ Document importDoc = docBuilder.parse(new ByteArrayInputStream(importXml.getBytes(encoding)));
+ Import_impl importObj = new Import_impl();
importObj.buildFromXMLElement(importDoc.getDocumentElement(), null);
- } catch (InvalidXMLException e) {
- ex = e;
- }
- assertNotNull(ex);
+ assertEquals("this.is.a.test", importObj.getName());
+ assertNull(importObj.getLocation());
- // invalid - empty import
- importXml = "<import/>";
- importDoc = docBuilder.parse(new ByteArrayInputStream(importXml.getBytes(UTF_8)));
- importObj = new Import_impl();
- ex = null;
- try {
+ // location import
+ importXml = "<import location=\"foo/bar/MyFile.xml\"/>";
+ importDoc = docBuilder.parse(new ByteArrayInputStream(importXml.getBytes(encoding)));
+ importObj = new Import_impl();
importObj.buildFromXMLElement(importDoc.getDocumentElement(), null);
- } catch (InvalidXMLException e) {
- ex = e;
+ assertEquals("foo/bar/MyFile.xml", importObj.getLocation());
+ assertNull(importObj.getName());
+
+ // invalid - both location and name
+ importXml = "<import name=\"this.is.a.test\" location=\"foo/bar/MyFile.xml\"/>";
+ importDoc = docBuilder.parse(new ByteArrayInputStream(importXml.getBytes(encoding)));
+ importObj = new Import_impl();
+ InvalidXMLException ex = null;
+ try {
+ importObj.buildFromXMLElement(importDoc.getDocumentElement(), null);
+ } catch (InvalidXMLException e) {
+ ex = e;
+ }
+ assertNotNull(ex);
+
+ // invalid - empty import
+ importXml = "<import/>";
+ importDoc = docBuilder.parse(new ByteArrayInputStream(importXml.getBytes(encoding)));
+ importObj = new Import_impl();
+ ex = null;
+ try {
+ importObj.buildFromXMLElement(importDoc.getDocumentElement(), null);
+ } catch (InvalidXMLException e) {
+ ex = e;
+ }
+ assertNotNull(ex);
+ assertNotNull(ex.getMessage());
+
+ } catch (Exception e) {
+ JUnitExtension.handleException(e);
}
- assertNotNull(ex);
- assertNotNull(ex.getMessage());
- }
-
- @Test
- void testFindAbsoluteUrl() throws Exception {
- var importObj = new Import_impl();
- importObj.setLocation("foo/bar/MyFile.xml");
-
- var absUrl = importObj.findAbsoluteUrl(UIMAFramework.newDefaultResourceManager());
- var expectedUrl = new File(System.getProperty("user.dir"), "foo/bar/MyFile.xml")
- .getAbsoluteFile().toURL();
-
- assertEquals(expectedUrl, absUrl);
}
@Test
- void testImportByName() throws Exception {
- var importObj = new Import_impl();
- importObj.setName("TypeSystemDescriptionImplTest.TestTypeSystem");
-
- var workingDir = JUnitExtension.getFile("TypeSystemDescriptionImplTest").getParentFile()
- .getAbsolutePath();
-
- var resMgr = UIMAFramework.newDefaultResourceManager();
- resMgr.setDataPathElements(workingDir);
-
- var absUrl = importObj.findAbsoluteUrl(resMgr);
- var expectedUrl = new File(workingDir, "TypeSystemDescriptionImplTest/TestTypeSystem.xml")
- .toURL();
-
- assertEquals(expectedUrl, absUrl);
+ public void testFindAbsoluteUrl() throws Exception {
+ try {
+ // location import
+ Import_impl importObj = new Import_impl();
+ importObj.setLocation("foo/bar/MyFile.xml");
+ URL absUrl = importObj.findAbsoluteUrl(UIMAFramework.newDefaultResourceManager());
+ URL expectedUrl = new File(System.getProperty("user.dir"), "foo/bar/MyFile.xml")
+ .getAbsoluteFile().toURL();
+ assertEquals(expectedUrl, absUrl);
+
+ // name import
+ importObj = new Import_impl();
+ importObj.setName("TypeSystemDescriptionImplTest.TestTypeSystem");
+ String workingDir = JUnitExtension.getFile("TypeSystemDescriptionImplTest").getParentFile()
+ .getAbsolutePath();
+ ResourceManager resMgr = UIMAFramework.newDefaultResourceManager();
+ resMgr.setDataPath(workingDir);
+ absUrl = importObj.findAbsoluteUrl(resMgr);
+ expectedUrl = new File(workingDir, "TypeSystemDescriptionImplTest/TestTypeSystem.xml")
+ .toURL();
+ assertEquals(expectedUrl, absUrl);
+
+ // name not found
+ importObj = new Import_impl();
+ importObj.setName("this.should.not.be.found.at.least.i.hope.not");
+ InvalidXMLException ex = null;
+ try {
+ importObj.findAbsoluteUrl(UIMAFramework.newDefaultResourceManager());
+ } catch (InvalidXMLException e) {
+ ex = e;
+ }
+ assertNotNull(ex);
+ assertNotNull(ex.getMessage());
+ } catch (Exception e) {
+ JUnitExtension.handleException(e);
+ }
}
@Test
- void testImportByNameFailed() throws Exception {
- var importObj = new Import_impl();
- importObj.setName("this.should.not.be.found.at.least.i.hope.not");
-
- assertThatExceptionOfType(InvalidXMLException.class).isThrownBy(() -> {
- importObj.findAbsoluteUrl(UIMAFramework.newDefaultResourceManager());
- });
+ public void testNestedImports() throws Exception {
+ try {
+ File baseDescriptorFile = JUnitExtension
+ .getFile("ImportImplTest/subdir/subdir2/AggregateTaeForNestedImportTest.xml");
+ File importedFile = JUnitExtension
+ .getFile("ImportImplTest/subdir/PrimitiveTaeForNestedImportTest.xml");
+ AnalysisEngineDescription_impl agg = (AnalysisEngineDescription_impl) UIMAFramework
+ .getXMLParser()
+ .parseAnalysisEngineDescription(new XMLInputSource(baseDescriptorFile));
+ assertEquals(baseDescriptorFile.toURL(), agg.getSourceUrl());
+
+ AnalysisEngineDescription_impl prim = (AnalysisEngineDescription_impl) agg
+ .getDelegateAnalysisEngineSpecifiers().get("Annotator1");
+ assertEquals(importedFile.toURL(), prim.getSourceUrl());
+
+ prim.getAnalysisEngineMetaData().getTypeSystem().resolveImports();
+ assertEquals(1, prim.getAnalysisEngineMetaData().getTypeSystem().getTypes().length);
+ } catch (Exception e) {
+ JUnitExtension.handleException(e);
+ }
}
- @Test
- void testNestedImports() throws Exception {
- var baseDescriptorFile = getClass()
- .getResource("/ImportImplTest/subdir/subdir2/AggregateTaeForNestedImportTest.xml");
- var agg = (AnalysisEngineDescription_impl) getXMLParser()
- .parseAnalysisEngineDescription(new XMLInputSource(baseDescriptorFile));
- assertThat(agg.getSourceUrl()).isEqualTo(baseDescriptorFile);
-
- var importedFile = getClass()
- .getResource("/ImportImplTest/subdir/PrimitiveTaeForNestedImportTest.xml");
- var prim = (AnalysisEngineDescription_impl) agg.getDelegateAnalysisEngineSpecifiers()
- .get("Annotator1");
- assertThat(prim.getSourceUrl()).isEqualTo(importedFile);
-
- prim.getAnalysisEngineMetaData().getTypeSystem().resolveImports();
- assertThat(prim.getAnalysisEngineMetaData().getTypeSystem().getTypes())
- .extracting(TypeDescription::getName) //
- .containsExactly("TestType4");
- }
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java b/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java
index cfd4b7e1a..2e7f2d2a1 100644
--- a/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java
@@ -21,6 +21,8 @@ package org.apache.uima.resource.metadata.impl;
import static java.lang.Boolean.FALSE;
import static java.lang.Boolean.TRUE;
import static org.apache.uima.UIMAFramework.getResourceSpecifierFactory;
+import static org.apache.uima.internal.util.SerializationUtils.deserialize;
+import static org.apache.uima.internal.util.SerializationUtils.serialize;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.ByteArrayInputStream;
@@ -32,13 +34,14 @@ import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.uima.UIMAFramework;
+import org.apache.uima.resource.metadata.ConfigurationParameterSettings;
import org.apache.uima.resource.metadata.MetaDataObject;
import org.apache.uima.resource.metadata.NameValuePair;
import org.apache.uima.util.XMLParser;
import org.apache.uima.util.XMLizable;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.SAXException;
@@ -46,26 +49,14 @@ import org.xml.sax.SAXException;
* Tests the MetaDataObject_impl class.
*/
public class MetaDataObject_implTest {
- private static DocumentBuilderFactory docBuilderFactory;
- private static DocumentBuilder docBuilder;
- private static XMLParser xmlp;
-
private TestFruitObject unknownFruit;
private TestFruitObject apple1;
private TestFruitObject apple2;
private TestFruitObject orange;
private TestFruitBagObject fruitBag;
- @BeforeAll
- static void setupClass() throws Exception {
- docBuilderFactory = DocumentBuilderFactory.newInstance();
- docBuilder = docBuilderFactory.newDocumentBuilder();
- xmlp = UIMAFramework.getXMLParser();
- xmlp.addMapping("fruit", TestFruitObject.class.getName());
- }
-
@BeforeEach
- void setUp() {
+ public void setUp() {
// create an object that can represent a fruit
unknownFruit = new TestFruitObject();
@@ -121,7 +112,7 @@ public class MetaDataObject_implTest {
* Test the getAttributes method
*/
@Test
- void testGetAttributes() throws Exception {
+ public void testGetAttributes() throws Exception {
assertThat(apple1.getAttributes()).containsAll(TestFruitObject.getMetaDataAttrSet());
assertThat(orange.getAttributes()).containsAll(TestFruitObject.getMetaDataAttrSet());
assertThat(fruitBag.getAttributes()).containsAll(TestFruitBagObject.getMetaDataAttrSet());
@@ -131,7 +122,7 @@ public class MetaDataObject_implTest {
* Tests the {@link MetaDataObject#equals(Object)} method.
*/
@Test
- void testEquals() throws Exception {
+ public void testEquals() throws Exception {
assertThat(unknownFruit).isEqualTo(unknownFruit);
assertThat(apple1).isEqualTo(apple2);
assertThat(apple2).isEqualTo(apple1);
@@ -144,13 +135,15 @@ public class MetaDataObject_implTest {
assertThat(apple1).isNotEqualTo(orange.clone());
// test with maps
- var cps1 = getResourceSpecifierFactory().createConfigurationParameterSettings();
+ ConfigurationParameterSettings cps1 = getResourceSpecifierFactory()
+ .createConfigurationParameterSettings();
cps1.getSettingsForGroups().put("k1",
new NameValuePair[] { new NameValuePair_impl("s1", "o1") });
cps1.getSettingsForGroups().put("k2",
new NameValuePair[] { new NameValuePair_impl("s2", "o2") });
- var cps2 = getResourceSpecifierFactory().createConfigurationParameterSettings();
+ ConfigurationParameterSettings cps2 = getResourceSpecifierFactory()
+ .createConfigurationParameterSettings();
cps2.getSettingsForGroups().put("k1",
new NameValuePair[] { new NameValuePair_impl("s1", "o1") });
cps2.getSettingsForGroups().put("k2",
@@ -169,7 +162,7 @@ public class MetaDataObject_implTest {
* Tests the {@link MetaDataObject#toString()} method.
*/
@Test
- void testToString() throws Exception {
+ public void testToString() throws Exception {
String apple1Str = apple1.toString();
String apple2Str = apple2.toString();
String orangeStr = orange.toString();
@@ -185,90 +178,97 @@ public class MetaDataObject_implTest {
* {@link MetaDataObject#setAttributeValue(String,Object)} methods.
*/
@Test
- void testXMLization() throws Exception {
+ public void testXMLization() throws Exception {
// write objects to XML
- var apple1xml = toXmlString(apple1);
- var apple2xml = toXmlString(apple2);
- var orangeXml = toXmlString(orange);
- var fruitBagXml = toXmlString(fruitBag);
+ String apple1xml = toXmlString(apple1);
+ String apple2xml = toXmlString(apple2);
+ String orangeXml = toXmlString(orange);
+ String fruitBagXml = toXmlString(fruitBag);
// identical objects should have identical XML
assertThat(apple1xml).isEqualTo(apple2xml);
// parse the XML
- var apple1xmlDoc = docBuilder.parse(new ByteArrayInputStream(apple1xml.getBytes()));
- var apple2xmlDoc = docBuilder.parse(new ByteArrayInputStream(apple2xml.getBytes()));
- var orangeXmlDoc = docBuilder.parse(new ByteArrayInputStream(orangeXml.getBytes()));
- var fruitBagXmlDoc = docBuilder.parse(new ByteArrayInputStream(fruitBagXml.getBytes()));
+ DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
+ DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
+
+ Document apple1xmlDoc = docBuilder.parse(new ByteArrayInputStream(apple1xml.getBytes()));
+ Document apple2xmlDoc = docBuilder.parse(new ByteArrayInputStream(apple2xml.getBytes()));
+ Document orangeXmlDoc = docBuilder.parse(new ByteArrayInputStream(orangeXml.getBytes()));
+ Document fruitBagXmlDoc = docBuilder.parse(new ByteArrayInputStream(fruitBagXml.getBytes()));
// construct new objects from the XML
- var newApple1 = (MetaDataObject_impl) unknownFruit.clone();
+ XMLParser xmlp = UIMAFramework.getXMLParser();
+ MetaDataObject_impl newApple1 = (MetaDataObject_impl) unknownFruit.clone();
newApple1.buildFromXMLElement(apple1xmlDoc.getDocumentElement(), xmlp);
- var newApple2 = (MetaDataObject_impl) unknownFruit.clone();
+ MetaDataObject_impl newApple2 = (MetaDataObject_impl) unknownFruit.clone();
newApple2.buildFromXMLElement(apple2xmlDoc.getDocumentElement(), xmlp);
- var newOrange = (MetaDataObject_impl) unknownFruit.clone();
+ MetaDataObject_impl newOrange = (MetaDataObject_impl) unknownFruit.clone();
newOrange.buildFromXMLElement(orangeXmlDoc.getDocumentElement(), xmlp);
- var newFruitBag = new TestFruitBagObject();
+ xmlp.addMapping("fruit", TestFruitObject.class.getName());
+
+ MetaDataObject_impl newFruitBag = new TestFruitBagObject();
newFruitBag.buildFromXMLElement(fruitBagXmlDoc.getDocumentElement(), xmlp);
// new objects should be equal to the originals
assertThat(newApple1).isEqualTo(apple1);
assertThat(newApple2).isEqualTo(apple2);
assertThat(newOrange).isEqualTo(orange);
- assertThat(newFruitBag).isEqualTo(fruitBag);
- }
+ assertThat(fruitBag.equals(newFruitBag)).isTrue();
- @Test
- void testInferredPropertyName() throws Exception {
- // property name omitted but can be inferred from type of value
- var xmlStr = "<fruit><name>banana</name><string>yellow</string></fruit>";
- var xmlDoc = docBuilder.parse(new ByteArrayInputStream(xmlStr.getBytes()));
+ // test special cases
- var banana = new TestFruitObject();
- banana.buildFromXMLElement(xmlDoc.getDocumentElement(), xmlp);
+ // single-property object where property name is omitted from XML
+ String xmlStr = "<fruitBag><fruit><name>banana</name><color>yellow</color></fruit>"
+ + "<fruit><name>raspberry</name><color>red</color></fruit></fruitBag>";
+ Document xmlDoc = docBuilder.parse(new ByteArrayInputStream(xmlStr.getBytes()));
+ TestFruitBagObject bag = new TestFruitBagObject();
+ bag.buildFromXMLElement(xmlDoc.getDocumentElement(), xmlp);
+ TestFruitObject[] fruits = bag.getFruits();
+ assertThat(fruits.length).isEqualTo(2);
+ assertThat(fruits[0].getName()).isEqualTo("banana");
+ assertThat(fruits[1].getName()).isEqualTo("raspberry");
+ // property name omitted but can be inferred from type of value
+ xmlStr = "<fruit><name>banana</name><string>yellow</string></fruit>";
+ xmlDoc = docBuilder.parse(new ByteArrayInputStream(xmlStr.getBytes()));
+ TestFruitObject banana = new TestFruitObject();
+ banana.buildFromXMLElement(xmlDoc.getDocumentElement(), xmlp);
assertThat(banana.getColor()).isEqualTo("yellow");
assertThat(banana.getName()).isEqualTo("banana");
- }
- @Test
- void testEnvVarReference() throws Exception {
// env var reference
- var xmlStr = """
- <fruit>
- <name>raspberry</name>
- <string><envVarRef>test.raspberry.color</envVarRef></string>
- </fruit>
- """;
+ xmlStr = "<fruit><name>raspberry</name><string><envVarRef>test.raspberry.color</envVarRef></string></fruit>";
System.setProperty("test.raspberry.color", "red");
- var xmlDoc = docBuilder.parse(new ByteArrayInputStream(xmlStr.getBytes()));
-
- var raspberry = new TestFruitObject();
+ xmlDoc = docBuilder.parse(new ByteArrayInputStream(xmlStr.getBytes()));
+ TestFruitObject raspberry = new TestFruitObject();
raspberry.buildFromXMLElement(xmlDoc.getDocumentElement(), xmlp);
-
assertThat(raspberry.getColor()).isEqualTo("red");
assertThat(raspberry.getName()).isEqualTo("raspberry");
}
@Test
- void testSinglePropertyObjectWithNameOmitted() throws Exception {
- // single-property object where property name is omitted from XML
- var xmlStr = "<fruitBag><fruit><name>banana</name><color>yellow</color></fruit>"
- + "<fruit><name>raspberry</name><color>red</color></fruit></fruitBag>";
- var xmlDoc = docBuilder.parse(new ByteArrayInputStream(xmlStr.getBytes()));
+ public void testSerialization() throws Exception {
+ assertThat(deserialize(serialize(apple1))).isInstanceOf(TestFruitObject.class)
+ .isEqualTo(apple1);
- var bag = new TestFruitBagObject();
- bag.buildFromXMLElement(xmlDoc.getDocumentElement(), xmlp);
+ assertThat(deserialize(serialize(apple2))).isInstanceOf(TestFruitObject.class)
+ .isEqualTo(apple2);
+
+ byte[] orangeBytes = serialize(orange);
+ assertThat(deserialize(orangeBytes)).isInstanceOf(TestFruitObject.class).isEqualTo(orange);
+
+ // make sure XMLization still works
+ String orange1xml = toXmlString(orange);
+ String orange2xml = toXmlString((TestFruitObject) deserialize(orangeBytes));
- assertThat(bag.getFruits()) //
- .extracting(TestFruitObject::getName) //
- .containsExactly("banana", "raspberry");
+ assertThat(orange1xml).isEqualTo(orange2xml);
}
private String toXmlString(XMLizable aObject) throws IOException, SAXException {
- var writer = new StringWriter();
+ StringWriter writer = new StringWriter();
aObject.toXML(writer);
- return writer.toString();
+ return writer.getBuffer().toString();
}
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/util/CasIOUtilsTest.java b/uimaj-core/src/test/java/org/apache/uima/util/CasIOUtilsTest.java
index 3897234fe..d08695ce2 100644
--- a/uimaj-core/src/test/java/org/apache/uima/util/CasIOUtilsTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/util/CasIOUtilsTest.java
@@ -19,13 +19,8 @@
package org.apache.uima.util;
import static java.util.Arrays.asList;
-import static org.apache.uima.UIMAFramework.getXMLParser;
import static org.apache.uima.cas.SerialFormat.COMPRESSED_FILTERED_TSI;
-import static org.apache.uima.util.CasCreationUtils.createCas;
-import static org.apache.uima.util.CasLoadMode.DEFAULT;
-import static org.apache.uima.util.CasLoadMode.LENIENT;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.fail;
import java.io.ByteArrayInputStream;
@@ -33,7 +28,7 @@ import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
-import java.io.IOException;
+import java.io.ObjectOutput;
import java.io.ObjectOutputStream;
import java.util.ArrayList;
import java.util.Collection;
@@ -41,6 +36,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
+import java.util.Set;
import org.apache.uima.UIMAFramework;
import org.apache.uima.cas.CAS;
@@ -49,14 +45,15 @@ import org.apache.uima.cas.FeatureStructure;
import org.apache.uima.cas.SerialFormat;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.jcas.cas.TOP;
+import org.apache.uima.jcas.tcas.Annotation;
+import org.apache.uima.resource.metadata.FsIndexDescription;
+import org.apache.uima.resource.metadata.TypeDescription;
+import org.apache.uima.resource.metadata.TypeSystemDescription;
import org.apache.uima.resource.metadata.impl.TypePriorities_impl;
import org.apache.uima.test.junit_extension.JUnitExtension;
-import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
public class CasIOUtilsTest {
@@ -69,151 +66,158 @@ public class CasIOUtilsTest {
private CAS cas2;
@BeforeEach
- void setUp() throws Exception {
+ public void setUp() throws Exception {
+ File indexesFile = JUnitExtension.getFile("ExampleCas/testIndexes.xml");
+ FsIndexDescription[] indexes = UIMAFramework.getXMLParser()
+ .parseFsIndexCollection(new XMLInputSource(indexesFile)).getFsIndexes();
- var indexes = getXMLParser()
- .parseFsIndexCollection(
- new XMLInputSource(getClass().getResource("/ExampleCas/testIndexes.xml")))
- .getFsIndexes();
+ File typeSystemFile = JUnitExtension.getFile("ExampleCas/testTypeSystem.xml");
+ TypeSystemDescription typeSystem = UIMAFramework.getXMLParser()
+ .parseTypeSystemDescription(new XMLInputSource(typeSystemFile));
- var typeSystem = getXMLParser().parseTypeSystemDescription(
- new XMLInputSource(getClass().getResource("/ExampleCas/testTypeSystem.xml")));
-
- cas = createCas(typeSystem, new TypePriorities_impl(), indexes);
+ cas = CasCreationUtils.createCas(typeSystem, new TypePriorities_impl(), indexes);
try (FileInputStream casInputStream = new FileInputStream(
JUnitExtension.getFile("ExampleCas/simpleCas.xmi"))) {
CasIOUtils.load(casInputStream, cas);
}
- var typeSystem2 = getXMLParser().parseTypeSystemDescription(
- new XMLInputSource(getClass().getResource("/ExampleCas/testTypeSystem_variation.xml")));
- cas2 = createCas(typeSystem2, new TypePriorities_impl(), indexes);
- }
-
- @AfterEach
- public void tearDown() throws Exception {
- cas.release();
+ File typeSystemFile2 = JUnitExtension.getFile("ExampleCas/testTypeSystem_variation.xml");
+ TypeSystemDescription typeSystem2 = UIMAFramework.getXMLParser()
+ .parseTypeSystemDescription(new XMLInputSource(typeSystemFile2));
+ cas2 = CasCreationUtils.createCas(typeSystem2, new TypePriorities_impl(), indexes);
}
@Test
- void testXMI() throws Exception {
+ public void testXMI() throws Exception {
testXMI(false);
}
@Test
- void testXMILenient() throws Exception {
+ public void testXMILenient() throws Exception {
testXMI(true);
}
- void testXMI(boolean leniently) throws Exception {
- var casFile = new File("target/temp-test-output/simpleCas.xmi");
+ public void testXMI(boolean leniently) throws Exception {
+ File casFile = new File("target/temp-test-output/simpleCas.xmi");
casFile.getParentFile().mkdirs();
- try (var docOS = new FileOutputStream(casFile)) {
- CasIOUtils.save(cas, docOS, SerialFormat.XMI);
- }
+ FileOutputStream docOS = new FileOutputStream(casFile);
+ CasIOUtils.save(cas, docOS, SerialFormat.XMI);
+ docOS.close();
// NOTE - when Saxon saves the cas it omits the prefixes.
// e.g. produces: <NULL id="0"/> instead of: <cas:NULL xmi:id="0"/>
// This causes JUnit test failure "unknown type NULL"
// Use a CAS initialized with the "correct" type system or with a different type system?
- var casToUse = leniently ? cas2 : cas;
+ CAS casToUse = leniently ? cas2 : cas;
casToUse.reset();
- try (var is = new FileInputStream(casFile)) {
- CasIOUtils.load(is, null, casToUse, leniently ? LENIENT : DEFAULT);
+ try (FileInputStream casInputStream = new FileInputStream(casFile)) {
+ CasIOUtils.load(casInputStream, null, casToUse,
+ leniently ? CasLoadMode.LENIENT : CasLoadMode.DEFAULT);
}
assertCorrectlyLoaded(casToUse, leniently);
casToUse.reset();
- CasIOUtils.load(casFile.toURI().toURL(), null, casToUse, leniently ? LENIENT : DEFAULT);
+ CasIOUtils.load(casFile.toURI().toURL(), null, casToUse,
+ leniently ? CasLoadMode.LENIENT : CasLoadMode.DEFAULT);
assertCorrectlyLoaded(casToUse, leniently);
}
- @ValueSource(booleans = { true, false })
- @ParameterizedTest
- void testXCAS(boolean leniently) throws Exception {
- var casFile = new File("target/temp-test-output/simpleCas.xcas");
+ @Test
+ public void testXCAS() throws Exception {
+ testXCAS(false);
+ }
+
+ @Test
+ public void testXCASLenient() throws Exception {
+ testXCAS(true);
+ }
+
+ public void testXCAS(boolean leniently) throws Exception {
+ File casFile = new File("target/temp-test-output/simpleCas.xcas");
casFile.getParentFile().mkdirs();
- try (var os = new FileOutputStream(casFile)) {
- CasIOUtils.save(cas, os, SerialFormat.XCAS);
+ try (FileOutputStream docOS = new FileOutputStream(casFile)) {
+ CasIOUtils.save(cas, docOS, SerialFormat.XCAS);
}
// Use a CAS initialized with the "correct" type system or with a different type system?
- var casToUse = leniently ? cas2 : cas;
+ CAS casToUse = leniently ? cas2 : cas;
casToUse.reset();
- CasIOUtils.load(casFile.toURI().toURL(), null, casToUse, leniently ? LENIENT : DEFAULT);
+ CasIOUtils.load(casFile.toURI().toURL(), null, casToUse,
+ leniently ? CasLoadMode.LENIENT : CasLoadMode.DEFAULT);
assertCorrectlyLoaded(casToUse, leniently);
}
@Test
- void testS() throws Exception {
+ public void testS() throws Exception {
testFormat(SerialFormat.SERIALIZED, "bins", false);
}
@Test
- void testSp() throws Exception {
+ public void testSp() throws Exception {
testFormat(SerialFormat.SERIALIZED_TSI, "binsp", false);
}
@Test
- void testS6p() throws Exception {
+ public void testS6p() throws Exception {
testFormat(SerialFormat.COMPRESSED_FILTERED_TSI, "bins6p", false);
}
@Test
- void testS6pTs() throws Exception {
+ public void testS6pTs() throws Exception {
testFormat(SerialFormat.COMPRESSED_FILTERED_TS, "bins6pTs", false);
}
@Test
- void testS6pLenient() throws Exception {
+ public void testS6pLenient() throws Exception {
testFormat(SerialFormat.COMPRESSED_FILTERED_TSI, "bins6", true);
}
@Test
- void testS0() throws Exception {
+ public void testS0() throws Exception {
testFormat(SerialFormat.BINARY, "bins0", false);
}
@Test
- void testS0tsi() throws Exception {
+ public void testS0tsi() throws Exception {
testFormat(SerialFormat.BINARY_TSI, "bins0", false);
}
@Test
- void testS4() throws Exception {
+ public void testS4() throws Exception {
testFormat(SerialFormat.COMPRESSED, "bins4", false);
}
@Test
- void testS4tsi() throws Exception {
+ public void testS4tsi() throws Exception {
testFormat(SerialFormat.COMPRESSED_TSI, "bins4", false);
}
@Test
- void testS6() throws Exception {
+ public void testS6() throws Exception {
testFormat(SerialFormat.COMPRESSED_FILTERED, "bins6", false);
}
private void testFormat(SerialFormat format, String fileEnding, boolean leniently)
throws Exception {
- var casFile = new File("target/temp-test-output/simpleCas." + fileEnding);
+ File casFile = new File("target/temp-test-output/simpleCas." + fileEnding);
casFile.getParentFile().mkdirs();
- try (var os = new FileOutputStream(casFile)) {
- CasIOUtils.save(cas, os, format);
- }
+ FileOutputStream docOS = new FileOutputStream(casFile);
+ CasIOUtils.save(cas, docOS, format);
+ docOS.close();
// Use a CAS initialized with the "correct" type system or with a different type system?
CAS casToUse = leniently ? cas2 : cas;
casToUse.reset();
- try (var is = new FileInputStream(casFile)) {
- var loadedFormat = CasIOUtils.load(is, null, casToUse, leniently ? LENIENT : DEFAULT);
- assertThat(loadedFormat).isEqualTo(format);
- assertCorrectlyLoaded(casToUse, leniently);
- }
+ FileInputStream casInputStream = new FileInputStream(casFile);
+ SerialFormat loadedFormat = CasIOUtils.load(casInputStream, null, casToUse,
+ leniently ? CasLoadMode.LENIENT : CasLoadMode.DEFAULT);
+ casInputStream.close();
+ assertThat(loadedFormat).isEqualTo(format);
+ assertCorrectlyLoaded(casToUse, leniently);
}
private static void assertCorrectlyLoaded(CAS cas, boolean leniently) throws Exception {
@@ -255,53 +259,56 @@ public class CasIOUtilsTest {
}
@Test
- void testWrongInputStream() throws Exception {
- byte[] casBytes;
- try (var bos = new ByteArrayOutputStream(); var os = new ObjectOutputStream(bos)) {
- os.writeObject(new String("WRONG OBJECT"));
- casBytes = bos.toByteArray();
- }
+ public void testWrongInputStream() throws Exception {
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ ObjectOutput out = null;
+
+ out = new ObjectOutputStream(byteArrayOutputStream);
+ out.writeObject(new String("WRONG OBJECT"));
- try (ByteArrayInputStream casInputStream = new ByteArrayInputStream(casBytes)) {
+ byte[] casBytes = byteArrayOutputStream.toByteArray();
+ out.close();
+ ByteArrayInputStream casInputStream = new ByteArrayInputStream(casBytes);
+ try {
CasIOUtils.load(casInputStream, cas);
} catch (Exception e) {
assertThat(e instanceof CASRuntimeException).isTrue();
assertThat(((CASRuntimeException) e).getMessageKey()
.equals("UNRECOGNIZED_SERIALIZED_CAS_FORMAT")).isTrue();
+ casInputStream.close();
return;
}
-
fail("An exception should have been thrown for wrong input.");
}
@Test
- void testWrongFormat() throws Exception {
- ThrowingCallable testFunc = () -> {
- try (var os = new ByteArrayOutputStream()) {
- CasIOUtils.save(cas, os, SerialFormat.UNKNOWN);
- }
- };
-
- assertThatExceptionOfType(IOException.class) //
- .isThrownBy(testFunc) //
- .withRootCauseInstanceOf(IllegalArgumentException.class);
+ public void testWrongFormat() throws Exception {
+ File casFile = new File("target/temp-test-output/simpleCas.wrong");
+ try {
+ CasIOUtils.save(cas, new FileOutputStream(casFile), SerialFormat.UNKNOWN);
+ } catch (Exception e) {
+ // assertThat(e instanceof IllegalArgumentException).isTrue();
+ return;
+ }
+ fail("An exception should have been thrown for wrong format.");
}
@Test
- void testDocumentAnnotationIsNotResurrected() throws Exception {
- var refererAnnoTypeName = "org.apache.uima.testing.Referer";
- var customDocAnnoTypeName = "org.apache.uima.testing.CustomDocumentAnnotation";
+ public void testDocumentAnnotationIsNotResurrected() throws Exception {
+ String refererAnnoTypeName = "org.apache.uima.testing.Referer";
+ String customDocAnnoTypeName = "org.apache.uima.testing.CustomDocumentAnnotation";
- var tsd = UIMAFramework.getResourceSpecifierFactory().createTypeSystemDescription();
+ TypeSystemDescription tsd = UIMAFramework.getResourceSpecifierFactory()
+ .createTypeSystemDescription();
tsd.addType(customDocAnnoTypeName, "", CAS.TYPE_NAME_DOCUMENT_ANNOTATION);
- var refererType = tsd.addType(refererAnnoTypeName, "", CAS.TYPE_NAME_TOP);
+ TypeDescription refererType = tsd.addType(refererAnnoTypeName, "", CAS.TYPE_NAME_TOP);
refererType.addFeature("ref", "", CAS.TYPE_NAME_DOCUMENT_ANNOTATION);
- CAS cas = createCas(tsd, null, null);
+ CAS cas = CasCreationUtils.createCas(tsd, null, null);
// Initialize the default document annotation
// ... then immediately remove it from the indexes.
- var da = cas.getDocumentAnnotation();
+ FeatureStructure da = cas.getDocumentAnnotation();
assertThat(cas.select(cas.getTypeSystem().getType(CAS.TYPE_NAME_DOCUMENT_ANNOTATION)).asList())
.extracting(fs -> fs.getType().getName())
@@ -309,64 +316,58 @@ public class CasIOUtilsTest {
// Add a feature structure that references the original document annotation before we remove
// it from the indexes
- var referer = cas.createFS(cas.getTypeSystem().getType(refererAnnoTypeName));
+ FeatureStructure referer = cas.createFS(cas.getTypeSystem().getType(refererAnnoTypeName));
referer.setFeatureValue(referer.getType().getFeatureByBaseName("ref"), da);
cas.addFsToIndexes(referer);
cas.removeFsFromIndexes(da);
// Now add a new document annotation of our custom type
- var cda = cas.createFS(cas.getTypeSystem().getType(customDocAnnoTypeName));
+ FeatureStructure cda = cas.createFS(cas.getTypeSystem().getType(customDocAnnoTypeName));
cas.addFsToIndexes(cda);
assertThat(cas.select(cas.getTypeSystem().getType(CAS.TYPE_NAME_DOCUMENT_ANNOTATION)).asList())
.extracting(fs -> fs.getType().getName()).containsExactly(customDocAnnoTypeName);
// Serialize to a buffer
- byte[] data;
- try (var bos = new ByteArrayOutputStream()) {
- CasIOUtils.save(cas, bos, SerialFormat.SERIALIZED_TSI);
- data = bos.toByteArray();
- }
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ CasIOUtils.save(cas, bos, SerialFormat.SERIALIZED_TSI);
// Deserialize from the buffer
- try (var bis = new ByteArrayInputStream(data)) {
- CasIOUtils.load(bis, cas);
- }
+ ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
+ CasIOUtils.load(bis, cas);
assertThat(cas.select(cas.getTypeSystem().getType(CAS.TYPE_NAME_DOCUMENT_ANNOTATION)).asList())
- .extracting(fs -> fs.getType().getName()) //
- .containsExactly(customDocAnnoTypeName);
+ .extracting(fs -> fs.getType().getName()).containsExactly(customDocAnnoTypeName);
}
@Test
public void thatBinaryForm6DoesOnlyIncludeReachableFSes() throws Exception {
- CASImpl cas = (CASImpl) createCas();
+ CASImpl cas = (CASImpl) CasCreationUtils.createCas();
byte[] buf;
- try (var ctx = cas.ll_enableV2IdRefs(true)) {
- var ann = cas.createAnnotation(cas.getAnnotationType(), 0, 1);
+ try (AutoCloseableNoException a = cas.ll_enableV2IdRefs(true)) {
+ Annotation ann = cas.createAnnotation(cas.getAnnotationType(), 0, 1);
ann.addToIndexes();
ann.removeFromIndexes();
- var allFSes = new LinkedHashSet<FeatureStructure>();
+ Set<FeatureStructure> allFSes = new LinkedHashSet<>();
cas.walkReachablePlusFSsSorted(allFSes::add, null, null, null);
assertThat(allFSes) //
.as("The annotation that was added and then removed before serialization should be found") //
.containsExactly(cas.getSofa(), ann);
- try (var bos = new ByteArrayOutputStream()) {
- CasIOUtils.save(cas, bos, COMPRESSED_FILTERED_TSI);
- buf = bos.toByteArray();
- }
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ CasIOUtils.save(cas, bos, COMPRESSED_FILTERED_TSI);
+ buf = bos.toByteArray();
}
cas.reset();
- try (var ctx = cas.ll_enableV2IdRefs(true)) {
+ try (AutoCloseableNoException a = cas.ll_enableV2IdRefs(true)) {
CasIOUtils.load(new ByteArrayInputStream(buf), cas);
- var allFSes = new LinkedHashSet<FeatureStructure>();
+ Set<FeatureStructure> allFSes = new LinkedHashSet<>();
cas.walkReachablePlusFSsSorted(allFSes::add, null, null, null);
assertThat(allFSes) //
@@ -374,4 +375,9 @@ public class CasIOUtilsTest {
.containsExactly(cas.getSofa());
}
}
+
+ @AfterEach
+ public void tearDown() throws Exception {
+ cas.release();
+ }
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/util/impl/XMLParser_implTest.java b/uimaj-core/src/test/java/org/apache/uima/util/impl/XMLParser_implTest.java
index 67b598e81..d381fb52b 100644
--- a/uimaj-core/src/test/java/org/apache/uima/util/impl/XMLParser_implTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/util/impl/XMLParser_implTest.java
@@ -192,7 +192,7 @@ public class XMLParser_implTest {
public void testParsePearSpecifier() throws Exception {
XMLInputSource in = new XMLInputSource(
JUnitExtension.getFile("XmlParserTest/TestPearSpecifier.xml"));
- PearSpecifier pearSpec = mXmlParser.parsePearSpecifier(in);
+ PearSpecifier pearSpec = this.mXmlParser.parsePearSpecifier(in);
assertEquals("/home/user/uimaApp/installedPears/testpear", pearSpec.getPearPath());
assertThat(pearSpec.getParameters()).extracting(Parameter::getName, Parameter::getValue)
diff --git a/uimaj-cpe/pom.xml b/uimaj-cpe/pom.xml
index 5010de219..5b9beebfe 100644
--- a/uimaj-cpe/pom.xml
+++ b/uimaj-cpe/pom.xml
@@ -65,11 +65,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/CasConverter.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/CasConverter.java
index b148b53dd..b269e45e7 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/CasConverter.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/CasConverter.java
@@ -103,10 +103,10 @@ public class CasConverter {
// Generate XCAS events and pipe them to XCASDeserializer
CasDataToXCas generator = new CasDataToXCas();
- generator.setDocumentTextTypeName(getDocumentTextTypeName());
- generator.setDocumentTextFeatureName(getDocumentTextFeatureName());
+ generator.setDocumentTextTypeName(this.getDocumentTextTypeName());
+ generator.setDocumentTextFeatureName(this.getDocumentTextFeatureName());
XCASDeserializer xcasDeser = new XCASDeserializer(aContainer.getTypeSystem());
- xcasDeser.setDocumentTypeName(getDocumentTextTypeName());
+ xcasDeser.setDocumentTypeName(this.getDocumentTextTypeName());
// xcasDeser.setDocumentTextFeautre(this.getDocumentTextFeatureName()); NOT NEEDED
// to be lenient, install OutOfTypeSystemData object to collect data that doesn't
@@ -136,8 +136,8 @@ public class CasConverter {
CasData result = new CasDataImpl();
XCasToCasDataSaxHandler handler = new XCasToCasDataSaxHandler(result);
XCASSerializer xcasSer = new XCASSerializer(aContainer.getTypeSystem());
- xcasSer.setDocumentTypeName(getDocumentTextTypeName());
- xcasSer.setDocumentTextFeature(getDocumentTextFeatureName());
+ xcasSer.setDocumentTypeName(this.getDocumentTextTypeName());
+ xcasSer.setDocumentTextFeature(this.getDocumentTextFeatureName());
try {
xcasSer.serialize(aContainer, handler);
} catch (IOException e) {
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/BaseCPMImpl.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/BaseCPMImpl.java
index 3477ef504..05fa07176 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/BaseCPMImpl.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/BaseCPMImpl.java
@@ -766,10 +766,10 @@ public class BaseCPMImpl implements BaseCPM, Runnable {
@Override
public BaseCollectionReader getCollectionReader() {
try {
- if (collectionReader == null) {
- collectionReader = cpeFactory.getCollectionReader();
+ if (this.collectionReader == null) {
+ this.collectionReader = this.cpeFactory.getCollectionReader();
}
- return collectionReader;
+ return this.collectionReader;
} catch (ResourceConfigurationException e) {
throw new UIMARuntimeException(e);
}
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CPEConfig.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CPEConfig.java
index 4e4530e33..740524954 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CPEConfig.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CPEConfig.java
@@ -24,7 +24,10 @@ import org.apache.uima.util.UimaTimer;
/**
* Object containing global cpe configuration.
+ *
+ *
*/
+
public class CPEConfig {
private CheckpointConfig chConfig = null;
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CPMImpl.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CPMImpl.java
index 147fadfea..f179f80ba 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CPMImpl.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CPMImpl.java
@@ -75,12 +75,11 @@ public class CPMImpl extends BaseCPMImpl implements CollectionProcessingManager
if (consumers != null) {
return consumers;
}
-
- var consumerList = new ArrayList<CasConsumer>();
+ ArrayList consumerList = new ArrayList();
CasProcessor[] casProcs = getCasProcessors();
for (int i = 0; i < casProcs.length; i++) {
if (casProcs[i] instanceof CasConsumer) {
- consumerList.add((CasConsumer) casProcs[i]);
+ consumerList.add(casProcs[i]);
}
}
consumers = new CasConsumer[consumerList.size()];
@@ -121,5 +120,7 @@ public class CPMImpl extends BaseCPMImpl implements CollectionProcessingManager
public void process(CollectionReader aCollectionReader, int aBatchSize)
throws ResourceInitializationException {
super.process(aCollectionReader, aBatchSize);
+
}
+
}
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/Checkpoint.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/Checkpoint.java
index 6327ce23a..5d91a4104 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/Checkpoint.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/Checkpoint.java
@@ -19,48 +19,37 @@
package org.apache.uima.collection.impl.cpm;
-import static java.io.ObjectInputFilter.allowFilter;
-import static java.io.ObjectInputFilter.rejectUndecidedClass;
-import static java.io.ObjectInputFilter.Status.UNDECIDED;
-import static org.apache.uima.util.Level.FINEST;
-import static org.apache.uima.util.Level.INFO;
-
import java.io.EOFException;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputFilter;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.List;
-import java.util.Set;
import org.apache.uima.UIMAFramework;
import org.apache.uima.collection.base_cpm.SynchPoint;
import org.apache.uima.collection.impl.cpm.utils.CPMUtils;
+import org.apache.uima.util.Level;
import org.apache.uima.util.ProcessTrace;
import org.apache.uima.util.ProcessTraceEvent;
-import org.apache.uima.util.impl.ProcessTrace_impl;
/**
- * Running in a separate thread creates a checkpoint file at predefined intervals.
+ * Runing in a seperate thread creates a checkpoint file at predefined intervals.
+ *
*/
public class Checkpoint implements Runnable {
- static final String PROP_CPE_CHECKPOINT_SERIAL_FILTER = "uima.cpe.checkpoint.serial_filter";
-
/** The file name. */
- private final String fileName;
+ private String fileName = null;
/** The stop. */
- // volatile may be buggy in some JVMs apparently
- // consider changing to use synch
- private volatile boolean stop = false;
+ private volatile boolean stop = false; // volatile may be buggy in some JVMs apparently
+ // consider changing to use synch
/** The checkpoint frequency. */
- private final long checkpointFrequency;
+ private long checkpointFrequency = 3000;
/**
* The pause.
@@ -74,10 +63,10 @@ public class Checkpoint implements Runnable {
/** The cpm. */
// private boolean isRunning = false;
- private final BaseCPMImpl cpm;
+ private BaseCPMImpl cpm = null;
/** The synch point file name. */
- private final String synchPointFileName;
+ private String synchPointFileName = null;
/**
* Initialize the checkpoint with a reference to controlling cpe, the file where the checkpoint is
@@ -95,8 +84,6 @@ public class Checkpoint implements Runnable {
int fExtPos = fileName.indexOf('.');
if (fExtPos > -1) {
synchPointFileName = fileName.substring(0, fExtPos) + "_synchPoint.xml";
- } else {
- synchPointFileName = null;
}
cpm = aCpm;
checkpointFrequency = aCheckpointFrequency;
@@ -108,10 +95,11 @@ public class Checkpoint implements Runnable {
public void stop() {
stop = true;
// isRunning = false;
- if (UIMAFramework.getLogger().isInfoEnabled()) {
- UIMAFramework.getLogger(this.getClass()).logrb(INFO, this.getClass().getName(), "process",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_stop_checkpoint_thread__INFO",
+ if (UIMAFramework.getLogger().isLoggable(Level.INFO)) {
+ UIMAFramework.getLogger(this.getClass()).logrb(Level.INFO, this.getClass().getName(),
+ "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_stop_checkpoint_thread__INFO",
new Object[] { Thread.currentThread().getName() });
+
}
}
@@ -132,22 +120,22 @@ public class Checkpoint implements Runnable {
}
}
}
- if (UIMAFramework.getLogger().isLoggable(FINEST)) {
- UIMAFramework.getLogger(this.getClass()).logrb(FINEST, this.getClass().getName(), "process",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_checkpoint__FINEST",
+ if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
+ UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST, this.getClass().getName(),
+ "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_checkpoint__FINEST",
new Object[] { Thread.currentThread().getName() });
}
doCheckpoint();
try {
- if (UIMAFramework.getLogger().isLoggable(FINEST)) {
- UIMAFramework.getLogger(this.getClass()).logrb(FINEST, this.getClass().getName(),
+ if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
+ UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST, this.getClass().getName(),
"process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_sleep__FINEST",
new Object[] { Thread.currentThread().getName() });
}
Thread.sleep(checkpointFrequency);
- if (UIMAFramework.getLogger().isLoggable(FINEST)) {
- UIMAFramework.getLogger(this.getClass()).logrb(FINEST, this.getClass().getName(),
+ if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
+ UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST, this.getClass().getName(),
"process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_wakeup__FINEST",
new Object[] { Thread.currentThread().getName() });
}
@@ -196,9 +184,9 @@ public class Checkpoint implements Runnable {
*/
public void doCheckpoint() {
try {
- if (UIMAFramework.getLogger().isLoggable(FINEST)) {
- UIMAFramework.getLogger(this.getClass()).logrb(FINEST, this.getClass().getName(), "process",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_checkpoint__FINEST",
+ if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
+ UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST, this.getClass().getName(),
+ "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_checkpoint__FINEST",
new Object[] { Thread.currentThread().getName() });
}
// 02/08/05 Checkpoint has been broken up into two files. One containing the
@@ -219,17 +207,17 @@ public class Checkpoint implements Runnable {
CheckpointData targetToSave = null;
if (pTrace != null) {
if (synchPoint != null) {
- if (UIMAFramework.getLogger().isLoggable(FINEST)) {
- UIMAFramework.getLogger(this.getClass()).logrb(FINEST, this.getClass().getName(),
- "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
+ UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST,
+ this.getClass().getName(), "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
"UIMA_CPM_checkpoint_with_synchpoint__FINEST",
new Object[] { Thread.currentThread().getName() });
}
targetToSave = new CheckpointData(pTrace, synchPoint);
} else {
- if (UIMAFramework.getLogger().isLoggable(FINEST)) {
- UIMAFramework.getLogger(this.getClass()).logrb(FINEST, this.getClass().getName(),
- "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
+ UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST,
+ this.getClass().getName(), "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
"UIMA_CPM_checkpoint_with_pt__FINEST",
new Object[] { Thread.currentThread().getName() });
}
@@ -246,14 +234,16 @@ public class Checkpoint implements Runnable {
}
}
} catch (Exception e) {
- UIMAFramework.getLogger(this.getClass()).logrb(FINEST, this.getClass().getName(), "process",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_exception_when_checkpointing__FINEST",
+ UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST, this.getClass().getName(),
+ "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_exception_when_checkpointing__FINEST",
new Object[] { Thread.currentThread().getName(), e.getMessage() });
}
} catch (Exception e) {
- UIMAFramework.getLogger(this.getClass()).logrb(FINEST, this.getClass().getName(), "process",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_exception_when_checkpointing__FINEST",
+ UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST, this.getClass().getName(),
+ "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_exception_when_checkpointing__FINEST",
new Object[] { Thread.currentThread().getName(), e.getMessage() });
}
}
@@ -277,18 +267,18 @@ public class Checkpoint implements Runnable {
* the pr T
*/
public static void printStats(ProcessTrace prT) {
- if (UIMAFramework.getLogger().isLoggable(FINEST)) {
- UIMAFramework.getLogger(Checkpoint.class).log(FINEST,
+ if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
+ UIMAFramework.getLogger(Checkpoint.class).log(Level.FINEST,
"\n\t\t\t----------------------------------------");
- UIMAFramework.getLogger(Checkpoint.class).log(FINEST, "\t\t\t\t PERFORMANCE REPORT ");
- UIMAFramework.getLogger(Checkpoint.class).log(FINEST,
+ UIMAFramework.getLogger(Checkpoint.class).log(Level.FINEST, "\t\t\t\t PERFORMANCE REPORT ");
+ UIMAFramework.getLogger(Checkpoint.class).log(Level.FINEST,
"\t\t\t----------------------------------------\n");
}
// get the list of events from the processTrace
- List<ProcessTraceEvent> eveList = prT.getEvents();
+ List eveList = prT.getEvents();
printEveList(eveList, 0);
- if (UIMAFramework.getLogger().isLoggable(FINEST)) {
- UIMAFramework.getLogger(Checkpoint.class).log(FINEST,
+ if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
+ UIMAFramework.getLogger(Checkpoint.class).log(Level.FINEST,
"_________________________________________________________________\n");
}
}
@@ -301,12 +291,12 @@ public class Checkpoint implements Runnable {
* @param tCnt
* depth of this List in the Process Trace hierarchy
*/
- public static void printEveList(List<ProcessTraceEvent> lst, int tCnt) {
+ public static void printEveList(List lst, int tCnt) {
String compNameS;
String typeS;
int dur;
int totDur;
- List<ProcessTraceEvent> subEveList;
+ List subEveList;
String tabS = "";
int tabCnt = tCnt;
for (int j = 0; j < tabCnt; j++) {
@@ -319,17 +309,17 @@ public class Checkpoint implements Runnable {
dur = prEvent.getDurationExcludingSubEvents();
totDur = prEvent.getDuration();
subEveList = prEvent.getSubEvents();
- if (UIMAFramework.getLogger().isLoggable(FINEST)) {
- UIMAFramework.getLogger(Checkpoint.class).log(FINEST, tabS + "COMPONENT : " + compNameS
- + "\tTYPE : " + typeS + "\tDescription : " + prEvent.getDescription());
- UIMAFramework.getLogger(Checkpoint.class).log(FINEST,
+ if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
+ UIMAFramework.getLogger(Checkpoint.class).log(Level.FINEST, tabS + "COMPONENT : "
+ + compNameS + "\tTYPE : " + typeS + "\tDescription : " + prEvent.getDescription());
+ UIMAFramework.getLogger(Checkpoint.class).log(Level.FINEST,
tabS + "TOTAL_TIME : " + totDur + "\tTIME_EXCLUDING_SUBEVENTS : " + dur);
}
if (subEveList != null) {
printEveList(subEveList, (tabCnt + 1));
}
- if (UIMAFramework.getLogger().isLoggable(FINEST)) {
- UIMAFramework.getLogger(Checkpoint.class).log(FINEST, " ");
+ if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
+ UIMAFramework.getLogger(Checkpoint.class).log(Level.FINEST, " ");
}
}
}
@@ -350,11 +340,13 @@ public class Checkpoint implements Runnable {
/**
* Retrieves the checkpoint from the filesystem.
*
- * @return deserialized object containing recovery information.
+ * @return - desirialized object containing recovery information.
* @throws IOException
* -
*/
public synchronized Object restoreFromCheckpoint() throws IOException {
+ ObjectInputStream stream = null;
+ FileInputStream synchPointStream = null;
try {
File file = new File(fileName);
Object anObject = null;
@@ -363,14 +355,18 @@ public class Checkpoint implements Runnable {
// part of the checkpoint, namely the SynchPoint. This data needed to be exposed as text to
// a human administrator to manually change it. Requirement from the WF project.
if (file.exists()) {
- if (UIMAFramework.getLogger().isLoggable(FINEST)) {
- UIMAFramework.getLogger(getClass()).logrb(FINEST, this.getClass().getName(), "process",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_restoring_from_checkpoint__FINEST",
+
+ if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
+ UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST, this.getClass().getName(),
+ "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_restoring_from_checkpoint__FINEST",
new Object[] { Thread.currentThread().getName() });
}
- try (var stream = new FileInputStream(file)) {
- anObject = deserializeCheckpoint(stream);
- if (anObject instanceof CheckpointData) {
+ FileInputStream in = new FileInputStream(file);
+ stream = new ObjectInputStream(in);
+ if (stream != null) {
+ anObject = stream.readObject();
+ if (anObject != null && anObject instanceof CheckpointData) {
ProcessTrace processTrace = ((CheckpointData) anObject).getProcessTrace();
printStats(processTrace);
}
@@ -380,18 +376,18 @@ public class Checkpoint implements Runnable {
// Read the synchpoint from the filesystem.
SynchPoint synchPoint = null;
if (file.exists()) {
- if (UIMAFramework.getLogger().isLoggable(FINEST)) {
- UIMAFramework.getLogger(this.getClass()).logrb(FINEST, this.getClass().getName(),
+ if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
+ UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST, this.getClass().getName(),
"process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
"UIMA_CPM_synchpoint_from_file__FINEST",
new Object[] { Thread.currentThread().getName(), synchPointFileName });
}
-
- try (var synchPointStream = new FileInputStream(file)) {
+ synchPointStream = new FileInputStream(file);
+ if (synchPointStream != null) {
// Use the SynchPoint object retrieved above. Its internal data should be
// overwritten during deserialization done below. Its just a convenience to
// reuse the same object that was saved as part of a checkpoint.
- if (anObject instanceof CheckpointData) {
+ if (anObject != null && anObject instanceof CheckpointData) {
synchPoint = ((CheckpointData) anObject).getSynchPoint();
if (synchPoint != null) {
synchPoint.deserialize(synchPointStream);
@@ -404,24 +400,14 @@ public class Checkpoint implements Runnable {
} catch (EOFException e) {
} catch (Exception e) {
e.printStackTrace();
+ } finally {
+ if (stream != null) {
+ stream.close();
+ }
+ if (synchPointStream != null) {
+ synchPointStream.close();
+ }
}
return null;
}
-
- static CheckpointData deserializeCheckpoint(InputStream stream)
- throws IOException, ClassNotFoundException {
- var safeList = Set.of(CheckpointData.class, ProcessTrace.class, ProcessTrace_impl.class,
- SynchPoint.class);
-
- var filter = allowFilter(safeList::contains, UNDECIDED);
- var ois = new ObjectInputStream(stream);
- var serialFilterPropertyValue = System.getProperty(PROP_CPE_CHECKPOINT_SERIAL_FILTER);
- if (serialFilterPropertyValue != null) {
- var serialFilter = ObjectInputFilter.Config.createFilter(serialFilterPropertyValue);
- filter = ObjectInputFilter.merge(filter, serialFilter);
- }
- filter = rejectUndecidedClass(filter);
- ois.setObjectInputFilter(filter);
- return (CheckpointData) ois.readObject();
- }
}
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CheckpointConfig.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CheckpointConfig.java
index 0730a4856..1774e34a8 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CheckpointConfig.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CheckpointConfig.java
@@ -40,7 +40,7 @@ public class CheckpointConfig {
private boolean minutes = false;
/**
- * Initializes instance with a file where the checkpoint will be stored and checkpoint frequency.
+ * Initilizes instance with a file where the checkpoint will be stored and checkpoint frequency.
*
* @param aChpFile
* - path to the checkpoint file
@@ -54,6 +54,8 @@ public class CheckpointConfig {
/**
* Parses the frequency String
+ *
+ * @param aFrequency
*/
private void determineFrequency(String aFrequency) {
try {
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CheckpointData.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CheckpointData.java
index 6f92121df..d003f8467 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CheckpointData.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/CheckpointData.java
@@ -28,6 +28,8 @@ import org.apache.uima.util.ProcessTrace;
* Serializable containing the checkpoint. The checkpoint contains both {@link ProcessTrace} and
* {@link SynchPoint} objects. It is serialized to file system by {@link Checkpoint} thread at
* predefined intervals.
+ *
+ *
*/
public class CheckpointData implements Serializable {
private static final long serialVersionUID = -3261502844386898304L;
@@ -93,4 +95,5 @@ public class CheckpointData implements Serializable {
public void setSynchPoint(SynchPoint point) {
synchPoint = point;
}
+
}
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/Constants.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/Constants.java
index 0db3d7543..27f109056 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/Constants.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/Constants.java
@@ -21,7 +21,10 @@ package org.apache.uima.collection.impl.cpm;
/**
* CPE Constants
+ *
+ *
*/
+
public class Constants {
public static final String LONG_COLON_TERM = "_colon_";
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/StatusCallbackListenerImpl.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/StatusCallbackListenerImpl.java
index d437632ee..2cecb02f3 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/StatusCallbackListenerImpl.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/StatusCallbackListenerImpl.java
@@ -21,6 +21,7 @@ package org.apache.uima.collection.impl.cpm;
import org.apache.uima.UIMAFramework;
import org.apache.uima.cas.CAS;
+import org.apache.uima.cas.FSIterator;
import org.apache.uima.cas.Feature;
import org.apache.uima.cas.Type;
import org.apache.uima.collection.EntityProcessStatus;
@@ -30,6 +31,8 @@ import org.apache.uima.util.Level;
/**
* Callback Listener.
+ *
+ *
*/
class StatusCallbackListenerImpl implements StatusCallbackListener {
int entityCount = 0;
@@ -39,7 +42,7 @@ class StatusCallbackListenerImpl implements StatusCallbackListener {
/**
* Called when the initialization is completed.
*
- * @see org.apache.uima.collection.StatusCallbackListener#initializationComplete()
+ * @see org.apache.uima.collection.processing.StatusCallbackListener#initializationComplete()
*/
@Override
public void initializationComplete() {
@@ -53,7 +56,7 @@ class StatusCallbackListenerImpl implements StatusCallbackListener {
/**
* Called when the batchProcessing is completed.
*
- * @see org.apache.uima.collection.StatusCallbackListener#batchProcessComplete()
+ * @see org.apache.uima.collection.processing.StatusCallbackListener#batchProcessComplete()
*
*/
@Override
@@ -68,7 +71,7 @@ class StatusCallbackListenerImpl implements StatusCallbackListener {
/**
* Called when the collection processing is completed.
*
- * @see org.apache.uima.collection.StatusCallbackListener#collectionProcessComplete()
+ * @see org.apache.uima.collection.processing.StatusCallbackListener#collectionProcessComplete()
*/
@Override
public synchronized void collectionProcessComplete() {
@@ -82,7 +85,7 @@ class StatusCallbackListenerImpl implements StatusCallbackListener {
/**
* Called when the CPM is paused.
*
- * @see org.apache.uima.collection.StatusCallbackListener#paused()
+ * @see org.apache.uima.collection.processing.StatusCallbackListener#paused()
*/
@Override
public synchronized void paused() {
@@ -96,7 +99,7 @@ class StatusCallbackListenerImpl implements StatusCallbackListener {
/**
* Called when the CPM is resumed after a pause.
*
- * @see org.apache.uima.collection.StatusCallbackListener#resumed()
+ * @see org.apache.uima.collection.processing.StatusCallbackListener#resumed()
*/
@Override
public synchronized void resumed() {
@@ -110,7 +113,7 @@ class StatusCallbackListenerImpl implements StatusCallbackListener {
/**
* Called when the CPM is stopped abruptly due to errors.
*
- * @see org.apache.uima.collection.StatusCallbackListener#aborted()
+ * @see org.apache.uima.collection.processing.StatusCallbackListener#aborted()
*/
@Override
public void aborted() {
@@ -161,7 +164,7 @@ class StatusCallbackListenerImpl implements StatusCallbackListener {
// get size here
Type t = aCas.getTypeSystem().getType("uima.cpm.FileLocation");
Feature f = t.getFeatureByBaseName("DocumentSize");
- var fsI = aCas.getAnnotationIndex(t).iterator();
+ FSIterator fsI = aCas.getAnnotationIndex(t).iterator();
if (fsI.isValid()) {
dataSize = fsI.get().getIntValue(f);
}
@@ -178,4 +181,5 @@ class StatusCallbackListenerImpl implements StatusCallbackListener {
UIMAFramework.getLogger(this.getClass()).log(Level.WARNING, "", io);
}
}
+
}
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEContext.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEContext.java
index 3476eb028..a1654f2c2 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEContext.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEContext.java
@@ -20,6 +20,8 @@
package org.apache.uima.collection.impl.cpm.container;
/**
+ *
+ *
* To change the template for this generated type comment go to
* Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
*/
@@ -27,8 +29,9 @@ public class CPEContext {
private String cpeDescriptorPath = null;
/**
+ *
* @param aDescriptorPath
- * the path to the descriptor
+ * -
*/
public CPEContext(String aDescriptorPath) {
cpeDescriptorPath = aDescriptorPath;
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEFactory.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEFactory.java
index d856cb51f..ecbe2ea9d 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEFactory.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEFactory.java
@@ -91,11 +91,11 @@ import org.apache.uima.util.XMLInputSource;
/**
* Component responsible for generating objects representing cpe descriptor configuration. Provides
* various ways to instantiate object model representing cpe configuration. In the simplest form it
- * ingests an XML file (CPE descriptor), parses it and creates an object for every element in the
- * XML file.
+ * ingests an xml file (cpe descriptor), parses it and creates an object for every element in the
+ * xml file.
* <p>
* Using objects representing configuration, this component creates CollectionReader CasInitializer,
- * Analysis Engines, and CAS Consumers.
+ * Analysis Engines, and Cas Consumers.
* <p>
* In addition to creating object, this component provides read/write access to the object model
* allowing for dynamic or programmatic modifications. It facilitates plugging in existing
@@ -293,8 +293,8 @@ public class CPEFactory {
}
/**
- * Returns Collection Reader instantiated from configuration in the CPE descriptor. It also
- * creates and initializes the CAS Initializer if one is defined and associates it with the
+ * Returns Collection Reader instantiated from configuration in the cpe descriptor. It also
+ * creates and intializes the Cas Initializer if one is defined and associates it with the
* CollectionReader.
*
* @return CollectionReader instance
@@ -346,15 +346,14 @@ public class CPEFactory {
// compute sofa mapping for the CollectionReader
CpeSofaMappings sofanamemappings = cit.getSofaNameMappings();
- var sofamap = new HashMap<String, String>();
+ HashMap sofamap = new HashMap();
if (sofanamemappings != null) {
CpeSofaMapping[] sofaNameMappingArray = sofanamemappings.getSofaNameMappings();
for (int i = 0; sofaNameMappingArray != null && i < sofaNameMappingArray.length; i++) {
CpeSofaMapping aSofaMap = sofaNameMappingArray[i];
// if no component sofa name, then set it to default
- if (aSofaMap.getComponentSofaName() == null) {
+ if (aSofaMap.getComponentSofaName() == null)
aSofaMap.setComponentSofaName(CAS.NAME_DEFAULT_TEXT_SOFA);
- }
sofamap.put(aSofaMap.getComponentSofaName(), aSofaMap.getCpeSofaName());
}
}
@@ -415,9 +414,8 @@ public class CPEFactory {
for (int i = 0; sofaNameMappingArray != null && i < sofaNameMappingArray.length; i++) {
CpeSofaMapping aSofaMap = sofaNameMappingArray[i];
// if no component sofa name, then set it to default
- if (aSofaMap.getComponentSofaName() == null) {
+ if (aSofaMap.getComponentSofaName() == null)
aSofaMap.setComponentSofaName(CAS.NAME_DEFAULT_TEXT_SOFA);
- }
sofamap.put(aSofaMap.getComponentSofaName(), aSofaMap.getCpeSofaName());
}
}
@@ -1077,9 +1075,8 @@ public class CPEFactory {
for (int i = 0; sofaNameMappingArray != null && i < sofaNameMappingArray.length; i++) {
CpeSofaMapping aSofaMap = sofaNameMappingArray[i];
// if no component sofa name, then set it to default
- if (aSofaMap.getComponentSofaName() == null) {
+ if (aSofaMap.getComponentSofaName() == null)
aSofaMap.setComponentSofaName(CAS.NAME_DEFAULT_TEXT_SOFA);
- }
sofamap.put(aSofaMap.getComponentSofaName(), aSofaMap.getCpeSofaName());
}
}
@@ -1201,7 +1198,7 @@ public class CPEFactory {
int threadCount;
try {
- threadCount = getCpeDescriptor().getCpeCasProcessors().getConcurrentPUCount();
+ threadCount = this.getCpeDescriptor().getCpeCasProcessors().getConcurrentPUCount();
} catch (Exception e) {
throw new ResourceConfigurationException(InvalidXMLException.REQUIRED_ATTRIBUTE_MISSING,
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CasProcessorConfigurationJAXBImpl.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CasProcessorConfigurationJAXBImpl.java
index 08c355827..f0827840d 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CasProcessorConfigurationJAXBImpl.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CasProcessorConfigurationJAXBImpl.java
@@ -51,8 +51,10 @@ import org.apache.uima.util.InvalidXMLException;
import org.apache.uima.util.Level;
/**
- * A wrapper containing CAS Processor configuration. An instance of this class is associated with
- * each CAS Processor.
+ * A wrapper containing Cas Processor configuration. An instance of this class is associated with
+ * each Cas Processor.
+ *
+ *
*/
public class CasProcessorConfigurationJAXBImpl implements CasProcessorConfiguration {
private String actionOnMaxError;
@@ -89,7 +91,7 @@ public class CasProcessorConfigurationJAXBImpl implements CasProcessorConfigurat
private JavaApplication javaApp;
- private List<NameValuePair> deploymentParameters = null;
+ private List deploymentParameters = null;
private int waitTimeBetweenRestarts = 0;
@@ -100,10 +102,10 @@ public class CasProcessorConfigurationJAXBImpl implements CasProcessorConfigurat
private ResourceManager resourceManager;
/**
- * Initializes instance and copies configuration from CPE descriptor.
+ * Initializes instance and copies configuation from cpe descriptor.
*
* @param aCasProcessorConfig
- * - configuration object containing CAS Processor configuration
+ * - configuration object containing Cas Processor configuration
* @param aResourceManager
* - needed to resolve import by name
* @throws ResourceConfigurationException
@@ -111,7 +113,7 @@ public class CasProcessorConfigurationJAXBImpl implements CasProcessorConfigurat
*/
public CasProcessorConfigurationJAXBImpl(CpeCasProcessor aCasProcessorConfig,
ResourceManager aResourceManager) throws ResourceConfigurationException {
- resourceManager = aResourceManager;
+ this.resourceManager = aResourceManager;
if (aCasProcessorConfig == null) {
throw new ResourceConfigurationException(InvalidXMLException.ELEMENT_NOT_FOUND,
@@ -157,7 +159,7 @@ public class CasProcessorConfigurationJAXBImpl implements CasProcessorConfigurat
}
/**
- * Returns how long to wait between re-sending CAS after failure
+ * Returns how long to wait between resending CAS after failure
*/
@Override
public int getMaxTimeToWaitBetweenRetries() {
@@ -185,18 +187,18 @@ public class CasProcessorConfigurationJAXBImpl implements CasProcessorConfigurat
/**
* Copies runtime information
*
- * @param aCasProcessorConfig
- * - configuration object containing CAS Processor configuration
+ * @param aJaxbCasProcessorConfig
+ * - configuration object containing Cas Processor configuration
*/
private void addRunInSeparateProcess(CpeCasProcessor aCasProcessorConfig) {
runInSeparateProcess = aCasProcessorConfig.getRunInSeparateProcess() != null;
}
/**
- * Determines if this CAS Processor should run in java JVM.
+ * Determines if this Cas Processor should run in java jvm.
*
- * @param aCasProcessorConfig
- * - configuration object containing CAS Processor configuration
+ * @param aJaxbCasProcessorConfig
+ * - configuration object containing Cas Processor configuration
*/
private void addIsJavaProcess(CpeCasProcessor aCasProcessorConfig) {
isJavaProcess = false;
@@ -211,8 +213,8 @@ public class CasProcessorConfigurationJAXBImpl implements CasProcessorConfigurat
/**
* Copies Error handling settings
*
- * @param aCasProcessorConfig
- * configuration object containing CAS Processor configuration
+ * @param aJaxbCasProcessorConfig
+ * - configuration object containing Cas Processor configuration
*/
private void addErrorHandling(CpeCasProcessor aCasProcessorConfig)
throws ResourceConfigurationException {
@@ -285,11 +287,11 @@ public class CasProcessorConfigurationJAXBImpl implements CasProcessorConfigurat
}
/**
- * Copies deployment parameters associated with this CAS Processor These parameters are used to
- * construct appropriate command line for launching the CAS Processor in external process
+ * Copies deployment parameters associated with this Cas Processor These parameters are used to
+ * construct appropriate command line for launching the Cas Processor in external process
*
- * @param aCasProcessorConfig
- * - configuration object containing CAS Processor configuration
+ * @param aJaxbCasProcessorConfig
+ * - configuration object containing Cas Processor configuration
*/
private void addDeploymentParameters(CpeCasProcessor aCasProcessorConfig)
throws ResourceConfigurationException {
@@ -323,7 +325,7 @@ public class CasProcessorConfigurationJAXBImpl implements CasProcessorConfigurat
CPEFactory.CPM_HOME, parameters[i].getParameterValue());
nvp.setValue(value);
if (deploymentParameters == null) {
- deploymentParameters = new ArrayList<NameValuePair>();
+ deploymentParameters = new ArrayList();
}
deploymentParameters.add(nvp);
@@ -337,16 +339,16 @@ public class CasProcessorConfigurationJAXBImpl implements CasProcessorConfigurat
&& rsp.getExecutable() != null) {
// List args = rsp.getExecutable().getArg();
if (deploymentParameters == null) {
- deploymentParameters = new ArrayList<NameValuePair>();
+ deploymentParameters = new ArrayList();
}
}
}
/**
- * Copies deployment type associated with this CAS Processor
+ * Copies deployment type associated with this Cas Processor
*
- * @param aCasProcessorConfig
- * - - configuration object containing CAS Processor configuration
+ * @param aJaxbCasProcessorConfig
+ * - - configuration object containing Cas Processor configuration
* @throws ResourceConfigurationException
* -
*/
@@ -377,8 +379,8 @@ public class CasProcessorConfigurationJAXBImpl implements CasProcessorConfigurat
/**
* Copies filter expression used during processing.
*
- * @param aCasProcessorConfig
- * - configuration object containing CAS Processor configuration
+ * @param aJaxbCasProcessorConfig
+ * - configuration object containing Cas Processor configuration
*/
private void addFiltering(CpeCasProcessor aCasProcessorConfig)
throws ResourceConfigurationException {
@@ -394,10 +396,10 @@ public class CasProcessorConfigurationJAXBImpl implements CasProcessorConfigurat
}
/**
- * Copies batch size associated with this CAS Processor
+ * Copies batch size associated with this Cas Processor
*
- * @param aCasProcessorConfig
- * configuration object containing CAS Processor configuration
+ * @param aJaxbCasProcessorConfig
+ * - configuration object containing Cas Processor configuration
*/
private void addBatchSize(CpeCasProcessor aCasProcessorConfig)
throws ResourceConfigurationException {
@@ -436,10 +438,13 @@ public class CasProcessorConfigurationJAXBImpl implements CasProcessorConfigurat
}
/**
- * Copies path of the CAS Processor descriptor.
+ * Copies path of the Cas Processor descriptor.
*
- * @param aCasProcessorConfig
- * configuration object holding path to the descriptor
+ * @param aJaxbCasProcessorConfig
+ * - configuration object holding path to the descriptor
+ *
+ * @throws ResourceConfigurationException
+ * -
*/
private void addDescriptor(CpeCasProcessor aCasProcessorConfig)
throws ResourceConfigurationException {
@@ -575,7 +580,7 @@ public class CasProcessorConfigurationJAXBImpl implements CasProcessorConfigurat
}
/**
- * Returns the max amount of time the CPE will wait for CAS Processor response.
+ * Returns the max amount of time the CPE will wait for Cas Processor reponse.
*
* @return - value for timeout
*/
@@ -585,17 +590,17 @@ public class CasProcessorConfigurationJAXBImpl implements CasProcessorConfigurat
}
/**
- * Returns a list of deployment parameters associated with this CAS Processor
+ * Returns a list of deployment parameters ssociated with this Cas Processor
*
- * @return - deployment parameters as List
+ * @return - deployment paramaters as List
*/
@Override
- public List<NameValuePair> getDeploymentParameters() {
+ public List getDeploymentParameters() {
return deploymentParameters;
}
/**
- * Returns deployment type associated with this CAS Processor
+ * Returns deployment type associated with this Cas Processor
* <ul>
* <li>integrated</li>
* <li>local</li>
@@ -610,7 +615,9 @@ public class CasProcessorConfigurationJAXBImpl implements CasProcessorConfigurat
}
/**
- * @return unparsed filter expression
+ * Returns unparsed filter expression
+ *
+ * @return - fliter String
*/
@Override
public String getFilterString() {
@@ -619,6 +626,7 @@ public class CasProcessorConfigurationJAXBImpl implements CasProcessorConfigurat
/**
* Returns parsed filter expressions as List.
+ *
*/
@Override
public LinkedList getFilter() throws ResourceConfigurationException {
@@ -645,8 +653,8 @@ public class CasProcessorConfigurationJAXBImpl implements CasProcessorConfigurat
}
/**
- * Returns an array of types that should not be sent to CAS Processor. The drop types are defined
- * in the CPE descriptor.
+ * Returns an array of types that should not be sent to Cas Processor. The drop types are defined
+ * in the cpe descriptor.
*/
@Override
public String[] getKeysToDrop() throws ResourceConfigurationException {
@@ -723,9 +731,9 @@ public class CasProcessorConfigurationJAXBImpl implements CasProcessorConfigurat
}
/**
- * Returns true if this CAS Processor will run in its own process
+ * Returns true if this Cas Processor will run in its own process
*
- * @return - true if running in separate process
+ * @return - true if running in seperate process
*/
@Override
public boolean runInSeparateProcess() {
@@ -733,7 +741,7 @@ public class CasProcessorConfigurationJAXBImpl implements CasProcessorConfigurat
}
/**
- * Returns true it the CAS Processor is written in java and will be run with Java JVM.
+ * Returns true it the Cas Processor is written in java and will be run with java jvm.
*
*/
@Override
@@ -742,9 +750,9 @@ public class CasProcessorConfigurationJAXBImpl implements CasProcessorConfigurat
}
/**
- * Returns executable section of the CAS Processor configuration. It contains the name of
- * executable program to be used when launching a separate process with CAS Processor running as
- * Vinci service.
+ * Returns executable section of the Cas Processor configuration. It contains the name of
+ * executable program to be used when launching a seperate process with Cas Processor running as
+ * vinci service.
*
* @return - Execute object
*/
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/NetworkCasProcessorImpl.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/NetworkCasProcessorImpl.java
index a02bb7045..fc1376bba 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/NetworkCasProcessorImpl.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/NetworkCasProcessorImpl.java
@@ -153,7 +153,7 @@ public class NetworkCasProcessorImpl implements CasDataProcessor {
totalTime += (pEnd - pStart);
} catch (ServiceException e) {
// check if the proxy is connected to the service
- if (!textAnalysisProxy.isConnected()) {
+ if (textAnalysisProxy.isConnected() == false) {
if (UIMAFramework.getLogger().isLoggable(Level.INFO)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.INFO, this.getClass().getName(),
"process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_service_down__INFO",
@@ -282,7 +282,7 @@ public class NetworkCasProcessorImpl implements CasDataProcessor {
}
try {
// check if the proxy is connected to the service
- if (!textAnalysisProxy.isConnected()) {
+ if (textAnalysisProxy.isConnected() == false) {
if (UIMAFramework.getLogger().isLoggable(Level.INFO)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.INFO, this.getClass().getName(),
"process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_service_down__INFO",
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java
index f5f7d011a..ae943bbc5 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java
@@ -1116,7 +1116,11 @@ public class ProcessingContainer_Impl extends ProcessingContainer implements Run
* @return - true if feature is in the Cas, false otherwise
*/
private boolean processCas(Object aCas) {
- if (!(aCas instanceof CasData) || DATACasUtils.isCasEmpty((CasData) aCas)) {
+ if (!(aCas instanceof CasData)) // || skipIfCasEmpty == null)
+ {
+ return false;
+ }
+ if (DATACasUtils.isCasEmpty((CasData) aCas)) {
return false; // dont process empty CAS'es
}
@@ -1659,7 +1663,7 @@ public class ProcessingContainer_Impl extends ProcessingContainer implements Run
@Override
public boolean isPaused() {
synchronized (lockForIsPaused) {
- return isPaused;
+ return this.isPaused;
}
}
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/CPEDeployerDefaultImpl.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/CPEDeployerDefaultImpl.java
index fd034afe6..78a206573 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/CPEDeployerDefaultImpl.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/CPEDeployerDefaultImpl.java
@@ -264,7 +264,7 @@ public class CPEDeployerDefaultImpl implements CasProcessorDeployer {
if (resourceSpecifier instanceof AnalysisEngineDescription) {
casProcessor = UIMAFramework.produceAnalysisEngine(resourceSpecifier,
- cpeFactory.getResourceManager(), null);
+ this.cpeFactory.getResourceManager(), null);
// casProcessor.
} else if (resourceSpecifier instanceof CasConsumerDescription) {
if (cpeFactory.isDefinitionInstanceOf(CasConsumer.class, resourceSpecifier,
@@ -276,7 +276,7 @@ public class CPEDeployerDefaultImpl implements CasProcessorDeployer {
new Object[] { Thread.currentThread().getName() });
}
casProcessor = UIMAFramework.produceCasConsumer(resourceSpecifier,
- cpeFactory.getResourceManager(), null);
+ this.cpeFactory.getResourceManager(), null);
} else if (cpeFactory.isDefinitionInstanceOf(CasProcessor.class, resourceSpecifier,
aDescriptor.toString())) {
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/VinciTAP.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/VinciTAP.java
index 18550f41d..1197b1a9e 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/VinciTAP.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/VinciTAP.java
@@ -759,7 +759,7 @@ public class VinciTAP {
aPT.startEvent(aResourceName, "Vinci Response Frame to CAS", "");
CasData newCasData = new CasDataImpl();
- FeatureStructure casDataFs = getDocTextFeatureStructure(aCas);
+ FeatureStructure casDataFs = this.getDocTextFeatureStructure(aCas);
if (casDataFs != null) {
newCasData.addFeatureStructure(casDataFs);
}
@@ -977,7 +977,7 @@ public class VinciTAP {
// CasData. BUT, we also need to preserve the document text from the request,
// since it may not be echoed by the service.
CasData newCasData = new CasDataImpl();
- FeatureStructure casDataFs = getDocTextFeatureStructure(aCasList[instanceCount]);
+ FeatureStructure casDataFs = this.getDocTextFeatureStructure(aCasList[instanceCount]);
if (casDataFs != null) {
newCasData.addFeatureStructure(casDataFs);
}
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vinci/VinciCasProcessorDeployer.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vinci/VinciCasProcessorDeployer.java
index 4bac9a959..390dcfbb0 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vinci/VinciCasProcessorDeployer.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vinci/VinciCasProcessorDeployer.java
@@ -390,7 +390,7 @@ public class VinciCasProcessorDeployer implements CasProcessorDeployer {
try {
if (casProcessorConfig.runInSeparateProcess()) {
// redeploy = true IF the service failed and intent is to re-launch it
- if (!redeploy) {
+ if (redeploy == false) {
// Get number of instances of the Cas Processors to launch. This is defined in the CPE
// descriptor by
// attribute processingThreadCount in the <casProcessors> element.
@@ -681,7 +681,7 @@ public class VinciCasProcessorDeployer implements CasProcessorDeployer {
}
int serviceCount = attachToServices(redeploy, serviceUri, howMany, aProcessingContainer);
- if (!redeploy && exclusiveAccess && serviceCount < concurrentThreadCount) {
+ if (redeploy == false && exclusiveAccess && serviceCount < concurrentThreadCount) {
ServiceProxyPool pool = aProcessingContainer.getPool();
int poolSize = pool.getSize();
for (int i = 0; i < poolSize; i++) {
@@ -793,7 +793,7 @@ public class VinciCasProcessorDeployer implements CasProcessorDeployer {
// Retrieve a new service list from the VNS
serviceList = getNewServiceList(aServiceUri, casProcessorConfig);
- if (serviceList == null || serviceList.size() == 0 && !redeploy) {
+ if (serviceList == null || serviceList.size() == 0 && redeploy == false) {
throw new ResourceConfigurationException(CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
"UIMA_CPM_no_service_in_vns__FINEST",
new Object[] { Thread.currentThread().getName(), aServiceUri,
@@ -850,7 +850,7 @@ public class VinciCasProcessorDeployer implements CasProcessorDeployer {
if (exclusiveAccess) {
serviceInfo = getNextAvailable(serviceList);
if (serviceInfo == null) {
- if (!redeploy) {
+ if (redeploy == false) {
// No more services available. Report how many services we attached to so far
return succesfullConnections;
}
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vns/LocalVNS.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vns/LocalVNS.java
index 6730158d7..6a08d39d6 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vns/LocalVNS.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vns/LocalVNS.java
@@ -295,7 +295,7 @@ public class LocalVNS extends VinciServableAdapter implements Runnable {
"UIMA_CPM_deactivating_vns_port__INFO",
new Object[] { Thread.currentThread().getName() });
}
- cleanExit();
+ this.cleanExit();
return input;
} else if (cmd.equals("serveon")) {
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
@@ -396,7 +396,7 @@ public class LocalVNS extends VinciServableAdapter implements Runnable {
new Object[] { Thread.currentThread().getName() });
}
try {
- cleanExit();
+ this.cleanExit();
if (server != null) {
server.shutdownServing();
if (UIMAFramework.getLogger().isLoggable(Level.INFO)) {
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vns/VNSQuery.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vns/VNSQuery.java
index d2380cf8f..81139c83c 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vns/VNSQuery.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vns/VNSQuery.java
@@ -130,7 +130,7 @@ public class VNSQuery {
VinciServiceInfo service = (VinciServiceInfo) oldList.get(i);
if (aService.getHost().equals(service.getHost()) && aService.getPort() == service.getPort()
- && !service.isAvailable()) {
+ && service.isAvailable() == false) {
return false;
}
}
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ArtifactProducer.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ArtifactProducer.java
index c85016acb..3dd2474f8 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ArtifactProducer.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ArtifactProducer.java
@@ -194,16 +194,16 @@ public class ArtifactProducer implements Runnable {
* Null out fields of this object. Call this only when this object is no longer needed.
*/
public void cleanup() {
- casPool = null;
- workQueue = null;
- collectionReader = null;
- casList = null;
- cpm = null;
- if (cpmStatTable != null) {
- cpmStatTable.clear();
- cpmStatTable = null;
+ this.casPool = null;
+ this.workQueue = null;
+ this.collectionReader = null;
+ this.casList = null;
+ this.cpm = null;
+ if (this.cpmStatTable != null) {
+ this.cpmStatTable.clear();
+ this.cpmStatTable = null;
}
- lastDocId = null;
+ this.lastDocId = null;
}
/**
@@ -427,7 +427,7 @@ public class ArtifactProducer implements Runnable {
"UIMA_CPM_cr_check_cas_for_null__FINEST", new Object[] {
Thread.currentThread().getName(), String.valueOf((casList[i] == null)) });
}
- if (!cpm.isRunning()) {
+ if (cpm.isRunning() == false) {
// CPM is in shutdown stage. No need to enqueue additional
// documents/CAS'es. Just release
// those that have been aquired so far back to the pool and
@@ -771,8 +771,8 @@ public class ArtifactProducer implements Runnable {
// while the CPM is in normal shutdown state.
// (Moved this code inside if (casObjectList != null)
// block to avoid NullPointerException. -Adam
- if (cpm.isRunning()
- || (!cpm.isRunning() && !cpm.isHardKilled())) {
+ if (cpm.isRunning() == true
+ || (cpm.isRunning() == false && cpm.isHardKilled() == false)) {
threadState = 1005; // Entering enqueue
workQueue.enqueue(casObjectList);
// synchronized (workQueue) { // redundant, enqueue does this
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPECasPool.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPECasPool.java
index 8da2fdb9c..76fe496f8 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPECasPool.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPECasPool.java
@@ -193,7 +193,7 @@ public class CPECasPool {
new Object[] { Thread.currentThread().getName(),
String.valueOf(checkedOutInstances.size()) });
}
- notifyAll(); // when CAS becomes available
+ this.notifyAll(); // when CAS becomes available
}
}
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java
index 2eac6bf48..f431e73c4 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java
@@ -1276,7 +1276,7 @@ public class CPMEngine implements Runnable {
// The number of instances is determined based on number of processing
// threads and CP property setting that determines if the CP is able
// to run in parallel.
- if (!casProcessorsDeployed) {
+ if (casProcessorsDeployed == false) {
CasProcessor[] casprocessorList = new CasProcessor[initial_cp_list.size()];
ArrayList list;
for (int i = 0; i < initial_cp_list.size(); i++) {
@@ -1567,7 +1567,7 @@ public class CPMEngine implements Runnable {
*/
public boolean isPaused() {
synchronized (lockForPause) {
- return pause;
+ return (pause == true);
}
}
@@ -1875,7 +1875,7 @@ public class CPMEngine implements Runnable {
}
// CAS[] casList = null;
- if (!mixedCasProcessorTypeSupport && collectionReader instanceof CollectionReader) {
+ if (mixedCasProcessorTypeSupport == false && collectionReader instanceof CollectionReader) {
mixedCasProcessorTypeSupport = true;
}
@@ -2924,7 +2924,7 @@ public class CPMEngine implements Runnable {
producer.invalidate(aCASList);
} else {
ChunkMetadata meta = CPMUtils.getChunkMetadata(aCASList[0]);
- if (meta != null && meta.isOneOfMany() && !skippedDocs.containsKey(meta.getDocId())) {
+ if (meta != null && meta.isOneOfMany() && skippedDocs.containsKey(meta.getDocId()) == false) {
skippedDocs.put(meta.getDocId(), meta.getDocId());
}
}
@@ -3081,7 +3081,7 @@ public class CPMEngine implements Runnable {
"UIMA_CPM_call_get_cas_returns_null_FINEST", new Object[] {
Thread.currentThread().getName(), String.valueOf((casList[0] == null)) });
}
- if (!isRunning()) {
+ if (isRunning() == false) {
readerState = 1009;
casPool.releaseCas(casList[0]);
// synchronized (casPool) { // redundant - the above releaseCas call does this
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/DebugControlThread.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/DebugControlThread.java
index 575409049..b380675d8 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/DebugControlThread.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/DebugControlThread.java
@@ -134,7 +134,7 @@ public class DebugControlThread implements Runnable {
}
}
String command = doCheckpoint();
- if (!NOTFOUND.equals(command)) {
+ if (NOTFOUND.equals(command) == false) {
interpretAndExecuteCommand(command);
}
try {
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/NonThreadedProcessingUnit.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/NonThreadedProcessingUnit.java
index 2c9542eef..a4ed10957 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/NonThreadedProcessingUnit.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/NonThreadedProcessingUnit.java
@@ -204,19 +204,19 @@ public class NonThreadedProcessingUnit {
* Null out fields of this object. Call this only when this object is no longer needed.
*/
public void cleanup() {
- casPool = null;
- cpm = null;
- workQueue = null;
- outputQueue = null;
- mConverter = null;
- processingUnitProcessTrace = null;
- processContainers.clear();
- processContainers = null;
- casList = null;
- conversionCas = null;
- artifact = null;
- statusCbL = null;
- conversionCasArray = null;
+ this.casPool = null;
+ this.cpm = null;
+ this.workQueue = null;
+ this.outputQueue = null;
+ this.mConverter = null;
+ this.processingUnitProcessTrace = null;
+ this.processContainers.clear();
+ this.processContainers = null;
+ this.casList = null;
+ this.conversionCas = null;
+ this.artifact = null;
+ this.statusCbL = null;
+ this.conversionCasArray = null;
}
/**
@@ -539,7 +539,7 @@ public class NonThreadedProcessingUnit {
return false; // Dont pass the CAS to the CasConsumer. CAS has been dropped
}
} finally {
- if (!retry) {
+ if (retry == false) {
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST,
this.getClass().getName(), "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
@@ -655,8 +655,8 @@ public class NonThreadedProcessingUnit {
}
}
// enqueue CASes. If the CPM is in shutdown mode due to hard kill dont allow enqueue of CASes
- if (outputQueue != null && (cpm.isRunning()
- || (!cpm.isRunning() && !cpm.isHardKilled()))) {
+ if (outputQueue != null && (cpm.isRunning() == true
+ || (cpm.isRunning() == false && cpm.isHardKilled() == false))) {
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST, this.getClass().getName(),
"process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_add_cas_to_queue__FINEST",
@@ -982,7 +982,7 @@ public class NonThreadedProcessingUnit {
}
break;
}
- if (!isCasObject) {
+ if (isCasObject == false) {
convertCasDataToCasObject(casIndex, container.getName(), aCasObjectList);
} else {
casList[casIndex] = (CAS) aCasObjectList[casIndex];
@@ -1111,7 +1111,7 @@ public class NonThreadedProcessingUnit {
}
pTrTemp.startEvent(container.getName(), "Process", "");
// Check if the CasObject to CasData conversion is necessary
- if (isCasObject) {
+ if (isCasObject == true) {
CasData[] casDataObjects = new CasData[aCasObjectList.length];
for (int casIndex = 0; casIndex < aCasObjectList.length; casIndex++) {
casDataObjects[casIndex] = mConverter.casContainerToCasData((CAS) aCasObjectList[casIndex]);
@@ -1296,7 +1296,7 @@ public class NonThreadedProcessingUnit {
// Based on type of listener do appropriate conversions of Cas if necessary
if (statCL instanceof CasDataStatusCallbackListener) {
// The Cas is of type CAS, need to convert it to CasData
- if (isCasObject) {
+ if (isCasObject == true) {
// Convert CAS to CasData object
casObjectCopy = mConverter.casContainerToCasData((CAS) casObjectCopy);
}
@@ -1306,7 +1306,7 @@ public class NonThreadedProcessingUnit {
} else if (statCL instanceof StatusCallbackListener) {
boolean casFromPool = false;
// The cas is of type CasData, need to convert it to CAS
- if (!isCasObject) {
+ if (isCasObject == false) {
conversionCas = null;
if (casCache != null && casCache[0] != null) {
conversionCas = casCache[0];
@@ -1693,7 +1693,7 @@ public class NonThreadedProcessingUnit {
} finally {
pTrTemp.endEvent(container.getName(), "End of Batch", "");
if (processingUnitProcessTrace != null) {
- processingUnitProcessTrace.aggregate(pTrTemp);
+ this.processingUnitProcessTrace.aggregate(pTrTemp);
}
}
}
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ProcessingUnit.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ProcessingUnit.java
index 696bfdb60..38ee3a9a2 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ProcessingUnit.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ProcessingUnit.java
@@ -276,19 +276,19 @@ public class ProcessingUnit implements Runnable {
* Null out fields of this object. Call this only when this object is no longer needed.
*/
public void cleanup() {
- casPool = null;
- cpm = null;
- workQueue = null;
- outputQueue = null;
- mConverter = null;
- processingUnitProcessTrace = null;
- processContainers.clear();
- processContainers = null;
- casList = null;
- conversionCas = null;
- artifact = null;
- statusCbL = null;
- conversionCasArray = null;
+ this.casPool = null;
+ this.cpm = null;
+ this.workQueue = null;
+ this.outputQueue = null;
+ this.mConverter = null;
+ this.processingUnitProcessTrace = null;
+ this.processContainers.clear();
+ this.processContainers = null;
+ this.casList = null;
+ this.conversionCas = null;
+ this.artifact = null;
+ this.statusCbL = null;
+ this.conversionCasArray = null;
}
/**
@@ -647,12 +647,12 @@ public class ProcessingUnit implements Runnable {
}
threadState = 2003; // Killing
- cpm.killIt();
+ this.cpm.killIt();
} catch (Exception e) {
maybeLogSevereException(e);
threadState = 2003; // Killing
- cpm.killIt();
+ this.cpm.killIt();
} finally {
if (releaseCAS) {
clearCasCache();
@@ -854,7 +854,7 @@ public class ProcessingUnit implements Runnable {
if (processor instanceof CasDataProcessor) {
maybeLogFinest("UIMA_CPM_cas_data_processor__FINEST", container, processor);
pTrTemp.startEvent(container.getName(), "Process", "");
- if (isCasObject) {
+ if (isCasObject == true) {
CasData[] casDataObjects = new CasData[aCasObjectList.length];
for (int casIndex = 0; casIndex < aCasObjectList.length; casIndex++) {
casDataObjects[casIndex] = mConverter
@@ -920,7 +920,7 @@ public class ProcessingUnit implements Runnable {
}
break;
}
- if (!isCasObject) {
+ if (isCasObject == false) {
// The following may be true if the CollectionReader is CasData based and this is
// the first CasObject based annotator in the chain.
if (casCache == null || casCache[casIndex] == null) {
@@ -1306,8 +1306,8 @@ public class ProcessingUnit implements Runnable {
maybeLogFinest("UIMA_CPM_done_notify_listeners__FINEST");
}
// enqueue CASes. If the CPM is in shutdown mode due to hard kill dont allow enqueue of CASes
- if (outputQueue != null && (cpm.isRunning()
- || (!cpm.isRunning() && !cpm.isHardKilled()))) {
+ if (outputQueue != null && (cpm.isRunning() == true
+ || (cpm.isRunning() == false && cpm.isHardKilled() == false))) {
maybeLogFinestWorkQueue("UIMA_CPM_add_cas_to_queue__FINEST", outputQueue);
WorkUnit workUnit = new WorkUnit(aCasObjectList);
if (casCache != null && casCache[0] != null) {
@@ -1690,7 +1690,7 @@ public class ProcessingUnit implements Runnable {
// Based on type of listener do appropriate conversions of Cas if necessary
if (statCL instanceof CasDataStatusCallbackListener) {
// The Cas is of type CAS, need to convert it to CasData
- if (isCasObject) {
+ if (isCasObject == true) {
// Convert CAS to CasData object
casObjectCopy = mConverter.casContainerToCasData((CAS) casObjectCopy);
}
@@ -1700,7 +1700,7 @@ public class ProcessingUnit implements Runnable {
} else if (statCL instanceof StatusCallbackListener) {
boolean casFromPool = false;
// The cas is of type CasData, need to convert it to CAS
- if (!isCasObject) {
+ if (isCasObject == false) {
conversionCas = null;
if (casCache != null && casCache[0] != null) {
conversionCas = casCache[0];
@@ -1805,7 +1805,7 @@ public class ProcessingUnit implements Runnable {
} finally {
pTrTemp.endEvent(container.getName(), "End of Batch", "");
if (processingUnitProcessTrace != null) {
- processingUnitProcessTrace.aggregate(pTrTemp);
+ this.processingUnitProcessTrace.aggregate(pTrTemp);
}
}
}
@@ -2077,7 +2077,7 @@ public class ProcessingUnit implements Runnable {
return false; // Dont pass the CAS to the CasConsumer. CAS has been dropped
}
} finally {
- if (!retry) {
+ if (retry == false) {
maybeLogFinest("UIMA_CPM_end_of_batch__FINEST", container, processor);
if (isProcessorReady(container.getStatus())) {
t1 = System.currentTimeMillis();
@@ -2328,7 +2328,7 @@ public class ProcessingUnit implements Runnable {
}
break;
}
- if (!isCasObject) {
+ if (isCasObject == false) {
convertCasDataToCasObject(casIndex, container.getName(), aCasObjectList);
} else {
casList[casIndex] = (CAS) aCasObjectList[casIndex];
@@ -2417,7 +2417,7 @@ public class ProcessingUnit implements Runnable {
maybeLogFinest("UIMA_CPM_cas_data_processor__FINEST", container, processor);
pTrTemp.startEvent(container.getName(), "Process", "");
// Check if the CasObject to CasData conversion is necessary
- if (isCasObject) {
+ if (isCasObject == true) {
CasData[] casDataObjects = new CasData[aCasObjectList.length];
for (int casIndex = 0; casIndex < aCasObjectList.length; casIndex++) {
casDataObjects[casIndex] = mConverter.casContainerToCasData((CAS) aCasObjectList[casIndex]);
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/SequencedQueue.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/SequencedQueue.java
index 4af27a9e9..e0a5c30d2 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/SequencedQueue.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/SequencedQueue.java
@@ -472,7 +472,7 @@ public class SequencedQueue extends BoundedWorkQueue {
if (!timedOutDocs.containsKey(meta.getDocId())) {
addDocToTimedOutDocs(10000, meta.getDocId());
}
- if (meta.getDocId().equalsIgnoreCase(nextChunkMetadata.getDocId()) && chunkState) {
+ if (meta.getDocId().equalsIgnoreCase(nextChunkMetadata.getDocId()) && chunkState == true) {
chunkState = false;
nextChunkMetadata = new ChunkMetadata("", 0, false);
}
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/CPMUtils.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/CPMUtils.java
index 465b7599b..3722d9062 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/CPMUtils.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/CPMUtils.java
@@ -377,7 +377,7 @@ public class CPMUtils {
String appRoot = "annotators";
File rootDir = new File(rootPath, appRoot);
- if (!rootDir.isDirectory()) {
+ if (rootDir.isDirectory() == false) {
throw new Exception(CpmLocalizedMessage.getLocalizedMessage(CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
"UIMA_CPM_EXP_not_directory__WARNING",
new Object[] { Thread.currentThread().getName(), appRoot }));
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Filter.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Filter.java
index 6b82e9afb..cb19b6cdb 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Filter.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Filter.java
@@ -113,7 +113,7 @@ public class Filter {
} else if ("and".equalsIgnoreCase(token) || "or".equalsIgnoreCase(token)) {
evaluate(token);
} else {
- if (leftPartInStack) {
+ if (leftPartInStack == true) {
stack.push(new RightPart(token));
leftPartInStack = false;
} else {
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorCpeObject.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorCpeObject.java
index 10f7413e9..df1ff57bf 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorCpeObject.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorCpeObject.java
@@ -157,7 +157,7 @@ public class CasProcessorCpeObject extends MetaDataObject_impl implements CpeCas
if (descriptor == null) {
CpeComponentDescriptor comp_desc = CpeDescriptorFactory
.produceComponentDescriptor(aDescriptorPath);
- setCpeComponentDescriptor(comp_desc);
+ this.setCpeComponentDescriptor(comp_desc);
} else {
descriptor.getInclude().set(aDescriptorPath);
}
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCasProcessorsImpl.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCasProcessorsImpl.java
index 53629baf3..86de3dc31 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCasProcessorsImpl.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCasProcessorsImpl.java
@@ -468,7 +468,7 @@ public class CpeCasProcessorsImpl extends MetaDataObject_impl implements CpeCasP
@Override
protected AttributesImpl getXMLAttributes() {
AttributesImpl attrs = super.getXMLAttributes();
- if (isDropCasOnException()) {
+ if (isDropCasOnException() == true) {
attrs.addAttribute("", "dropCasOnException", "dropCasOnException", "CDATA",
String.valueOf(isDropCasOnException()));
}
diff --git a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeLocalCasProcessorImpl.java b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeLocalCasProcessorImpl.java
index e608973d5..5af5745b0 100644
--- a/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeLocalCasProcessorImpl.java
+++ b/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeLocalCasProcessorImpl.java
@@ -196,7 +196,7 @@ public class CpeLocalCasProcessorImpl extends CasProcessorCpeObject
param.setParameterType("String");
param.setParameterValue("9904");
deployParams.add(param);
- setDeploymentParams(deployParams);
+ this.setDeploymentParams(deployParams);
}
super.addDefaults();
diff --git a/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CheckpointTest.java b/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CheckpointTest.java
deleted file mode 100644
index 0df9cebc0..000000000
--- a/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CheckpointTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.uima.collection.impl.cpm;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.assertj.core.api.Assertions.assertThatNoException;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InvalidClassException;
-import java.io.ObjectOutputStream;
-
-import org.apache.uima.collection.base_cpm.SynchPoint;
-import org.junit.jupiter.api.Test;
-
-class CheckpointTest {
-
- @Test
- void testDeserializingCheckpointWithoutData() throws Exception {
- assertThatNoException().isThrownBy(() -> {
- var original = new CheckpointData();
- try (var bis = new ByteArrayInputStream(toBytes(original))) {
- var clone = Checkpoint.deserializeCheckpoint(bis);
- assertThat(clone).usingRecursiveComparison().isEqualTo(original);
- }
- });
- }
-
- void testDeserializingCheckpointWithIllegalData() throws Exception {
- assertThatExceptionOfType(IOException.class).isThrownBy(() -> {
- var original = new CheckpointData();
- var originalSynchPoint = new CustomSynchPoint();
- originalSynchPoint.set("foo");
- original.setSynchPoint(originalSynchPoint);
- try (var bis = new ByteArrayInputStream(toBytes(original))) {
- var clone = Checkpoint.deserializeCheckpoint(bis);
- assertThat(clone).usingRecursiveComparison().isEqualTo(original);
- }
- }).withMessageContaining("filter").withMessageContaining("REJECTED");
-
- }
-
- void testDeserializingCheckpointWithCustomSerialFilter() throws Exception {
- System.setProperty(Checkpoint.PROP_CPE_CHECKPOINT_SERIAL_FILTER,
- CustomSynchPoint.class.getName());
- try {
- assertThatNoException().isThrownBy(() -> {
- var original = new CheckpointData();
- var originalSynchPoint = new CustomSynchPoint();
- originalSynchPoint.set("foo");
- original.setSynchPoint(originalSynchPoint);
- try (var bis = new ByteArrayInputStream(toBytes(original))) {
- var clone = Checkpoint.deserializeCheckpoint(bis);
- assertThat(clone).usingRecursiveComparison().isEqualTo(original);
- }
- });
- } finally {
- System.getProperties().remove(Checkpoint.PROP_CPE_CHECKPOINT_SERIAL_FILTER);
- }
- }
-
- private byte[] toBytes(CheckpointData aOriginal) throws IOException {
- try (var bos = new ByteArrayOutputStream(); var oos = new ObjectOutputStream(bos)) {
- oos.writeObject(aOriginal);
- oos.flush();
- return bos.toByteArray();
- }
- }
-
- public static final class CustomSynchPoint implements SynchPoint {
-
- private static final long serialVersionUID = -6794583862575232021L;
- private Object data;
-
- @Override
- public void set(Object aSynchPointData) throws InvalidClassException {
- data = aSynchPointData;
- }
-
- @Override
- public Object get() {
- return data;
- }
-
- @Override
- public String serializeToXML() {
- throw new RuntimeException("Not implemented");
- }
-
- @Override
- public void deserialize(InputStream aInputStream) throws Exception {
- throw new RuntimeException("Not implemented");
- }
- }
-}
diff --git a/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpeDescriptorSerialization_Test.java b/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpeDescriptorSerialization_Test.java
index a7d60a08e..287199bb4 100644
--- a/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpeDescriptorSerialization_Test.java
+++ b/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpeDescriptorSerialization_Test.java
@@ -63,7 +63,7 @@ public class CpeDescriptorSerialization_Test {
@BeforeEach
public void setUp() throws Exception {
// get test base path setting
- testBaseDir = JUnitExtension.getFile("CpmTests/CpeAPITest");
+ this.testBaseDir = JUnitExtension.getFile("CpmTests/CpeAPITest");
}
/**
@@ -82,7 +82,7 @@ public class CpeDescriptorSerialization_Test {
cpeDesc = UIMAFramework.getXMLParser().parseCpeDescription(in);
// output file
- File outputFile = new File(testBaseDir, "outConf.xml");
+ File outputFile = new File(this.testBaseDir, "outConf.xml");
// serialize input file to output file
ByteArrayOutputStream outStream = new ByteArrayOutputStream();
@@ -113,7 +113,7 @@ public class CpeDescriptorSerialization_Test {
cpeDesc = UIMAFramework.getXMLParser().parseCpeDescription(in);
// output file
- File outputFile = new File(testBaseDir, "outConf2.xml");
+ File outputFile = new File(this.testBaseDir, "outConf2.xml");
// serialize input file to output file
ByteArrayOutputStream outStream = new ByteArrayOutputStream();
diff --git a/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmAE_ErrorTest.java b/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmAE_ErrorTest.java
index cf462634c..c9f55d7aa 100644
--- a/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmAE_ErrorTest.java
+++ b/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmAE_ErrorTest.java
@@ -951,7 +951,7 @@ public class CpmAE_ErrorTest {
public void aborted() {
super.aborted();
System.out.println("abort was called.");
- cpe.stop();
+ this.cpe.stop();
}
}
}
diff --git a/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmCasConsumer_ErrorTest.java b/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmCasConsumer_ErrorTest.java
index 7c7c08776..39d240688 100644
--- a/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmCasConsumer_ErrorTest.java
+++ b/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmCasConsumer_ErrorTest.java
@@ -453,8 +453,8 @@ public class CpmCasConsumer_ErrorTest {
while (iter.hasNext()) {
// if there is an error ... call the cpm to kill and check for a null CAS
if (iter.next() instanceof java.lang.Error) {
- cpe.kill();
- errorThrown = true;
+ this.cpe.kill();
+ this.errorThrown = true;
assertEquals("The cas is not null, as expected.", null, aCas);
}
}
@@ -462,7 +462,7 @@ public class CpmCasConsumer_ErrorTest {
}
public boolean hasError() {
- return errorThrown;
+ return this.errorThrown;
}
}
}
diff --git a/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmCollectionReader_ErrorTest.java b/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmCollectionReader_ErrorTest.java
index e12c8d5cf..e820203aa 100644
--- a/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmCollectionReader_ErrorTest.java
+++ b/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmCollectionReader_ErrorTest.java
@@ -756,7 +756,7 @@ public class CpmCollectionReader_ErrorTest {
public void aborted() {
super.aborted();
// System.out.println("abort was called.");
- cpe.stop();
+ this.cpe.stop();
}
/**
@@ -775,8 +775,8 @@ public class CpmCollectionReader_ErrorTest {
// if there is an error ... call the cpm to kill and check for a
// null CAS
if (iter.next() instanceof java.lang.Error) {
- cpe.kill();
- errorThrown = true;
+ this.cpe.kill();
+ this.errorThrown = true;
assertEquals("The cas is not null, as expected.", null, aCas);
}
}
@@ -784,7 +784,7 @@ public class CpmCollectionReader_ErrorTest {
}
public boolean hasError() {
- return errorThrown;
+ return this.errorThrown;
}
}
}
diff --git a/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/PearCasPoolTest.java b/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/PearCasPoolTest.java
index c46d6d7cf..27ce0521b 100644
--- a/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/PearCasPoolTest.java
+++ b/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/PearCasPoolTest.java
@@ -86,7 +86,7 @@ public class PearCasPoolTest {
ResourceManager rm = UIMAFramework.newDefaultResourceManager();
// check temporary working directory
- if (pearInstallDir == null)
+ if (this.pearInstallDir == null)
throw new FileNotFoundException("PEAR install directory not found");
// get pear files to install
@@ -95,7 +95,7 @@ public class PearCasPoolTest {
Assert.assertNotNull(pearFile);
// Install PEAR packages
- installedPear = PackageInstaller.installPackage(pearInstallDir, pearFile, false);
+ installedPear = PackageInstaller.installPackage(this.pearInstallDir, pearFile, false);
Assert.assertNotNull(installedPear);
core(10, 2, 3, null);
diff --git a/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestAnnotator.java b/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestAnnotator.java
index 48bec0322..3fb0c6122 100644
--- a/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestAnnotator.java
+++ b/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/utils/ErrorTestAnnotator.java
@@ -99,8 +99,8 @@ public class ErrorTestAnnotator extends JTextAnnotator_ImplBase {
keyList = new String[] { FUNC_PROCESS_KEY, FUNC_INITIALIZE_KEY, FUNC_RECONFIGURE_KEY };
// check the config what to do
- aTestAnnotator = safeGetConfigParameterValue(aContext, TEST_THIS_ANNOTATOR, true);
- if (aTestAnnotator) {
+ this.aTestAnnotator = safeGetConfigParameterValue(aContext, TEST_THIS_ANNOTATOR, true);
+ if (this.aTestAnnotator == true) {
String[] aGroups = aContext.getConfigurationGroupNames();
// walk through all configured (error)groups - ignore all appearing errors
for (int i = 0; i < aGroups.length; i++) {
diff --git a/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/SofaCollectionReader.java b/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/SofaCollectionReader.java
index 30ee382cd..1db799c3b 100644
--- a/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/SofaCollectionReader.java
+++ b/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/SofaCollectionReader.java
@@ -50,7 +50,7 @@ public class SofaCollectionReader extends CollectionReader_ImplBase {
public void getNext(CAS aCAS) throws IOException, CollectionException {
String text = "this beer is good";
try {
- getCasInitializer().initializeCas(text, aCAS);
+ this.getCasInitializer().initializeCas(text, aCAS);
} catch (NullPointerException e) {
// Create the Source text Sofa
SofaID sofaid = getUimaContext().mapToSofaID("InputText");
--
2.42.1
View Git Blame Copy Permalink