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 2013/02/20 18:34:37 UTC
svn commit: r1448314 - in
/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory:
ConfigurationParameterFactoryTest.java testAes/ParameterizedAE.java
Author: rec
Date: Wed Feb 20 17:34:37 2013
New Revision: 1448314
URL: http://svn.apache.org/r1448314
Log:
[UIMA-2587] @ConfigurationParameter - name should default to name of annotated field without class name
https://issues.apache.org/jira/browse/UIMA-2587
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/ConfigurationParameterFactoryTest.java
uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ParameterizedAE.java
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/ConfigurationParameterFactoryTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/ConfigurationParameterFactoryTest.java?rev=1448314&r1=1448313&r2=1448314&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/ConfigurationParameterFactoryTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/ConfigurationParameterFactoryTest.java Wed Feb 20 17:34:37 2013
@@ -33,18 +33,13 @@ import java.util.Set;
import org.apache.uima.fit.descriptor.ConfigurationParameter;
import org.junit.Test;
-/**
- */
-
public class ConfigurationParameterFactoryTest {
- public static final String PARAM_DOUBLE_1 = "org.uimafit.factory.ConfigurationParameterFactoryTest.PARAM_STRING_1";
-
+ public static final String PARAM_DOUBLE_1 = "double1";
@ConfigurationParameter(name = PARAM_DOUBLE_1, mandatory = true, defaultValue = "3.1415")
private Double double1;
- public static final String PARAM_DOUBLE_2 = "org.uimafit.factory.ConfigurationParameterFactoryTest.PARAM_DOUBLE_2";
-
+ public static final String PARAM_DOUBLE_2 = "double2";
@ConfigurationParameter(name = PARAM_DOUBLE_2, mandatory = true, defaultValue = "3.3333")
private Double[] double2;
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ParameterizedAE.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ParameterizedAE.java?rev=1448314&r1=1448313&r2=1448314&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ParameterizedAE.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ParameterizedAE.java Wed Feb 20 17:34:37 2013
@@ -37,29 +37,24 @@ import org.apache.uima.jcas.JCas;
@SofaCapability(inputSofas = CAS.NAME_DEFAULT_SOFA)
public class ParameterizedAE extends JCasAnnotator_ImplBase {
- public static final String PARAM_STRING_1 = "org.uimafit.factory.testAes.ParameterizedAE.PARAM_STRING_1";
-
+ public static final String PARAM_STRING_1 = "string1";
@ConfigurationParameter(name = PARAM_STRING_1, mandatory = true, defaultValue = "pineapple")
private String string1;
- public static final String PARAM_STRING_2 = "org.uimafit.factory.testAes.ParameterizedAE.PARAM_STRING_2";
-
+ public static final String PARAM_STRING_2 = "string2";
@ConfigurationParameter(name = PARAM_STRING_2, mandatory = false, defaultValue = { "coconut",
"mango" })
private String[] string2;
- public static final String PARAM_STRING_3 = "org.uimafit.factory.testAes.ParameterizedAE.PARAM_STRING_3";
-
+ public static final String PARAM_STRING_3 = "string3";
@ConfigurationParameter(name = PARAM_STRING_3)
private String string3;
- public static final String PARAM_STRING_4 = "org.uimafit.factory.testAes.ParameterizedAE.PARAM_STRING_4";
-
+ public static final String PARAM_STRING_4 = "string4";
@ConfigurationParameter(name = PARAM_STRING_4, mandatory = true, defaultValue = "apple")
private String[] string4;
- public static final String PARAM_STRING_5 = "org.uimafit.factory.testAes.ParameterizedAE.PARAM_STRING_5";
-
+ public static final String PARAM_STRING_5 = "string5";
@ConfigurationParameter(name = PARAM_STRING_5, mandatory = false, defaultValue = "")
private String[] string5;
@@ -72,8 +67,7 @@ public class ParameterizedAE extends JCa
@ConfigurationParameter(name = "strings8", defaultValue = "cherry")
private Set<String> strings8;
- public static final String PARAM_STRING_9 = "org.uimafit.factory.testAes.ParameterizedAE.PARAM_STRING_)";
-
+ public static final String PARAM_STRING_9 = "strings9";
@ConfigurationParameter(name = PARAM_STRING_9)
private Set<String> strings9;
@@ -97,13 +91,11 @@ public class ParameterizedAE extends JCa
return strings9;
}
- public static final String PARAM_BOOLEAN_1 = "org.uimafit.factory.testAes.ParameterizedAE.PARAM_BOOLEAN_1";
-
+ public static final String PARAM_BOOLEAN_1 = "boolean1";
@ConfigurationParameter(name = PARAM_BOOLEAN_1, mandatory = true, defaultValue = "false")
private boolean boolean1;
- public static final String PARAM_BOOLEAN_2 = "org.uimafit.factory.testAes.ParameterizedAE.PARAM_BOOLEAN_2";
-
+ public static final String PARAM_BOOLEAN_2 = "boolean2";
@ConfigurationParameter(name = PARAM_BOOLEAN_2)
private Boolean boolean2;
@@ -114,20 +106,17 @@ public class ParameterizedAE extends JCa
return boolean2b;
}
- public static final String PARAM_BOOLEAN_3 = "org.uimafit.factory.testAes.ParameterizedAE.PARAM_BOOLEAN_3";
-
+ public static final String PARAM_BOOLEAN_3 = "boolean3";
@ConfigurationParameter(name = PARAM_BOOLEAN_3, mandatory = true, defaultValue = { "true",
"true", "false" })
private Boolean[] boolean3;
- public static final String PARAM_BOOLEAN_4 = "org.uimafit.factory.testAes.ParameterizedAE.PARAM_BOOLEAN_4";
-
+ public static final String PARAM_BOOLEAN_4 = "boolean4";
@ConfigurationParameter(name = PARAM_BOOLEAN_4, mandatory = true, defaultValue = { "true",
"false", "true" })
public boolean[] boolean4;
- public static final String PARAM_BOOLEAN_5 = "org.uimafit.factory.testAes.ParameterizedAE.PARAM_BOOLEAN_5";
-
+ public static final String PARAM_BOOLEAN_5 = "boolean5";
@ConfigurationParameter(name = PARAM_BOOLEAN_5, mandatory = true, defaultValue = "false")
private boolean[] boolean5;
@@ -138,23 +127,19 @@ public class ParameterizedAE extends JCa
return booleans6;
}
- public static final String PARAM_INT_1 = "org.uimafit.factory.testAes.ParameterizedAE.PARAM_INT_1";
-
+ public static final String PARAM_INT_1 = "int1";
@ConfigurationParameter(name = PARAM_INT_1, mandatory = true, defaultValue = "0")
private int int1;
- public static final String PARAM_INT_2 = "org.uimafit.factory.testAes.ParameterizedAE.PARAM_INT_2";
-
+ public static final String PARAM_INT_2 = "int2";
@ConfigurationParameter(name = PARAM_INT_2, defaultValue = "42")
private int int2;
- public static final String PARAM_INT_3 = "org.uimafit.factory.testAes.ParameterizedAE.PARAM_INT_3";
-
+ public static final String PARAM_INT_3 = "int3";
@ConfigurationParameter(name = PARAM_INT_3, defaultValue = { "42", "111" })
private int[] int3;
- public static final String PARAM_INT_4 = "org.uimafit.factory.testAes.ParameterizedAE.PARAM_INT_4";
-
+ public static final String PARAM_INT_4 = "int4";
@ConfigurationParameter(name = PARAM_INT_4, defaultValue = "2", mandatory = true)
private Integer[] int4;
@@ -172,39 +157,32 @@ public class ParameterizedAE extends JCa
@ConfigurationParameter(name = "ints6", defaultValue = { "1", "2", "3", "4", "5" })
private List<Integer> ints6;
- public static final String PARAM_FLOAT_1 = "org.uimafit.factory.testAes.ParameterizedAE.PARAM_FLOAT_1";
-
+ public static final String PARAM_FLOAT_1 = "float1";
@ConfigurationParameter(name = PARAM_FLOAT_1, mandatory = true, defaultValue = "0.0f")
private float float1;
- public static final String PARAM_FLOAT_2 = "org.uimafit.factory.testAes.ParameterizedAE.PARAM_FLOAT_2";
-
+ public static final String PARAM_FLOAT_2 = "float2";
@ConfigurationParameter(name = PARAM_FLOAT_2, mandatory = false, defaultValue = "3.1415f")
private float float2;
- public static final String PARAM_FLOAT_3 = "org.uimafit.factory.testAes.ParameterizedAE.PARAM_FLOAT_3";
-
+ public static final String PARAM_FLOAT_3 = "float3";
@ConfigurationParameter(name = PARAM_FLOAT_3, mandatory = true)
private float float3;
- public static final String PARAM_FLOAT_4 = "org.uimafit.factory.testAes.ParameterizedAE.PARAM_FLOAT_4";
-
+ public static final String PARAM_FLOAT_4 = "float4";
@ConfigurationParameter(name = PARAM_FLOAT_4, mandatory = false)
private float[] float4;
- public static final String PARAM_FLOAT_5 = "org.uimafit.factory.testAes.ParameterizedAE.PARAM_FLOAT_5";
-
+ public static final String PARAM_FLOAT_5 = "float5";
@ConfigurationParameter(name = PARAM_FLOAT_5, mandatory = false, defaultValue = { "0.0f",
"3.1415f", "2.7182818f" })
private float[] float5;
- public static final String PARAM_FLOAT_6 = "org.uimafit.factory.testAes.ParameterizedAE.PARAM_FLOAT_6";
-
+ public static final String PARAM_FLOAT_6 = "float6";
@ConfigurationParameter(name = PARAM_FLOAT_6, mandatory = true)
private Float[] float6;
- public static final String PARAM_FLOAT_7 = "org.uimafit.factory.testAes.ParameterizedAE.PARAM_FLOAT_7";
-
+ public static final String PARAM_FLOAT_7 = "float7";
@ConfigurationParameter(name = PARAM_FLOAT_7, mandatory = true, defaultValue = { "1.1111f",
"2.2222f", "3.333f" })
private Float[] float7;
@@ -213,19 +191,16 @@ public class ParameterizedAE extends JCa
ENUM_1, ENUM_2
}
- public static final String PARAM_ENUM_1 = "org.uimafit.factory.testAes.ParameterizedAE.PARAM_ENUM_1";
-
+ public static final String PARAM_ENUM_1 = "enum1";
@ConfigurationParameter(name = PARAM_ENUM_1, mandatory = true, defaultValue = { "ENUM_1" })
private EnumValue enum1;
- public static final String PARAM_ENUM_2 = "org.uimafit.factory.testAes.ParameterizedAE.PARAM_ENUM_2";
-
+ public static final String PARAM_ENUM_2 = "enum2";
@ConfigurationParameter(name = PARAM_ENUM_2, mandatory = true, defaultValue = { "ENUM_1",
"ENUM_2" })
private EnumValue[] enum2;
- public static final String PARAM_ENUM_3 = "org.uimafit.factory.testAes.ParameterizedAE.PARAM_ENUM_3";
-
+ public static final String PARAM_ENUM_3 = "enum3";
@ConfigurationParameter(name = PARAM_ENUM_3, mandatory = true, defaultValue = { "ENUM_1",
"ENUM_2" })
private List<EnumValue> enum3;