You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by to...@apache.org on 2011/05/11 09:25:16 UTC
svn commit: r1101776 - in /uima/sandbox/trunk/AlchemyAPIAnnotator/src:
main/java/org/apache/uima/alchemy/annotator/
main/java/org/apache/uima/alchemy/digester/categorization/
main/java/org/apache/uima/alchemy/digester/concept/
main/java/org/apache/uima...
Author: tommaso
Date: Wed May 11 07:25:15 2011
New Revision: 1101776
URL: http://svn.apache.org/viewvc?rev=1101776&view=rev
Log:
[UIMA-2142] - added the statusInfo information to the Results class and the parsers, added a simple test to check invalid-api-key message when a wrong api key is set in parameters
Modified:
uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/annotator/AbstractAlchemyAnnotator.java
uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/categorization/JsonTextCategorizationDigester.java
uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/categorization/XMLTextCategorizationDigester.java
uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/concept/JsonTextConceptDigester.java
uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/concept/XMLTextConceptDigester.java
uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/domain/Results.java
uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/entity/annotated/XMLAnnotatedEntityExtractionDigester.java
uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/entity/ranked/JsonTextRankedEntityExtractionDigester.java
uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/entity/ranked/XMLRankedEntityExtractionDigester.java
uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/keyword/XMLTextKeywordExctractionDigester.java
uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/language/XMLLanguageDigester.java
uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/microformats/XMLMicroformatsDigester.java
uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/sentiment/XMLSentimentAnalysisDigester.java
uima/sandbox/trunk/AlchemyAPIAnnotator/src/test/java/org/apache/uima/alchemy/annotator/SimpleTest.java
uima/sandbox/trunk/AlchemyAPIAnnotator/src/test/java/org/apache/uima/alchemy/annotator/TextRankedEntityExtractionAnnotatorTest.java
Modified: uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/annotator/AbstractAlchemyAnnotator.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/annotator/AbstractAlchemyAnnotator.java?rev=1101776&r1=1101775&r2=1101776&view=diff
==============================================================================
--- uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/annotator/AbstractAlchemyAnnotator.java (original)
+++ uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/annotator/AbstractAlchemyAnnotator.java Wed May 11 07:25:15 2011
@@ -129,7 +129,8 @@ public abstract class AbstractAlchemyAnn
if (results.getStatus().equalsIgnoreCase(STATUS_OK)) {
mapResultsToTypeSystem(results, aJCas);
} else {
- throw new AlchemyCallFailedException(results.getStatus());
+ throw new AlchemyCallFailedException(new StringBuilder(results.getStatus()).append(" - ").
+ append(results.getStatusInfo()).toString());
}
} catch (Exception e) {
Modified: uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/categorization/JsonTextCategorizationDigester.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/categorization/JsonTextCategorizationDigester.java?rev=1101776&r1=1101775&r2=1101776&view=diff
==============================================================================
--- uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/categorization/JsonTextCategorizationDigester.java (original)
+++ uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/categorization/JsonTextCategorizationDigester.java Wed May 11 07:25:15 2011
@@ -18,17 +18,16 @@
*/
package org.apache.uima.alchemy.digester.categorization;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URISyntaxException;
-
import org.apache.commons.digester.Digester;
import org.apache.uima.alchemy.digester.OutputDigester;
import org.apache.uima.alchemy.digester.domain.CategorizationResults;
import org.apache.uima.alchemy.digester.domain.Results;
+import org.apache.uima.alchemy.digester.json.JsonDigester;
import org.xml.sax.SAXException;
-import org.apache.uima.alchemy.digester.json.JsonDigester;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URISyntaxException;
public class JsonTextCategorizationDigester implements OutputDigester {
@@ -39,6 +38,7 @@ public class JsonTextCategorizationDiges
digester.setValidating(false);
digester.addObjectCreate("$", CategorizationResults.class);
digester.addBeanPropertySetter("$/status", "status");
+ digester.addBeanPropertySetter("$/statusInfo", "statusInfo");
digester.addBeanPropertySetter("$/url", "url");
digester.addBeanPropertySetter("$/language", "language");
digester.addBeanPropertySetter("$/category", "category");
Modified: uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/categorization/XMLTextCategorizationDigester.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/categorization/XMLTextCategorizationDigester.java?rev=1101776&r1=1101775&r2=1101776&view=diff
==============================================================================
--- uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/categorization/XMLTextCategorizationDigester.java (original)
+++ uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/categorization/XMLTextCategorizationDigester.java Wed May 11 07:25:15 2011
@@ -18,16 +18,16 @@
*/
package org.apache.uima.alchemy.digester.categorization;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URISyntaxException;
-
import org.apache.commons.digester.Digester;
import org.apache.uima.alchemy.digester.OutputDigester;
import org.apache.uima.alchemy.digester.domain.CategorizationResults;
import org.apache.uima.alchemy.digester.domain.Results;
import org.xml.sax.SAXException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URISyntaxException;
+
public class XMLTextCategorizationDigester implements OutputDigester {
public Results parseAlchemyXML(InputStream stream) throws IOException, SAXException,
@@ -37,6 +37,7 @@ public class XMLTextCategorizationDigest
digester.addObjectCreate("results", CategorizationResults.class);
digester.addBeanPropertySetter("results/status", "status");
+ digester.addBeanPropertySetter("results/statusInfo", "statusInfo");
digester.addBeanPropertySetter("results/url", "url");
digester.addBeanPropertySetter("results/category", "category");
digester.addBeanPropertySetter("results/score", "score");
Modified: uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/concept/JsonTextConceptDigester.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/concept/JsonTextConceptDigester.java?rev=1101776&r1=1101775&r2=1101776&view=diff
==============================================================================
--- uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/concept/JsonTextConceptDigester.java (original)
+++ uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/concept/JsonTextConceptDigester.java Wed May 11 07:25:15 2011
@@ -18,10 +18,6 @@
*/
package org.apache.uima.alchemy.digester.concept;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URISyntaxException;
-
import org.apache.commons.digester.Digester;
import org.apache.uima.alchemy.digester.OutputDigester;
import org.apache.uima.alchemy.digester.domain.Concept;
@@ -30,6 +26,10 @@ import org.apache.uima.alchemy.digester.
import org.apache.uima.alchemy.digester.json.JsonDigester;
import org.xml.sax.SAXException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URISyntaxException;
+
public class JsonTextConceptDigester implements OutputDigester {
public Results parseAlchemyXML(InputStream xmlReader) throws IOException, SAXException,
URISyntaxException {
@@ -38,6 +38,7 @@ public class JsonTextConceptDigester imp
digester.addObjectCreate("$", ConceptResults.class);
digester.addBeanPropertySetter("$/status", "status");
+ digester.addBeanPropertySetter("$/statusInfo", "statusInfo");
digester.addBeanPropertySetter("$/url", "url");
digester.addBeanPropertySetter("$/language", "language");
digester.addObjectCreate("$/concepts/concept", Concept.class);
Modified: uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/concept/XMLTextConceptDigester.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/concept/XMLTextConceptDigester.java?rev=1101776&r1=1101775&r2=1101776&view=diff
==============================================================================
--- uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/concept/XMLTextConceptDigester.java (original)
+++ uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/concept/XMLTextConceptDigester.java Wed May 11 07:25:15 2011
@@ -39,6 +39,7 @@ public class XMLTextConceptDigester impl
digester.addObjectCreate("results", ConceptResults.class);
digester.addBeanPropertySetter("results/status", "status");
+ digester.addBeanPropertySetter("results/statusInfo", "statusInfo");
digester.addBeanPropertySetter("results/url", "url");
digester.addBeanPropertySetter("results/language", "language");
digester.addObjectCreate("results/concepts", Concepts.class);
Modified: uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/domain/Results.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/domain/Results.java?rev=1101776&r1=1101775&r2=1101776&view=diff
==============================================================================
--- uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/domain/Results.java (original)
+++ uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/domain/Results.java Wed May 11 07:25:15 2011
@@ -22,6 +22,8 @@ public class Results {
private String status;
+ private String statusInfo;
+
private String language;
private String url;
@@ -49,7 +51,15 @@ public class Results {
public void setUrl(String url) {
this.url = url;
}
-
+
+ public String getStatusInfo() {
+ return statusInfo;
+ }
+
+ public void setStatusInfo(String statusInfo) {
+ this.statusInfo = statusInfo;
+ }
+
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
Modified: uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/entity/annotated/XMLAnnotatedEntityExtractionDigester.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/entity/annotated/XMLAnnotatedEntityExtractionDigester.java?rev=1101776&r1=1101775&r2=1101776&view=diff
==============================================================================
--- uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/entity/annotated/XMLAnnotatedEntityExtractionDigester.java (original)
+++ uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/entity/annotated/XMLAnnotatedEntityExtractionDigester.java Wed May 11 07:25:15 2011
@@ -18,16 +18,16 @@
*/
package org.apache.uima.alchemy.digester.entity.annotated;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URISyntaxException;
-
import org.apache.commons.digester.Digester;
import org.apache.uima.alchemy.digester.OutputDigester;
import org.apache.uima.alchemy.digester.domain.AnnotatedResults;
import org.apache.uima.alchemy.digester.domain.Results;
import org.xml.sax.SAXException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URISyntaxException;
+
public class XMLAnnotatedEntityExtractionDigester implements OutputDigester {
public Results parseAlchemyXML(InputStream stream) throws IOException, SAXException,
@@ -37,6 +37,7 @@ public class XMLAnnotatedEntityExtractio
digester.addObjectCreate("results", AnnotatedResults.class);
digester.addBeanPropertySetter("results/status", "status");
+ digester.addBeanPropertySetter("results/statusInfo", "statusInfo");
digester.addBeanPropertySetter("results/language", "language");
digester.addBeanPropertySetter("results/text", "text");
digester.addBeanPropertySetter("results/url", "url");
Modified: uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/entity/ranked/JsonTextRankedEntityExtractionDigester.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/entity/ranked/JsonTextRankedEntityExtractionDigester.java?rev=1101776&r1=1101775&r2=1101776&view=diff
==============================================================================
--- uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/entity/ranked/JsonTextRankedEntityExtractionDigester.java (original)
+++ uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/entity/ranked/JsonTextRankedEntityExtractionDigester.java Wed May 11 07:25:15 2011
@@ -18,20 +18,15 @@
*/
package org.apache.uima.alchemy.digester.entity.ranked;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URISyntaxException;
-
import org.apache.commons.digester.Digester;
import org.apache.uima.alchemy.digester.OutputDigester;
-import org.apache.uima.alchemy.digester.domain.Disambiguated;
-import org.apache.uima.alchemy.digester.domain.EntitiesResults;
-import org.apache.uima.alchemy.digester.domain.Entity;
-import org.apache.uima.alchemy.digester.domain.Quotations;
-import org.apache.uima.alchemy.digester.domain.Results;
+import org.apache.uima.alchemy.digester.domain.*;
+import org.apache.uima.alchemy.digester.json.JsonDigester;
import org.xml.sax.SAXException;
-import org.apache.uima.alchemy.digester.json.JsonDigester;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URISyntaxException;
public class JsonTextRankedEntityExtractionDigester implements OutputDigester {
@@ -42,6 +37,7 @@ public class JsonTextRankedEntityExtract
digester.setValidating(false);
digester.addObjectCreate("$", EntitiesResults.class);
digester.addBeanPropertySetter("$/status");
+ digester.addBeanPropertySetter("$/statusInfo", "statusInfo");
digester.addBeanPropertySetter("$/url");
digester.addBeanPropertySetter("$/language");
digester.addObjectCreate("$/entities", Entity.class);
Modified: uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/entity/ranked/XMLRankedEntityExtractionDigester.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/entity/ranked/XMLRankedEntityExtractionDigester.java?rev=1101776&r1=1101775&r2=1101776&view=diff
==============================================================================
--- uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/entity/ranked/XMLRankedEntityExtractionDigester.java (original)
+++ uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/entity/ranked/XMLRankedEntityExtractionDigester.java Wed May 11 07:25:15 2011
@@ -18,21 +18,15 @@
*/
package org.apache.uima.alchemy.digester.entity.ranked;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URISyntaxException;
-
import org.apache.commons.digester.Digester;
import org.apache.uima.alchemy.digester.OutputDigester;
-import org.apache.uima.alchemy.digester.domain.Disambiguated;
-import org.apache.uima.alchemy.digester.domain.DocumentSentiment;
-import org.apache.uima.alchemy.digester.domain.Entities;
-import org.apache.uima.alchemy.digester.domain.EntitiesResults;
-import org.apache.uima.alchemy.digester.domain.Entity;
-import org.apache.uima.alchemy.digester.domain.Quotations;
-import org.apache.uima.alchemy.digester.domain.Results;
+import org.apache.uima.alchemy.digester.domain.*;
import org.xml.sax.SAXException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URISyntaxException;
+
public class XMLRankedEntityExtractionDigester implements OutputDigester {
public Results parseAlchemyXML(InputStream stream) throws IOException, SAXException,
@@ -42,6 +36,7 @@ public class XMLRankedEntityExtractionDi
digester.addObjectCreate("results", EntitiesResults.class);
digester.addBeanPropertySetter("results/status", "status");
+ digester.addBeanPropertySetter("results/statusInfo", "statusInfo");
digester.addBeanPropertySetter("results/language", "language");
digester.addBeanPropertySetter("results/url", "url");
digester.addObjectCreate("results/entities", Entities.class);
Modified: uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/keyword/XMLTextKeywordExctractionDigester.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/keyword/XMLTextKeywordExctractionDigester.java?rev=1101776&r1=1101775&r2=1101776&view=diff
==============================================================================
--- uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/keyword/XMLTextKeywordExctractionDigester.java (original)
+++ uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/keyword/XMLTextKeywordExctractionDigester.java Wed May 11 07:25:15 2011
@@ -18,10 +18,6 @@
*/
package org.apache.uima.alchemy.digester.keyword;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URISyntaxException;
-
import org.apache.commons.digester.Digester;
import org.apache.uima.alchemy.digester.OutputDigester;
import org.apache.uima.alchemy.digester.domain.Keyword;
@@ -29,6 +25,10 @@ import org.apache.uima.alchemy.digester.
import org.apache.uima.alchemy.digester.domain.Results;
import org.xml.sax.SAXException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URISyntaxException;
+
public class XMLTextKeywordExctractionDigester implements OutputDigester {
public Results parseAlchemyXML(InputStream xmlReader) throws IOException, SAXException,
@@ -38,6 +38,7 @@ public class XMLTextKeywordExctractionDi
digester.addObjectCreate("results", KeywordResults.class);
digester.addBeanPropertySetter("results/status", "status");
+ digester.addBeanPropertySetter("results/statusInfo", "statusInfo");
digester.addBeanPropertySetter("results/url", "url");
digester.addBeanPropertySetter("results/language", "language");
digester.addObjectCreate("results/keywords/keyword", Keyword.class);
Modified: uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/language/XMLLanguageDigester.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/language/XMLLanguageDigester.java?rev=1101776&r1=1101775&r2=1101776&view=diff
==============================================================================
--- uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/language/XMLLanguageDigester.java (original)
+++ uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/language/XMLLanguageDigester.java Wed May 11 07:25:15 2011
@@ -18,16 +18,16 @@
*/
package org.apache.uima.alchemy.digester.language;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URISyntaxException;
-
import org.apache.commons.digester.Digester;
import org.apache.uima.alchemy.digester.OutputDigester;
import org.apache.uima.alchemy.digester.domain.LanguageDetectionResults;
import org.apache.uima.alchemy.digester.domain.Results;
import org.xml.sax.SAXException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URISyntaxException;
+
public class XMLLanguageDigester implements OutputDigester {
public Results parseAlchemyXML(InputStream responseStream) throws IOException, SAXException,
@@ -37,6 +37,7 @@ public class XMLLanguageDigester impleme
digester.addObjectCreate("results", LanguageDetectionResults.class);
digester.addBeanPropertySetter("results/status", "status");
+ digester.addBeanPropertySetter("results/statusInfo", "statusInfo");
digester.addBeanPropertySetter("results/url", "url");
digester.addBeanPropertySetter("results/language", "language");
digester.addBeanPropertySetter("results/iso-639-1", "iso6391");
Modified: uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/microformats/XMLMicroformatsDigester.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/microformats/XMLMicroformatsDigester.java?rev=1101776&r1=1101775&r2=1101776&view=diff
==============================================================================
--- uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/microformats/XMLMicroformatsDigester.java (original)
+++ uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/microformats/XMLMicroformatsDigester.java Wed May 11 07:25:15 2011
@@ -18,10 +18,6 @@
*/
package org.apache.uima.alchemy.digester.microformats;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URISyntaxException;
-
import org.apache.commons.digester.Digester;
import org.apache.uima.alchemy.digester.OutputDigester;
import org.apache.uima.alchemy.digester.domain.Microformat;
@@ -29,6 +25,10 @@ import org.apache.uima.alchemy.digester.
import org.apache.uima.alchemy.digester.domain.Results;
import org.xml.sax.SAXException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URISyntaxException;
+
public class XMLMicroformatsDigester implements OutputDigester {
public Results parseAlchemyXML(InputStream responseStream) throws IOException, SAXException,
@@ -38,6 +38,7 @@ public class XMLMicroformatsDigester imp
digester.addObjectCreate("results", MicroformatsResults.class);
digester.addBeanPropertySetter("results/status", "status");
+ digester.addBeanPropertySetter("results/statusInfo", "statusInfo");
digester.addBeanPropertySetter("results/url", "url");
digester.addObjectCreate("results/microformats/microformat", Microformat.class);
digester.addBeanPropertySetter("results/microformats/microformat/field", "fieldName");
Modified: uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/sentiment/XMLSentimentAnalysisDigester.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/sentiment/XMLSentimentAnalysisDigester.java?rev=1101776&r1=1101775&r2=1101776&view=diff
==============================================================================
--- uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/sentiment/XMLSentimentAnalysisDigester.java (original)
+++ uima/sandbox/trunk/AlchemyAPIAnnotator/src/main/java/org/apache/uima/alchemy/digester/sentiment/XMLSentimentAnalysisDigester.java Wed May 11 07:25:15 2011
@@ -20,7 +20,9 @@ package org.apache.uima.alchemy.digester
import org.apache.commons.digester.Digester;
import org.apache.uima.alchemy.digester.OutputDigester;
-import org.apache.uima.alchemy.digester.domain.*;
+import org.apache.uima.alchemy.digester.domain.DocumentSentiment;
+import org.apache.uima.alchemy.digester.domain.Results;
+import org.apache.uima.alchemy.digester.domain.SentimentAnalysisResults;
import org.xml.sax.SAXException;
import java.io.IOException;
@@ -38,6 +40,7 @@ public class XMLSentimentAnalysisDigeste
digester.addObjectCreate("results", SentimentAnalysisResults.class);
digester.addBeanPropertySetter("results/status", "status");
+ digester.addBeanPropertySetter("results/statusInfo", "statusInfo");
digester.addBeanPropertySetter("results/url", "url");
digester.addBeanPropertySetter("results/language", "language");
digester.addObjectCreate("results/docSentiment", DocumentSentiment.class);
Modified: uima/sandbox/trunk/AlchemyAPIAnnotator/src/test/java/org/apache/uima/alchemy/annotator/SimpleTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/AlchemyAPIAnnotator/src/test/java/org/apache/uima/alchemy/annotator/SimpleTest.java?rev=1101776&r1=1101775&r2=1101776&view=diff
==============================================================================
--- uima/sandbox/trunk/AlchemyAPIAnnotator/src/test/java/org/apache/uima/alchemy/annotator/SimpleTest.java (original)
+++ uima/sandbox/trunk/AlchemyAPIAnnotator/src/test/java/org/apache/uima/alchemy/annotator/SimpleTest.java Wed May 11 07:25:15 2011
@@ -18,16 +18,21 @@
*/
package org.apache.uima.alchemy.annotator;
-import static org.junit.Assert.fail;
-
import org.apache.uima.alchemy.utils.TestUtils;
import org.apache.uima.analysis_engine.AnalysisEngine;
+import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.resource.ResourceInitializationException;
import org.junit.Test;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
/**
- *
* Test case for simple actions
- *
*/
public class SimpleTest {
@@ -45,4 +50,19 @@ public class SimpleTest {
}
}
+ @Test
+ public void testAnalysisEngineError() {
+ try {
+ Map<String, Object> parameterSettings = new HashMap<String, Object>();
+ parameterSettings.put("apikey", "asdasdas12131");
+ JCas resultingCAS = TestUtils.executeAE(TestUtils.getAE("desc/TextCategorizationAEDescriptor.xml", parameterSettings), "the big brown fox jumped on the table");
+ fail("it should've failed with AnalysisEngineProcessException but it worked flawlessly");
+ } catch (ResourceInitializationException e) {
+ fail("it should've failed with AnalysisEngineProcessException - "+e.getLocalizedMessage());
+ } catch (AnalysisEngineProcessException e) {
+ assertEquals("org.apache.uima.alchemy.annotator.exception.AlchemyCallFailedException: ERROR - invalid-api-key",
+ e.getCause().getLocalizedMessage());
+ }
+ }
+
}
Modified: uima/sandbox/trunk/AlchemyAPIAnnotator/src/test/java/org/apache/uima/alchemy/annotator/TextRankedEntityExtractionAnnotatorTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/AlchemyAPIAnnotator/src/test/java/org/apache/uima/alchemy/annotator/TextRankedEntityExtractionAnnotatorTest.java?rev=1101776&r1=1101775&r2=1101776&view=diff
==============================================================================
--- uima/sandbox/trunk/AlchemyAPIAnnotator/src/test/java/org/apache/uima/alchemy/annotator/TextRankedEntityExtractionAnnotatorTest.java (original)
+++ uima/sandbox/trunk/AlchemyAPIAnnotator/src/test/java/org/apache/uima/alchemy/annotator/TextRankedEntityExtractionAnnotatorTest.java Wed May 11 07:25:15 2011
@@ -18,23 +18,23 @@
*/
package org.apache.uima.alchemy.annotator;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.uima.alchemy.annotator.mocked.MockedTextRankedEntityAnnotator;
import org.apache.uima.alchemy.annotator.mocked.MockedNotSyncTextRankedEntityAnnotator;
+import org.apache.uima.alchemy.annotator.mocked.MockedTextRankedEntityAnnotator;
import org.apache.uima.alchemy.ts.entity.Country;
-import org.apache.uima.alchemy.ts.entity.RadioStation;
+import org.apache.uima.alchemy.ts.entity.TelevisionStation;
import org.apache.uima.alchemy.utils.TestUtils;
import org.apache.uima.jcas.JCas;
import org.apache.uima.util.FileUtils;
import org.junit.Test;
+import java.io.File;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class TextRankedEntityExtractionAnnotatorTest {
private static final String DOC = "Eight US soldiers die in attacks in south Afghanistan, making October the deadliest month for the US in the war there";
@@ -51,8 +51,8 @@ public class TextRankedEntityExtractionA
String documentText = FileUtils.file2String(new File(DOCPATH));
JCas resultingCAS = TestUtils.executeAE(TestUtils.getAE(XML_PATH, parameterSettings),
documentText);
- List<RadioStation> entities = (List<RadioStation>) TestUtils.getAllFSofType(
- RadioStation.type, resultingCAS);
+ List<TelevisionStation> entities = (List<TelevisionStation>) TestUtils.getAllFSofType(
+ TelevisionStation.type, resultingCAS);
assertTrue(entities != null);
assertTrue(entities.size() == 1);
} catch (Exception e) {