You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2015/10/20 16:07:29 UTC
svn commit: r1709598 - in /uima/ruta/trunk:
ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/
ruta-core/src/main/java/org/apache/uima/ruta/descriptor/
ruta-core/src/main/java/org/apache/uima/ruta/engine/
ruta-core/src/test/java/org/apache/uima/rut...
Author: pkluegl
Date: Tue Oct 20 14:07:29 2015
New Revision: 1709598
URL: http://svn.apache.org/viewvc?rev=1709598&view=rev
Log:
UIMA-4621
- added list of identifiers to uimafit import for initialization of config param
- added test
Added:
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/UimaFitAnalysisEngineWithManditoryParameter.java (with props)
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/UimaFitAnalysisEngineWithManditoryParameterTest.java (with props)
Modified:
uima/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorBuilder.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g
Modified: uima/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g?rev=1709598&r1=1709597&r2=1709598&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g (original)
+++ uima/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g Tue Oct 20 14:07:29 2015
@@ -296,12 +296,17 @@ public void setExternalFactory(RutaExter
descInfo.addEngine(namespace);
}
}
- public void addImportUimafitEngine(RutaBlock parent, String namespace) {
- parent.getScript().addUimafitEngine(namespace, null);
- if(descInfo != null) {
- descInfo.addUimafitEngine(namespace);
- }
- }
+ public void addImportUimafitEngine(RutaBlock parent, String namespace,
+ List<String> configurationData) {
+ parent.getScript().addUimafitEngine(namespace, null);
+ if (descInfo != null) {
+ String namespaceWithConfig = namespace;
+ if (configurationData != null && !configurationData.isEmpty()) {
+ namespaceWithConfig = namespace + "[" + StringUtils.join(configurationData, ",") + "]";
+ }
+ descInfo.addUimafitEngine(namespaceWithConfig);
+ }
+ }
/**
* Import a type from a type system.
@@ -564,11 +569,19 @@ List<String> vars = new ArrayList<String
// ;
importStatement returns [RutaStatement stmt = null]
+@init {
+List<String> configurationData = new ArrayList<String>();
+}
:
TypeSystemString ts = dottedIdentifier2{addImportTypeSystem($blockDeclaration::env, ts);} SEMI
| ScriptString ns = dottedIdentifier2{addImportScript($blockDeclaration::env, ns);} SEMI
| EngineString ns = dottedIdentifier2{addImportEngine($blockDeclaration::env, ns);} SEMI
- | UimafitString ns = dottedIdentifier2{addImportUimafitEngine($blockDeclaration::env, ns);} SEMI
+ | UimafitString ns = dottedIdentifier2
+ (LPAREN p = dottedIdentifier2 {configurationData.add(p);}
+ (COMMA p = dottedIdentifier2 {configurationData.add(p);})+
+ RPAREN)?
+ {addImportUimafitEngine($blockDeclaration::env, ns, configurationData);}
+ SEMI
| ImportString type = dottedIdentifier (FromString ts = dottedIdentifier2)? (AsString alias = Identifier)? SEMI{importTypeFromTypeSystem($blockDeclaration::env, ts, type, alias);}
| ImportString STAR FromString ts = dottedIdentifier2 SEMI{addImportTypeSystem($blockDeclaration::env, ts);}
| ImportString PackageString pkg = dottedIdentifier (FromString ts = dottedIdentifier2)? (AsString alias = Identifier)? SEMI{importPackage($blockDeclaration::env, ts, pkg, alias);}
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorBuilder.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorBuilder.java?rev=1709598&r1=1709597&r2=1709598&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorBuilder.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorBuilder.java Tue Oct 20 14:07:29 2015
@@ -278,7 +278,7 @@ public class RutaDescriptorBuilder {
types.addAll(Arrays.asList(presentTypes));
typeSystemDescription.setTypes(types.toArray(new TypeDescription[0]));
String descName = desc.getScriptName() + options.getTypeSystemSuffix();
- if(!StringUtils.isBlank(desc.getPackageString())) {
+ if (!StringUtils.isBlank(desc.getPackageString())) {
descName = desc.getPackageString() + "." + descName;
}
typeSystemDescription.setName(descName);
@@ -294,15 +294,17 @@ public class RutaDescriptorBuilder {
String engineOutput, RutaBuildOptions options, String[] scriptPaths,
String[] enginePaths, String[] resourcePaths) throws InvalidXMLException, IOException {
TypeSystemDescription aets = uimaFactory.createTypeSystemDescription();
- Import_impl import_impl = new Import_impl();
+ Import_impl import_impl = null;
if (options.isImportByName()) {
if (typeSystemDescription != null) {
+ import_impl = new Import_impl();
import_impl.setName(typeSystemDescription.getName());
}
} else {
if (typeSystemOutput != null) {
String relativeLocation = getRelativeLocation(new File(typeSystemOutput).toURI(),
engineOutput);
+ import_impl = new Import_impl();
import_impl.setLocation(relativeLocation);
}
}
@@ -414,11 +416,15 @@ public class RutaDescriptorBuilder {
AnalysisEngineDescription analysisEngineDescription = UIMAFramework.getXMLParser()
.parseAnalysisEngineDescription(new XMLInputSource(defaultAnalysisEngine));
- aets.setImports(new Import[] { import_impl });
+ if(import_impl != null) {
+ aets.setImports(new Import[] { import_impl });
+ }
analysisEngineDescription.getAnalysisEngineMetaData().setTypeSystem(aets);
- File file = getFile(engineOutput);
- analysisEngineDescription.setSourceUrl(file.toURI().toURL());
+ if (engineOutput != null) {
+ File file = getFile(engineOutput);
+ analysisEngineDescription.setSourceUrl(file.toURI().toURL());
+ }
if (!desc.getTypeShortNames().isEmpty()) {
Capability capability = uimaFactory.createCapability();
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java?rev=1709598&r1=1709597&r2=1709598&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java Tue Oct 20 14:07:29 2015
@@ -39,6 +39,7 @@ import org.antlr.runtime.ANTLRStringStre
import org.antlr.runtime.CharStream;
import org.antlr.runtime.CommonTokenStream;
import org.antlr.runtime.RecognitionException;
+import org.apache.commons.lang.StringUtils;
import org.apache.uima.UIMAFramework;
import org.apache.uima.UimaContext;
import org.apache.uima.analysis_component.AnalysisComponent;
@@ -525,9 +526,9 @@ public class RutaEngine extends JCasAnno
@Override
public void process(JCas jcas) throws AnalysisEngineProcessException {
-
+
CAS cas = jcas.getCas();
-
+
if (reloadScript || (!initialized && !cas.getViewName().equals(CAS.NAME_DEFAULT_SOFA))) {
initializeScript(cas.getViewName());
} else {
@@ -718,60 +719,68 @@ public class RutaEngine extends JCasAnno
}
private void initializeScript(String viewName) throws AnalysisEngineProcessException {
- if (mainScript == null) {
- if (rules != null) {
+ if (rules != null) {
+ try {
+ script = loadScriptByString(rules);
+ } catch (RecognitionException e) {
+ throw new AnalysisEngineProcessException(e);
+ }
+ } else if(mainScript != null) {
+ String scriptLocation = locate(mainScript, scriptPaths, SCRIPT_FILE_EXTENSION);
+ if (scriptLocation == null) {
try {
- script = loadScriptByString(rules);
+ String mainScriptPath = mainScript.replaceAll("\\.", "/") + SCRIPT_FILE_EXTENSION;
+ script = loadScriptIS(mainScriptPath);
+ } catch (IOException e) {
+ throw new AnalysisEngineProcessException(new FileNotFoundException("Script ["
+ + mainScript + "] cannot be found at [" + collectionToString(scriptPaths)
+ + "] or classpath with extension .ruta"));
} catch (RecognitionException e) {
+ throw new AnalysisEngineProcessException(new FileNotFoundException("Script ["
+ + mainScript + "] cannot be found at [" + collectionToString(scriptPaths)
+ + "] or classpath with extension .ruta"));
+ }
+ } else {
+ try {
+ script = loadScript(scriptLocation);
+ } catch (RutaParseRuntimeException re) {
+ throw re;
+ } catch (Exception e) {
throw new AnalysisEngineProcessException(e);
}
}
- return;
}
- String scriptLocation = locate(mainScript, scriptPaths, SCRIPT_FILE_EXTENSION);
- if (scriptLocation == null) {
- try {
- String mainScriptPath = mainScript.replaceAll("\\.", "/") + SCRIPT_FILE_EXTENSION;
- script = loadScriptIS(mainScriptPath);
- } catch (IOException e) {
- throw new AnalysisEngineProcessException(new FileNotFoundException("Script [" + mainScript
- + "] cannot be found at [" + collectionToString(scriptPaths)
- + "] or classpath with extension .ruta"));
- } catch (RecognitionException e) {
- throw new AnalysisEngineProcessException(new FileNotFoundException("Script [" + mainScript
- + "] cannot be found at [" + collectionToString(scriptPaths)
- + "] or classpath with extension .ruta"));
- }
- } else {
- try {
- script = loadScript(scriptLocation);
- } catch (RutaParseRuntimeException re) {
- throw re;
- } catch (Exception e) {
- throw new AnalysisEngineProcessException(e);
- }
+ if(script == null) {
+ return;
}
-
+
Map<String, RutaModule> additionalScriptsMap = new HashMap<String, RutaModule>();
Map<String, AnalysisEngine> additionalEnginesMap = new HashMap<String, AnalysisEngine>();
if (additionalUimafitEngines != null) {
for (String eachUimafitEngine : additionalUimafitEngines) {
AnalysisEngine eachEngine = null;
+ String classString = eachUimafitEngine;
+ Object[] configurationData = new String[0];
+ String[] split = eachUimafitEngine.split("[\\[\\]]");
+ if (split.length == 2) {
+ classString = split[0];
+ configurationData = StringUtils.split(split[1], ",");
+ }
try {
@SuppressWarnings("unchecked")
// Class clazz = this.getClass().getClassLoader().loadClass(eachUimafitEngine) ;
Class<? extends AnalysisComponent> uimafitClass = (Class<? extends AnalysisComponent>) Class
- .forName(eachUimafitEngine);
- eachEngine = AnalysisEngineFactory.createEngine(uimafitClass);
+ .forName(classString);
+ eachEngine = AnalysisEngineFactory.createEngine(uimafitClass, configurationData);
} catch (ClassNotFoundException e) {
throw new AnalysisEngineProcessException(e);
} catch (ResourceInitializationException e) {
throw new AnalysisEngineProcessException(e);
}
try {
- additionalEnginesMap.put(eachUimafitEngine, eachEngine);
- String[] eachEngineLocationPartArray = eachUimafitEngine.split("\\.");
+ additionalEnginesMap.put(classString, eachEngine);
+ String[] eachEngineLocationPartArray = classString.split("\\.");
if (eachEngineLocationPartArray.length > 1) {
String shortEachEngineLocation = eachEngineLocationPartArray[eachEngineLocationPartArray.length - 1];
additionalEnginesMap.put(shortEachEngineLocation, eachEngine);
@@ -1011,8 +1020,8 @@ public class RutaEngine extends JCasAnno
AnalysisEngine eachEngine = engineLoader.loadEngineIS(engineLocationIS, viewName);
additionalEngines.put(eachEngineLocation, eachEngine);
} catch (Exception e) {
-// TODO avoid exception and solve it with return null or something!
-
+ // TODO avoid exception and solve it with return null or something!
+
// uimaFit engine?
try {
@SuppressWarnings("unchecked")
Added: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/UimaFitAnalysisEngineWithManditoryParameter.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/UimaFitAnalysisEngineWithManditoryParameter.java?rev=1709598&view=auto
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/UimaFitAnalysisEngineWithManditoryParameter.java (added)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/UimaFitAnalysisEngineWithManditoryParameter.java Tue Oct 20 14:07:29 2015
@@ -0,0 +1,27 @@
+package org.apache.uima.ruta.engine;
+
+import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
+import org.apache.uima.cas.CAS;
+import org.apache.uima.cas.Type;
+import org.apache.uima.cas.text.AnnotationFS;
+import org.apache.uima.fit.component.JCasAnnotator_ImplBase;
+import org.apache.uima.fit.descriptor.ConfigurationParameter;
+import org.apache.uima.jcas.JCas;
+
+public class UimaFitAnalysisEngineWithManditoryParameter extends JCasAnnotator_ImplBase {
+
+ public static final String PARAM_TYPE = "type";
+
+ @ConfigurationParameter(name = PARAM_TYPE, mandatory = true)
+ private String type;
+
+ @Override
+ public void process(JCas jcas) throws AnalysisEngineProcessException {
+ CAS cas = jcas.getCas();
+ AnnotationFS da = cas.getDocumentAnnotation();
+ Type t = cas.getTypeSystem().getType(type);
+ AnnotationFS a = cas.createAnnotation(t, da.getBegin(), da.getEnd());
+ cas.addFsToIndexes(a);
+ }
+
+}
Propchange: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/UimaFitAnalysisEngineWithManditoryParameter.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/UimaFitAnalysisEngineWithManditoryParameterTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/UimaFitAnalysisEngineWithManditoryParameterTest.java?rev=1709598&view=auto
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/UimaFitAnalysisEngineWithManditoryParameterTest.java (added)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/UimaFitAnalysisEngineWithManditoryParameterTest.java Tue Oct 20 14:07:29 2015
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.uima.ruta.engine;
+
+import org.apache.uima.analysis_engine.AnalysisEngine;
+import org.apache.uima.analysis_engine.AnalysisEngineDescription;
+import org.apache.uima.cas.CAS;
+import org.apache.uima.fit.factory.AnalysisEngineFactory;
+import org.apache.uima.ruta.descriptor.RutaBuildOptions;
+import org.apache.uima.ruta.descriptor.RutaDescriptorFactory;
+import org.apache.uima.ruta.descriptor.RutaDescriptorInformation;
+import org.junit.Test;
+
+public class UimaFitAnalysisEngineWithManditoryParameterTest {
+
+ @Test
+ public void test() throws Exception {
+
+ String document = "Some text.";
+ String script = "UIMAFIT org.apache.uima.ruta.engine.UimaFitAnalysisEngineWithManditoryParameter (type, "+RutaTestUtils.TYPE+"1);";
+ script += "EXEC(UimaFitAnalysisEngineWithManditoryParameter);";
+ CAS cas = null;
+ RutaDescriptorFactory factory = new RutaDescriptorFactory();
+ RutaDescriptorInformation rdi = factory.parseDescriptorInformation(script);
+ AnalysisEngineDescription aed = factory.createAnalysisEngineDescription(null, rdi, new RutaBuildOptions(), null, null, null, this.getClass().getClassLoader());
+ AnalysisEngine ae = AnalysisEngineFactory.createEngine(aed, RutaEngine.PARAM_RULES, script);
+ try {
+ cas = RutaTestUtils.getCAS(document);
+ ae.process(cas);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "Some text.");
+
+ cas.release();
+ }
+}
Propchange: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/UimaFitAnalysisEngineWithManditoryParameterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g?rev=1709598&r1=1709597&r2=1709598&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g (original)
+++ uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g Tue Oct 20 14:07:29 2015
@@ -363,6 +363,7 @@ importStatement returns [Statement stmt
| im = UimafitString
{stmt = StatementFactory.createImportEngine(StatementFactory.createEmptyComponentDeclaration(im),im);}
name = dottedComponentDeclaration
+ (LPAREN dottedIdentifier2 (COMMA dottedIdentifier2)+ RPAREN)?
{if(name != null) {stmt = StatementFactory.createImportEngine(name,im);addImportUimafitEngine(name);}}
SEMI
| im = ImportString type = dottedId (FromString ts = dottedComponentDeclaration)? (AsString alias = Identifier)? SEMI