This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch feature/348-Varargs-for-description-class-setters
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit b15280d9fbbd6668e4c529f0fcc039f17afd7f56
Author: Richard Eckart de Castilho <r...@apache.org>
AuthorDate: Mon Sep 18 12:31:36 2023 +0200
Issue #348: Varargs for description class setters
- Change array arguments to varargs arguments
---
.../org/apache/uima/analysis_engine/metadata/FixedFlow.java | 2 +-
.../metadata/impl/AnalysisEngineMetaData_impl.java | 4 ++--
.../uima/analysis_engine/metadata/impl/FixedFlow_impl.java | 2 +-
.../org/apache/uima/resource/ResourceCreationSpecifier.java | 2 +-
.../uima/resource/impl/ResourceCreationSpecifier_impl.java | 5 +++--
.../java/org/apache/uima/resource/metadata/Capability.java | 6 +++---
.../org/apache/uima/resource/metadata/ConfigurationGroup.java | 2 +-
.../resource/metadata/ConfigurationParameterDeclarations.java | 4 ++--
.../org/apache/uima/resource/metadata/FsIndexDescription.java | 2 +-
.../uima/resource/metadata/ProcessingResourceMetaData.java | 4 ++--
.../uima/resource/metadata/ResourceManagerConfiguration.java | 4 ++--
.../org/apache/uima/resource/metadata/TypeDescription.java | 2 +-
.../apache/uima/resource/metadata/impl/Capability_impl.java | 6 +++---
.../uima/resource/metadata/impl/ConfigurationGroup_impl.java | 2 +-
.../metadata/impl/ConfigurationParameterDeclarations_impl.java | 10 ++++++----
.../uima/resource/metadata/impl/FsIndexDescription_impl.java | 2 +-
.../metadata/impl/ResourceManagerConfiguration_impl.java | 4 ++--
17 files changed, 33 insertions(+), 30 deletions(-)
diff --git
a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/FixedFlow.java
b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/FixedFlow.java
index 14845ade2..2988d4e17 100644
---
a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/FixedFlow.java
+++
b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/FixedFlow.java
@@ -66,5 +66,5 @@ public interface FixedFlow extends FlowConstraints {
* @throws org.apache.uima.UIMA_UnsupportedOperationException
* if this <code>MetaDataObject</code> is not modifiable.
*/
- void setFixedFlow(String[] aFlow);
+ void setFixedFlow(String... aFlow);
}
diff --git
a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/AnalysisEngineMetaData_impl.java
b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/AnalysisEngineMetaData_impl.java
index e14932a26..4678d55a7 100644
---
a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/AnalysisEngineMetaData_impl.java
+++
b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/AnalysisEngineMetaData_impl.java
@@ -109,7 +109,7 @@ public class AnalysisEngineMetaData_impl extends
ResourceMetaData_impl
* @see
org.apache.uima.analysis_engine.metadata.AnalysisEngineMetaData#setCapabilities(Capability[])
*/
@Override
- public void setCapabilities(Capability[] aCapabilities) {
+ public void setCapabilities(Capability... aCapabilities) {
if (aCapabilities == null) {
throw new
UIMA_IllegalArgumentException(UIMA_IllegalArgumentException.ILLEGAL_ARGUMENT,
new Object[] { "null", "aCapabilities", "setCapabilities" });
@@ -177,7 +177,7 @@ public class AnalysisEngineMetaData_impl extends
ResourceMetaData_impl
* @see
org.apache.uima.analysis_engine.metadata.AnalysisEngineMetaData#setFsIndexes(FsIndexDescription[])
*/
@Override
- public void setFsIndexes(FsIndexDescription[] aFsIndexes) {
+ public void setFsIndexes(FsIndexDescription... aFsIndexes) {
if (mFsIndexCollection == null) {
mFsIndexCollection = new FsIndexCollection_impl();
}
diff --git
a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/FixedFlow_impl.java
b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/FixedFlow_impl.java
index 4d5452eb9..1036eb5b7 100644
---
a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/FixedFlow_impl.java
+++
b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/FixedFlow_impl.java
@@ -60,7 +60,7 @@ public class FixedFlow_impl extends MetaDataObject_impl
implements FixedFlow {
* @see
org.apache.uima.analysis_engine.metadata.FixedFlow#setFixedFlow(String[])
*/
@Override
- public void setFixedFlow(String[] aFlow) {
+ public void setFixedFlow(String... aFlow) {
if (aFlow == null) {
throw new
UIMA_IllegalArgumentException(UIMA_IllegalArgumentException.ILLEGAL_ARGUMENT,
new Object[] { "null", "aFlow", "setFixedFlow" });
diff --git
a/uimaj-core/src/main/java/org/apache/uima/resource/ResourceCreationSpecifier.java
b/uimaj-core/src/main/java/org/apache/uima/resource/ResourceCreationSpecifier.java
index f5419be12..00ee3aacb 100644
---
a/uimaj-core/src/main/java/org/apache/uima/resource/ResourceCreationSpecifier.java
+++
b/uimaj-core/src/main/java/org/apache/uima/resource/ResourceCreationSpecifier.java
@@ -127,7 +127,7 @@ public interface ResourceCreationSpecifier extends
ResourceSpecifier {
* an array of {@link ExternalResourceDependency} objects that
describe this
* <code>ResourceCreationSpecifier</code>'s resource dependencies.
*/
- void setExternalResourceDependencies(ExternalResourceDependency[]
aDependencies);
+ void setExternalResourceDependencies(ExternalResourceDependency...
aDependencies);
/**
* Gets the external resource dependency with the given key.
diff --git
a/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceCreationSpecifier_impl.java
b/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceCreationSpecifier_impl.java
index 672351e95..5dea01fd4 100644
---
a/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceCreationSpecifier_impl.java
+++
b/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceCreationSpecifier_impl.java
@@ -131,7 +131,7 @@ public class ResourceCreationSpecifier_impl extends
MetaDataObject_impl
* @see
org.apache.uima.analysis_engine.AnalysisEngineDescription#setExternalResourceDependencies(ExternalResourceDependency[])
*/
@Override
- public void setExternalResourceDependencies(ExternalResourceDependency[]
aDependencies) {
+ public void setExternalResourceDependencies(ExternalResourceDependency...
aDependencies) {
// can't just clear the ArrayList since that breaks clone(). Create a new
list.
mExternalResourceDependencies = new ArrayList<>();
if (aDependencies != null) {
@@ -147,8 +147,9 @@ public class ResourceCreationSpecifier_impl extends
MetaDataObject_impl
@Override
public ExternalResourceDependency getExternalResourceDependency(String aKey)
{
for (ExternalResourceDependency dep : mExternalResourceDependencies) {
- if (aKey.equals(dep.getKey()))
+ if (aKey.equals(dep.getKey())) {
return dep;
+ }
}
return null;
}
diff --git
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/Capability.java
b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/Capability.java
index fc839d072..0163efc70 100644
--- a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/Capability.java
+++ b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/Capability.java
@@ -154,7 +154,7 @@ public interface Capability extends MetaDataObject {
* @throws org.apache.uima.UIMA_UnsupportedOperationException
* if this <code>MetaDataObject</code> is not modifiable.
*/
- void setPreconditions(Precondition[] aPreconditions);
+ void setPreconditions(Precondition... aPreconditions);
/**
* A convenience method that sets the languages that this Resource supports.
This is only
@@ -168,7 +168,7 @@ public interface Capability extends MetaDataObject {
* an array of ISO language identifiers. An empty array means that
the Resource claims to
* be language-independent.
*/
- void setLanguagesSupported(String[] aLanguageIDs);
+ void setLanguagesSupported(String... aLanguageIDs);
/**
* A convenience method that sets the MIME types that this Resource can take
as input.
@@ -180,7 +180,7 @@ public interface Capability extends MetaDataObject {
* an array of MIME types. This may be empty if the Resource does
not declare MIME type
* preconditions.
*/
- void setMimeTypesSupported(String[] aMimeTypes);
+ void setMimeTypesSupported(String... aMimeTypes);
/**
* A convenience method that adds an input Type to this Capability.
diff --git
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationGroup.java
b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationGroup.java
index d859b2066..a7f61ea69 100644
---
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationGroup.java
+++
b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationGroup.java
@@ -60,7 +60,7 @@ public interface ConfigurationGroup extends MetaDataObject {
* an array containing {@link ConfigurationParameter} objects, each
of which describes a
* configuration parameter in this group.
*/
- void setConfigurationParameters(ConfigurationParameter[] aParams);
+ void setConfigurationParameters(ConfigurationParameter... aParams);
/**
* Adds a Configuration Parameter to this group.
diff --git
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationParameterDeclarations.java
b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationParameterDeclarations.java
index 93e5c34f0..95e320dfb 100644
---
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationParameterDeclarations.java
+++
b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationParameterDeclarations.java
@@ -95,7 +95,7 @@ public interface ConfigurationParameterDeclarations extends
MetaDataObject {
* @throws org.apache.uima.UIMA_UnsupportedOperationException
* if this object is not modifiable
*/
- void setConfigurationGroups(ConfigurationGroup[] aGroups);
+ void setConfigurationGroups(ConfigurationGroup... aGroups);
/**
* Adds a Configuration Group.
@@ -137,7 +137,7 @@ public interface ConfigurationParameterDeclarations extends
MetaDataObject {
* an array containing {@link ConfigurationParameter} objects, each
of which describes a
* parameter common to all groups.
*/
- void setCommonParameters(ConfigurationParameter[] aParams);
+ void setCommonParameters(ConfigurationParameter... aParams);
/**
* Adds a Configuration Parameter that is common to all groups.
diff --git
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/FsIndexDescription.java
b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/FsIndexDescription.java
index ca223ff54..6c62287aa 100644
---
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/FsIndexDescription.java
+++
b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/FsIndexDescription.java
@@ -98,7 +98,7 @@ public interface FsIndexDescription extends MetaDataObject {
* @param aKeys
* the keys for this index
*/
- void setKeys(FsIndexKeyDescription[] aKeys);
+ void setKeys(FsIndexKeyDescription... aKeys);
/**
* Identifies a Sorted index.
diff --git
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ProcessingResourceMetaData.java
b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ProcessingResourceMetaData.java
index 5de1ea4f8..a81dde096 100644
---
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ProcessingResourceMetaData.java
+++
b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ProcessingResourceMetaData.java
@@ -122,7 +122,7 @@ public interface ProcessingResourceMetaData extends
ResourceMetaData {
* @throws UIMA_UnsupportedOperationException
* if this <code>MetaDataObject</code> is not modifiable.
*/
- void setFsIndexes(FsIndexDescription[] aFSIndexes);
+ void setFsIndexes(FsIndexDescription... aFSIndexes);
/**
* Retrieves this Processing Resource's {@link Capability Capabilities}.
Each capability consists
@@ -144,7 +144,7 @@ public interface ProcessingResourceMetaData extends
ResourceMetaData {
* @throws UIMA_UnsupportedOperationException
* if this <code>MetaDataObject</code> is not modifiable.
*/
- void setCapabilities(Capability[] aCapabilities);
+ void setCapabilities(Capability... aCapabilities);
/**
* Gets this Processing Resource's {@link OperationalProperties}. This
includes information such
diff --git
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ResourceManagerConfiguration.java
b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ResourceManagerConfiguration.java
index 11b485aa8..fda59354e 100644
---
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ResourceManagerConfiguration.java
+++
b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ResourceManagerConfiguration.java
@@ -174,7 +174,7 @@ public interface ResourceManagerConfiguration extends
MetaDataObject {
* an array of {@link
org.apache.uima.resource.ExternalResourceDescription} objects that
* describe the external resources.
*/
- void setExternalResources(ExternalResourceDescription[] aDescriptions);
+ void setExternalResources(ExternalResourceDescription... aDescriptions);
/**
* Adds a External Resource to this configuration
@@ -220,7 +220,7 @@ public interface ResourceManagerConfiguration extends
MetaDataObject {
* an array of {@link
org.apache.uima.resource.metadata.ExternalResourceBinding} objects
* that bind dependencies to resources.
*/
- void setExternalResourceBindings(ExternalResourceBinding[] aBindings);
+ void setExternalResourceBindings(ExternalResourceBinding... aBindings);
/**
* Adds a External ResourceBinding to this configuration
diff --git
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypeDescription.java
b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypeDescription.java
index 1a6ca726f..3c22a5b27 100644
---
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypeDescription.java
+++
b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypeDescription.java
@@ -109,7 +109,7 @@ public interface TypeDescription extends MetaDataObject {
* @param aAllowedValues
* the allowed values for instances of this Type
*/
- void setAllowedValues(AllowedValue[] aAllowedValues);
+ void setAllowedValues(AllowedValue... aAllowedValues);
/**
* Convenience method which adds a FeatureDescription to this
TypeDescription.
diff --git
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/Capability_impl.java
b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/Capability_impl.java
index 2132ccea1..0ce5aa23a 100644
---
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/Capability_impl.java
+++
b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/Capability_impl.java
@@ -160,7 +160,7 @@ public class Capability_impl extends MetaDataObject_impl
implements Capability {
* @see
org.apache.uima.resource.metadata.Capability#setPreconditions(Precondition[])
*/
@Override
- public void setPreconditions(Precondition[] aPreconditions) {
+ public void setPreconditions(Precondition... aPreconditions) {
mPreconditions = aPreconditions;
}
@@ -168,7 +168,7 @@ public class Capability_impl extends MetaDataObject_impl
implements Capability {
* @see
org.apache.uima.resource.metadata.Capability#setLanguagesSupported(String[])
*/
@Override
- public void setLanguagesSupported(String[] aLanguageIDs) {
+ public void setLanguagesSupported(String... aLanguageIDs) {
// create a list of existing preconditions
List<Precondition> preconditions = new ArrayList<>();
Precondition[] precondArray = getPreconditions();
@@ -196,7 +196,7 @@ public class Capability_impl extends MetaDataObject_impl
implements Capability {
* @see
org.apache.uima.resource.metadata.Capability#setMimeTypesSupported(java.lang.String[])
*/
@Override
- public void setMimeTypesSupported(String[] aMimeTypes) {
+ public void setMimeTypesSupported(String... aMimeTypes) {
// create a list of existing preconditions
List<Precondition> preconditions = new ArrayList<>();
Precondition[] precondArray = getPreconditions();
diff --git
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationGroup_impl.java
b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationGroup_impl.java
index ab3dd28ba..082cac882 100644
---
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationGroup_impl.java
+++
b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationGroup_impl.java
@@ -78,7 +78,7 @@ public class ConfigurationGroup_impl extends
MetaDataObject_impl implements Conf
* @see
ConfigurationGroup#setConfigurationParameters(ConfigurationParameter[])
*/
@Override
- public void setConfigurationParameters(ConfigurationParameter[] aParams) {
+ public void setConfigurationParameters(ConfigurationParameter... aParams) {
mConfigurationParameters = aParams;
}
diff --git
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterDeclarations_impl.java
b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterDeclarations_impl.java
index 070e2007a..8c0d8d37f 100644
---
a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterDeclarations_impl.java
+++
b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterDeclarations_impl.java
@@ -117,7 +117,7 @@ public class ConfigurationParameterDeclarations_impl
extends MetaDataObject_impl
* @see
ConfigurationParameterDeclarations#setCommonParameters(ConfigurationParameter[])
*/
@Override
- public void setCommonParameters(ConfigurationParameter[] aParams) {
+ public void setCommonParameters(ConfigurationParameter... aParams) {
if (aParams == null) {
throw new
UIMA_IllegalArgumentException(UIMA_IllegalArgumentException.ILLEGAL_ARGUMENT,
new Object[] { "null", "aParams", "setCommonParameters" });
@@ -129,7 +129,7 @@ public class ConfigurationParameterDeclarations_impl
extends MetaDataObject_impl
* @see
ConfigurationParameterDeclarations#setConfigurationGroups(ConfigurationGroup[])
*/
@Override
- public void setConfigurationGroups(ConfigurationGroup[] aGroups) {
+ public void setConfigurationGroups(ConfigurationGroup... aGroups) {
if (aGroups == null) {
throw new
UIMA_IllegalArgumentException(UIMA_IllegalArgumentException.ILLEGAL_ARGUMENT,
new Object[] { "null", "aGroups", "setConfigurationGroups" });
@@ -172,8 +172,9 @@ public class ConfigurationParameterDeclarations_impl
extends MetaDataObject_impl
for (int i = 0; i < groups.length; i++) {
ConfigurationParameter[] paramsInGroup =
groups[i].getConfigurationParameters();
p = _getConfigurationParameter(paramsInGroup, aParamName);
- if (p != null)
+ if (p != null) {
break;
+ }
}
}
return p;
@@ -297,8 +298,9 @@ public class ConfigurationParameterDeclarations_impl
extends MetaDataObject_impl
String aName) {
if (aParams != null) {
for (int i = 0; i < aParams.length; i++) {
- if (aName.equals(aParams[i].getName()))
+ if (aName.equals(aParams[i].getName())) {
return aParams[i];
+ }
}
}
return null;
diff --git
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
index 735786c23..fbe1878f7 100644
---
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
@@ -106,7 +106,7 @@ public class FsIndexDescription_impl extends
MetaDataObject_impl implements FsIn
* @see FsIndexDescription#setKeys(FsIndexKeyDescription[])
*/
@Override
- public void setKeys(FsIndexKeyDescription[] aKeys) {
+ public void setKeys(FsIndexKeyDescription... aKeys) {
if (aKeys == null) {
throw new
UIMA_IllegalArgumentException(UIMA_IllegalArgumentException.ILLEGAL_ARGUMENT,
new Object[] { "null", "aKeys", "setKeys" });
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 82dcccd6d..d14e95347 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
@@ -168,7 +168,7 @@ public class ResourceManagerConfiguration_impl extends
MetaDataObject_impl
* uima.resource.ExternalResourceDescription[])
*/
@Override
- public void setExternalResources(ExternalResourceDescription[]
aDescriptions) {
+ public void setExternalResources(ExternalResourceDescription...
aDescriptions) {
mExternalResources = (aDescriptions != null) ? aDescriptions
: ExternalResourceDescription.EMPTY_EXTERNAL_RESORUCE_DESCRIPTIONS;
}
@@ -192,7 +192,7 @@ public class ResourceManagerConfiguration_impl extends
MetaDataObject_impl
* apache.uima.resource.metadata.ExternalResourceBinding[])
*/
@Override
- public void setExternalResourceBindings(ExternalResourceBinding[] aBindings)
{
+ public void setExternalResourceBindings(ExternalResourceBinding...
aBindings) {
mBindings = (aBindings != null) ? aBindings :
ExternalResourceBinding.EMPTY_RESOURCE_BINDINGS;
}
