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/03/30 17:55:20 UTC
svn commit: r1462797 - in /uima/sandbox/uimafit/trunk/uimafit/src:
main/java/org/apache/uima/fit/descriptor/
test/java/org/apache/uima/fit/component/initialize/
test/java/org/apache/uima/fit/factory/
test/java/org/apache/uima/fit/factory/testAes/
Author: rec
Date: Sat Mar 30 16:55:19 2013
New Revision: 1462797
URL: http://svn.apache.org/r1462797
Log:
[UIMA-2779] External resources and parameters should be mandatory by default
https://issues.apache.org/jira/browse/UIMA-2779
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/descriptor/ConfigurationParameter.java
uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/component/initialize/ConfigurationParameterInitializerTest.java
uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/AnalysisEngineFactoryTest.java
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
uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ReversableTestFlowController.java
Modified: uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/descriptor/ConfigurationParameter.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/descriptor/ConfigurationParameter.java?rev=1462797&r1=1462796&r2=1462797&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/descriptor/ConfigurationParameter.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/descriptor/ConfigurationParameter.java Sat Mar 30 16:55:19 2013
@@ -74,9 +74,9 @@ public @interface ConfigurationParameter
String description() default "";
/**
- * specifies whether this configuration parameter is mandatory - i.e. the value must be provided
+ * Specifies whether this configuration parameter is mandatory - i.e. the value must be provided
*/
- boolean mandatory() default false;
+ boolean mandatory() default true;
/**
* What can be the value should correspond with the type of the field that is annotated. If for
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/component/initialize/ConfigurationParameterInitializerTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/component/initialize/ConfigurationParameterInitializerTest.java?rev=1462797&r1=1462796&r2=1462797&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/component/initialize/ConfigurationParameterInitializerTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/component/initialize/ConfigurationParameterInitializerTest.java Sat Mar 30 16:55:19 2013
@@ -71,11 +71,8 @@ public class ConfigurationParameterIniti
AnalysisEngine engine = AnalysisEngineFactory.createPrimitive(ParameterizedAE.class,
typeSystemDescription, ParameterizedAE.PARAM_FLOAT_3, 1.234f,
ParameterizedAE.PARAM_FLOAT_6, new Float[] { 1.234f, 0.001f }, "file2", "foo/bar",
- "files9", new File[] { new File("test/data/file"), new File("test/data/file2") });
- // Test initializing a multi-valued parameter with a single value
- // This is supposed to be fixed as part of issue #79
- // -- REC 2011-05-02
- // ParameterizedAE.PARAM_STRING_9, "singleelementarray");
+ "files9", new File[] { new File("test/data/file"), new File("test/data/file2") },
+ ParameterizedAE.PARAM_STRING_9, new String[] { "singleelementarray" });
ParameterizedAE component = new ParameterizedAE();
component.initialize(engine.getUimaContext());
@@ -91,7 +88,7 @@ public class ConfigurationParameterIniti
assertNull(component.getStrings7());
assertEquals(1, component.getStrings8().size());
assertTrue(component.getStrings8().contains("cherry"));
- // assertTrue(component.getStrings9().contains("singleelementarray"));
+ assertTrue(component.getStrings9().contains("singleelementarray"));
assertFalse(component.isBoolean1());
@@ -164,6 +161,9 @@ public class ConfigurationParameterIniti
assertEquals(2, component.getFiles9().size());
assertEquals(new File("test/data/file"), component.getFiles9().get(0));
assertEquals(new File("test/data/file2"), component.getFiles9().get(1));
+
+ assertNull(component.getRegex1());
+ assertTrue(component.getRegex2().matcher("This is uimaFIT calling!").matches());
engine = AnalysisEngineFactory.createPrimitive(ParameterizedAE.class, typeSystemDescription,
ParameterizedAE.PARAM_FLOAT_3, 1.234f, ParameterizedAE.PARAM_FLOAT_6, new Float[] {
@@ -339,7 +339,7 @@ public class ConfigurationParameterIniti
}
public static class DefaultValueAE1 extends JCasAnnotator_ImplBase {
- @ConfigurationParameter(defaultValue = "green")
+ @ConfigurationParameter(defaultValue = "green", mandatory = false)
private String color;
@Override
@@ -410,10 +410,10 @@ public class ConfigurationParameterIniti
@ConfigurationParameter(name = "L2")
public Locale locale2;
- @ConfigurationParameter(name = "L3")
+ @ConfigurationParameter(name = "L3", mandatory = false)
public Locale locale3;
- @ConfigurationParameter(name = "L4")
+ @ConfigurationParameter(name = "L4", mandatory = false)
public Locale locale4;
@Override
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/AnalysisEngineFactoryTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/AnalysisEngineFactoryTest.java?rev=1462797&r1=1462796&r2=1462797&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/AnalysisEngineFactoryTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/AnalysisEngineFactoryTest.java Sat Mar 30 16:55:19 2013
@@ -263,9 +263,9 @@ public class AnalysisEngineFactoryTest e
testConfigurationParameter(aed, ParameterizedAE.PARAM_INT_1,
ConfigurationParameter.TYPE_INTEGER, true, false, 0);
testConfigurationParameter(aed, ParameterizedAE.PARAM_INT_2,
- ConfigurationParameter.TYPE_INTEGER, false, false, 42);
+ ConfigurationParameter.TYPE_INTEGER, true, false, 42);
testConfigurationParameter(aed, ParameterizedAE.PARAM_INT_3,
- ConfigurationParameter.TYPE_INTEGER, false, true, new Integer[] { 42, 111 });
+ ConfigurationParameter.TYPE_INTEGER, true, true, new Integer[] { 42, 111 });
testConfigurationParameter(aed, ParameterizedAE.PARAM_INT_4,
ConfigurationParameter.TYPE_INTEGER, true, true, new Integer[] { 2 });
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=1462797&r1=1462796&r2=1462797&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 Sat Mar 30 16:55:19 2013
@@ -108,7 +108,7 @@ public class ConfigurationParameterFacto
assertEquals("param1", cp.getName());
assertEquals(org.apache.uima.resource.metadata.ConfigurationParameter.TYPE_STRING, cp.getType());
assertEquals("", cp.getDescription());
- assertFalse(cp.isMandatory());
+ assertTrue(cp.isMandatory());
assertFalse(cp.isMultiValued());
assertNull(ConfigurationParameterFactory.getDefaultValue(field1));
}
@@ -148,7 +148,7 @@ public class ConfigurationParameterFacto
assertEquals(org.apache.uima.resource.metadata.ConfigurationParameter.TYPE_INTEGER,
cp.getType());
assertEquals("", cp.getDescription());
- assertFalse(cp.isMandatory());
+ assertTrue(cp.isMandatory());
assertFalse(cp.isMultiValued());
assertNull(ConfigurationParameterFactory.getDefaultValue(field3));
}
@@ -167,7 +167,7 @@ public class ConfigurationParameterFacto
assertEquals("param4", cp.getName());
assertEquals(org.apache.uima.resource.metadata.ConfigurationParameter.TYPE_STRING, cp.getType());
assertEquals("", cp.getDescription());
- assertFalse(cp.isMandatory());
+ assertTrue(cp.isMandatory());
assertTrue(cp.isMultiValued());
assertArrayEquals(new String[] { "a", "b", "c" },
(String[]) ConfigurationParameterFactory.getDefaultValue(field4));
@@ -186,7 +186,7 @@ public class ConfigurationParameterFacto
assertEquals(org.apache.uima.resource.metadata.ConfigurationParameter.TYPE_STRING,
param.getType());
assertEquals("", param.getDescription());
- assertFalse(param.isMandatory());
+ assertTrue(param.isMandatory());
String[] expected = new String[] { "data/foo", "bar" };
String[] actual = (String[]) ConfigurationParameterFactory.getDefaultValue(field);
assertArrayEquals(expected, actual);
@@ -204,7 +204,7 @@ public class ConfigurationParameterFacto
assertEquals("stringSet", param.getName());
assertEquals(org.apache.uima.resource.metadata.ConfigurationParameter.TYPE_STRING,
param.getType());
- assertFalse(param.isMandatory());
+ assertTrue(param.isMandatory());
String[] expected = new String[] { "5", "5", "4", "3" };
String[] actual = (String[]) ConfigurationParameterFactory.getDefaultValue(field);
assertArrayEquals(expected, actual);
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=1462797&r1=1462796&r2=1462797&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 Sat Mar 30 16:55:19 2013
@@ -47,7 +47,7 @@ public class ParameterizedAE extends JCa
private String[] string2;
public static final String PARAM_STRING_3 = "string3";
- @ConfigurationParameter(name = PARAM_STRING_3)
+ @ConfigurationParameter(name = PARAM_STRING_3, mandatory = false)
private String string3;
public static final String PARAM_STRING_4 = "string4";
@@ -61,14 +61,14 @@ public class ParameterizedAE extends JCa
@ConfigurationParameter(name = "strings6", defaultValue = { "kiwi fruit", "grape", "pear" })
private Set<String> strings6;
- @ConfigurationParameter(name = "strings7")
+ @ConfigurationParameter(name = "strings7", mandatory = false)
private Set<String> strings7;
@ConfigurationParameter(name = "strings8", defaultValue = "cherry")
private Set<String> strings8;
public static final String PARAM_STRING_9 = "strings9";
- @ConfigurationParameter(name = PARAM_STRING_9)
+ @ConfigurationParameter(name = PARAM_STRING_9, mandatory = false)
private Set<String> strings9;
@SuppressWarnings("unused")
@@ -96,10 +96,10 @@ public class ParameterizedAE extends JCa
private boolean boolean1;
public static final String PARAM_BOOLEAN_2 = "boolean2";
- @ConfigurationParameter(name = PARAM_BOOLEAN_2)
+ @ConfigurationParameter(name = PARAM_BOOLEAN_2, mandatory = false)
private Boolean boolean2;
- @ConfigurationParameter
+ @ConfigurationParameter(mandatory = false)
private boolean boolean2b;
public boolean isBoolean2b() {
@@ -215,7 +215,7 @@ public class ParameterizedAE extends JCa
@ConfigurationParameter(name = "file2", mandatory = true)
private File file2;
- @ConfigurationParameter(name = "files3")
+ @ConfigurationParameter(name = "files3", mandatory = false)
private File[] files3;
@ConfigurationParameter(name = "files4", defaultValue = "test/data/file")
@@ -224,7 +224,7 @@ public class ParameterizedAE extends JCa
@ConfigurationParameter(name = "files5", defaultValue = { "test/data/file", "test/data/file2" })
private File[] files5;
- @ConfigurationParameter(name = "files6")
+ @ConfigurationParameter(name = "files6", mandatory = false)
private List<File> files6;
@ConfigurationParameter(name = "files7", defaultValue = "test/data/file")
@@ -233,7 +233,7 @@ public class ParameterizedAE extends JCa
@ConfigurationParameter(name = "files8", defaultValue = { "test/data/file", "test/data/file2" })
private List<File> files8;
- @ConfigurationParameter(name = "files9")
+ @ConfigurationParameter(name = "files9", mandatory = false)
private List<File> files9;
public EnumValue getEnum1() {
@@ -373,12 +373,19 @@ public class ParameterizedAE extends JCa
return string5;
}
- @SuppressWarnings("unused")
- @ConfigurationParameter(name = "regex1")
+ public static final String PARAM_REGEX_1 = "regex1";
+ @ConfigurationParameter(name = PARAM_REGEX_1, mandatory = false)
private Pattern regex1;
- @SuppressWarnings("unused")
- @ConfigurationParameter(name = "regex2")
+ public static final String PARAM_REGEX_2 = "regex2";
+ @ConfigurationParameter(name = PARAM_REGEX_2, defaultValue=".*uimaFIT.*")
private Pattern regex2;
-
+
+ public Pattern getRegex1() {
+ return regex1;
+ }
+
+ public Pattern getRegex2() {
+ return regex2;
+ }
}
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ReversableTestFlowController.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ReversableTestFlowController.java?rev=1462797&r1=1462796&r2=1462797&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ReversableTestFlowController.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ReversableTestFlowController.java Sat Mar 30 16:55:19 2013
@@ -45,8 +45,8 @@ public class ReversableTestFlowControlle
org.apache.uima.fit.component.JCasFlowController_ImplBase {
public static final String PARAM_REVERSE_ORDER = "reverseOrder";
- @ConfigurationParameter
- private boolean reverseOrder = false;
+ @ConfigurationParameter(defaultValue = "false")
+ private boolean reverseOrder;
@Override
public Flow computeFlow(JCas jCas) throws AnalysisEngineProcessException {