You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ctakes.apache.org by al...@apache.org on 2017/11/20 23:09:33 UTC
svn commit: r1815866 - in
/ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae:
DictionaryLookupFactory.java OverlapJCasTermAnnotator.java
Author: alexz
Date: Mon Nov 20 23:09:33 2017
New Revision: 1815866
URL: http://svn.apache.org/viewvc?rev=1815866&view=rev
Log:
CTAKES-465: remove usage of deprecated JCasTermAnnotator.DICTIONARY_DESCRIPTOR_KEY
Modified:
ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/DictionaryLookupFactory.java
ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/OverlapJCasTermAnnotator.java
Modified: ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/DictionaryLookupFactory.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/DictionaryLookupFactory.java?rev=1815866&r1=1815865&r2=1815866&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/DictionaryLookupFactory.java (original)
+++ ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/DictionaryLookupFactory.java Mon Nov 20 23:09:33 2017
@@ -1,5 +1,6 @@
package org.apache.ctakes.dictionary.lookup2.ae;
+import org.apache.ctakes.core.config.ConfigParameterConstants;
import org.apache.ctakes.core.resource.FileLocator;
import org.apache.uima.analysis_engine.AnalysisEngineDescription;
import org.apache.uima.fit.factory.AnalysisEngineFactory;
@@ -30,12 +31,16 @@ final public class DictionaryLookupFacto
return AnalysisEngineFactory.createEngineDescription( DefaultJCasTermAnnotator.class );
}
- public static AnalysisEngineDescription createCustomDictionaryLookupDescription( final String descriptorPath )
- throws ResourceInitializationException {
- checkDescriptorPath( descriptorPath );
- return AnalysisEngineFactory.createEngineDescription( DefaultJCasTermAnnotator.class,
- JCasTermAnnotator.DICTIONARY_DESCRIPTOR_KEY,
- descriptorPath );
+ // TODO: Create UTest for deprecated JCasTermAnnotator.DICTIONARY_DESCRIPTOR_KEY
+ // Make sure deprecated JCasTermAnnotator.DICTIONARY_DESCRIPTOR_KEY was correctly replaced by
+ // ConfigParameterConstants.PARAM_LOOKUP_XML
+ public static AnalysisEngineDescription createCustomDictionaryLookupDescription(final String descriptorPath)
+ throws ResourceInitializationException {
+
+ checkDescriptorPath(descriptorPath);
+ return AnalysisEngineFactory.createEngineDescription(DefaultJCasTermAnnotator.class,
+ ConfigParameterConstants.PARAM_LOOKUP_XML,
+ descriptorPath);
}
public static AnalysisEngineDescription createOverlapDictionaryLookupDescription()
@@ -43,12 +48,16 @@ final public class DictionaryLookupFacto
return AnalysisEngineFactory.createEngineDescription( OverlapJCasTermAnnotator.class );
}
- public static AnalysisEngineDescription createCustomOverlapDictionaryLookupDescription( final String descriptorPath )
- throws ResourceInitializationException {
- checkDescriptorPath( descriptorPath );
- return AnalysisEngineFactory.createEngineDescription( OverlapJCasTermAnnotator.class,
- JCasTermAnnotator.DICTIONARY_DESCRIPTOR_KEY,
- descriptorPath );
+ // TODO: Create UTest for deprecated JCasTermAnnotator.DICTIONARY_DESCRIPTOR_KEY
+ // Make sure deprecated JCasTermAnnotator.DICTIONARY_DESCRIPTOR_KEY was correctly replaced by
+ // ConfigParameterConstants.PARAM_LOOKUP_XML
+ public static AnalysisEngineDescription createCustomOverlapDictionaryLookupDescription(final String descriptorPath)
+ throws ResourceInitializationException {
+
+ checkDescriptorPath(descriptorPath);
+ return AnalysisEngineFactory.createEngineDescription(OverlapJCasTermAnnotator.class,
+ ConfigParameterConstants.PARAM_LOOKUP_XML,
+ descriptorPath);
}
/**
Modified: ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/OverlapJCasTermAnnotator.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/OverlapJCasTermAnnotator.java?rev=1815866&r1=1815865&r2=1815866&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/OverlapJCasTermAnnotator.java (original)
+++ ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/OverlapJCasTermAnnotator.java Mon Nov 20 23:09:33 2017
@@ -18,6 +18,7 @@
*/
package org.apache.ctakes.dictionary.lookup2.ae;
+import org.apache.ctakes.core.config.ConfigParameterConstants;
import org.apache.ctakes.core.pipeline.PipeBitInfo;
import org.apache.ctakes.core.util.collection.CollectionMap;
import org.apache.ctakes.dictionary.lookup2.dictionary.RareWordDictionary;
@@ -217,20 +218,32 @@ final public class OverlapJCasTermAnnota
return AnalysisEngineFactory.createEngineDescription( OverlapJCasTermAnnotator.class );
}
+ // TODO: Ambiguous constructor for AnalysisEngineDescription named as AnnotatorDescription. Consider refactor
+ //
+ // TODO: Create UTest for deprecated JCasTermAnnotator.DICTIONARY_DESCRIPTOR_KEY
+ // Make sure deprecated JCasTermAnnotator.DICTIONARY_DESCRIPTOR_KEY was correctly replaced by
+ // ConfigParameterConstants.PARAM_LOOKUP_XML
static public AnalysisEngineDescription createAnnotatorDescription( final String descriptorPath )
throws ResourceInitializationException {
+
return AnalysisEngineFactory.createEngineDescription( OverlapJCasTermAnnotator.class,
- DICTIONARY_DESCRIPTOR_KEY, descriptorPath );
+ ConfigParameterConstants.PARAM_LOOKUP_XML, descriptorPath );
}
- static public AnalysisEngineDescription createAnnotatorDescription( final String descriptorPath,
- final int consecutiveSkipMax,
- final int totalSkipMax )
- throws ResourceInitializationException {
+ // TODO: Ambiguous constructor for AnalysisEngineDescription named as AnnotatorDescription. Consider refactor
+ //
+ // TODO: Create UTest for deprecated JCasTermAnnotator.DICTIONARY_DESCRIPTOR_KEY
+ // Make sure deprecated JCasTermAnnotator.DICTIONARY_DESCRIPTOR_KEY was correctly replaced by
+ // ConfigParameterConstants.PARAM_LOOKUP_XML
+ static public AnalysisEngineDescription createAnnotatorDescription(final String descriptorPath,
+ final int consecutiveSkipMax,
+ final int totalSkipMax )
+ throws ResourceInitializationException {
+
return AnalysisEngineFactory.createEngineDescription( OverlapJCasTermAnnotator.class,
- DICTIONARY_DESCRIPTOR_KEY, descriptorPath,
- CONS_SKIP_PRP_KEY, consecutiveSkipMax,
- TOTAL_SKIP_PRP_KEY, totalSkipMax );
+ ConfigParameterConstants.PARAM_LOOKUP_XML, descriptorPath,
+ CONS_SKIP_PRP_KEY, consecutiveSkipMax,
+ TOTAL_SKIP_PRP_KEY, totalSkipMax );
}
}