You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ju...@apache.org on 2011/03/31 18:06:44 UTC
svn commit: r1087353 - in /tika/trunk:
tika-app/src/main/java/org/apache/tika/gui/
tika-core/src/main/java/org/apache/tika/extractor/
tika-core/src/main/java/org/apache/tika/fork/
tika-core/src/main/java/org/apache/tika/parser/ tika-core/src/test/java/...
Author: jukka
Date: Thu Mar 31 16:06:43 2011
New Revision: 1087353
URL: http://svn.apache.org/viewvc?rev=1087353&view=rev
Log:
TIKA-626: Add an AbstractParser class
Add the AbstractParser class, and adapt existing parsers to use it.
Added:
tika/trunk/tika-core/src/main/java/org/apache/tika/parser/AbstractParser.java
- copied, changed from r1087014, tika/trunk/tika-core/src/main/java/org/apache/tika/parser/ErrorParser.java
Modified:
tika/trunk/tika-app/src/main/java/org/apache/tika/gui/TikaGUI.java
tika/trunk/tika-core/src/main/java/org/apache/tika/extractor/ParserContainerExtractor.java
tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkParser.java
tika/trunk/tika-core/src/main/java/org/apache/tika/parser/CompositeParser.java
tika/trunk/tika-core/src/main/java/org/apache/tika/parser/DelegatingParser.java
tika/trunk/tika-core/src/main/java/org/apache/tika/parser/EmptyParser.java
tika/trunk/tika-core/src/main/java/org/apache/tika/parser/ErrorParser.java
tika/trunk/tika-core/src/main/java/org/apache/tika/parser/ExternalParser.java
tika/trunk/tika-core/src/main/java/org/apache/tika/parser/ParserDecorator.java
tika/trunk/tika-core/src/test/java/org/apache/tika/fork/ForkTestParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/asm/ClassParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/audio/AudioParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/audio/MidiParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/dwg/DWGParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/epub/EpubContentParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/epub/EpubParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/feed/FeedParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/font/TrueTypeParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/hdf/HDFParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/HtmlParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/TiffParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/IWorkPackageParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/IWorkParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/jpeg/JpegParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mail/RFC822Parser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mbox/MboxParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mp3/Mp3Parser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/netcdf/NetCDFParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/odf/OpenDocumentContentParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/odf/OpenDocumentParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/PackageParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/txt/TXTParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/video/FLVParser.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/xml/XMLParser.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/DummyParser.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/AbstractPkgTest.java
tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaResource.java
Modified: tika/trunk/tika-app/src/main/java/org/apache/tika/gui/TikaGUI.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-app/src/main/java/org/apache/tika/gui/TikaGUI.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-app/src/main/java/org/apache/tika/gui/TikaGUI.java (original)
+++ tika/trunk/tika-app/src/main/java/org/apache/tika/gui/TikaGUI.java Thu Mar 31 16:06:43 2011
@@ -48,6 +48,7 @@ import org.apache.tika.extractor.Documen
import org.apache.tika.io.IOUtils;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.AutoDetectParser;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
@@ -354,7 +355,7 @@ public class TikaGUI extends JFrame {
* directory, and delegates everything else to another downstream
* parser.
*/
- private static class ImageSavingParser implements Parser {
+ private static class ImageSavingParser extends AbstractParser {
private Map<String,File> wanted = new HashMap<String,File>();
private Parser downstreamParser;
private File tmpDir;
@@ -395,9 +396,5 @@ public class TikaGUI extends JFrame {
}
}
- public void parse(InputStream stream, ContentHandler handler,
- Metadata metadata) throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
}
}
Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/extractor/ParserContainerExtractor.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/extractor/ParserContainerExtractor.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/extractor/ParserContainerExtractor.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/extractor/ParserContainerExtractor.java Thu Mar 31 16:06:43 2011
@@ -29,6 +29,7 @@ import org.apache.tika.io.TemporaryFiles
import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.AutoDetectParser;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
@@ -84,7 +85,7 @@ public class ParserContainerExtractor im
}
}
- private class RecursiveParser implements Parser {
+ private class RecursiveParser extends AbstractParser {
private final ContainerExtractor extractor;
@@ -131,12 +132,6 @@ public class ParserContainerExtractor im
}
}
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
}
}
Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkParser.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkParser.java Thu Mar 31 16:06:43 2011
@@ -25,13 +25,14 @@ import java.util.Set;
import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.AutoDetectParser;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
-public class ForkParser implements Parser {
+public class ForkParser extends AbstractParser {
/** Serial version UID */
private static final long serialVersionUID = -4962742892274663950L;
@@ -138,12 +139,6 @@ public class ForkParser implements Parse
}
}
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
public synchronized void close() {
for (ForkClient client : pool) {
client.close();
Copied: tika/trunk/tika-core/src/main/java/org/apache/tika/parser/AbstractParser.java (from r1087014, tika/trunk/tika-core/src/main/java/org/apache/tika/parser/ErrorParser.java)
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/parser/AbstractParser.java?p2=tika/trunk/tika-core/src/main/java/org/apache/tika/parser/AbstractParser.java&p1=tika/trunk/tika-core/src/main/java/org/apache/tika/parser/ErrorParser.java&r1=1087014&r2=1087353&rev=1087353&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/parser/ErrorParser.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/parser/AbstractParser.java Thu Mar 31 16:06:43 2011
@@ -18,40 +18,29 @@ package org.apache.tika.parser;
import java.io.IOException;
import java.io.InputStream;
-import java.util.Collections;
-import java.util.Set;
import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata;
-import org.apache.tika.mime.MediaType;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
/**
- * Dummy parser that always throws a {@link TikaException} without even
- * attempting to parse the given document stream. Useful as a sentinel parser
- * for unknown document types.
+ * Abstract base class for new parsers. This method implements the old
+ * deprecated parse method so subclasses won't have to.
+ *
+ * @since Apache Tika 1.0
*/
-public class ErrorParser implements Parser {
+public abstract class AbstractParser implements Parser {
/**
- * Singleton instance of this class.
+ * Serial version UID.
*/
- public static final ErrorParser INSTANCE = new ErrorParser();
-
- public Set<MediaType> getSupportedTypes(ParseContext context) {
- return Collections.emptySet();
- }
-
- public void parse(
- InputStream stream, ContentHandler handler,
- Metadata metadata, ParseContext context)
- throws TikaException {
- throw new TikaException("Parse error");
- }
+ private static final long serialVersionUID = 7186985395903074255L;
/**
- * @deprecated This method will be removed in Apache Tika 1.0.
+ * Calls the
+ * {@link Parser#parse(InputStream, ContentHandler, Metadata, ParseContext)}
+ * method with an empty {@link ParseContext}.
*/
public void parse(
InputStream stream, ContentHandler handler, Metadata metadata)
Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/parser/CompositeParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/parser/CompositeParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/parser/CompositeParser.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/parser/CompositeParser.java Thu Mar 31 16:06:43 2011
@@ -43,7 +43,7 @@ import org.xml.sax.SAXException;
* parser is defined for cases where a parser for the given content type is
* not available.
*/
-public class CompositeParser implements Parser {
+public class CompositeParser extends AbstractParser {
/** Serial version UID */
private static final long serialVersionUID = 2192845797749627824L;
@@ -228,13 +228,4 @@ public class CompositeParser implements
}
}
- /**
- * @deprecated This method will be removed in Apache Tika 1.0.
- */
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
}
Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/parser/DelegatingParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/parser/DelegatingParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/parser/DelegatingParser.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/parser/DelegatingParser.java Thu Mar 31 16:06:43 2011
@@ -34,7 +34,7 @@ import org.xml.sax.SAXException;
*
* @since Apache Tika 0.4, major changes in Tika 0.5
*/
-public class DelegatingParser implements Parser {
+public class DelegatingParser extends AbstractParser {
/**
* Returns the parser instance to which parsing tasks should be delegated.
@@ -72,13 +72,4 @@ public class DelegatingParser implements
getDelegateParser(context).parse(stream, handler, metadata, context);
}
- /**
- * @deprecated This method will be removed in Apache Tika 1.0.
- */
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
}
Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/parser/EmptyParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/parser/EmptyParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/parser/EmptyParser.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/parser/EmptyParser.java Thu Mar 31 16:06:43 2011
@@ -16,12 +16,10 @@
*/
package org.apache.tika.parser;
-import java.io.IOException;
import java.io.InputStream;
import java.util.Collections;
import java.util.Set;
-import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
import org.apache.tika.sax.XHTMLContentHandler;
@@ -33,7 +31,7 @@ import org.xml.sax.SAXException;
* attempting to parse the given document stream. Useful as a sentinel parser
* for unknown document types.
*/
-public class EmptyParser implements Parser {
+public class EmptyParser extends AbstractParser {
/**
* Serial version UID.
@@ -58,13 +56,4 @@ public class EmptyParser implements Pars
xhtml.endDocument();
}
- /**
- * @deprecated This method will be removed in Apache Tika 1.0.
- */
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
}
Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/parser/ErrorParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/parser/ErrorParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/parser/ErrorParser.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/parser/ErrorParser.java Thu Mar 31 16:06:43 2011
@@ -32,7 +32,7 @@ import org.xml.sax.SAXException;
* attempting to parse the given document stream. Useful as a sentinel parser
* for unknown document types.
*/
-public class ErrorParser implements Parser {
+public class ErrorParser extends AbstractParser {
/**
* Singleton instance of this class.
@@ -50,13 +50,4 @@ public class ErrorParser implements Pars
throw new TikaException("Parse error");
}
- /**
- * @deprecated This method will be removed in Apache Tika 1.0.
- */
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
}
Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/parser/ExternalParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/parser/ExternalParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/parser/ExternalParser.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/parser/ExternalParser.java Thu Mar 31 16:06:43 2011
@@ -38,7 +38,7 @@ import org.xml.sax.SAXException;
* Parser that uses an external program (like catdoc or pdf2txt) to extract
* text content from a given document.
*/
-public class ExternalParser implements Parser {
+public class ExternalParser extends AbstractParser {
/**
* Media types supported by the external program.
@@ -98,15 +98,6 @@ public class ExternalParser implements P
}
/**
- * @deprecated This method will be removed in Apache Tika 1.0.
- */
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
- /**
* Starts a thread that extracts the contents of the standard output
* stream of the given process to the given XHTML content handler.
* The standard output stream is closed once fully processed.
Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/parser/ParserDecorator.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/parser/ParserDecorator.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/parser/ParserDecorator.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/parser/ParserDecorator.java Thu Mar 31 16:06:43 2011
@@ -32,7 +32,7 @@ import org.xml.sax.SAXException;
* instance. Subclasses can provide extra decoration by overriding the
* parse method.
*/
-public class ParserDecorator implements Parser {
+public class ParserDecorator extends AbstractParser {
/** Serial version UID */
private static final long serialVersionUID = -3861669115439125268L;
@@ -91,15 +91,7 @@ public class ParserDecorator implements
parser.parse(stream, handler, metadata, context);
}
- /**
- * @deprecated This method will be removed in Apache Tika 1.0.
- */
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
+
/**
* Gets the parser wrapped by this ParserDecorator
* @return
Modified: tika/trunk/tika-core/src/test/java/org/apache/tika/fork/ForkTestParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/test/java/org/apache/tika/fork/ForkTestParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-core/src/test/java/org/apache/tika/fork/ForkTestParser.java (original)
+++ tika/trunk/tika-core/src/test/java/org/apache/tika/fork/ForkTestParser.java Thu Mar 31 16:06:43 2011
@@ -24,13 +24,14 @@ import java.util.Set;
import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
import org.apache.tika.sax.XHTMLContentHandler;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
-class ForkTestParser implements Parser {
+class ForkTestParser extends AbstractParser {
/** Serial version UID */
private static final long serialVersionUID = -5492269783593452319L;
@@ -50,10 +51,4 @@ class ForkTestParser implements Parser {
xhtml.endDocument();
}
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
}
\ No newline at end of file
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/asm/ClassParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/asm/ClassParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/asm/ClassParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/asm/ClassParser.java Thu Mar 31 16:06:43 2011
@@ -24,15 +24,15 @@ import java.util.Set;
import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.Parser;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
/**
* Parser for Java .class files.
*/
-public class ClassParser implements Parser {
+public class ClassParser extends AbstractParser {
private static final Set<MediaType> SUPPORTED_TYPES =
Collections.singleton(MediaType.application("java-vm"));
@@ -48,13 +48,4 @@ public class ClassParser implements Pars
new XHTMLClassVisitor(handler, metadata).parse(stream);
}
- /**
- * @deprecated This method will be removed in Apache Tika 1.0.
- */
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
}
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/audio/AudioParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/audio/AudioParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/audio/AudioParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/audio/AudioParser.java Thu Mar 31 16:06:43 2011
@@ -36,13 +36,13 @@ import org.apache.tika.exception.TikaExc
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.XMPDM;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.Parser;
import org.apache.tika.sax.XHTMLContentHandler;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
-public class AudioParser implements Parser {
+public class AudioParser extends AbstractParser {
private static final Set<MediaType> SUPPORTED_TYPES =
Collections.unmodifiableSet(new HashSet<MediaType>(Arrays.asList(
@@ -133,13 +133,4 @@ public class AudioParser implements Pars
}
}
- /**
- * @deprecated This method will be removed in Apache Tika 1.0.
- */
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
}
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/audio/MidiParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/audio/MidiParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/audio/MidiParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/audio/MidiParser.java Thu Mar 31 16:06:43 2011
@@ -35,13 +35,13 @@ import javax.sound.midi.Track;
import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.Parser;
import org.apache.tika.sax.XHTMLContentHandler;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
-public class MidiParser implements Parser {
+public class MidiParser extends AbstractParser {
private static final Set<MediaType> SUPPORTED_TYPES =
Collections.unmodifiableSet(new HashSet<MediaType>(Arrays.asList(
@@ -113,13 +113,4 @@ public class MidiParser implements Parse
xhtml.endDocument();
}
- /**
- * @deprecated This method will be removed in Apache Tika 1.0.
- */
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
}
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/dwg/DWGParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/dwg/DWGParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/dwg/DWGParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/dwg/DWGParser.java Thu Mar 31 16:06:43 2011
@@ -27,8 +27,8 @@ import org.apache.poi.util.StringUtil;
import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.Parser;
import org.apache.tika.sax.XHTMLContentHandler;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -39,7 +39,7 @@ import org.xml.sax.SAXException;
* Note that we use Apache POI for various parts of the processing, as
* lots of the low level string/int/short concepts are the same.
*/
-public class DWGParser implements Parser {
+public class DWGParser extends AbstractParser {
private static MediaType TYPE = MediaType.image("vnd.dwg");
@@ -320,10 +320,4 @@ public class DWGParser implements Parser
}
}
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
}
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/epub/EpubContentParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/epub/EpubContentParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/epub/EpubContentParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/epub/EpubContentParser.java Thu Mar 31 16:06:43 2011
@@ -30,8 +30,8 @@ import org.apache.tika.exception.TikaExc
import org.apache.tika.io.CloseShieldInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.Parser;
import org.apache.tika.sax.OfflineContentHandler;
import org.apache.tika.sax.XHTMLContentHandler;
import org.xml.sax.ContentHandler;
@@ -43,7 +43,7 @@ import org.xml.sax.SAXNotRecognizedExcep
*
* For the time being, assume XHTML (TODO: DTBook)
*/
-public class EpubContentParser implements Parser {
+public class EpubContentParser extends AbstractParser {
public Set<MediaType> getSupportedTypes(ParseContext context) {
return Collections.emptySet(); // not a top-level parser
@@ -77,13 +77,4 @@ public class EpubContentParser implement
}
}
- /**
- * @deprecated This method will be removed in Apache Tika 1.0.
- */
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
}
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/epub/EpubParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/epub/EpubParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/epub/EpubParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/epub/EpubParser.java Thu Mar 31 16:06:43 2011
@@ -27,6 +27,7 @@ import org.apache.tika.exception.TikaExc
import org.apache.tika.io.IOUtils;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
import org.apache.tika.parser.xml.DcXMLParser;
@@ -37,7 +38,7 @@ import org.xml.sax.helpers.DefaultHandle
/**
* Epub parser
*/
-public class EpubParser implements Parser {
+public class EpubParser extends AbstractParser {
private static final Set<MediaType> SUPPORTED_TYPES =
Collections.singleton(MediaType.application("epub+zip"));
@@ -87,13 +88,4 @@ public class EpubParser implements Parse
}
}
- /**
- * @deprecated This method will be removed in Apache Tika 1.0.
- */
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
}
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/feed/FeedParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/feed/FeedParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/feed/FeedParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/feed/FeedParser.java Thu Mar 31 16:06:43 2011
@@ -28,8 +28,8 @@ import java.util.Set;
import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.Parser;
import org.apache.tika.sax.XHTMLContentHandler;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
@@ -46,7 +46,7 @@ import com.sun.syndication.io.SyndFeedIn
* Uses Rome for parsing the feeds. A feed description is put in a paragraph
* with its link and title in an anchor.
*/
-public class FeedParser implements Parser {
+public class FeedParser extends AbstractParser {
private static final Set<MediaType> SUPPORTED_TYPES = Collections
.unmodifiableSet(new HashSet<MediaType>(Arrays.asList(
@@ -58,11 +58,6 @@ public class FeedParser implements Parse
}
public void parse(InputStream stream, ContentHandler handler,
- Metadata metadata) throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
- public void parse(InputStream stream, ContentHandler handler,
Metadata metadata, ParseContext context) throws IOException,
SAXException, TikaException {
SyndFeed feed = null;
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/font/TrueTypeParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/font/TrueTypeParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/font/TrueTypeParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/font/TrueTypeParser.java Thu Mar 31 16:06:43 2011
@@ -29,8 +29,8 @@ import org.apache.tika.metadata.DublinCo
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.Property;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.Parser;
import org.apache.tika.sax.XHTMLContentHandler;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -38,7 +38,7 @@ import org.xml.sax.SAXException;
/**
* Parser for TrueType font files (TTF).
*/
-public class TrueTypeParser implements Parser {
+public class TrueTypeParser extends AbstractParser {
private static final MediaType TYPE =
MediaType.application("x-font-ttf");
@@ -74,13 +74,4 @@ public class TrueTypeParser implements P
xhtml.endDocument();
}
- /**
- * @deprecated This method will be removed in Apache Tika 1.0.
- */
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
}
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/hdf/HDFParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/hdf/HDFParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/hdf/HDFParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/hdf/HDFParser.java Thu Mar 31 16:06:43 2011
@@ -28,8 +28,8 @@ import java.util.Set;
import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.Parser;
import org.apache.tika.parser.netcdf.NetCDFParser;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -48,7 +48,7 @@ import ucar.nc2.NetcdfFile;
* >this link</a> for more information.
*
*/
-public class HDFParser implements Parser {
+public class HDFParser extends AbstractParser {
private static final Set<MediaType> SUPPORTED_TYPES = Collections
.singleton(MediaType.application("x-hdf"));
@@ -82,18 +82,6 @@ public class HDFParser implements Parser
this.unravelStringMet(ncFile, null, metadata);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.tika.parser.netcdf.NetCDFParser#parse(java.io.InputStream,
- * org.xml.sax.ContentHandler, org.apache.tika.metadata.Metadata)
- */
- public void parse(InputStream stream, ContentHandler handler,
- Metadata metadata) throws IOException, SAXException, TikaException {
- this.parse(stream, handler, metadata, new ParseContext());
- }
-
protected void unravelStringMet(NetcdfFile ncFile, Group group, Metadata met) {
if (group == null) {
group = ncFile.getRootGroup();
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/HtmlParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/HtmlParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/HtmlParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/html/HtmlParser.java Thu Mar 31 16:06:43 2011
@@ -32,6 +32,7 @@ import org.apache.tika.exception.TikaExc
import org.apache.tika.io.CloseShieldInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
import org.apache.tika.parser.txt.CharsetDetector;
@@ -48,7 +49,7 @@ import org.xml.sax.SAXException;
* and post-processes the events to produce XHTML and metadata expected by
* Tika clients.
*/
-public class HtmlParser implements Parser {
+public class HtmlParser extends AbstractParser {
private static final Set<MediaType> SUPPORTED_TYPES =
Collections.unmodifiableSet(new HashSet<MediaType>(Arrays.asList(
@@ -205,15 +206,6 @@ public class HtmlParser implements Parse
}
/**
- * @deprecated This method will be removed in Apache Tika 1.0.
- */
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
- /**
* Maps "safe" HTML element names to semantic XHTML equivalents. If the
* given element is unknown or deemed unsafe for inclusion in the parse
* output, then this method returns <code>null</code> and the element
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java Thu Mar 31 16:06:43 2011
@@ -34,15 +34,16 @@ import org.apache.tika.io.CloseShieldInp
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.Property;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.Parser;
import org.apache.tika.sax.XHTMLContentHandler;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
-public class ImageParser implements Parser {
+public class ImageParser extends AbstractParser {
+
private static final MediaType CANONICAL_BMP_TYPE = MediaType.image("x-ms-bmp");
private static final MediaType JAVA_BMP_TYPE = MediaType.image("bmp");
@@ -106,15 +107,7 @@ public class ImageParser implements Pars
xhtml.endDocument();
}
- /**
- * @deprecated This method will be removed in Apache Tika 1.0.
- */
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
+
private static void setIfPresent(Metadata metadata, String imageIOkey, String tikaKey) {
if(metadata.get(imageIOkey) != null) {
metadata.set(tikaKey, metadata.get(imageIOkey));
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/TiffParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/TiffParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/TiffParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/TiffParser.java Thu Mar 31 16:06:43 2011
@@ -25,14 +25,14 @@ import java.util.Set;
import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.Parser;
import org.apache.tika.parser.image.xmp.JempboxExtractor;
import org.apache.tika.sax.XHTMLContentHandler;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
-public class TiffParser implements Parser {
+public class TiffParser extends AbstractParser {
private static final Set<MediaType> SUPPORTED_TYPES =
Collections.singleton(MediaType.image("tiff"));
@@ -41,15 +41,6 @@ public class TiffParser implements Parse
return SUPPORTED_TYPES;
}
- /**
- * @deprecated This method will be removed in Apache Tika 1.0.
- */
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
public void parse(
InputStream stream, ContentHandler handler,
Metadata metadata, ParseContext context)
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/IWorkPackageParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/IWorkPackageParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/IWorkPackageParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/IWorkPackageParser.java Thu Mar 31 16:06:43 2011
@@ -25,13 +25,12 @@ import java.util.Set;
import org.apache.commons.compress.archivers.ArchiveEntry;
import org.apache.commons.compress.archivers.ArchiveInputStream;
-import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
-import org.apache.commons.compress.archivers.zip.ZipFile;
import org.apache.tika.exception.TikaException;
import org.apache.tika.io.CloseShieldInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.EmptyParser;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
@@ -42,7 +41,7 @@ import org.xml.sax.SAXException;
* A parser for the IWork container files. This includes *.key, *.pages and *.numbers files.
* This parser delegates the relevant files to {@link IWorkParser} that parsers the content.
*/
-public class IWorkPackageParser implements Parser {
+public class IWorkPackageParser extends AbstractParser {
private final static Set<MediaType> supportedTypes =
Collections.singleton(MediaType.application("vnd.apple.iwork"));
@@ -72,13 +71,4 @@ public class IWorkPackageParser implemen
zip.close();
}
- /**
- * @deprecated This method will be removed in Apache Tika 1.0.
- */
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
}
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/IWorkParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/IWorkParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/IWorkParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/iwork/IWorkParser.java Thu Mar 31 16:06:43 2011
@@ -20,6 +20,7 @@ import org.apache.tika.exception.TikaExc
import org.apache.tika.io.CloseShieldInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
import org.apache.tika.sax.OfflineContentHandler;
@@ -44,7 +45,7 @@ import java.util.Set;
* <li>Numbers format version 1.x. Currently only tested with Numbers version 2.0.x
* </ol>
*/
-public class IWorkParser implements Parser {
+public class IWorkParser extends AbstractParser {
private final static Set<MediaType> supportedTypes =
Collections.unmodifiableSet(new HashSet<MediaType>(Arrays.asList(
@@ -82,13 +83,4 @@ public class IWorkParser implements Pars
xhtml.endDocument();
}
-
- /**
- * @deprecated This method will be removed in Apache Tika 1.0.
- */
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
}
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/jpeg/JpegParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/jpeg/JpegParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/jpeg/JpegParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/jpeg/JpegParser.java Thu Mar 31 16:06:43 2011
@@ -27,15 +27,15 @@ import org.apache.tika.io.TemporaryFiles
import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.Parser;
import org.apache.tika.parser.image.ImageMetadataExtractor;
import org.apache.tika.parser.image.xmp.JempboxExtractor;
import org.apache.tika.sax.XHTMLContentHandler;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
-public class JpegParser implements Parser {
+public class JpegParser extends AbstractParser {
private static final Set<MediaType> SUPPORTED_TYPES =
Collections.singleton(MediaType.image("jpeg"));
@@ -44,15 +44,6 @@ public class JpegParser implements Parse
return SUPPORTED_TYPES;
}
- /**
- * @deprecated This method will be removed in Apache Tika 1.0.
- */
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
public void parse(
InputStream stream, ContentHandler handler,
Metadata metadata, ParseContext context)
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mail/RFC822Parser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mail/RFC822Parser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mail/RFC822Parser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mail/RFC822Parser.java Thu Mar 31 16:06:43 2011
@@ -26,8 +26,8 @@ import org.apache.james.mime4j.parser.Mi
import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.Parser;
import org.apache.tika.sax.XHTMLContentHandler;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -38,7 +38,7 @@ import org.xml.sax.SAXException;
*
* @author jnioche@digitalpebble.com
**/
-public class RFC822Parser implements Parser {
+public class RFC822Parser extends AbstractParser {
private static final Set<MediaType> SUPPORTED_TYPES = Collections
.singleton(MediaType.parse("message/rfc822"));
@@ -71,9 +71,4 @@ public class RFC822Parser implements Par
}
}
- public void parse(InputStream stream, ContentHandler handler,
- Metadata metadata) throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
}
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mbox/MboxParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mbox/MboxParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mbox/MboxParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mbox/MboxParser.java Thu Mar 31 16:06:43 2011
@@ -33,8 +33,8 @@ import java.util.regex.Pattern;
import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.Parser;
import org.apache.tika.sax.XHTMLContentHandler;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -43,7 +43,7 @@ import org.xml.sax.SAXException;
* Mbox (mailbox) parser. This version returns the headers for the first email
* via metadata, which means headers from subsequent emails will be lost.
*/
-public class MboxParser implements Parser {
+public class MboxParser extends AbstractParser {
private static final Set<MediaType> SUPPORTED_TYPES =
Collections.singleton(MediaType.application("mbox"));
@@ -242,10 +242,4 @@ public class MboxParser implements Parse
return dateFormat.parse(headerContent);
}
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
}
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java Thu Mar 31 16:06:43 2011
@@ -32,6 +32,7 @@ import org.apache.tika.exception.TikaExc
import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
import org.apache.tika.parser.microsoft.ooxml.OOXMLParser;
@@ -44,8 +45,9 @@ import org.xml.sax.SAXException;
/**
* Defines a Microsoft document content extractor.
*/
-public class OfficeParser implements Parser {
- private static final long serialVersionUID = 7393462244028653479L;
+public class OfficeParser extends AbstractParser {
+
+ private static final long serialVersionUID = 7393462244028653479L;
private static final Set<MediaType> SUPPORTED_TYPES =
Collections.unmodifiableSet(new HashSet<MediaType>(Arrays.asList(
@@ -228,15 +230,6 @@ public class OfficeParser implements Par
xhtml.endDocument();
}
- /**
- * @deprecated This method will be removed in Apache Tika 1.0.
- */
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
private void setType(Metadata metadata, MediaType type) {
metadata.set(Metadata.CONTENT_TYPE, type.toString());
}
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParser.java Thu Mar 31 16:06:43 2011
@@ -26,8 +26,8 @@ import java.util.Set;
import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.Parser;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -35,7 +35,7 @@ import org.xml.sax.SAXException;
* Office Open XML (OOXML) parser.
*
*/
-public class OOXMLParser implements Parser {
+public class OOXMLParser extends AbstractParser {
private static final Set<MediaType> SUPPORTED_TYPES =
Collections.unmodifiableSet(new HashSet<MediaType>(Arrays.asList(
@@ -67,13 +67,4 @@ public class OOXMLParser implements Pars
OOXMLExtractorFactory.parse(stream, handler, metadata, context);
}
- /**
- * @deprecated This method will be removed in Apache Tika 1.0.
- */
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
}
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mp3/Mp3Parser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mp3/Mp3Parser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mp3/Mp3Parser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mp3/Mp3Parser.java Thu Mar 31 16:06:43 2011
@@ -27,8 +27,8 @@ import org.apache.tika.exception.TikaExc
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.XMPDM;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.Parser;
import org.apache.tika.sax.XHTMLContentHandler;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -41,7 +41,7 @@ import org.xml.sax.SAXException;
* @see <a href="http://www.id3.org/id3v2.4.0-structure">MP3 ID3 Version 2.4 Structure Specification</a>
* @see <a href="http://www.id3.org/id3v2.4.0-frames">MP3 ID3 Version 2.4 Frames Specification</a>
*/
-public class Mp3Parser implements Parser {
+public class Mp3Parser extends AbstractParser {
private static final Set<MediaType> SUPPORTED_TYPES =
Collections.singleton(MediaType.audio("mpeg"));
@@ -116,15 +116,6 @@ public class Mp3Parser implements Parser
}
/**
- * @deprecated This method will be removed in Apache Tika 1.0.
- */
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
- /**
* Scans the MP3 frames for ID3 tags, and creates ID3Tag Handlers
* for each supported set of tags.
*/
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/netcdf/NetCDFParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/netcdf/NetCDFParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/netcdf/NetCDFParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/netcdf/NetCDFParser.java Thu Mar 31 16:06:43 2011
@@ -27,6 +27,7 @@ import java.util.Set;
import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
import org.xml.sax.ContentHandler;
@@ -43,7 +44,7 @@ import ucar.nc2.NetcdfFile;
* href="http://www.unidata.ucar.edu/software/netcdf-java/">NetCDF for Java</a>
* API.
*/
-public class NetCDFParser implements Parser {
+public class NetCDFParser extends AbstractParser {
private final Set<MediaType> SUPPORTED_TYPES = Collections
.singleton(MediaType.application("x-netcdf"));
@@ -88,17 +89,6 @@ public class NetCDFParser implements Par
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.tika.parser.Parser#parse(java.io.InputStream,
- * org.xml.sax.ContentHandler, org.apache.tika.metadata.Metadata)
- */
- public void parse(InputStream stream, ContentHandler handler,
- Metadata metadata) throws IOException, SAXException, TikaException {
- this.parse(stream, handler, metadata, new ParseContext());
- }
-
protected void writeStreamToMemory(InputStream is, ByteArrayOutputStream os)
throws TikaException {
byte[] buf = new byte[512];
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/odf/OpenDocumentContentParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/odf/OpenDocumentContentParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/odf/OpenDocumentContentParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/odf/OpenDocumentContentParser.java Thu Mar 31 16:06:43 2011
@@ -36,8 +36,8 @@ import org.apache.tika.exception.TikaExc
import org.apache.tika.io.CloseShieldInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.Parser;
import org.apache.tika.sax.ElementMappingContentHandler;
import org.apache.tika.sax.OfflineContentHandler;
import org.apache.tika.sax.XHTMLContentHandler;
@@ -51,7 +51,7 @@ import org.xml.sax.helpers.DefaultHandle
/**
* Parser for ODF <code>content.xml</code> files.
*/
-public class OpenDocumentContentParser implements Parser {
+public class OpenDocumentContentParser extends AbstractParser {
public static final String TEXT_NS =
"urn:oasis:names:tc:opendocument:xmlns:text:1.0";
@@ -341,13 +341,4 @@ public class OpenDocumentContentParser i
}
}
- /**
- * @deprecated This method will be removed in Apache Tika 1.0.
- */
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
}
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/odf/OpenDocumentParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/odf/OpenDocumentParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/odf/OpenDocumentParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/odf/OpenDocumentParser.java Thu Mar 31 16:06:43 2011
@@ -29,6 +29,7 @@ import org.apache.tika.exception.TikaExc
import org.apache.tika.io.IOUtils;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
import org.xml.sax.ContentHandler;
@@ -38,7 +39,7 @@ import org.xml.sax.helpers.DefaultHandle
/**
* OpenOffice parser
*/
-public class OpenDocumentParser implements Parser {
+public class OpenDocumentParser extends AbstractParser {
private static final Set<MediaType> SUPPORTED_TYPES =
Collections.unmodifiableSet(new HashSet<MediaType>(Arrays.asList(
@@ -119,13 +120,4 @@ public class OpenDocumentParser implemen
}
}
- /**
- * @deprecated This method will be removed in Apache Tika 1.0.
- */
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
}
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java Thu Mar 31 16:06:43 2011
@@ -35,8 +35,8 @@ import org.apache.tika.metadata.Metadata
import org.apache.tika.metadata.PagedText;
import org.apache.tika.metadata.Property;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.Parser;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -48,7 +48,7 @@ import org.xml.sax.SAXException;
* document. If no password is given, then this parser will try decrypting
* the document using the empty password that's often used with PDFs.
*/
-public class PDFParser implements Parser {
+public class PDFParser extends AbstractParser {
/** Serial version UID */
private static final long serialVersionUID = -752276948656079347L;
@@ -92,15 +92,6 @@ public class PDFParser implements Parser
}
}
- /**
- * @deprecated This method will be removed in Apache Tika 1.0.
- */
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
private void extractMetadata(PDDocument document, Metadata metadata)
throws TikaException {
PDDocumentInformation info = document.getDocumentInformation();
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/PackageParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/PackageParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/PackageParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/PackageParser.java Thu Mar 31 16:06:43 2011
@@ -26,8 +26,8 @@ import java.util.Set;
import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.Parser;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -37,7 +37,7 @@ import org.xml.sax.SAXException;
* elements that contain the (optional) entry name as a <h1> element
* and the full structured body content of the parsed entry.
*/
-public class PackageParser implements Parser {
+public class PackageParser extends AbstractParser {
private static final Set<MediaType> SUPPORTED_TYPES =
Collections.unmodifiableSet(new HashSet<MediaType>(Arrays.asList(
@@ -61,13 +61,4 @@ public class PackageParser implements Pa
new PackageExtractor(handler, metadata, context).parse(stream);
}
- /**
- * @deprecated This method will be removed in Apache Tika 1.0.
- */
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
}
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java Thu Mar 31 16:06:43 2011
@@ -20,8 +20,8 @@ import org.apache.tika.exception.TikaExc
import org.apache.tika.io.IOUtils;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.Parser;
import org.apache.tika.sax.XHTMLContentHandler;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -36,7 +36,7 @@ import java.util.regex.Pattern;
/**
* RTF parser
*/
-public class RTFParser implements Parser {
+public class RTFParser extends AbstractParser {
private static final Set<MediaType> SUPPORTED_TYPES = Collections
.singleton(MediaType.application("rtf"));
@@ -126,14 +126,6 @@ public class RTFParser implements Parser
}
}
- /**
- * @deprecated This method will be removed in Apache Tika 1.0.
- */
- public void parse(InputStream stream, ContentHandler handler,
- Metadata metadata) throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
private String escapeByUnicode(String data, String enc) {
StringBuilder dataBuf = new StringBuilder(data.length() + 16);
StringBuilder keywordBuf = new StringBuilder(4);
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/txt/TXTParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/txt/TXTParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/txt/TXTParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/txt/TXTParser.java Thu Mar 31 16:06:43 2011
@@ -30,8 +30,8 @@ import java.util.Set;
import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.Parser;
import org.apache.tika.sax.XHTMLContentHandler;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -56,7 +56,7 @@ import org.xml.sax.SAXException;
* </dl>
*/
@SuppressWarnings("serial")
-public class TXTParser implements Parser {
+public class TXTParser extends AbstractParser {
private static final Set<MediaType> SUPPORTED_TYPES =
Collections.singleton(MediaType.TEXT_PLAIN);
@@ -141,13 +141,4 @@ public class TXTParser implements Parser
}
}
- /**
- * @deprecated This method will be removed in Apache Tika 1.0.
- */
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
}
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/video/FLVParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/video/FLVParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/video/FLVParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/video/FLVParser.java Thu Mar 31 16:06:43 2011
@@ -31,8 +31,8 @@ import java.util.Map.Entry;
import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.Parser;
import org.apache.tika.sax.XHTMLContentHandler;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -60,7 +60,7 @@ import org.xml.sax.SAXException;
* hasCuePoints width, cuePoints, lasttimestamp, canSeekToEnd, datasize,
* duration, videosize, filesize, audiodatarate, hasAudio, stereo audiodelay
*/
-public class FLVParser implements Parser {
+public class FLVParser extends AbstractParser {
private static int TYPE_METADATA = 0x12;
private static byte MASK_AUDIO = 1;
@@ -258,9 +258,4 @@ public class FLVParser implements Parser
xhtml.endDocument();
}
- public void parse(InputStream stream, ContentHandler handler,
- Metadata metadata) throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
}
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/xml/XMLParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/xml/XMLParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/xml/XMLParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/xml/XMLParser.java Thu Mar 31 16:06:43 2011
@@ -20,6 +20,7 @@ import org.apache.tika.exception.TikaExc
import org.apache.tika.io.CloseShieldInputStream;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
import org.apache.tika.sax.EmbeddedContentHandler;
@@ -39,7 +40,7 @@ import java.util.Set;
/**
* XML parser.
*/
-public class XMLParser implements Parser {
+public class XMLParser extends AbstractParser {
private static final Set<MediaType> SUPPORTED_TYPES =
Collections.unmodifiableSet(new HashSet<MediaType>(Arrays.asList(
@@ -72,15 +73,6 @@ public class XMLParser implements Parser
xhtml.endDocument();
}
- /**
- * @deprecated This method will be removed in Apache Tika 1.0.
- */
- public void parse(
- InputStream stream, ContentHandler handler, Metadata metadata)
- throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
-
protected ContentHandler getContentHandler(
ContentHandler handler, Metadata metadata) {
return new TextContentHandler(handler);
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java Thu Mar 31 16:06:43 2011
@@ -255,7 +255,7 @@ public class AutoDetectParserTest extend
}
@SuppressWarnings("serial")
- private static class MyParser implements Parser {
+ private static class MyParser extends AbstractParser {
public Set<MediaType> getSupportedTypes(ParseContext context) {
Set<MediaType> supportedTypes = new HashSet<MediaType>();
supportedTypes.add(MY_MEDIA_TYPE);
@@ -266,9 +266,6 @@ public class AutoDetectParserTest extend
metadata.add("MyParser", "value");
}
- public void parse(InputStream stream, ContentHandler handler, Metadata metadata) {
- parse(stream, handler, metadata, new ParseContext());
- }
}
/**
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/DummyParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/DummyParser.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/DummyParser.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/DummyParser.java Thu Mar 31 16:06:43 2011
@@ -31,7 +31,7 @@ import org.xml.sax.SAXException;
/**
* A Dummy Parser for use with unit tests.
*/
-public class DummyParser implements Parser {
+public class DummyParser extends AbstractParser {
private Set<MediaType> types;
private Map<String,String> metadata;
private String xmlText;
@@ -61,8 +61,4 @@ public class DummyParser implements Pars
handler.endDocument();
}
- public void parse(InputStream stream, ContentHandler handler,
- Metadata metadata) throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
}
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/AbstractPkgTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/AbstractPkgTest.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/AbstractPkgTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/AbstractPkgTest.java Thu Mar 31 16:06:43 2011
@@ -27,6 +27,7 @@ import junit.framework.TestCase;
import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.AutoDetectParser;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
@@ -57,7 +58,7 @@ public abstract class AbstractPkgTest ex
@SuppressWarnings("serial")
- protected static class EmbeddedTrackingParser implements Parser {
+ protected static class EmbeddedTrackingParser extends AbstractParser {
protected List<String> filenames = new ArrayList<String>();
protected List<String> mediatypes = new ArrayList<String>();
protected byte[] lastSeenStart;
@@ -82,9 +83,5 @@ public abstract class AbstractPkgTest ex
stream.read(lastSeenStart);
}
- public void parse(InputStream stream, ContentHandler handler,
- Metadata metadata) throws IOException, SAXException, TikaException {
- parse(stream, handler, metadata, new ParseContext());
- }
}
}
Modified: tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaResource.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaResource.java?rev=1087353&r1=1087352&r2=1087353&view=diff
==============================================================================
--- tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaResource.java (original)
+++ tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaResource.java Thu Mar 31 16:06:43 2011
@@ -19,15 +19,14 @@ package org.apache.tika.server;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.extractor.ExtractorFactory;
import org.apache.poi.hwpf.OldWordFileFormatException;
import org.apache.tika.detect.Detector;
import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.AbstractParser;
import org.apache.tika.parser.AutoDetectParser;
import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.Parser;
import org.apache.tika.sax.BodyContentHandler;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -57,7 +56,7 @@ public class TikaResource {
public static AutoDetectParser createParser() {
final AutoDetectParser parser = new AutoDetectParser();
- parser.setFallback(new Parser() {
+ parser.setFallback(new AbstractParser() {
public Set<MediaType> getSupportedTypes(ParseContext parseContext) {
return parser.getSupportedTypes(parseContext);
}
@@ -65,10 +64,6 @@ public class TikaResource {
public void parse(InputStream inputStream, ContentHandler contentHandler, Metadata metadata, ParseContext parseContext) {
throw new WebApplicationException(Response.Status.UNSUPPORTED_MEDIA_TYPE);
}
-
- public void parse(InputStream inputStream, ContentHandler contentHandler, Metadata metadata) {
- throw new WebApplicationException(Response.Status.UNSUPPORTED_MEDIA_TYPE);
- }
});
return parser;