TIKA-4554 - rm ForkParser (#2454)

Author: tballison

tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java

@@ -77,7 +77,6 @@
 import org.apache.tika.extractor.DefaultEmbeddedStreamTranslator;
 import org.apache.tika.extractor.EmbeddedDocumentExtractor;
 import org.apache.tika.extractor.EmbeddedStreamTranslator;
-import org.apache.tika.fork.ForkParser;
 import org.apache.tika.gui.TikaGUI;
 import org.apache.tika.io.TikaInputStream;
 import org.apache.tika.language.detect.LanguageHandler;
@@ -204,7 +203,6 @@ public void process(TikaInputStream tis, OutputStream output, Metadata metadata)
     private String password = System.getenv("TIKA_PASSWORD");
     private Digester digester = null;
     private boolean pipeMode = true;
-    private boolean fork = false;
     private boolean prettyPrint;
     private final OutputType XML = new OutputType() {
         @Override
@@ -430,8 +428,6 @@ public void process(String arg) throws Exception {
             convertConfigXmlToJson(arg.substring("--convert-config-xml-to-json=".length()));
         } else if (arg.equals("--container-aware") || arg.equals("--container-aware-detector")) {
             // ignore, as container-aware detectors are now always used
-        } else if (arg.equals("-f") || arg.equals("--fork")) {
-            fork = true;
         } else if (arg.startsWith("--config=")) {
             configFilePath = arg.substring("--config=".length());
         } else if (arg.startsWith("--digest=")) {
@@ -597,7 +593,6 @@ private void usage() {
         out.println("    -V  or --version       Print the Apache Tika version number");
         out.println();
         out.println("    -g  or --gui           Start the Apache Tika GUI");
-        out.println("    -f  or --fork          Use Fork Mode for out-of-process extraction");
         out.println();
         out.println("    --config=<tika-config.xml>");
         out.println("        TikaConfig file. Must be specified before -g, -s, -f or the dump-x-config !");
@@ -1106,24 +1101,15 @@ public String getPassword(Metadata metadata) {
     private class OutputType {
         public void process(TikaInputStream tis, OutputStream output, Metadata metadata) throws Exception {
             Parser p = parser;
-            if (fork) {
-                p = new ForkParser(TikaCLI.class.getClassLoader(), p);
-            }
             ContentHandler handler = getContentHandler(output, metadata);
-            try {
-                p.parse(tis, handler, metadata, context);
-                // fix for TIKA-596: if a parser doesn't generate
-                // XHTML output, the lack of an output document prevents
-                // metadata from being output: this fixes that
-                if (handler instanceof NoDocumentMetHandler) {
-                    NoDocumentMetHandler metHandler = (NoDocumentMetHandler) handler;
-                    if (!metHandler.metOutput()) {
-                        metHandler.endDocument();
-                    }
-                }
-            } finally {
-                if (fork) {
-                    ((ForkParser) p).close();
+            p.parse(tis, handler, metadata, context);
+            // fix for TIKA-596: if a parser doesn't generate
+            // XHTML output, the lack of an output document prevents
+            // metadata from being output: this fixes that
+            if (handler instanceof NoDocumentMetHandler) {
+                NoDocumentMetHandler metHandler = (NoDocumentMetHandler) handler;
+                if (!metHandler.metOutput()) {
+                    metHandler.endDocument();
                 }
             }
         }

tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java

@@ -200,17 +200,6 @@ public void testContentAllOutput() throws Exception {
         assertTrue(out.contains("body"));
     }
 
-    /**
-     * Tests -f option of the cli
-     *
-     * @throws Exception
-     */
-    @Test
-    public void testForkParser() throws Exception {
-        String content = getParamOutContent("-f", resourcePrefix + "alice.cli.test");
-        assertTrue(content.contains("finished off the cake"));
-    }
-
     /**
      * Tests -m option of the cli
      *

tika-bundles/tika-bundle-standard/src/test/java/org/apache/tika/bundle/BundleIT.java

@@ -16,7 +16,6 @@
  */
 package org.apache.tika.bundle;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -29,8 +28,6 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
 import java.net.URISyntaxException;
 import java.nio.file.Paths;
 import java.util.Arrays;
@@ -60,7 +57,6 @@
 import org.apache.tika.detect.Detector;
 import org.apache.tika.exception.EncryptedDocumentException;
 import org.apache.tika.exception.TikaException;
-import org.apache.tika.fork.ForkParser;
 import org.apache.tika.io.TikaInputStream;
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.metadata.TikaCoreProperties;
@@ -70,7 +66,6 @@
 import org.apache.tika.parser.DefaultParser;
 import org.apache.tika.parser.ParseContext;
 import org.apache.tika.parser.Parser;
-import org.apache.tika.parser.internal.Activator;
 import org.apache.tika.parser.ocr.TesseractOCRParser;
 import org.apache.tika.sax.BodyContentHandler;
 
@@ -153,28 +148,6 @@ public void testBundleDetection() throws Exception {
         assertEquals(MediaType.application("pdf"), contentTypeDetector.detect(null, metadataPDF, new ParseContext()));
     }
 
-    @Test
-    public void testForkParser() throws Exception {
-        try (ForkParser parser = new ForkParser(Activator.class.getClassLoader(), defaultParser)) {
-            String data =
-                    "<!DOCTYPE html>\n<html><body><p>test <span>content</span></p></body></html>";
-            try (TikaInputStream tis = TikaInputStream.get(data.getBytes(UTF_8))) {
-                Writer writer = new StringWriter();
-                ContentHandler contentHandler = new BodyContentHandler(writer);
-                Metadata metadata = new Metadata();
-                MediaType type = contentTypeDetector.detect(tis, metadata, new ParseContext());
-                assertEquals(type.toString(), "text/html");
-                metadata.add(Metadata.CONTENT_TYPE, type.toString());
-                ParseContext parseCtx = new ParseContext();
-                parser.parse(tis, contentHandler, metadata, parseCtx);
-                writer.flush();
-                String content = writer.toString();
-                assertTrue(content.length() > 0);
-                assertEquals("test content", content.trim());
-            }
-        }
-    }
-
     @Test
     public void testBundleSimpleText() throws Exception {
         Tika tika = new Tika();