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 2016/06/24 15:44:46 UTC
[4/4] tika git commit: TIKA-2020 -- remove 3 parameter parse() and
simplify CAD tests
TIKA-2020 -- remove 3 parameter parse() and simplify CAD tests
Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/cd12917f
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/cd12917f
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/cd12917f
Branch: refs/heads/2.x
Commit: cd12917fad98e9164e79b5026a551b1eb58f516c
Parents: 0c71b2f
Author: tballison <ta...@mitre.org>
Authored: Fri Jun 24 11:43:44 2016 -0400
Committer: tballison <ta...@mitre.org>
Committed: Fri Jun 24 11:43:44 2016 -0400
----------------------------------------------------------------------
CHANGES.txt | 17 ++++++++++----
.../org/apache/tika/parser/AbstractParser.java | 24 --------------------
.../apache/tika/parser/prt/PRTParserTest.java | 2 +-
3 files changed, 13 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tika/blob/cd12917f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1c93618..6a6bca1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,13 +1,20 @@
-Release 2.0 - Future Development
+Release 2.0 - ???
- * Upgrade rome to 1.5.1 (TIKA-1820)
+ MAJOR CHANGES
- * The default LoadErrorHandler is now WARN, to alert you to missing
- parser classes and their dependencies. To keep the old behaviour,
- set your LoadErrorHandler to IGNORE. (TIKA-1805)
+ * Remove 3 parameter parse option from AbstractParser (TIKA-2020).
+ Clients will now need to include a ParseContext.
* (Something about more specific parser bundles, plus an overall one)
+ MINOR CHANGES
+
+ * Upgrade rome to 1.5.1 (TIKA-1820)
+
+ * The default LoadErrorHandler is now WARN, to alert you to missing
+ parser classes and their dependencies. To keep the old behaviour,
+ set your LoadErrorHandler to IGNORE. (TIKA-1805)
+
Release 1.14 - ???
* Add mime types, mime magic and/or globs for:
http://git-wip-us.apache.org/repos/asf/tika/blob/cd12917f/tika-core/src/main/java/org/apache/tika/parser/AbstractParser.java
----------------------------------------------------------------------
diff --git a/tika-core/src/main/java/org/apache/tika/parser/AbstractParser.java b/tika-core/src/main/java/org/apache/tika/parser/AbstractParser.java
index a4c7719..c478c75 100644
--- a/tika-core/src/main/java/org/apache/tika/parser/AbstractParser.java
+++ b/tika-core/src/main/java/org/apache/tika/parser/AbstractParser.java
@@ -16,14 +16,6 @@
*/
package org.apache.tika.parser;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.tika.exception.TikaException;
-import org.apache.tika.metadata.Metadata;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
-
/**
* Abstract base class for new parsers. This method implements the old
* deprecated parse method so subclasses won't have to.
@@ -38,22 +30,6 @@ public abstract class AbstractParser implements Parser {
private static final long serialVersionUID = 7186985395903074255L;
/**
- * Calls the
- * {@link Parser#parse(InputStream, ContentHandler, Metadata, ParseContext)}
- * method with an empty {@link ParseContext}. This method exists as a
- * leftover from Tika 0.x when the three-argument parse() method still
- * existed in the {@link Parser} interface. No new code should call this
- * method anymore, it's only here for backwards compatibility.
- *
- * @deprecated use the {@link Parser#parse(InputStream, ContentHandler, Metadata, ParseContext)} method instead
- */
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
- /**
* Convenience method for creating ParserProxy instances
* with the current class' ClassLoader
*
http://git-wip-us.apache.org/repos/asf/tika/blob/cd12917f/tika-parser-modules/tika-parser-cad-module/src/test/java/org/apache/tika/parser/prt/PRTParserTest.java
----------------------------------------------------------------------
diff --git a/tika-parser-modules/tika-parser-cad-module/src/test/java/org/apache/tika/parser/prt/PRTParserTest.java b/tika-parser-modules/tika-parser-cad-module/src/test/java/org/apache/tika/parser/prt/PRTParserTest.java
index de870ed..3de7d75 100644
--- a/tika-parser-modules/tika-parser-cad-module/src/test/java/org/apache/tika/parser/prt/PRTParserTest.java
+++ b/tika-parser-modules/tika-parser-cad-module/src/test/java/org/apache/tika/parser/prt/PRTParserTest.java
@@ -29,7 +29,7 @@ public class PRTParserTest extends TikaTest {
*/
@Test
public void testPRTParserBasics() throws Exception {
- XMLResult r = getXML("testCADKey.prt", new PRTParser());
+ XMLResult r = getXML("testCADKEY.prt", new PRTParser());
Metadata metadata = r.metadata;
String contents = r.xml;
assertEquals("application/x-prt", metadata.get(Metadata.CONTENT_TYPE));