Author: rec
Date: Fri Jun 7 14:43:00 2013
New Revision: 1490666
URL: http://svn.apache.org/r1490666
Log:
[UIMA-2866] Parameter ordering could be improved in
ConfigurationParameterInitializer & ExternalResourceInitializer
- Changed parameter ordering to (target, settings) to be consistent with the
other "initialize" methods in ConfigurationParameterInitializer.
Modified:
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/initializable/InitializableFactoryTest.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasAnnotator_ImplBase.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasCollectionReader_ImplBase.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasConsumer_ImplBase.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasFlowController_ImplBase.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasMultiplier_ImplBase.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasAnnotator_ImplBase.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasCollectionReader_ImplBase.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasConsumer_ImplBase.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasFlowController_ImplBase.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasMultiplier_ImplBase.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/initialize/ConfigurationParameterInitializer.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/initialize/ExternalResourceInitializer.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/xwriter/IntegerFileNamer.java
uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/initializable/InitializableFactoryTest.java
Modified:
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/initializable/InitializableFactoryTest.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/initializable/InitializableFactoryTest.java?rev=1490666&r1=1490665&r2=1490666&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/initializable/InitializableFactoryTest.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/test/java/org/apache/uima/fit/factory/initializable/InitializableFactoryTest.java
Fri Jun 7 14:43:00 2013
@@ -82,7 +82,7 @@ public class InitializableFactoryTest {
public boolean booleanParameter = false;
public void initialize(UimaContext context) throws
ResourceInitializationException {
- ConfigurationParameterInitializer.initialize(context, this);
+ ConfigurationParameterInitializer.initialize(this, context);
}
}
@@ -95,7 +95,7 @@ public class InitializableFactoryTest {
public boolean booleanParameter = false;
public void initialize(UimaContext context) throws
ResourceInitializationException {
- ConfigurationParameterInitializer.initialize(context, this);
+ ConfigurationParameterInitializer.initialize(this, context);
}
}
@@ -108,7 +108,7 @@ public class InitializableFactoryTest {
public String stringParameter = "hello";
public void initialize(UimaContext context) throws
ResourceInitializationException {
- ConfigurationParameterInitializer.initialize(context, this);
+ ConfigurationParameterInitializer.initialize(this, context);
}
public String nameFile(JCas jCas) {
@@ -125,7 +125,7 @@ public class InitializableFactoryTest {
public String stringParameter = "hello";
public void initialize(UimaContext context) throws
ResourceInitializationException {
- ConfigurationParameterInitializer.initialize(context, this);
+ ConfigurationParameterInitializer.initialize(this, context);
}
public String nameFile(JCas jCas) {
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasAnnotator_ImplBase.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasAnnotator_ImplBase.java?rev=1490666&r1=1490665&r2=1490666&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasAnnotator_ImplBase.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasAnnotator_ImplBase.java
Fri Jun 7 14:43:00 2013
@@ -43,7 +43,7 @@ public abstract class CasAnnotator_ImplB
@Override
public void initialize(final UimaContext context) throws
ResourceInitializationException {
super.initialize(context);
- ConfigurationParameterInitializer.initialize(context, this);
- ExternalResourceInitializer.initialize(context, this);
+ ConfigurationParameterInitializer.initialize(this, context);
+ ExternalResourceInitializer.initialize(this, context);
}
}
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasCollectionReader_ImplBase.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasCollectionReader_ImplBase.java?rev=1490666&r1=1490665&r2=1490666&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasCollectionReader_ImplBase.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasCollectionReader_ImplBase.java
Fri Jun 7 14:43:00 2013
@@ -47,8 +47,8 @@ public abstract class CasCollectionReade
@Override
// This method should not be overwritten. Overwrite initialize(UimaContext)
instead.
public final void initialize() throws ResourceInitializationException {
- ConfigurationParameterInitializer.initialize(getUimaContext(), this);
- ExternalResourceInitializer.initialize(getUimaContext(), this);
+ ConfigurationParameterInitializer.initialize(this, getUimaContext());
+ ExternalResourceInitializer.initialize(this, getUimaContext());
initialize(getUimaContext());
}
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasConsumer_ImplBase.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasConsumer_ImplBase.java?rev=1490666&r1=1490665&r2=1490666&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasConsumer_ImplBase.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasConsumer_ImplBase.java
Fri Jun 7 14:43:00 2013
@@ -46,7 +46,7 @@ public abstract class CasConsumer_ImplBa
@Override
public void initialize(final UimaContext context) throws
ResourceInitializationException {
super.initialize(context);
- ConfigurationParameterInitializer.initialize(context, this);
- ExternalResourceInitializer.initialize(context, this);
+ ConfigurationParameterInitializer.initialize(this, context);
+ ExternalResourceInitializer.initialize(this, context);
}
}
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasFlowController_ImplBase.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasFlowController_ImplBase.java?rev=1490666&r1=1490665&r2=1490666&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasFlowController_ImplBase.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasFlowController_ImplBase.java
Fri Jun 7 14:43:00 2013
@@ -42,7 +42,7 @@ public abstract class CasFlowController_
public void initialize(final FlowControllerContext context)
throws ResourceInitializationException {
super.initialize(context);
- ConfigurationParameterInitializer.initialize(context, this);
- ExternalResourceInitializer.initialize(context, this);
+ ConfigurationParameterInitializer.initialize(this, context);
+ ExternalResourceInitializer.initialize(this, context);
}
}
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasMultiplier_ImplBase.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasMultiplier_ImplBase.java?rev=1490666&r1=1490665&r2=1490666&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasMultiplier_ImplBase.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasMultiplier_ImplBase.java
Fri Jun 7 14:43:00 2013
@@ -44,7 +44,7 @@ public abstract class CasMultiplier_Impl
@Override
public void initialize(final UimaContext context) throws
ResourceInitializationException {
super.initialize(context);
- ConfigurationParameterInitializer.initialize(context, this);
- ExternalResourceInitializer.initialize(context, this);
+ ConfigurationParameterInitializer.initialize(this, context);
+ ExternalResourceInitializer.initialize(this, context);
}
}
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasAnnotator_ImplBase.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasAnnotator_ImplBase.java?rev=1490666&r1=1490665&r2=1490666&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasAnnotator_ImplBase.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasAnnotator_ImplBase.java
Fri Jun 7 14:43:00 2013
@@ -42,7 +42,7 @@ public abstract class JCasAnnotator_Impl
@Override
public void initialize(final UimaContext context) throws
ResourceInitializationException {
super.initialize(context);
- ConfigurationParameterInitializer.initialize(context, this);
- ExternalResourceInitializer.initialize(context, this);
+ ConfigurationParameterInitializer.initialize(this, context);
+ ExternalResourceInitializer.initialize(this, context);
}
}
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasCollectionReader_ImplBase.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasCollectionReader_ImplBase.java?rev=1490666&r1=1490665&r2=1490666&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasCollectionReader_ImplBase.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasCollectionReader_ImplBase.java
Fri Jun 7 14:43:00 2013
@@ -51,8 +51,8 @@ public abstract class JCasCollectionRead
// This method should not be overwritten. Overwrite initialize(UimaContext)
instead.
@Override
public final void initialize() throws ResourceInitializationException {
- ConfigurationParameterInitializer.initialize(getUimaContext(), this);
- ExternalResourceInitializer.initialize(getUimaContext(), this);
+ ConfigurationParameterInitializer.initialize(this, getUimaContext());
+ ExternalResourceInitializer.initialize(this, getUimaContext());
initialize(getUimaContext());
}
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasConsumer_ImplBase.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasConsumer_ImplBase.java?rev=1490666&r1=1490665&r2=1490666&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasConsumer_ImplBase.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasConsumer_ImplBase.java
Fri Jun 7 14:43:00 2013
@@ -46,7 +46,7 @@ public abstract class JCasConsumer_ImplB
@Override
public void initialize(final UimaContext context) throws
ResourceInitializationException {
super.initialize(context);
- ConfigurationParameterInitializer.initialize(context, this);
- ExternalResourceInitializer.initialize(context, this);
+ ConfigurationParameterInitializer.initialize(this, context);
+ ExternalResourceInitializer.initialize(this, context);
}
}
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasFlowController_ImplBase.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasFlowController_ImplBase.java?rev=1490666&r1=1490665&r2=1490666&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasFlowController_ImplBase.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasFlowController_ImplBase.java
Fri Jun 7 14:43:00 2013
@@ -42,7 +42,7 @@ public abstract class JCasFlowController
public void initialize(final FlowControllerContext context)
throws ResourceInitializationException {
super.initialize(context);
- ConfigurationParameterInitializer.initialize(context, this);
- ExternalResourceInitializer.initialize(context, this);
+ ConfigurationParameterInitializer.initialize(this, context);
+ ExternalResourceInitializer.initialize(this, context);
}
}
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasMultiplier_ImplBase.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasMultiplier_ImplBase.java?rev=1490666&r1=1490665&r2=1490666&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasMultiplier_ImplBase.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasMultiplier_ImplBase.java
Fri Jun 7 14:43:00 2013
@@ -44,7 +44,7 @@ public abstract class JCasMultiplier_Imp
@Override
public void initialize(final UimaContext context) throws
ResourceInitializationException {
super.initialize(context);
- ConfigurationParameterInitializer.initialize(context, this);
- ExternalResourceInitializer.initialize(context, this);
+ ConfigurationParameterInitializer.initialize(this, context);
+ ExternalResourceInitializer.initialize(this, context);
}
}
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/initialize/ConfigurationParameterInitializer.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/initialize/ConfigurationParameterInitializer.java?rev=1490666&r1=1490665&r2=1490666&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/initialize/ConfigurationParameterInitializer.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/initialize/ConfigurationParameterInitializer.java
Fri Jun 7 14:43:00 2013
@@ -76,12 +76,12 @@ public final class ConfigurationParamete
* or to not provide one at all. If the context does not have a
configuration parameter, then the
* default value provided by the developer as specified by the defaultValue
element of the
* {@link ConfigurationParameter} will be used. See comments in the code for
additional details.
- * @param context
- * a UIMA context with configuration parameters.
* @param component
* the component to initialize.
+ * @param context
+ * a UIMA context with configuration parameters.
*/
- public static void initialize(final UimaContext context, final Object
component)
+ public static void initialize(final Object component, final UimaContext
context)
throws ResourceInitializationException {
MutablePropertyValues values = new MutablePropertyValues();
List<String> mandatoryValues = new ArrayList<String>();
@@ -184,7 +184,7 @@ public final class ConfigurationParamete
* the component to initialize.
* @param map
* a UIMA context with configuration parameters.
- * @see #initialize(UimaContext, Object)
+ * @see #initialize(Object, UimaContext)
*/
public static void initialize(final Object component, final Map<String,
Object> map)
throws ResourceInitializationException {
@@ -195,7 +195,7 @@ public final class ConfigurationParamete
for (Entry<String, Object> e : map.entrySet()) {
cfgMgr.setConfigParameterValue(context.getQualifiedContextName() +
e.getKey(), e.getValue());
}
- initialize(context, component);
+ initialize(component, context);
}
/**
@@ -205,7 +205,7 @@ public final class ConfigurationParamete
* the component to initialize.
* @param spec
* a resource specifier.
- * @see #initialize(UimaContext, Object)
+ * @see #initialize(Object, UimaContext)
*/
public static void initialize(Object component, ResourceSpecifier spec)
throws ResourceInitializationException {
@@ -219,7 +219,7 @@ public final class ConfigurationParamete
* the component to initialize.
* @param parameters
* a list of parameters.
- * @see #initialize(UimaContext, Object)
+ * @see #initialize(Object, UimaContext)
*/
public static void initialize(Object component, Parameter... parameters)
throws ResourceInitializationException {
@@ -237,7 +237,7 @@ public final class ConfigurationParamete
* the component to initialize.
* @param parameters
* a list of parameters.
- * @see #initialize(UimaContext, Object)
+ * @see #initialize(Object, UimaContext)
*/
public static void initialize(Object component, NameValuePair... parameters)
throws ResourceInitializationException {
@@ -255,7 +255,7 @@ public final class ConfigurationParamete
* the component to initialize.
* @param dataResource
* a data resource with configuration meta data.
- * @see #initialize(UimaContext, Object)
+ * @see #initialize(Object, UimaContext)
*/
public static void initialize(Object component, DataResource dataResource)
throws ResourceInitializationException {
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/initialize/ExternalResourceInitializer.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/initialize/ExternalResourceInitializer.java?rev=1490666&r1=1490665&r2=1490666&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/initialize/ExternalResourceInitializer.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/initialize/ExternalResourceInitializer.java
Fri Jun 7 14:43:00 2013
@@ -56,17 +56,17 @@ public final class ExternalResourceIniti
/**
* Configure a component from the given context.
+ * @param object
+ * the component.
+ * @param context
+ * the UIMA context.
*
* @param <T>
* the component type.
- * @param context
- * the UIMA context.
- * @param object
- * the component.
* @throws ResourceInitializationException
* if the external resource cannot be configured.
*/
- public static <T> void initialize(UimaContext context, T object)
+ public static <T> void initialize(T object, UimaContext context)
throws ResourceInitializationException {
configure(context, object.getClass(), object.getClass(), object);
}
@@ -195,7 +195,7 @@ public final class ExternalResourceIniti
// Already mark the resource as initialized so we do not run into an
// endless recursive loop when initialize() is called again.
initializedResources.put(r, INITIALIZED);
- initialize(aContext, r);
+ initialize(r, aContext);
awareResources.add((ExternalResourceAware) r);
}
}
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/xwriter/IntegerFileNamer.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/xwriter/IntegerFileNamer.java?rev=1490666&r1=1490665&r2=1490666&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/xwriter/IntegerFileNamer.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/xwriter/IntegerFileNamer.java
Fri Jun 7 14:43:00 2013
@@ -48,6 +48,6 @@ public class IntegerFileNamer implements
}
public void initialize(UimaContext context) throws
ResourceInitializationException {
- ConfigurationParameterInitializer.initialize(context, this);
+ ConfigurationParameterInitializer.initialize(this, context);
}
}
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/initializable/InitializableFactoryTest.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/initializable/InitializableFactoryTest.java?rev=1490666&r1=1490665&r2=1490666&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/initializable/InitializableFactoryTest.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/initializable/InitializableFactoryTest.java
Fri Jun 7 14:43:00 2013
@@ -79,7 +79,7 @@ public class InitializableFactoryTest {
public boolean booleanParameter = false;
public void initialize(UimaContext context) throws
ResourceInitializationException {
- ConfigurationParameterInitializer.initialize(context, this);
+ ConfigurationParameterInitializer.initialize(this, context);
}
}
@@ -90,7 +90,7 @@ public class InitializableFactoryTest {
public boolean booleanParameter = false;
public void initialize(UimaContext context) throws
ResourceInitializationException {
- ConfigurationParameterInitializer.initialize(context, this);
+ ConfigurationParameterInitializer.initialize(this, context);
}
}
@@ -101,7 +101,7 @@ public class InitializableFactoryTest {
public String stringParameter = "hello";
public void initialize(UimaContext context) throws
ResourceInitializationException {
- ConfigurationParameterInitializer.initialize(context, this);
+ ConfigurationParameterInitializer.initialize(this, context);
}
public String nameFile(JCas jCas) {
@@ -116,7 +116,7 @@ public class InitializableFactoryTest {
public String stringParameter = "hello";
public void initialize(UimaContext context) throws
ResourceInitializationException {
- ConfigurationParameterInitializer.initialize(context, this);
+ ConfigurationParameterInitializer.initialize(this, context);
}
public String nameFile(JCas jCas) {
