Issue #348: Varargs for description class setters
- Change array arguments to varargs arguments
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 14845ad..2988d4e 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 @@
* @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 e14932a..4678d55 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 @@
* @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 @@
* @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 4d5452e..1036eb5 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 @@
* @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 f5419be..00ee3aa 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 @@
* 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 672351e..5dea01f 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 @@
* @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 @@
@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 fc839d0..8a1be0d 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
@@ -118,7 +118,7 @@
* @param aInputs
* an array of references to Types or Features in this Resource's TypeSystem.
*/
- void setInputs(TypeOrFeature[] aInputs);
+ void setInputs(TypeOrFeature... aInputs);
/**
* Sets the outputs of this Capability.
@@ -126,7 +126,7 @@
* @param aOutputs
* an array of references to Types or Features in this Resource's TypeSystem.
*/
- void setOutputs(TypeOrFeature[] aOutputs);
+ void setOutputs(TypeOrFeature... aOutputs);
/**
* Sets the input Sofa names.
@@ -135,7 +135,7 @@
* an array of strings containing SofA names
*/
/* Reserved for future use. */
- void setInputSofas(String[] aInputSofas);
+ void setInputSofas(String... aInputSofas);
/**
* Sets the output Sofa names of this capability
@@ -143,7 +143,7 @@
* @param aOutputSofas
* an array of strings containing SoFA name
*/
- void setOutputSofas(String[] aOutputSofas);
+ void setOutputSofas(String... aOutputSofas);
/**
* Sets the <code>Precondition</code>s of this <code>Capability</code>.
@@ -154,7 +154,7 @@
* @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 @@
* 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 @@
* 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 d859b20..add79d7 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
@@ -43,7 +43,7 @@
* @param aNames
* an array of group names. Names are not allowed to contain whitespace.
*/
- void setNames(String[] aNames);
+ void setNames(String... aNames);
/**
* Gets the configuration parameters in this group.
@@ -60,7 +60,7 @@
* 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/ConfigurationParameter.java b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationParameter.java
index 85707ee..e8b90d7 100644
--- a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationParameter.java
+++ b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ConfigurationParameter.java
@@ -206,7 +206,7 @@
* @param aOverrides
* the parameters this this parameter overrides
*/
- void setOverrides(String[] aOverrides);
+ void setOverrides(String... aOverrides);
/**
* Adds an override to this configuration parameter.
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 93e5c34..95e320d 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 @@
* @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 @@
* 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 ca223ff..6c62287 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 @@
* @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 5de1ea4..a81dde0 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 @@
* @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 @@
* @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 11b485a..fda5935 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 @@
* 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 @@
* 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 1a6ca72..3c22a5b 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 @@
* @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 2132cce..ef2a20e 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
@@ -144,7 +144,7 @@
* @see org.apache.uima.resource.metadata.Capability#setInputs(TypeOrFeature[])
*/
@Override
- public void setInputs(TypeOrFeature[] aInputs) {
+ public void setInputs(TypeOrFeature... aInputs) {
mInputs = aInputs;
}
@@ -152,7 +152,7 @@
* @see org.apache.uima.resource.metadata.Capability#setOutputs(TypeOrFeature[])
*/
@Override
- public void setOutputs(TypeOrFeature[] aOutputs) {
+ public void setOutputs(TypeOrFeature... aOutputs) {
mOutputs = aOutputs;
}
@@ -160,7 +160,7 @@
* @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 @@
* @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 @@
* @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();
@@ -343,7 +343,7 @@
* @see org.apache.uima.resource.metadata.Capability#setInputSofaNames(java.lang.String[])
*/
@Override
- public void setInputSofas(String[] aInputSofaNames) {
+ public void setInputSofas(String... aInputSofaNames) {
mInputSofas = aInputSofaNames;
}
@@ -353,7 +353,7 @@
* @see org.apache.uima.resource.metadata.Capability#setOutputSofaNames(java.lang.String[])
*/
@Override
- public void setOutputSofas(String[] aOutputSofaNames) {
+ public void setOutputSofas(String... aOutputSofaNames) {
mOutputSofas = aOutputSofaNames;
}
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 ab3dd28..69788ef 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
@@ -62,7 +62,7 @@
* @see ConfigurationGroup#setNames(java.lang.String[])
*/
@Override
- public void setNames(String[] aNames) {
+ public void setNames(String... aNames) {
mNames = aNames;
}
@@ -78,7 +78,7 @@
* @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 070e200..8c0d8d3 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 @@
* @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 @@
* @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 @@
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 @@
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/ConfigurationParameter_impl.java b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameter_impl.java
index 4f317e7..995a406 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
@@ -198,7 +198,7 @@
* @see org.apache.uima.resource.metadata.ConfigurationParameter#setOverrides(java.lang.String[])
*/
@Override
- public void setOverrides(String[] aOverrides) {
+ public void setOverrides(String... aOverrides) {
if (aOverrides == null) {
mOverrides = Constants.EMPTY_STRING_ARRAY;
} else {
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 735786c..fbe1878 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 @@
* @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 82dcccd..d14e953 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 @@
* 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 @@
* apache.uima.resource.metadata.ExternalResourceBinding[])
*/
@Override
- public void setExternalResourceBindings(ExternalResourceBinding[] aBindings) {
+ public void setExternalResourceBindings(ExternalResourceBinding... aBindings) {
mBindings = (aBindings != null) ? aBindings : ExternalResourceBinding.EMPTY_RESOURCE_BINDINGS;
}
