You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2024/08/19 09:41:10 UTC
(uima-uimaj) 01/01: Merge branch 'main' into release/4.0.x
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch release/4.0.x
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit e4b5bdbbd66bd20b8ec0e777fe8a50ace07942be
Merge: 14a236e89 f79fdcc3b
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Mon Aug 19 11:40:58 2024 +0200
Merge branch 'main' into release/4.0.x
* main:
No issue: Unrequire status checks
Issue #368: select(AnnotationBaseFs-type).count() seems to return MAX_LONG
Issue #348: Varargs for description class setters
Issue #348: Varargs for description class setters
.asf.yaml | 8 +-
.../uima/analysis_engine/TextAnalysisEngine.java | 3 +-
.../annotator/AnnotatorContext.java | 5 +-
.../annotator/AnnotatorContextException.java | 4 +
.../annotator/Annotator_ImplBase.java | 3 +-
.../analysis_engine/annotator/BaseAnnotator.java | 2 +
.../asb/impl/FlowControllerContainer.java | 24 +---
.../impl/AggregateAnalysisEngine_impl.java | 11 +-
.../impl/AnalysisEngineDescription_impl.java | 12 +-
.../impl/AnalysisEngineImplBase.java | 137 +++-----------------
.../impl/AnalysisEngineProcessorAdapter.java | 28 +----
.../impl/AnalysisProcessData_impl.java | 11 +-
.../impl/AnnotatorContext_impl.java | 83 ++----------
.../metadata/CapabilityLanguageFlow.java | 2 +-
.../uima/analysis_engine/metadata/FixedFlow.java | 2 +-
.../metadata/impl/AnalysisEngineMetaData_impl.java | 75 +----------
.../metadata/impl/CapabilityLanguageFlow_impl.java | 2 +-
.../metadata/impl/FixedFlow_impl.java | 19 +--
.../impl/FlowControllerDeclaration_impl.java | 50 --------
.../metadata/impl/SofaMapping_impl.java | 32 -----
.../org/apache/uima/cas/impl/BinaryCasSerDes4.java | 2 +-
.../java/org/apache/uima/cas/impl/CasCompare.java | 17 ++-
.../org/apache/uima/cas/impl/SelectFSs_impl.java | 37 +++---
.../uima/cas_data/impl/FeatureStructureImpl.java | 16 +--
.../collection/metadata/CasProcessorExecArg.java | 9 +-
.../metadata/CasProcessorExecutable.java | 2 -
.../collection/metadata/CasProcessorFilter.java | 2 -
.../metadata/CasProcessorRunInSeperateProcess.java | 2 -
.../metadata/CasProcessorRuntimeEnvParam.java | 2 -
.../collection/metadata/CasProcessorTimeout.java | 2 -
.../uima/collection/metadata/CpeCasProcessor.java | 19 ++-
.../uima/collection/metadata/CpeCheckpoint.java | 2 -
.../collection/metadata/CpeCollectionReader.java | 10 +-
.../CpeCollectionReaderCasInitializer.java | 2 +-
.../metadata/CpeCollectionReaderIterator.java | 1 -
.../metadata/CpeComponentDescriptor.java | 2 -
.../uima/collection/metadata/CpeConfiguration.java | 9 +-
.../uima/collection/metadata/CpeDescription.java | 3 +-
.../metadata/CpeDescriptorException.java | 4 -
.../uima/collection/metadata/CpeInclude.java | 8 +-
.../metadata/CpeIntegratedCasProcessor.java | 2 -
.../collection/metadata/CpeLocalCasProcessor.java | 2 -
.../collection/metadata/CpeRemoteCasProcessor.java | 2 -
.../metadata/CpeResourceManagerConfiguration.java | 6 +-
.../uima/collection/metadata/CpeSofaMapping.java | 1 -
.../uima/collection/metadata/CpeSofaMappings.java | 3 +-
.../uima/collection/metadata/NameValuePair.java | 8 +-
.../uima/collection/metadata/OutputQueue.java | 9 +-
.../uima/flow/CasFlowController_ImplBase.java | 5 -
.../src/main/java/org/apache/uima/flow/Flow.java | 1 -
.../apache/uima/flow/FlowController_ImplBase.java | 25 ----
.../impl/CapabilityLanguageFlowController.java | 10 +-
.../apache/uima/flow/impl/FixedFlowController.java | 102 ++++++---------
.../org/apache/uima/internal/util/Class_TCCL.java | 12 +-
.../uima/internal/util/CopyOnWriteObjHashSet.java | 1 -
.../uima/pear/tools/InstallationController.java | 139 +++++++++++++--------
.../uima/resource/CustomResourceSpecifier.java | 2 +-
.../uima/resource/ParameterizedDataResource.java | 4 +-
.../uima/resource/ResourceCreationSpecifier.java | 14 +--
.../resource/ResourceInitializationException.java | 2 -
.../org/apache/uima/resource/ResourceManager.java | 6 +-
.../apache/uima/resource/Resource_ImplBase.java | 39 ++----
.../org/apache/uima/resource/URISpecifier.java | 2 +-
.../apache/uima/resource/impl/CasManager_impl.java | 6 +-
.../impl/ResourceCreationSpecifier_impl.java | 5 +-
.../uima/resource/impl/URISpecifier_impl.java | 2 +-
.../uima/resource/metadata/AllowedValue.java | 10 +-
.../apache/uima/resource/metadata/Capability.java | 38 +++---
.../uima/resource/metadata/ConfigurationGroup.java | 6 +-
.../resource/metadata/ConfigurationParameter.java | 4 +-
.../ConfigurationParameterDeclarations.java | 8 +-
.../metadata/ConfigurationParameterSettings.java | 2 +-
.../uima/resource/metadata/FeatureDescription.java | 14 +--
.../uima/resource/metadata/FsIndexCollection.java | 10 +-
.../uima/resource/metadata/FsIndexDescription.java | 2 +-
.../resource/metadata/FsIndexKeyDescription.java | 2 -
.../org/apache/uima/resource/metadata/Import.java | 2 -
.../resource/metadata/LanguagePrecondition.java | 4 +-
.../uima/resource/metadata/MetaDataObject.java | 6 +-
.../resource/metadata/MimeTypePrecondition.java | 4 +-
.../uima/resource/metadata/NameValuePair.java | 8 +-
.../uima/resource/metadata/Precondition.java | 2 -
.../metadata/ProcessingResourceMetaData.java | 8 +-
.../metadata/ResourceManagerConfiguration.java | 20 +--
.../uima/resource/metadata/ResourceMetaData.java | 4 +-
.../uima/resource/metadata/TypeDescription.java | 6 +-
.../uima/resource/metadata/TypePriorities.java | 8 +-
.../uima/resource/metadata/TypePriorityList.java | 3 +-
.../resource/metadata/TypeSystemDescription.java | 8 +-
.../resource/metadata/impl/AllowedValue_impl.java | 20 ---
.../resource/metadata/impl/Capability_impl.java | 108 ++--------------
.../metadata/impl/ConfigurationGroup_impl.java | 25 +---
.../ConfigurationParameterDeclarations_impl.java | 70 +----------
.../impl/ConfigurationParameterSettings_impl.java | 25 +---
.../metadata/impl/ConfigurationParameter_impl.java | 61 +--------
.../impl/ExternalResourceBinding_impl.java | 25 ----
.../metadata/impl/FeatureDescription_impl.java | 40 ------
.../metadata/impl/FsIndexCollection_impl.java | 58 +--------
.../metadata/impl/FsIndexDescription_impl.java | 30 +----
.../metadata/impl/FsIndexKeyDescription_impl.java | 22 ----
.../resource/metadata/impl/ImportResolver.java | 4 +-
.../uima/resource/metadata/impl/Import_impl.java | 36 +-----
.../metadata/impl/LanguagePrecondition_impl.java | 37 ++----
.../impl/MetaDataObjectSerializer_indent.java | 14 +--
.../metadata/impl/MetaDataObject_impl.java | 102 ++++++++-------
.../metadata/impl/MimeTypePrecondition_impl.java | 26 +---
.../resource/metadata/impl/NameValuePair_impl.java | 6 -
.../metadata/impl/OperationalProperties_impl.java | 28 -----
.../impl/ResourceManagerConfiguration_impl.java | 135 +++-----------------
.../metadata/impl/ResourceMetaData_impl.java | 71 ++---------
.../metadata/impl/SimplePrecondition_impl.java | 53 +-------
.../metadata/impl/TypeDescription_impl.java | 54 ++------
.../metadata/impl/TypePriorities_impl.java | 70 ++---------
.../metadata/impl/TypePriorityList_impl.java | 19 +--
.../metadata/impl/TypeSystemDescription_impl.java | 66 ++--------
.../service/impl/ResourceServiceAdapter.java | 12 --
.../service/impl/ResourceService_impl.java | 2 -
.../org/apache/uima/uimacpp/CppUimajEngine.java | 4 +-
.../uima/uimacpp/UimacppAnalysisComponent.java | 14 +--
.../org/apache/uima/uimacpp/UimacppEngine.java | 1 +
.../impl/AnalysisEngineDescription_implTest.java | 79 +++++-------
.../impl/AnalysisEngine_implTest.java | 56 ++++-----
.../impl/AnnotatorContext_implTest.java | 4 +
.../MultiprocessingAnalysisEngine_implTest.java | 42 +++----
.../impl/TaeDescription_implTest.java | 131 +++++++++----------
.../TestProgramaticPseudoAggregateAnnotator.java | 7 +-
.../org/apache/uima/cas/impl/SelectFsTest.java | 27 +++-
.../uima/cas/impl/XmiCasDeserializerTest.java | 8 +-
.../impl/CasConsumerDescription_implTest.java | 63 +++++-----
.../impl/CasInitializerDescription_implTest.java | 51 ++++----
.../impl/CollectionReaderDescription_implTest.java | 59 ++++-----
.../uima/flow/impl/FixedFlowControllerTest.java | 2 +-
.../uima/internal/util/AnalysisEnginePoolTest.java | 4 +-
.../org/apache/uima/pear/util/PearRuntimeTest.java | 12 +-
...ConfigurableDataResourceSpecifier_implTest.java | 2 +-
.../resource/impl/ResourceManager_implTest.java | 3 +-
.../uima/resource/impl/URISpecifier_implTest.java | 7 +-
.../impl/ResourceServiceAdapter_implTest.java | 3 +-
.../service/impl/ResourceService_implTest.java | 2 +-
.../org/apache/uima/util/CasCreationUtilsTest.java | 2 +-
.../test/java/org/apache/uima/util/LevelTest.java | 8 +-
uimaj-core/src/test/java/x/y/z/Token.java | 30 ++---
uimaj-parent/pom.xml | 13 ++
143 files changed, 813 insertions(+), 2293 deletions(-)
diff --cc uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexDescription_impl.java
index 78179dc0a,f58c4f097..9f66a0fa6
--- a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexDescription_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexDescription_impl.java
@@@ -23,13 -23,9 +23,9 @@@ import org.apache.uima.UIMA_IllegalArgu
import org.apache.uima.resource.metadata.FsIndexDescription;
import org.apache.uima.resource.metadata.FsIndexKeyDescription;
- /**
- *
- *
- */
public class FsIndexDescription_impl extends MetaDataObject_impl implements FsIndexDescription {
- static final long serialVersionUID = 8939000196947456114L;
+ private static final long serialVersionUID = 8939000196947456114L;
static final FsIndexKeyDescription[] EMPTY_FS_INDEX_KEY_DESCRIPTION_ARRAY = new FsIndexKeyDescription[0];
diff --cc uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceMetaData_impl.java
index 36598a2e2,8c02f9bbd..cef1cafe8
--- a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceMetaData_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceMetaData_impl.java
@@@ -40,13 -40,10 +40,10 @@@ import org.w3c.dom.Element
/**
* Reference implementation of {@link ResourceMetaData}.
- *
- *
*/
-
public class ResourceMetaData_impl extends MetaDataObject_impl implements ResourceMetaData {
- static final long serialVersionUID = 3408359518094534817L;
+ private static final long serialVersionUID = 3408359518094534817L;
/** UUID of the Resource */
private String mUUID;