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/07/20 19:50:52 UTC
svn commit: r1505173 [4/4] - in /uima/sandbox/uimafit/trunk:
uimafit-cpe/src/main/java/org/apache/uima/fit/cpe/
uimafit-cpe/src/test/java/org/apache/uima/fit/cpe/
uimafit-docbook/src/docbook/
uimafit-examples/src/main/java/org/apache/uima/fit/examples/...
Modified: uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/UimaContextFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/UimaContextFactory.java?rev=1505173&r1=1505172&r2=1505173&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/UimaContextFactory.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/UimaContextFactory.java Sat Jul 20 17:50:51 2013
@@ -41,7 +41,7 @@ public final class UimaContextFactory {
*/
public static UimaContext createUimaContext(Object... configurationParameters)
throws ResourceInitializationException {
- AnalysisEngine engine = AnalysisEngineFactory.createPrimitive(NoOpAnnotator.class, null,
+ AnalysisEngine engine = AnalysisEngineFactory.createEngine(NoOpAnnotator.class, null,
configurationParameters);
return engine.getUimaContext();
}
Modified: uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/pipeline/JCasIterable.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/pipeline/JCasIterable.java?rev=1505173&r1=1505172&r2=1505173&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/pipeline/JCasIterable.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/pipeline/JCasIterable.java Sat Jul 20 17:50:51 2013
@@ -61,7 +61,7 @@ public class JCasIterable implements Ite
public JCasIterable(final CollectionReader aReader,
final TypeSystemDescription aTypeSystemDescription) throws UIMAException, IOException {
this(aReader, AnalysisEngineFactory
- .createPrimitive(NoOpAnnotator.class, aTypeSystemDescription));
+ .createEngine(NoOpAnnotator.class, aTypeSystemDescription));
}
/**
Modified: uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/pipeline/SimplePipeline.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/pipeline/SimplePipeline.java?rev=1505173&r1=1505172&r2=1505173&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/pipeline/SimplePipeline.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/pipeline/SimplePipeline.java Sat Jul 20 17:50:51 2013
@@ -19,8 +19,8 @@
package org.apache.uima.fit.pipeline;
import static java.util.Arrays.asList;
-import static org.apache.uima.fit.factory.AnalysisEngineFactory.createAggregate;
-import static org.apache.uima.fit.factory.AnalysisEngineFactory.createAggregateDescription;
+import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngineDescription;
+import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngine;
import static org.apache.uima.fit.factory.CollectionReaderFactory.createCollectionReader;
import java.io.IOException;
@@ -64,10 +64,10 @@ public final class SimplePipeline {
public static void runPipeline(final CollectionReader reader,
final AnalysisEngineDescription... descs) throws UIMAException, IOException {
// Create AAE
- final AnalysisEngineDescription aaeDesc = createAggregateDescription(descs);
+ final AnalysisEngineDescription aaeDesc = createEngineDescription(descs);
// Instantiate AAE
- final AnalysisEngine aae = createAggregate(aaeDesc);
+ final AnalysisEngine aae = createEngine(aaeDesc);
// Create CAS from merged metadata
final CAS cas = CasCreationUtils.createCas(asList(reader.getMetaData(), aae.getMetaData()));
@@ -158,10 +158,10 @@ public final class SimplePipeline {
public static void runPipeline(final CAS aCas, final AnalysisEngineDescription... aDescs)
throws UIMAException, IOException {
// Create aggregate AE
- final AnalysisEngineDescription aaeDesc = createAggregateDescription(aDescs);
+ final AnalysisEngineDescription aaeDesc = createEngineDescription(aDescs);
// Instantiate
- final AnalysisEngine aae = createAggregate(aaeDesc);
+ final AnalysisEngine aae = createEngine(aaeDesc);
try {
// Process
aae.process(aCas);
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/DefaultPackageAETest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/DefaultPackageAETest.java?rev=1505173&r1=1505172&r2=1505173&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/DefaultPackageAETest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/DefaultPackageAETest.java Sat Jul 20 17:50:51 2013
@@ -33,13 +33,13 @@ public class DefaultPackageAETest extend
@Test
public void testPackageLessAE() throws Exception {
- AnalysisEngineDescription aed = AnalysisEngineFactory.createPrimitiveDescription(
+ AnalysisEngineDescription aed = AnalysisEngineFactory.createEngineDescription(
DefaultPackageAE.class, (Object[]) null);
jCas.setDocumentText("some text");
SimplePipeline.runPipeline(jCas, aed);
aed = AnalysisEngineFactory
- .createPrimitiveDescription(DefaultPackageAE2.class, (Object[]) null);
+ .createEngineDescription(DefaultPackageAE2.class, (Object[]) null);
jCas.reset();
jCas.setDocumentText("some text");
SimplePipeline.runPipeline(jCas, aed);
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/component/ViewCreatorAnnotatorTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/component/ViewCreatorAnnotatorTest.java?rev=1505173&r1=1505172&r2=1505173&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/component/ViewCreatorAnnotatorTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/component/ViewCreatorAnnotatorTest.java Sat Jul 20 17:50:51 2013
@@ -48,7 +48,7 @@ public class ViewCreatorAnnotatorTest ex
@Test
public void testViewCreatorAnnotator() throws ResourceInitializationException,
AnalysisEngineProcessException, CASException {
- AnalysisEngine viewCreator = AnalysisEngineFactory.createPrimitive(ViewCreatorAnnotator.class,
+ AnalysisEngine viewCreator = AnalysisEngineFactory.createEngine(ViewCreatorAnnotator.class,
typeSystemDescription, ViewCreatorAnnotator.PARAM_VIEW_NAME, "myView");
viewCreator.process(jCas);
JCas myView = jCas.getView("myView");
@@ -63,12 +63,12 @@ public class ViewCreatorAnnotatorTest ex
@Test
public void testDefaultView() throws ResourceInitializationException,
AnalysisEngineProcessException {
- AnalysisEngine engine = AnalysisEngineFactory.createPrimitive(SofaAwareAnnotator.class,
+ AnalysisEngine engine = AnalysisEngineFactory.createEngine(SofaAwareAnnotator.class,
typeSystemDescription);
engine.process(jCas);
assertEquals("some", JCasUtil.selectByIndex(jCas, Token.class, 0).getCoveredText());
- engine = AnalysisEngineFactory.createPrimitive(SofaUnawareAnnotator.class,
+ engine = AnalysisEngineFactory.createEngine(SofaUnawareAnnotator.class,
typeSystemDescription);
jCas.reset();
engine.process(jCas);
@@ -83,9 +83,9 @@ public class ViewCreatorAnnotatorTest ex
@Test(expected = AnalysisEngineProcessException.class)
public void testOtherViewAware() throws ResourceInitializationException,
AnalysisEngineProcessException {
- AnalysisEngineDescription description = AnalysisEngineFactory.createPrimitiveDescription(
+ AnalysisEngineDescription description = AnalysisEngineFactory.createEngineDescription(
SofaAwareAnnotator.class, typeSystemDescription);
- AnalysisEngine engine = AnalysisEngineFactory.createAnalysisEngine(description, "myView");
+ AnalysisEngine engine = AnalysisEngineFactory.createEngine(description, "myView");
HideOutput hider = new HideOutput();
engine.process(jCas);
hider.restoreOutput();
@@ -94,9 +94,9 @@ public class ViewCreatorAnnotatorTest ex
@Test(expected = AnalysisEngineProcessException.class)
public void testOtherViewUnaware() throws ResourceInitializationException,
AnalysisEngineProcessException {
- AnalysisEngineDescription description = AnalysisEngineFactory.createPrimitiveDescription(
+ AnalysisEngineDescription description = AnalysisEngineFactory.createEngineDescription(
SofaUnawareAnnotator.class, typeSystemDescription);
- AnalysisEngine engine = AnalysisEngineFactory.createAnalysisEngine(description, "myView");
+ AnalysisEngine engine = AnalysisEngineFactory.createEngine(description, "myView");
engine.process(jCas);
}
@@ -107,10 +107,10 @@ public class ViewCreatorAnnotatorTest ex
@Test
public void testSofaInitializer() throws ResourceInitializationException,
AnalysisEngineProcessException, CASException {
- AnalysisEngineDescription description = AnalysisEngineFactory.createPrimitiveDescription(
+ AnalysisEngineDescription description = AnalysisEngineFactory.createEngineDescription(
SofaAwareAnnotator.class, typeSystemDescription);
- AnalysisEngine engine = AnalysisEngineFactory.createAnalysisEngine(description, "myView");
- AnalysisEngine viewCreator = AnalysisEngineFactory.createPrimitive(ViewCreatorAnnotator.class,
+ AnalysisEngine engine = AnalysisEngineFactory.createEngine(description, "myView");
+ AnalysisEngine viewCreator = AnalysisEngineFactory.createEngine(ViewCreatorAnnotator.class,
typeSystemDescription, ViewCreatorAnnotator.PARAM_VIEW_NAME, "myView");
viewCreator.process(jCas);
engine.process(jCas);
@@ -127,9 +127,9 @@ public class ViewCreatorAnnotatorTest ex
assertEquals("some", JCasUtil.selectByIndex(jCas.getView("myView"), Token.class, 0)
.getCoveredText());
- description = AnalysisEngineFactory.createPrimitiveDescription(SofaUnawareAnnotator.class,
+ description = AnalysisEngineFactory.createEngineDescription(SofaUnawareAnnotator.class,
typeSystemDescription);
- engine = AnalysisEngineFactory.createAnalysisEngine(description, "myView");
+ engine = AnalysisEngineFactory.createEngine(description, "myView");
jCas.reset();
viewCreator.process(jCas);
engine.process(jCas);
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/component/ViewTextCopierAnnotatorTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/component/ViewTextCopierAnnotatorTest.java?rev=1505173&r1=1505172&r2=1505173&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/component/ViewTextCopierAnnotatorTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/component/ViewTextCopierAnnotatorTest.java Sat Jul 20 17:50:51 2013
@@ -46,7 +46,7 @@ public class ViewTextCopierAnnotatorTest
String destinationViewName = "DestinationView";
jCas.setDocumentText(text);
- AnalysisEngine viewCreator = AnalysisEngineFactory.createPrimitive(
+ AnalysisEngine viewCreator = AnalysisEngineFactory.createEngine(
ViewTextCopierAnnotator.class, typeSystemDescription,
ViewTextCopierAnnotator.PARAM_SOURCE_VIEW_NAME, CAS.NAME_DEFAULT_SOFA,
ViewTextCopierAnnotator.PARAM_DESTINATION_VIEW_NAME, destinationViewName);
@@ -63,7 +63,7 @@ public class ViewTextCopierAnnotatorTest
assertNotNull(destinationView);
assertEquals(text, destinationView.getDocumentText());
- viewCreator = AnalysisEngineFactory.createPrimitive(ViewTextCopierAnnotator.class,
+ viewCreator = AnalysisEngineFactory.createEngine(ViewTextCopierAnnotator.class,
typeSystemDescription, ViewTextCopierAnnotator.PARAM_SOURCE_VIEW_NAME, sourceViewName,
ViewTextCopierAnnotator.PARAM_DESTINATION_VIEW_NAME, destinationViewName);
jCas.reset();
@@ -83,7 +83,7 @@ public class ViewTextCopierAnnotatorTest
String sourceViewName = "SourceView";
String destinationViewName = "DestinationView";
- AnalysisEngine viewCreator = AnalysisEngineFactory.createPrimitive(
+ AnalysisEngine viewCreator = AnalysisEngineFactory.createEngine(
ViewTextCopierAnnotator.class, typeSystemDescription,
ViewTextCopierAnnotator.PARAM_SOURCE_VIEW_NAME, sourceViewName,
ViewTextCopierAnnotator.PARAM_DESTINATION_VIEW_NAME, destinationViewName);
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=1505173&r1=1505172&r2=1505173&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 Jul 20 17:50:51 2013
@@ -63,12 +63,12 @@ public class ConfigurationParameterIniti
ResourceInitializationException rie = null;
try {
- AnalysisEngineFactory.createPrimitive(ParameterizedAE.class, typeSystemDescription);
+ AnalysisEngineFactory.createEngine(ParameterizedAE.class, typeSystemDescription);
} catch (ResourceInitializationException e) {
rie = e;
}
assertNotNull(rie);
- AnalysisEngine engine = AnalysisEngineFactory.createPrimitive(ParameterizedAE.class,
+ AnalysisEngine engine = AnalysisEngineFactory.createEngine(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") },
@@ -170,7 +170,7 @@ public class ConfigurationParameterIniti
assertNull(component.getRegex1());
assertTrue(component.getRegex2().matcher("This is uimaFIT calling!").matches());
- engine = AnalysisEngineFactory.createPrimitive(ParameterizedAE.class, typeSystemDescription,
+ engine = AnalysisEngineFactory.createEngine(ParameterizedAE.class, typeSystemDescription,
ParameterizedAE.PARAM_FLOAT_3, 1.234f, ParameterizedAE.PARAM_FLOAT_6, new Float[] {
1.234f, 0.001f }, ParameterizedAE.PARAM_STRING_1, "lime",
ParameterizedAE.PARAM_STRING_2, new String[] { "banana", "strawberry" },
@@ -227,7 +227,7 @@ public class ConfigurationParameterIniti
assertEquals(new File("test/data/file"), component.getFiles9().get(0));
assertEquals(new File("test/data/file2"), component.getFiles9().get(1));
- engine = AnalysisEngineFactory.createPrimitive(ParameterizedAE.class, typeSystemDescription,
+ engine = AnalysisEngineFactory.createEngine(ParameterizedAE.class, typeSystemDescription,
ParameterizedAE.PARAM_FLOAT_3, 1.234f, ParameterizedAE.PARAM_FLOAT_6, new Float[] {
1.234f, 0.001f }, ParameterizedAE.PARAM_BOOLEAN_1, true,
ParameterizedAE.PARAM_BOOLEAN_3, new boolean[3], ParameterizedAE.PARAM_FLOAT_5,
@@ -242,7 +242,7 @@ public class ConfigurationParameterIniti
rie = null;
try {
- engine = AnalysisEngineFactory.createPrimitive(ParameterizedAE.class, typeSystemDescription,
+ engine = AnalysisEngineFactory.createEngine(ParameterizedAE.class, typeSystemDescription,
ParameterizedAE.PARAM_FLOAT_3, 1.234f, ParameterizedAE.PARAM_FLOAT_6, new Float[] {
1.234f, 0.001f }, ParameterizedAE.PARAM_STRING_1, true);
} catch (ResourceInitializationException e) {
@@ -254,7 +254,7 @@ public class ConfigurationParameterIniti
@Test
public void testInitialize2() throws ResourceInitializationException {
- AnalysisEngine engine = AnalysisEngineFactory.createPrimitive(Annotator1.class,
+ AnalysisEngine engine = AnalysisEngineFactory.createEngine(Annotator1.class,
typeSystemDescription);
assertEquals(1, engine.getAnalysisEngineMetaData().getCapabilities().length);
}
@@ -264,7 +264,7 @@ public class ConfigurationParameterIniti
// here we test an optional parameter that is missing from the
// configuration to ensure that it is filled in with the default value
AnalysisEngine aed = AnalysisEngineFactory
- .createAnalysisEngineFromPath("src/test/resources/data/descriptor/DefaultValueAE1.xml");
+ .createEngineFromPath("src/test/resources/data/descriptor/DefaultValueAE1.xml");
DefaultValueAE1 ae = new DefaultValueAE1();
ae.initialize(aed.getUimaContext());
assertEquals("green", ae.color);
@@ -275,7 +275,7 @@ public class ConfigurationParameterIniti
ResourceInitializationException rie = null;
try {
aed = AnalysisEngineFactory
- .createAnalysisEngineFromPath("src/test/resources/data/descriptor/DefaultValueAE2.xml");
+ .createEngineFromPath("src/test/resources/data/descriptor/DefaultValueAE2.xml");
} catch (ResourceInitializationException e) {
rie = e;
}
@@ -289,7 +289,7 @@ public class ConfigurationParameterIniti
@Test
public void testParameterSetToNull() throws Exception {
String paramColor = DefaultValueAE1.class.getName() + ".color";
- AnalysisEngine aed = AnalysisEngineFactory.createPrimitive(DefaultValueAE1.class, null,
+ AnalysisEngine aed = AnalysisEngineFactory.createEngine(DefaultValueAE1.class, null,
paramColor, null);
DefaultValueAE1 ae = new DefaultValueAE1();
ae.initialize(aed.getUimaContext());
@@ -303,7 +303,7 @@ public class ConfigurationParameterIniti
@Test(expected = ResourceInitializationException.class)
public void testMandatoryParameterSetToNull() throws Exception {
String paramColor = DefaultValueAE2.class.getName() + ".color";
- AnalysisEngine aed = AnalysisEngineFactory.createPrimitive(DefaultValueAE2.class, null,
+ AnalysisEngine aed = AnalysisEngineFactory.createEngine(DefaultValueAE2.class, null,
paramColor, null);
DefaultValueAE2 ae = new DefaultValueAE2();
ae.initialize(aed.getUimaContext());
@@ -316,7 +316,7 @@ public class ConfigurationParameterIniti
@Test(expected = IllegalArgumentException.class)
public void testNonUimaCompatibleParameterValue() throws Exception {
String paramColor = DefaultValueAE2.class.getName() + ".color";
- AnalysisEngine aed = AnalysisEngineFactory.createPrimitive(DefaultValueAE2.class, null,
+ AnalysisEngine aed = AnalysisEngineFactory.createEngine(DefaultValueAE2.class, null,
paramColor, new Point(1, 2));
DefaultValueAE2 ae = new DefaultValueAE2();
ae.initialize(aed.getUimaContext());
@@ -328,7 +328,7 @@ public class ConfigurationParameterIniti
*/
@Test
public void testUnsetOptionalParameter() throws Exception {
- AnalysisEngineDescription aed = AnalysisEngineFactory.createPrimitiveDescription(
+ AnalysisEngineDescription aed = AnalysisEngineFactory.createEngineDescription(
DefaultValueAE1.class, (Object[]) null);
// Remove the settings from the descriptor, but leave the declarations.
// The settings are already filled with default values by createPrimitiveDescription,
@@ -379,7 +379,7 @@ public class ConfigurationParameterIniti
@Test
public void testEnumDefaultValue() throws Exception {
try {
- AnalysisEngine aed = AnalysisEngineFactory.createPrimitive(DefaultEnumValueAE.class,
+ AnalysisEngine aed = AnalysisEngineFactory.createEngine(DefaultEnumValueAE.class,
(Object[]) null);
DefaultEnumValueAE ae = new DefaultEnumValueAE();
ae.initialize(aed.getUimaContext());
@@ -429,7 +429,7 @@ public class ConfigurationParameterIniti
@Test
public void testLocaleParams() throws Exception {
- AnalysisEngine aed = AnalysisEngineFactory.createPrimitive(DefaultLocaleValueAE.class, "L2",
+ AnalysisEngine aed = AnalysisEngineFactory.createEngine(DefaultLocaleValueAE.class, "L2",
"en-CA", "L3", "CANADA_FRENCH", "L4", "zh");
DefaultLocaleValueAE ae = new DefaultLocaleValueAE();
ae.initialize(aed.getUimaContext());
@@ -438,7 +438,7 @@ public class ConfigurationParameterIniti
assertEquals(Locale.CANADA_FRENCH, ae.locale3);
assertEquals(new Locale("zh"), ae.locale4);
- aed = AnalysisEngineFactory.createPrimitive(DefaultLocaleValueAE.class, "L1",
+ aed = AnalysisEngineFactory.createEngine(DefaultLocaleValueAE.class, "L1",
"es-ES-Traditional_WIN", "L2", "CHINA", "L3", "es", "L4", "en-CA");
ae = new DefaultLocaleValueAE();
ae.initialize(aed.getUimaContext());
@@ -447,7 +447,7 @@ public class ConfigurationParameterIniti
assertEquals(new Locale("es"), ae.locale3);
assertEquals(new Locale("en", "CA"), ae.locale4);
- aed = AnalysisEngineFactory.createPrimitive(DefaultLocaleValueAE.class, "L1", "", "L2", "",
+ aed = AnalysisEngineFactory.createEngine(DefaultLocaleValueAE.class, "L1", "", "L2", "",
"L3", null);
ae = new DefaultLocaleValueAE();
ae.initialize(aed.getUimaContext());
@@ -467,10 +467,10 @@ public class ConfigurationParameterIniti
*/
public static void main(String[] args) throws ResourceInitializationException,
FileNotFoundException, SAXException, IOException {
- AnalysisEngineDescription aed = AnalysisEngineFactory.createPrimitiveDescription(
+ AnalysisEngineDescription aed = AnalysisEngineFactory.createEngineDescription(
DefaultValueAE1.class, (Object[]) null);
aed.toXML(new FileOutputStream("src/test/resources/data/descriptor/DefaultValueAE1.xml"));
- aed = AnalysisEngineFactory.createPrimitiveDescription(DefaultValueAE2.class, (Object[]) null);
+ aed = AnalysisEngineFactory.createEngineDescription(DefaultValueAE2.class, (Object[]) null);
aed.toXML(new FileOutputStream("src/test/resources/data/descriptor/DefaultValueAE2.xml"));
}
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/component/xwriter/CASDumpWriterTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/component/xwriter/CASDumpWriterTest.java?rev=1505173&r1=1505172&r2=1505173&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/component/xwriter/CASDumpWriterTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/component/xwriter/CASDumpWriterTest.java Sat Jul 20 17:50:51 2013
@@ -43,7 +43,7 @@ public class CASDumpWriterTest {
public void testXWriter() throws Exception {
File outputFile = new File(folder.getRoot(), "dump-output.txt");
- AnalysisEngine writer = AnalysisEngineFactory.createPrimitive(CASDumpWriter.class,
+ AnalysisEngine writer = AnalysisEngineFactory.createEngine(CASDumpWriter.class,
CASDumpWriter.PARAM_OUTPUT_FILE, outputFile.getPath());
JCas jcas = writer.newJCas();
JCasFactory.loadJCas(jcas, "src/test/resources/data/docs/test.xmi");
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/component/xwriter/XWriterTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/component/xwriter/XWriterTest.java?rev=1505173&r1=1505172&r2=1505173&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/component/xwriter/XWriterTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/component/xwriter/XWriterTest.java Sat Jul 20 17:50:51 2013
@@ -67,7 +67,7 @@ public class XWriterTest extends Compone
public void testXWriter() throws Exception {
addDataToCas();
- AnalysisEngine xWriter = AnalysisEngineFactory.createPrimitive(XWriter.class,
+ AnalysisEngine xWriter = AnalysisEngineFactory.createEngine(XWriter.class,
typeSystemDescription, XWriter.PARAM_OUTPUT_DIRECTORY_NAME, outputDirectory.getPath());
xWriter.process(jCas);
@@ -89,7 +89,7 @@ public class XWriterTest extends Compone
jCas.reset();
addDataToCas();
- xWriter = AnalysisEngineFactory.createPrimitive(XWriter.class, typeSystemDescription,
+ xWriter = AnalysisEngineFactory.createEngine(XWriter.class, typeSystemDescription,
XWriter.PARAM_OUTPUT_DIRECTORY_NAME, outputDirectory.getPath(),
IntegerFileNamer.PARAM_PREFIX, "myprefix-");
@@ -104,12 +104,12 @@ public class XWriterTest extends Compone
tokenBuilder.buildTokens(jCas, "Anyone up for a game of Foosball?");
AggregateBuilder builder = new AggregateBuilder();
- builder.add(AnalysisEngineFactory.createPrimitiveDescription(Annotator1.class,
+ builder.add(AnalysisEngineFactory.createEngineDescription(Annotator1.class,
typeSystemDescription), ViewNames.PARENTHESES_VIEW, "A");
- builder.add(AnalysisEngineFactory.createPrimitiveDescription(Annotator2.class,
+ builder.add(AnalysisEngineFactory.createEngineDescription(Annotator2.class,
typeSystemDescription), ViewNames.SORTED_VIEW, "B", ViewNames.SORTED_PARENTHESES_VIEW,
"C", ViewNames.PARENTHESES_VIEW, "A");
- builder.add(AnalysisEngineFactory.createPrimitiveDescription(Annotator3.class,
+ builder.add(AnalysisEngineFactory.createEngineDescription(Annotator3.class,
typeSystemDescription), ViewNames.INITIAL_VIEW, "B");
AnalysisEngine aggregateEngine = builder.createAggregate();
@@ -118,7 +118,7 @@ public class XWriterTest extends Compone
@Test
public void testXmi() throws Exception {
- AnalysisEngine engine = AnalysisEngineFactory.createPrimitive(XWriter.class,
+ AnalysisEngine engine = AnalysisEngineFactory.createEngine(XWriter.class,
typeSystemDescription, XWriter.PARAM_OUTPUT_DIRECTORY_NAME,
this.outputDirectory.getPath());
tokenBuilder.buildTokens(jCas, "I like\nspam!", "I like spam !", "PRP VB NN .");
@@ -141,7 +141,7 @@ public class XWriterTest extends Compone
@Test
public void testXcas() throws Exception {
- AnalysisEngine engine = AnalysisEngineFactory.createPrimitive(XWriter.class,
+ AnalysisEngine engine = AnalysisEngineFactory.createEngine(XWriter.class,
typeSystemDescription, XWriter.PARAM_OUTPUT_DIRECTORY_NAME,
this.outputDirectory.getPath(), XWriter.PARAM_XML_SCHEME_NAME, XWriter.XCAS);
tokenBuilder.buildTokens(jCas, "I like\nspam!", "I like spam !", "PRP VB NN .");
@@ -164,7 +164,7 @@ public class XWriterTest extends Compone
@Test(expected = ResourceInitializationException.class)
public void testBadXmlSchemeName() throws ResourceInitializationException {
- AnalysisEngineFactory.createPrimitive(XWriter.class, typeSystemDescription,
+ AnalysisEngineFactory.createEngine(XWriter.class, typeSystemDescription,
XWriter.PARAM_XML_SCHEME_NAME, "xcas");
}
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/descriptor/TypeCapabilityTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/descriptor/TypeCapabilityTest.java?rev=1505173&r1=1505172&r2=1505173&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/descriptor/TypeCapabilityTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/descriptor/TypeCapabilityTest.java Sat Jul 20 17:50:51 2013
@@ -38,7 +38,7 @@ public class TypeCapabilityTest extends
@Test
public void testTC() throws ResourceInitializationException {
- AnalysisEngineDescription aed = AnalysisEngineFactory.createPrimitiveDescription(
+ AnalysisEngineDescription aed = AnalysisEngineFactory.createEngineDescription(
Annotator4.class, typeSystemDescription);
Capability[] capabilities = aed.getAnalysisEngineMetaData().getCapabilities();
assertEquals(1, capabilities.length);
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/AggregateBuilderTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/AggregateBuilderTest.java?rev=1505173&r1=1505172&r2=1505173&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/AggregateBuilderTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/AggregateBuilderTest.java Sat Jul 20 17:50:51 2013
@@ -18,6 +18,7 @@
*/
package org.apache.uima.fit.factory;
+import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngine;
import static org.junit.Assert.assertEquals;
import java.io.IOException;
@@ -50,12 +51,12 @@ public class AggregateBuilderTest extend
tokenBuilder.buildTokens(jCas, "Anyone up for a game of Foosball?");
AggregateBuilder builder = new AggregateBuilder();
- builder.add(AnalysisEngineFactory.createPrimitiveDescription(Annotator1.class,
+ builder.add(AnalysisEngineFactory.createEngineDescription(Annotator1.class,
typeSystemDescription), ViewNames.PARENTHESES_VIEW, "A");
- builder.add(AnalysisEngineFactory.createPrimitiveDescription(Annotator2.class,
+ builder.add(AnalysisEngineFactory.createEngineDescription(Annotator2.class,
typeSystemDescription), ViewNames.SORTED_VIEW, "B", ViewNames.SORTED_PARENTHESES_VIEW,
"C", ViewNames.PARENTHESES_VIEW, "A");
- builder.add(AnalysisEngineFactory.createPrimitiveDescription(Annotator3.class,
+ builder.add(AnalysisEngineFactory.createEngineDescription(Annotator3.class,
typeSystemDescription), ViewNames.INITIAL_VIEW, "B");
AnalysisEngine aggregateEngine = builder.createAggregate();
@@ -71,7 +72,7 @@ public class AggregateBuilderTest extend
.getDocumentText());
JCasFactory.loadJCas(jCas, "src/test/resources/data/docs/test.xmi");
- AnalysisEngine ae1 = AnalysisEngineFactory.createPrimitive(NoOpAnnotator.class,
+ AnalysisEngine ae1 = AnalysisEngineFactory.createEngine(NoOpAnnotator.class,
typeSystemDescription);
SimplePipeline.runPipeline(jCas, ae1, aggregateEngine);
@@ -79,7 +80,7 @@ public class AggregateBuilderTest extend
AnalysisEngineDescription aggregateDescription = builder.createAggregateDescription();
builder = new AggregateBuilder();
builder.add(aggregateDescription);
- builder.add(AnalysisEngineFactory.createPrimitiveDescription(Annotator1.class,
+ builder.add(AnalysisEngineFactory.createEngineDescription(Annotator1.class,
typeSystemDescription), ViewNames.PARENTHESES_VIEW, "PARENS");
aggregateEngine = builder.createAggregate();
@@ -107,11 +108,11 @@ public class AggregateBuilderTest extend
tokenBuilder.buildTokens(jCas, "'Verb' is a noun!?");
AggregateBuilder builder = new AggregateBuilder();
- String componentName1 = builder.add(AnalysisEngineFactory.createPrimitiveDescription(
+ String componentName1 = builder.add(AnalysisEngineFactory.createEngineDescription(
Annotator1.class, typeSystemDescription));
- String componentName2 = builder.add(AnalysisEngineFactory.createPrimitiveDescription(
+ String componentName2 = builder.add(AnalysisEngineFactory.createEngineDescription(
Annotator1.class, typeSystemDescription));
- String componentName3 = builder.add(AnalysisEngineFactory.createPrimitiveDescription(
+ String componentName3 = builder.add(AnalysisEngineFactory.createEngineDescription(
Annotator1.class, typeSystemDescription));
assertEquals("org.apache.uima.fit.factory.testAes.Annotator1", componentName1);
@@ -123,8 +124,7 @@ public class AggregateBuilderTest extend
builder.addSofaMapping(componentName3, ViewNames.PARENTHESES_VIEW, "C");
AnalysisEngineDescription aggregateEngineDescription = builder.createAggregateDescription();
- AnalysisEngine aggregateEngine = AnalysisEngineFactory
- .createAggregate(aggregateEngineDescription);
+ AnalysisEngine aggregateEngine = createEngine(aggregateEngineDescription);
aggregateEngine.process(jCas);
@@ -138,16 +138,16 @@ public class AggregateBuilderTest extend
@Test(expected = IllegalArgumentException.class)
public void testOddNumberOfViewNames() throws ResourceInitializationException {
AggregateBuilder builder = new AggregateBuilder();
- builder.add(AnalysisEngineFactory.createPrimitiveDescription(Annotator1.class,
+ builder.add(AnalysisEngineFactory.createEngineDescription(Annotator1.class,
typeSystemDescription), ViewNames.PARENTHESES_VIEW);
}
@Test(expected = IllegalArgumentException.class)
public void testDuplicateComponentNames() throws ResourceInitializationException {
AggregateBuilder builder = new AggregateBuilder();
- builder.add("name", AnalysisEngineFactory.createPrimitiveDescription(Annotator1.class,
+ builder.add("name", AnalysisEngineFactory.createEngineDescription(Annotator1.class,
typeSystemDescription));
- builder.add("name", AnalysisEngineFactory.createPrimitiveDescription(Annotator1.class,
+ builder.add("name", AnalysisEngineFactory.createEngineDescription(Annotator1.class,
typeSystemDescription));
}
@@ -162,11 +162,11 @@ public class AggregateBuilderTest extend
tokenBuilder.buildTokens(jCas, "An honest man can never surrender an honest doubt.");
AggregateBuilder builder = new AggregateBuilder();
- builder.add(AnalysisEngineFactory.createPrimitiveDescription(FlowAE1.class,
+ builder.add(AnalysisEngineFactory.createEngineDescription(FlowAE1.class,
typeSystemDescription));
- builder.add(AnalysisEngineFactory.createPrimitiveDescription(FlowAE2.class,
+ builder.add(AnalysisEngineFactory.createEngineDescription(FlowAE2.class,
typeSystemDescription));
- builder.add(AnalysisEngineFactory.createPrimitiveDescription(FlowAE3.class,
+ builder.add(AnalysisEngineFactory.createEngineDescription(FlowAE3.class,
typeSystemDescription));
FlowControllerDescription fcd = FlowControllerFactory
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/AnalysisEngineFactoryExternalResourceTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/AnalysisEngineFactoryExternalResourceTest.java?rev=1505173&r1=1505172&r2=1505173&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/AnalysisEngineFactoryExternalResourceTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/AnalysisEngineFactoryExternalResourceTest.java Sat Jul 20 17:50:51 2013
@@ -19,10 +19,9 @@
package org.apache.uima.fit.factory;
-import static org.apache.uima.fit.factory.AnalysisEngineFactory.createAggregate;
-import static org.apache.uima.fit.factory.AnalysisEngineFactory.createAggregateDescription;
-import static org.apache.uima.fit.factory.AnalysisEngineFactory.createPrimitive;
-import static org.apache.uima.fit.factory.AnalysisEngineFactory.createPrimitiveDescription;
+import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngineDescription;
+import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngine;
+import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngineDescription;
import static org.apache.uima.fit.factory.ExternalResourceFactory.bindExternalResource;
import static org.apache.uima.fit.factory.ExternalResourceFactory.createExternalResourceDescription;
import static org.junit.Assert.assertNotNull;
@@ -62,13 +61,13 @@ public class AnalysisEngineFactoryExtern
*/
@Test
public void resource_testInjection() throws Exception {
- AnalysisEngineDescription aeDesc = saveLoad(createPrimitiveDescription(
+ AnalysisEngineDescription aeDesc = saveLoad(createEngineDescription(
TestAnalysisEngineWithResource.class,
TestAnalysisEngineWithResource.PARAM_RESOURCE,
createExternalResourceDescription(TestExternalResource.class,
TestExternalResource.PARAM_VALUE, TestExternalResource.EXPECTED_VALUE)));
- AnalysisEngine ae = createPrimitive(aeDesc);
+ AnalysisEngine ae = createEngine(aeDesc);
ae.process(ae.newCAS());
}
@@ -81,23 +80,23 @@ public class AnalysisEngineFactoryExtern
TestExternalResource.class, TestExternalResource.PARAM_VALUE,
TestExternalResource.EXPECTED_VALUE);
- AnalysisEngineDescription aeDesc1 = saveLoad(createPrimitiveDescription(
+ AnalysisEngineDescription aeDesc1 = saveLoad(createEngineDescription(
TestAnalysisEngineWithResource.class, TestAnalysisEngineWithResource.PARAM_RESOURCE,
resDesc));
- AnalysisEngineDescription aeDesc2 = saveLoad(createPrimitiveDescription(
+ AnalysisEngineDescription aeDesc2 = saveLoad(createEngineDescription(
TestAnalysisEngineWithResource.class, TestAnalysisEngineWithResource.PARAM_RESOURCE,
resDesc));
dumpResourceConfiguration(aeDesc1);
dumpResourceConfiguration(aeDesc2);
- AnalysisEngine ae1 = createPrimitive(aeDesc1);
- AnalysisEngine ae2 = createPrimitive(aeDesc2);
+ AnalysisEngine ae1 = createEngine(aeDesc1);
+ AnalysisEngine ae2 = createEngine(aeDesc2);
ae1.process(ae1.newCAS());
ae2.process(ae2.newCAS());
- AnalysisEngine ae3 = createAggregate(createAggregateDescription(aeDesc1, aeDesc2));
+ AnalysisEngine ae3 = createEngine(createEngineDescription(aeDesc1, aeDesc2));
ae3.process(ae3.newCAS());
}
@@ -106,7 +105,7 @@ public class AnalysisEngineFactoryExtern
*/
@Test
public void resource_testSimpleNesting() throws Exception {
- AnalysisEngineDescription aeDesc = saveLoad(createPrimitiveDescription(
+ AnalysisEngineDescription aeDesc = saveLoad(createEngineDescription(
TestAnalysisEngineWithResource.class,
TestAnalysisEngineWithResource.PARAM_RESOURCE,
createExternalResourceDescription(
@@ -117,7 +116,7 @@ public class AnalysisEngineFactoryExtern
createExternalResourceDescription(TestExternalResource.class,
TestExternalResource.PARAM_VALUE, TestExternalResource.EXPECTED_VALUE))));
- AnalysisEngine ae = createPrimitive(aeDesc);
+ AnalysisEngine ae = createEngine(aeDesc);
ae.process(ae.newCAS());
}
@@ -134,25 +133,25 @@ public class AnalysisEngineFactoryExtern
createExternalResourceDescription(TestExternalResource.class,
TestExternalResource.PARAM_VALUE, TestExternalResource.EXPECTED_VALUE));
- AnalysisEngineDescription aeDesc1 = saveLoad(createPrimitiveDescription(
+ AnalysisEngineDescription aeDesc1 = saveLoad(createEngineDescription(
TestAnalysisEngineWithResource.class, TestAnalysisEngineWithResource.PARAM_RESOURCE,
resDesc));
dumpResourceConfiguration(aeDesc1);
- AnalysisEngineDescription aeDesc2 = saveLoad(createPrimitiveDescription(
+ AnalysisEngineDescription aeDesc2 = saveLoad(createEngineDescription(
TestAnalysisEngineWithResource.class, TestAnalysisEngineWithResource.PARAM_RESOURCE,
resDesc));
dumpResourceConfiguration(aeDesc1);
dumpResourceConfiguration(aeDesc2);
- AnalysisEngine ae1 = createPrimitive(aeDesc1);
- AnalysisEngine ae2 = createPrimitive(aeDesc2);
+ AnalysisEngine ae1 = createEngine(aeDesc1);
+ AnalysisEngine ae2 = createEngine(aeDesc2);
ae1.process(ae1.newCAS());
ae2.process(ae2.newCAS());
- AnalysisEngine ae3 = createAggregate(createAggregateDescription(aeDesc1, aeDesc2));
+ AnalysisEngine ae3 = createEngine(createEngineDescription(aeDesc1, aeDesc2));
ae3.process(ae3.newCAS());
}
@@ -169,7 +168,7 @@ public class AnalysisEngineFactoryExtern
TestExternalResource2.class, TestExternalResource2.PARAM_RESOURCE, resDesc2,
TestExternalResource.PARAM_VALUE, TestExternalResource.EXPECTED_VALUE);
- AnalysisEngineDescription aeDesc = saveLoad(createPrimitiveDescription(
+ AnalysisEngineDescription aeDesc = saveLoad(createEngineDescription(
TestAnalysisEngineWithResource.class,
TestAnalysisEngineWithResource.PARAM_RESOURCE,
createExternalResourceDescription(TestExternalResource2.class,
@@ -178,7 +177,7 @@ public class AnalysisEngineFactoryExtern
dumpResourceConfiguration(aeDesc);
- AnalysisEngine ae = createPrimitive(aeDesc);
+ AnalysisEngine ae = createEngine(aeDesc);
ae.process(ae.newCAS());
}
@@ -192,13 +191,13 @@ public class AnalysisEngineFactoryExtern
TestExternalResource.EXPECTED_VALUE);
bindExternalResource(resDesc, TestExternalResource2.PARAM_RESOURCE, resDesc);
- AnalysisEngineDescription aeDesc = saveLoad(createPrimitiveDescription(
+ AnalysisEngineDescription aeDesc = saveLoad(createEngineDescription(
TestAnalysisEngineWithResource.class, TestAnalysisEngineWithResource.PARAM_RESOURCE,
resDesc));
dumpResourceConfiguration(aeDesc);
- AnalysisEngine ae = createPrimitive(aeDesc);
+ AnalysisEngine ae = createEngine(aeDesc);
ae.process(ae.newCAS());
}
@@ -212,23 +211,23 @@ public class AnalysisEngineFactoryExtern
TestExternalResource.EXPECTED_VALUE);
bindExternalResource(resDesc, TestExternalResource2.PARAM_RESOURCE, resDesc);
- AnalysisEngineDescription aeDesc1 = saveLoad(createPrimitiveDescription(
+ AnalysisEngineDescription aeDesc1 = saveLoad(createEngineDescription(
TestAnalysisEngineWithResource.class, TestAnalysisEngineWithResource.PARAM_RESOURCE,
resDesc));
- AnalysisEngineDescription aeDesc2 = saveLoad(createPrimitiveDescription(
+ AnalysisEngineDescription aeDesc2 = saveLoad(createEngineDescription(
TestAnalysisEngineWithResource.class, TestAnalysisEngineWithResource.PARAM_RESOURCE,
resDesc));
dumpResourceConfiguration(aeDesc1);
dumpResourceConfiguration(aeDesc2);
- AnalysisEngine ae1 = createPrimitive(aeDesc1);
- AnalysisEngine ae2 = createPrimitive(aeDesc2);
+ AnalysisEngine ae1 = createEngine(aeDesc1);
+ AnalysisEngine ae2 = createEngine(aeDesc2);
ae1.process(ae1.newCAS());
ae2.process(ae2.newCAS());
- AnalysisEngine ae3 = createAggregate(createAggregateDescription(aeDesc1, aeDesc2));
+ AnalysisEngine ae3 = createEngine(createEngineDescription(aeDesc1, aeDesc2));
ae3.process(ae3.newCAS());
}
@@ -237,13 +236,13 @@ public class AnalysisEngineFactoryExtern
*/
@Test
public void sharedObject_testInjection() throws Exception {
- AnalysisEngineDescription aeDesc = saveLoad(createPrimitiveDescription(
+ AnalysisEngineDescription aeDesc = saveLoad(createEngineDescription(
TestAnalysisEngineWithSharedResourceObject.class,
TestAnalysisEngineWithSharedResourceObject.PARAM_RESOURCE,
createExternalResourceDescription(TestSharedResourceObject.class, "http://dumm.my",
TestSharedResourceObject.PARAM_VALUE, TestSharedResourceObject.EXPECTED_VALUE)));
- AnalysisEngine ae = createPrimitive(aeDesc);
+ AnalysisEngine ae = createEngine(aeDesc);
ae.process(ae.newCAS());
}
@@ -256,23 +255,23 @@ public class AnalysisEngineFactoryExtern
TestSharedResourceObject.class, "http://dumm.my", TestSharedResourceObject.PARAM_VALUE,
TestSharedResourceObject.EXPECTED_VALUE);
- AnalysisEngineDescription aeDesc1 = saveLoad(createPrimitiveDescription(
+ AnalysisEngineDescription aeDesc1 = saveLoad(createEngineDescription(
TestAnalysisEngineWithSharedResourceObject.class,
TestAnalysisEngineWithSharedResourceObject.PARAM_RESOURCE, resDesc));
- AnalysisEngineDescription aeDesc2 = saveLoad(createPrimitiveDescription(
+ AnalysisEngineDescription aeDesc2 = saveLoad(createEngineDescription(
TestAnalysisEngineWithSharedResourceObject.class,
TestAnalysisEngineWithSharedResourceObject.PARAM_RESOURCE, resDesc));
dumpResourceConfiguration(aeDesc1);
dumpResourceConfiguration(aeDesc2);
- AnalysisEngine ae1 = createPrimitive(aeDesc1);
- AnalysisEngine ae2 = createPrimitive(aeDesc2);
+ AnalysisEngine ae1 = createEngine(aeDesc1);
+ AnalysisEngine ae2 = createEngine(aeDesc2);
ae1.process(ae1.newCAS());
ae2.process(ae2.newCAS());
- AnalysisEngine ae3 = createAggregate(createAggregateDescription(aeDesc1, aeDesc2));
+ AnalysisEngine ae3 = createEngine(createEngineDescription(aeDesc1, aeDesc2));
ae3.process(ae3.newCAS());
}
@@ -286,13 +285,13 @@ public class AnalysisEngineFactoryExtern
TestSharedResourceObject.PARAM_VALUE, TestSharedResourceObject.EXPECTED_VALUE);
bindExternalResource(resDesc, TestSharedResourceObject2.PARAM_RESOURCE, resDesc);
- AnalysisEngineDescription aeDesc = saveLoad(createPrimitiveDescription(
+ AnalysisEngineDescription aeDesc = saveLoad(createEngineDescription(
TestAnalysisEngineWithSharedResourceObject.class,
TestAnalysisEngineWithSharedResourceObject.PARAM_RESOURCE, resDesc));
dumpResourceConfiguration(aeDesc);
- AnalysisEngine ae = createPrimitive(aeDesc);
+ AnalysisEngine ae = createEngine(aeDesc);
ae.process(ae.newCAS());
}
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=1505173&r1=1505172&r2=1505173&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 Jul 20 17:50:51 2013
@@ -19,15 +19,14 @@
package org.apache.uima.fit.factory;
import static java.util.Arrays.asList;
+import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngine;
+import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngineDescription;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import static org.apache.uima.fit.factory.AnalysisEngineFactory.createAggregateDescription;
-import static org.apache.uima.fit.factory.AnalysisEngineFactory.createPrimitiveDescription;
-import static org.apache.uima.fit.factory.AnalysisEngineFactory.createAggregate;
import java.io.IOException;
import java.lang.reflect.Array;
@@ -47,6 +46,7 @@ import org.apache.uima.cas.FSIterator;
import org.apache.uima.fit.ComponentTestBase;
import org.apache.uima.fit.component.JCasAnnotator_ImplBase;
import org.apache.uima.fit.component.NoOpAnnotator;
+import org.apache.uima.fit.descriptor.OperationalProperties;
import org.apache.uima.fit.descriptor.ResourceMetaData;
import org.apache.uima.fit.factory.testAes.Annotator1;
import org.apache.uima.fit.factory.testAes.Annotator2;
@@ -78,9 +78,9 @@ public class AnalysisEngineFactoryTest e
@Test
public void testViewAE() throws Exception {
- AnalysisEngineDescription aed = AnalysisEngineFactory.createPrimitiveDescription(
+ AnalysisEngineDescription aed = AnalysisEngineFactory.createEngineDescription(
Annotator4.class, typeSystemDescription);
- AnalysisEngine ae = AnalysisEngineFactory.createAnalysisEngine(aed, "A");
+ AnalysisEngine ae = AnalysisEngineFactory.createEngine(aed, "A");
JCas aView = jCas.createView("A");
tokenBuilder.buildTokens(aView, "'Verb' is a noun!?");
@@ -92,7 +92,7 @@ public class AnalysisEngineFactoryTest e
@Test
public void testCreateAnalysisEngineFromPath() throws UIMAException, IOException {
AnalysisEngine engine = AnalysisEngineFactory
- .createAnalysisEngineFromPath("src/main/resources/org/apache/uima/fit/component/NoOpAnnotator.xml");
+ .createEngineFromPath("src/main/resources/org/apache/uima/fit/component/NoOpAnnotator.xml");
assertNotNull(engine);
}
@@ -100,7 +100,7 @@ public class AnalysisEngineFactoryTest e
public void testCreateAnalysisEngineWithPrioritizedTypes() throws UIMAException {
String[] prioritizedTypeNames = new String[] { "org.apache.uima.fit.type.Token",
"org.apache.uima.fit.type.Sentence" };
- AnalysisEngine engine = AnalysisEngineFactory.createPrimitive(
+ AnalysisEngine engine = AnalysisEngineFactory.createEngine(
org.apache.uima.fit.component.NoOpAnnotator.class, typeSystemDescription,
prioritizedTypeNames, (Object[]) null);
@@ -119,7 +119,7 @@ public class AnalysisEngineFactoryTest e
prioritizedTypeNames = new String[] { "org.apache.uima.fit.type.Sentence",
"org.apache.uima.fit.type.Token" };
- engine = AnalysisEngineFactory.createPrimitive(
+ engine = AnalysisEngineFactory.createEngine(
org.apache.uima.fit.component.NoOpAnnotator.class, typeSystemDescription,
prioritizedTypeNames, (Object[]) null);
jCas = engine.newJCas();
@@ -147,7 +147,7 @@ public class AnalysisEngineFactoryTest e
primitiveAEClasses.add(Annotator2.class);
primitiveAEClasses.add(Annotator3.class);
- AnalysisEngine aggregateEngine = AnalysisEngineFactory.createAggregate(primitiveAEClasses,
+ AnalysisEngine aggregateEngine = AnalysisEngineFactory.createEngine(primitiveAEClasses,
typeSystemDescription, null, sofaMappings);
aggregateEngine.process(jCas);
@@ -175,16 +175,16 @@ public class AnalysisEngineFactoryTest e
SofaMappingFactory.createSofaMapping("ann3", ViewNames.INITIAL_VIEW, "B") };
List<AnalysisEngineDescription> primitiveDescriptors = new ArrayList<AnalysisEngineDescription>();
- primitiveDescriptors.add(AnalysisEngineFactory.createPrimitiveDescription(Annotator1.class,
+ primitiveDescriptors.add(AnalysisEngineFactory.createEngineDescription(Annotator1.class,
typeSystemDescription, (TypePriorities) null));
- primitiveDescriptors.add(AnalysisEngineFactory.createPrimitiveDescription(Annotator2.class,
+ primitiveDescriptors.add(AnalysisEngineFactory.createEngineDescription(Annotator2.class,
typeSystemDescription, (TypePriorities) null));
- primitiveDescriptors.add(AnalysisEngineFactory.createPrimitiveDescription(Annotator3.class,
+ primitiveDescriptors.add(AnalysisEngineFactory.createEngineDescription(Annotator3.class,
typeSystemDescription, (TypePriorities) null));
List<String> componentNames = Arrays.asList("ann1", "ann2", "ann3");
- AnalysisEngine aggregateEngine = AnalysisEngineFactory.createAggregate(primitiveDescriptors,
+ AnalysisEngine aggregateEngine = AnalysisEngineFactory.createEngine(primitiveDescriptors,
componentNames, null, sofaMappings);
aggregateEngine.process(jCas);
@@ -199,7 +199,7 @@ public class AnalysisEngineFactoryTest e
.getDocumentText());
JCasFactory.loadJCas(jCas, "src/test/resources/data/docs/test.xmi");
- AnalysisEngine ae1 = AnalysisEngineFactory.createPrimitive(NoOpAnnotator.class,
+ AnalysisEngine ae1 = AnalysisEngineFactory.createEngine(NoOpAnnotator.class,
typeSystemDescription);
SimplePipeline.runPipeline(jCas, ae1, aggregateEngine);
@@ -208,7 +208,7 @@ public class AnalysisEngineFactoryTest e
@Test
public void testReflectPrimitiveDescription() throws ResourceInitializationException {
- AnalysisEngineDescription aed = AnalysisEngineFactory.createPrimitiveDescription(
+ AnalysisEngineDescription aed = AnalysisEngineFactory.createEngineDescription(
Annotator2.class, typeSystemDescription, typePriorities);
Capability[] capabilities = aed.getAnalysisEngineMetaData().getCapabilities();
assertEquals(1, capabilities.length);
@@ -219,7 +219,7 @@ public class AnalysisEngineFactoryTest e
assertArrayEquals(new String[] { ViewNames.SORTED_VIEW, ViewNames.SORTED_PARENTHESES_VIEW },
outputSofas);
- aed = AnalysisEngineFactory.createPrimitiveDescription(ParameterizedAE.class,
+ aed = AnalysisEngineFactory.createEngineDescription(ParameterizedAE.class,
typeSystemDescription, typePriorities);
capabilities = aed.getAnalysisEngineMetaData().getCapabilities();
assertEquals(1, capabilities.length);
@@ -276,7 +276,7 @@ public class AnalysisEngineFactoryTest e
ConfigurationParameter.TYPE_FLOAT, true, true, new Float[] { 1.1111f, 2.2222f, 3.333f });
AnalysisEngine ae = AnalysisEngineFactory
- .createPrimitive(aed, ParameterizedAE.PARAM_FLOAT_3, 3.1415f,
+ .createEngine(aed, ParameterizedAE.PARAM_FLOAT_3, 3.1415f,
ParameterizedAE.PARAM_FLOAT_6, new Float[] { 2.71828183f }, "file2", "foo/bar");
Object paramValue = ae.getAnalysisEngineMetaData().getConfigurationParameterSettings()
.getParameterValue(ParameterizedAE.PARAM_FLOAT_3);
@@ -322,7 +322,7 @@ public class AnalysisEngineFactoryTest e
@Test
public void testPrimitiveDescription() throws ResourceInitializationException {
- AnalysisEngineDescription aed = AnalysisEngineFactory.createPrimitiveDescription(
+ AnalysisEngineDescription aed = AnalysisEngineFactory.createEngineDescription(
NoOpAnnotator.class, typeSystemDescription);
assertNotNull(aed);
// assertEquals("org.apache.uima.fit.type.TypeSystem",
@@ -335,21 +335,21 @@ public class AnalysisEngineFactoryTest e
*/
@Test
public void testComponentAnnotationOnAncestor() throws Exception {
- AnalysisEngineDescription desc1 = AnalysisEngineFactory.createPrimitiveDescription(
+ AnalysisEngineDescription desc1 = AnalysisEngineFactory.createEngineDescription(
PristineAnnotatorClass.class, (Object[]) null);
assertTrue(
"Multiple deployment should be allowed on " + desc1.getAnnotatorImplementationName(),
desc1.getAnalysisEngineMetaData().getOperationalProperties()
.isMultipleDeploymentAllowed());
- AnalysisEngineDescription desc2 = AnalysisEngineFactory.createPrimitiveDescription(
+ AnalysisEngineDescription desc2 = AnalysisEngineFactory.createEngineDescription(
UnannotatedAnnotatorClass.class, (Object[]) null);
assertFalse(
"Multiple deployment should be prohibited on " + desc2.getAnnotatorImplementationName(),
desc2.getAnalysisEngineMetaData().getOperationalProperties()
.isMultipleDeploymentAllowed());
- AnalysisEngineDescription desc3 = AnalysisEngineFactory.createPrimitiveDescription(
+ AnalysisEngineDescription desc3 = AnalysisEngineFactory.createEngineDescription(
AnnotatedAnnotatorClass.class, (Object[]) null);
assertTrue(
"Multiple deployment should be allowed on " + desc3.getAnnotatorImplementationName(),
@@ -364,14 +364,14 @@ public class AnalysisEngineFactoryTest e
@Test(expected = ResourceInitializationException.class)
public void testAAEMultipleDeploymentPolicyProblem() throws Exception {
{
- AnalysisEngineDescription desc1 = AnalysisEngineFactory.createPrimitiveDescription(
+ AnalysisEngineDescription desc1 = AnalysisEngineFactory.createEngineDescription(
PristineAnnotatorClass.class, (Object[]) null);
assertTrue(
"Multiple deployment should be allowed on " + desc1.getAnnotatorImplementationName(),
desc1.getAnalysisEngineMetaData().getOperationalProperties()
.isMultipleDeploymentAllowed());
- AnalysisEngineDescription desc2 = AnalysisEngineFactory.createPrimitiveDescription(
+ AnalysisEngineDescription desc2 = AnalysisEngineFactory.createEngineDescription(
UnannotatedAnnotatorClass.class, (Object[]) null);
assertFalse(
"Multiple deployment should be prohibited on "
@@ -379,7 +379,7 @@ public class AnalysisEngineFactoryTest e
.getOperationalProperties().isMultipleDeploymentAllowed());
AnalysisEngineDescription aae = AnalysisEngineFactory
- .createAggregateDescription(desc1, desc2);
+ .createEngineDescription(desc1, desc2);
aae.getAnalysisEngineMetaData().getOperationalProperties().setMultipleDeploymentAllowed(true);
UIMAFramework.produceAnalysisEngine(aae);
}
@@ -388,14 +388,14 @@ public class AnalysisEngineFactoryTest e
@Test
public void testAAEMultipleDeploymentPolicy() throws Exception {
{
- AnalysisEngineDescription desc1 = AnalysisEngineFactory.createPrimitiveDescription(
+ AnalysisEngineDescription desc1 = AnalysisEngineFactory.createEngineDescription(
PristineAnnotatorClass.class, (Object[]) null);
assertTrue(
"Multiple deployment should be allowed on " + desc1.getAnnotatorImplementationName(),
desc1.getAnalysisEngineMetaData().getOperationalProperties()
.isMultipleDeploymentAllowed());
- AnalysisEngineDescription desc2 = AnalysisEngineFactory.createPrimitiveDescription(
+ AnalysisEngineDescription desc2 = AnalysisEngineFactory.createEngineDescription(
UnannotatedAnnotatorClass.class, (Object[]) null);
assertFalse(
"Multiple deployment should be prohibited on "
@@ -403,7 +403,7 @@ public class AnalysisEngineFactoryTest e
.getOperationalProperties().isMultipleDeploymentAllowed());
AnalysisEngineDescription aae = AnalysisEngineFactory
- .createAggregateDescription(desc1, desc2);
+ .createEngineDescription(desc1, desc2);
UIMAFramework.produceAnalysisEngine(aae);
assertFalse("Multiple deployment should be prohibited on AAE", aae
@@ -411,14 +411,14 @@ public class AnalysisEngineFactoryTest e
}
{
- AnalysisEngineDescription desc1 = AnalysisEngineFactory.createPrimitiveDescription(
+ AnalysisEngineDescription desc1 = AnalysisEngineFactory.createEngineDescription(
PristineAnnotatorClass.class, (Object[]) null);
assertTrue(
"Multiple deployment should be allowed on " + desc1.getAnnotatorImplementationName(),
desc1.getAnalysisEngineMetaData().getOperationalProperties()
.isMultipleDeploymentAllowed());
- AnalysisEngineDescription desc3 = AnalysisEngineFactory.createPrimitiveDescription(
+ AnalysisEngineDescription desc3 = AnalysisEngineFactory.createEngineDescription(
AnnotatedAnnotatorClass.class, (Object[]) null);
assertTrue(
"Multiple deployment should be allowed on " + desc3.getAnnotatorImplementationName(),
@@ -426,7 +426,7 @@ public class AnalysisEngineFactoryTest e
.isMultipleDeploymentAllowed());
AnalysisEngineDescription aae = AnalysisEngineFactory
- .createAggregateDescription(desc1, desc3);
+ .createEngineDescription(desc1, desc3);
UIMAFramework.produceAnalysisEngine(aae);
assertTrue("Multiple deployment should be prohibited on AAE", aae.getAnalysisEngineMetaData()
@@ -437,7 +437,7 @@ public class AnalysisEngineFactoryTest e
@Test
public void testResourceMetaData() throws Exception {
AnalysisEngineDescription desc = AnalysisEngineFactory
- .createPrimitiveDescription(AnnotatorWithMetaDataClass.class);
+ .createEngineDescription(AnnotatorWithMetaDataClass.class);
org.apache.uima.resource.metadata.ResourceMetaData meta = desc.getMetaData();
@@ -482,22 +482,22 @@ public class AnalysisEngineFactoryTest e
@Test
public void testIssue5a() throws ResourceInitializationException {
- AnalysisEngineFactory.createPrimitiveDescription(ParameterizedAE.class, typeSystemDescription);
+ AnalysisEngineFactory.createEngineDescription(ParameterizedAE.class, typeSystemDescription);
}
@Test(expected = ResourceInitializationException.class)
public void testIssue5b() throws ResourceInitializationException {
- AnalysisEngineFactory.createPrimitive(ParameterizedAE.class, typeSystemDescription);
+ AnalysisEngineFactory.createEngine(ParameterizedAE.class, typeSystemDescription);
}
@Test(expected = IllegalArgumentException.class)
public void testUnbalancedComponentAndNames() throws ResourceInitializationException {
List<AnalysisEngineDescription> descriptions = new ArrayList<AnalysisEngineDescription>();
- descriptions.add(AnalysisEngineFactory.createPrimitiveDescription(NoOpAnnotator.class));
- descriptions.add(AnalysisEngineFactory.createPrimitiveDescription(NoOpAnnotator.class));
+ descriptions.add(AnalysisEngineFactory.createEngineDescription(NoOpAnnotator.class));
+ descriptions.add(AnalysisEngineFactory.createEngineDescription(NoOpAnnotator.class));
List<String> names = new ArrayList<String>();
- AnalysisEngineFactory.createAggregateDescription(descriptions, names, null, null, null);
+ createEngineDescription(descriptions, names, null, null, null);
}
/**
@@ -513,14 +513,14 @@ public class AnalysisEngineFactoryTest e
Token.class);
// This one doesn't use any auto-configuration
- AnalysisEngineDescription ae = createPrimitiveDescription(UnannotatedAnnotatorClass.class,
+ AnalysisEngineDescription ae = createEngineDescription(UnannotatedAnnotatorClass.class,
typeSystem, null, null, null, null, null, null);
// Try configuring priorities on the aggregate
- AnalysisEngineDescription aae = createAggregateDescription(asList(ae), asList("ae1"),
+ AnalysisEngineDescription aae = createEngineDescription(asList(ae), asList("ae1"),
extraPrios, null, null);
- AnalysisEngine engine = createAggregate(aae);
+ AnalysisEngine engine = createEngine(aae);
ProcessingResourceMetaData meta = engine.getProcessingResourceMetaData();
// When the meta data from the ae and the aae are merged in the engine, then it should be a
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/ExternalResourceConfiguratorTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/ExternalResourceConfiguratorTest.java?rev=1505173&r1=1505172&r2=1505173&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/ExternalResourceConfiguratorTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/ExternalResourceConfiguratorTest.java Sat Jul 20 17:50:51 2013
@@ -19,7 +19,7 @@
package org.apache.uima.fit.factory;
-import static org.apache.uima.fit.factory.AnalysisEngineFactory.createPrimitiveDescription;
+import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngineDescription;
import static org.apache.uima.fit.factory.ExternalResourceFactory.createExternalResourceDependencies;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -29,6 +29,7 @@ import java.util.Map;
import org.apache.uima.analysis_engine.AnalysisEngineDescription;
import org.apache.uima.fit.ComponentTestBase;
+import org.apache.uima.fit.component.initialize.ExternalResourceInitializer;
import org.apache.uima.fit.factory.testAes.ParameterizedAE2;
import org.apache.uima.resource.ExternalResourceDependency;
import org.junit.Test;
@@ -47,7 +48,7 @@ public class ExternalResourceConfigurato
@Test
public void testDescriptor() throws Exception {
- AnalysisEngineDescription desc = createPrimitiveDescription(ParameterizedAE2.class,
+ AnalysisEngineDescription desc = createEngineDescription(ParameterizedAE2.class,
typeSystemDescription);
verify(desc.getExternalResourceDependencies());
}
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/ExternalResourceFactoryTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/ExternalResourceFactoryTest.java?rev=1505173&r1=1505172&r2=1505173&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/ExternalResourceFactoryTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/ExternalResourceFactoryTest.java Sat Jul 20 17:50:51 2013
@@ -20,9 +20,9 @@
package org.apache.uima.fit.factory;
import static java.util.Arrays.asList;
-import static org.apache.uima.fit.factory.AnalysisEngineFactory.createAggregate;
-import static org.apache.uima.fit.factory.AnalysisEngineFactory.createAggregateDescription;
-import static org.apache.uima.fit.factory.AnalysisEngineFactory.createPrimitiveDescription;
+import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngineDescription;
+import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngine;
+import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngineDescription;
import static org.apache.uima.fit.factory.ExternalResourceFactory.bindExternalResource;
import static org.apache.uima.fit.factory.ExternalResourceFactory.bindResource;
import static org.apache.uima.fit.factory.ExternalResourceFactory.createDependencyAndBind;
@@ -94,7 +94,7 @@ public class ExternalResourceFactoryTest
@Test
public void testScanBind() throws Exception {
// Create analysis enginge description
- AnalysisEngineDescription desc = createPrimitiveDescription(DummyAE.class);
+ AnalysisEngineDescription desc = createEngineDescription(DummyAE.class);
// Bind external resources
bindResources(desc);
@@ -107,7 +107,7 @@ public class ExternalResourceFactoryTest
@Test
public void testDirectInjection() throws Exception {
// Create analysis enginge description
- AnalysisEngineDescription desc = createPrimitiveDescription(DummyAE2.class);
+ AnalysisEngineDescription desc = createEngineDescription(DummyAE2.class);
// Bind external resources for DummyAE
bindResources(desc);
@@ -135,7 +135,7 @@ public class ExternalResourceFactoryTest
@Test
public void testDirectInjectionAutowire() throws Exception {
// Create analysis engine description
- AnalysisEngineDescription desc = createPrimitiveDescription(DummyAE2.class);
+ AnalysisEngineDescription desc = createEngineDescription(DummyAE2.class);
// Bind external resources for DummyAE
bindResources(desc);
@@ -162,15 +162,15 @@ public class ExternalResourceFactoryTest
ExternalResourceDescription extDesc = createExternalResourceDescription(ResourceWithAssert.class);
// Binding external resource to each Annotator individually
- AnalysisEngineDescription aed1 = createPrimitiveDescription(MultiBindAE.class,
+ AnalysisEngineDescription aed1 = createEngineDescription(MultiBindAE.class,
MultiBindAE.RES_KEY, extDesc);
- AnalysisEngineDescription aed2 = createPrimitiveDescription(MultiBindAE.class,
+ AnalysisEngineDescription aed2 = createEngineDescription(MultiBindAE.class,
MultiBindAE.RES_KEY, extDesc);
// Check the external resource was injected
MultiBindAE.reset();
- AnalysisEngineDescription aed = createAggregateDescription(aed1, aed2);
- AnalysisEngine ae = createAggregate(aed);
+ AnalysisEngineDescription aed = createEngineDescription(aed1, aed2);
+ AnalysisEngine ae = createEngine(aed);
ae.process(ae.newJCas());
@@ -187,15 +187,15 @@ public class ExternalResourceFactoryTest
createExternalResourceDescription(ResourceWithAssert.class));
// Binding external resource to each Annotator individually
- AnalysisEngineDescription aed1 = createPrimitiveDescription(MultiBindAE.class,
+ AnalysisEngineDescription aed1 = createEngineDescription(MultiBindAE.class,
MultiBindAE.RES_KEY, extDesc);
- AnalysisEngineDescription aed2 = createPrimitiveDescription(MultiBindAE.class,
+ AnalysisEngineDescription aed2 = createEngineDescription(MultiBindAE.class,
MultiBindAE.RES_KEY, extDesc);
// Check the external resource was injected
MultiBindAE.reset();
- AnalysisEngineDescription aed = createAggregateDescription(aed1, aed2);
- AnalysisEngine ae = createAggregate(aed);
+ AnalysisEngineDescription aed = createEngineDescription(aed1, aed2);
+ AnalysisEngine ae = createEngine(aed);
ae.process(ae.newJCas());
@@ -213,10 +213,10 @@ public class ExternalResourceFactoryTest
ExternalResourceDescription extDesc1 = createExternalResourceDescription(ResourceWithAssert.class);
ExternalResourceDescription extDesc2 = createExternalResourceDescription(ResourceWithAssert.class);
- AnalysisEngineDescription aed = createPrimitiveDescription(MultiValuedResourceAE.class,
+ AnalysisEngineDescription aed = createEngineDescription(MultiValuedResourceAE.class,
MultiValuedResourceAE.RES_RESOURCE_ARRAY, asList(extDesc1, extDesc2));
- AnalysisEngine ae = createAggregate(aed);
+ AnalysisEngine ae = createEngine(aed);
ae.process(ae.newJCas());
ae.collectionProcessComplete();
}
@@ -231,13 +231,13 @@ public class ExternalResourceFactoryTest
ExternalResourceDescription extDesc1 = createExternalResourceDescription(ResourceWithAssert.class);
ExternalResourceDescription extDesc2 = createExternalResourceDescription(ResourceWithAssert.class);
- AnalysisEngineDescription aed = createAggregateDescription(
- createPrimitiveDescription(MultiValuedResourceAE.class,
+ AnalysisEngineDescription aed = createEngineDescription(
+ createEngineDescription(MultiValuedResourceAE.class,
MultiValuedResourceAE.RES_RESOURCE_ARRAY, asList(extDesc1, extDesc2)),
- createPrimitiveDescription(MultiValuedResourceAE.class,
+ createEngineDescription(MultiValuedResourceAE.class,
MultiValuedResourceAE.RES_RESOURCE_ARRAY, asList(extDesc1, extDesc2)));
- AnalysisEngine ae = createAggregate(aed);
+ AnalysisEngine ae = createEngine(aed);
ae.process(ae.newJCas());
// Check that the shared resources are really the same
@@ -255,13 +255,13 @@ public class ExternalResourceFactoryTest
ExternalResourceDescription extDesc1 = createExternalResourceDescription(ResourceWithAssert.class);
ExternalResourceDescription extDesc2 = createExternalResourceDescription(ResourceWithAssert.class);
- AnalysisEngineDescription aed = createAggregateDescription(
- createPrimitiveDescription(MultiValuedResourceAE.class,
+ AnalysisEngineDescription aed = createEngineDescription(
+ createEngineDescription(MultiValuedResourceAE.class,
MultiValuedResourceAE.RES_RESOURCE_ARRAY, asList(extDesc1, extDesc2)),
- createAggregateDescription(createPrimitiveDescription(MultiValuedResourceAE.class,
+ createEngineDescription(createEngineDescription(MultiValuedResourceAE.class,
MultiValuedResourceAE.RES_RESOURCE_ARRAY, asList(extDesc1, extDesc2))));
- AnalysisEngine ae = createAggregate(aed);
+ AnalysisEngine ae = createEngine(aed);
ae.process(ae.newJCas());
// Check that the shared resources are really the same
@@ -288,10 +288,10 @@ public class ExternalResourceFactoryTest
MultiValuedResource.RES_RESOURCE_LIST, new ExternalResourceDescription[] { extDesc3,
extDesc4 });
- AnalysisEngineDescription aed = createPrimitiveDescription(MultiValuedResourceAE.class,
+ AnalysisEngineDescription aed = createEngineDescription(MultiValuedResourceAE.class,
MultiValuedResourceAE.RES_RESOURCE_ARRAY, asList(mv1, mv2));
- AnalysisEngine ae = createAggregate(aed);
+ AnalysisEngine ae = createEngine(aed);
ae.process(ae.newJCas());
ae.collectionProcessComplete();
}
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/FlowControllerFactoryExternalResourceTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/FlowControllerFactoryExternalResourceTest.java?rev=1505173&r1=1505172&r2=1505173&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/FlowControllerFactoryExternalResourceTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/FlowControllerFactoryExternalResourceTest.java Sat Jul 20 17:50:51 2013
@@ -61,7 +61,7 @@ public class FlowControllerFactoryExtern
@Test
public void testAutoExternalResourceBinding() throws Exception {
AggregateBuilder builder = new AggregateBuilder();
- builder.add(AnalysisEngineFactory.createPrimitiveDescription(NoOpAnnotator.class));
+ builder.add(AnalysisEngineFactory.createEngineDescription(NoOpAnnotator.class));
builder.setFlowControllerDescription(createFlowControllerDescription(
TestFlowController.class,
TestFlowController.PARAM_RESOURCE,
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/FsIndexFactoryTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/FsIndexFactoryTest.java?rev=1505173&r1=1505172&r2=1505173&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/FsIndexFactoryTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/FsIndexFactoryTest.java Sat Jul 20 17:50:51 2013
@@ -18,7 +18,7 @@
*/
package org.apache.uima.fit.factory;
-import static org.apache.uima.fit.factory.AnalysisEngineFactory.createPrimitive;
+import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngine;
import static org.apache.uima.fit.factory.FsIndexFactory.createFsIndexCollection;
import static org.junit.Assert.assertEquals;
@@ -78,7 +78,7 @@ public class FsIndexFactoryTest extends
public void testIndexesWork() throws Exception {
// Index should be added the descriptor and thus end up in the CAS generated from the
// analysis engine.
- AnalysisEngine desc = createPrimitive(IndexTestComponent.class);
+ AnalysisEngine desc = createEngine(IndexTestComponent.class);
JCas jcas = desc.newJCas();
Token token1 = new Token(jcas, 1, 2);
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/JCasBuilderTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/JCasBuilderTest.java?rev=1505173&r1=1505172&r2=1505173&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/JCasBuilderTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/JCasBuilderTest.java Sat Jul 20 17:50:51 2013
@@ -19,7 +19,7 @@
package org.apache.uima.fit.factory;
import static org.apache.commons.io.FileUtils.readFileToString;
-import static org.apache.uima.fit.factory.AnalysisEngineFactory.createPrimitive;
+import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngine;
import static org.junit.Assert.assertEquals;
import java.io.File;
@@ -59,7 +59,7 @@ public class JCasBuilderTest extends Com
jb.close();
File outputFile = new File(folder.getRoot(), "dump-output.txt");
- AnalysisEngine writer = createPrimitive(CASDumpWriter.class, CASDumpWriter.PARAM_OUTPUT_FILE,
+ AnalysisEngine writer = createEngine(CASDumpWriter.class, CASDumpWriter.PARAM_OUTPUT_FILE,
outputFile.getPath());
writer.process(jb.getJCas());
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/LoggingTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/LoggingTest.java?rev=1505173&r1=1505172&r2=1505173&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/LoggingTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/LoggingTest.java Sat Jul 20 17:50:51 2013
@@ -18,7 +18,7 @@
*/
package org.apache.uima.fit.factory;
-import static org.apache.uima.fit.factory.AnalysisEngineFactory.createPrimitive;
+import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngine;
import static org.apache.uima.fit.factory.CollectionReaderFactory.createCollectionReader;
import static org.junit.Assert.assertEquals;
@@ -222,22 +222,22 @@ public class LoggingTest {
// createFlowControllerDescription(LoggingJCasFlowController.class).
// assertLogDone(records);
- createPrimitive(LoggingCasAnnotator.class).process(jcas.getCas());
+ createEngine(LoggingCasAnnotator.class).process(jcas.getCas());
assertLogDone(records);
- createPrimitive(LoggingJCasAnnotator.class).process(jcas);
+ createEngine(LoggingJCasAnnotator.class).process(jcas);
assertLogDone(records);
- createPrimitive(LoggingCasConsumer.class).process(jcas.getCas());
+ createEngine(LoggingCasConsumer.class).process(jcas.getCas());
assertLogDone(records);
- createPrimitive(LoggingJCasConsumer.class).process(jcas);
+ createEngine(LoggingJCasConsumer.class).process(jcas);
assertLogDone(records);
- createPrimitive(LoggingCasMultiplier.class).process(jcas.getCas());
+ createEngine(LoggingCasMultiplier.class).process(jcas.getCas());
assertLogDone(records);
- createPrimitive(LoggingJCasMultiplier.class).process(jcas);
+ createEngine(LoggingJCasMultiplier.class).process(jcas);
assertLogDone(records);
} finally {
if (oldLevel != null) {
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/pipeline/SimplePipelineTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/pipeline/SimplePipelineTest.java?rev=1505173&r1=1505172&r2=1505173&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/pipeline/SimplePipelineTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/pipeline/SimplePipelineTest.java Sat Jul 20 17:50:51 2013
@@ -109,16 +109,16 @@ public class SimplePipelineTest {
@Test
public void testWithInstances() throws Exception {
SimplePipeline.runPipeline(createCollectionReader(Reader.class),
- createPrimitive(Annotator.class),
- createPrimitive(Writer.class));
+ createEngine(Annotator.class),
+ createEngine(Writer.class));
assertEquals(Arrays.asList(SENTENCE_TEXT), Writer.SENTENCES);
}
@Test
public void testWithDescriptors() throws Exception {
SimplePipeline.runPipeline(createDescription(Reader.class),
- createPrimitiveDescription(Annotator.class),
- createPrimitiveDescription(Writer.class));
+ createEngineDescription(Annotator.class),
+ createEngineDescription(Writer.class));
assertEquals(Arrays.asList(SENTENCE_TEXT), Writer.SENTENCES);
}
}
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/SimplePipelineTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/SimplePipelineTest.java?rev=1505173&r1=1505172&r2=1505173&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/SimplePipelineTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/SimplePipelineTest.java Sat Jul 20 17:50:51 2013
@@ -39,11 +39,11 @@ public class SimplePipelineTest extends
@Test
public void test1() throws UIMAException, IOException {
JCasFactory.loadJCas(jCas, "src/test/resources/data/docs/test.xmi");
- AnalysisEngineDescription aed1 = AnalysisEngineFactory.createPrimitiveDescription(
+ AnalysisEngineDescription aed1 = AnalysisEngineFactory.createEngineDescription(
Annotator1.class, typeSystemDescription);
- AnalysisEngineDescription aed2 = AnalysisEngineFactory.createPrimitiveDescription(
+ AnalysisEngineDescription aed2 = AnalysisEngineFactory.createEngineDescription(
Annotator2.class, typeSystemDescription);
- AnalysisEngineDescription aed3 = AnalysisEngineFactory.createPrimitiveDescription(
+ AnalysisEngineDescription aed3 = AnalysisEngineFactory.createEngineDescription(
Annotator3.class, typeSystemDescription);
SimplePipeline.runPipeline(jCas, aed1, aed2, aed3);