You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2017/07/03 14:18:57 UTC

[tika] 02/02: TIKA-2368 -- rename SentimentParser to avoid conflict with dependency

This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git

commit b409ff65abdb4d364db66be39be35513abf89b54
Author: tballison <ta...@mitre.org>
AuthorDate: Mon Jul 3 10:18:46 2017 -0400

    TIKA-2368 -- rename SentimentParser to avoid conflict with dependency
---
 CHANGES.txt                                                           | 3 +++
 .../analysis/{SentimentParser.java => SentimentAnalysisParser.java}   | 4 ++--
 .../{SentimentParserTest.java => SentimentAnalysisParserTest.java}    | 4 ++--
 .../parser/sentiment/analysis/tika-config-sentiment-opennlp-cat.xml   | 2 +-
 .../tika/parser/sentiment/analysis/tika-config-sentiment-opennlp.xml  | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 2c92fa4..bed1646 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,8 @@
 Release 1.16 - ??/??/????
 
+  * Rename SentimentParser to SentimentAnalysisParser to
+    prevent conflict with dependency (TIKA-2368).
+
   * tika-app now extracts inline images in PDFs by
     default, and it includes a warning to users that this is not the
     default behavior elsewhere in Tika (TIKA-2374).
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/sentiment/analysis/SentimentParser.java b/tika-parsers/src/main/java/org/apache/tika/parser/sentiment/analysis/SentimentAnalysisParser.java
similarity index 97%
rename from tika-parsers/src/main/java/org/apache/tika/parser/sentiment/analysis/SentimentParser.java
rename to tika-parsers/src/main/java/org/apache/tika/parser/sentiment/analysis/SentimentAnalysisParser.java
index 4192936..7c94a8c 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/sentiment/analysis/SentimentParser.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/sentiment/analysis/SentimentAnalysisParser.java
@@ -47,12 +47,12 @@ import org.xml.sax.SAXException;
  * This parser classifies documents based on the sentiment of document.
  * The classifier is powered by Apache OpenNLP's Maximum Entropy Classifier
  */
-public class SentimentParser extends AbstractParser implements Initializable {
+public class SentimentAnalysisParser extends AbstractParser implements Initializable {
 
     private static final Set<MediaType> SUPPORTED_TYPES = Collections
             .singleton(MediaType.application("sentiment"));
     private static final Logger LOG = LoggerFactory
-            .getLogger(SentimentParser.class);
+            .getLogger(SentimentAnalysisParser.class);
     public static final String DEF_MODEL = "https://raw.githubusercontent.com/USCDataScience/SentimentAnalysisParser/master/sentiment-models/en-netflix-sentiment.bin";
 
     private SentimentME classifier;
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/sentiment/analysis/SentimentParserTest.java b/tika-parsers/src/test/java/org/apache/tika/parser/sentiment/analysis/SentimentAnalysisParserTest.java
similarity index 97%
rename from tika-parsers/src/test/java/org/apache/tika/parser/sentiment/analysis/SentimentParserTest.java
rename to tika-parsers/src/test/java/org/apache/tika/parser/sentiment/analysis/SentimentAnalysisParserTest.java
index 479bb15..16b17ea 100644
--- a/tika-parsers/src/test/java/org/apache/tika/parser/sentiment/analysis/SentimentParserTest.java
+++ b/tika-parsers/src/test/java/org/apache/tika/parser/sentiment/analysis/SentimentAnalysisParserTest.java
@@ -33,9 +33,9 @@ import org.junit.Test;
 import org.xml.sax.SAXException;
 
 /**
- * Test case for {@link SentimentParser}
+ * Test case for {@link SentimentAnalysisParser}
  */
-public class SentimentParserTest {
+public class SentimentAnalysisParserTest {
 
     @Test
     public void endToEndTest() throws Exception {
diff --git a/tika-parsers/src/test/resources/org/apache/tika/parser/sentiment/analysis/tika-config-sentiment-opennlp-cat.xml b/tika-parsers/src/test/resources/org/apache/tika/parser/sentiment/analysis/tika-config-sentiment-opennlp-cat.xml
index ef97485..85d17a8 100644
--- a/tika-parsers/src/test/resources/org/apache/tika/parser/sentiment/analysis/tika-config-sentiment-opennlp-cat.xml
+++ b/tika-parsers/src/test/resources/org/apache/tika/parser/sentiment/analysis/tika-config-sentiment-opennlp-cat.xml
@@ -16,7 +16,7 @@
 -->
 <properties>
     <parsers>
-        <parser class="org.apache.tika.parser.sentiment.analysis.SentimentParser">
+        <parser class="org.apache.tika.parser.sentiment.analysis.SentimentAnalysisParser">
             <mime>text/plain</mime>
             <mime>application/sentiment</mime>
             <params>
diff --git a/tika-parsers/src/test/resources/org/apache/tika/parser/sentiment/analysis/tika-config-sentiment-opennlp.xml b/tika-parsers/src/test/resources/org/apache/tika/parser/sentiment/analysis/tika-config-sentiment-opennlp.xml
index 214618b..f188c5a 100644
--- a/tika-parsers/src/test/resources/org/apache/tika/parser/sentiment/analysis/tika-config-sentiment-opennlp.xml
+++ b/tika-parsers/src/test/resources/org/apache/tika/parser/sentiment/analysis/tika-config-sentiment-opennlp.xml
@@ -17,7 +17,7 @@
 -->
 <properties>
     <parsers>
-        <parser class="org.apache.tika.parser.sentiment.analysis.SentimentParser">
+        <parser class="org.apache.tika.parser.sentiment.analysis.SentimentAnalysisParser">
             <mime>text/plain</mime>
             <mime>application/sentiment</mime>
             <params>

-- 
To stop receiving notification emails like this one, please contact
"commits@tika.apache.org" <co...@tika.apache.org>.