TIKA-4553-rm-tika-config-parsers-standard-package (#2440)

Author: tballison

tika-core/src/main/java/org/apache/tika/language/translate/DefaultTranslator.java

@@ -20,6 +20,7 @@
 import java.util.List;
 
 import org.apache.tika.config.ServiceLoader;
+import org.apache.tika.config.TikaComponent;
 import org.apache.tika.exception.TikaException;
 import org.apache.tika.utils.CompareUtils;
 
@@ -30,6 +31,7 @@
  *
  * @since Apache Tika 1.6
  */
+@TikaComponent
 public class DefaultTranslator implements Translator {
     private transient final ServiceLoader loader;
 
@@ -59,6 +61,10 @@ private static List<Translator> getDefaultTranslators(ServiceLoader loader) {
      */
     private static Translator getFirstAvailable(ServiceLoader loader) {
         for (Translator t : getDefaultTranslators(loader)) {
+            // Skip DefaultTranslator to avoid infinite recursion
+            if (t instanceof DefaultTranslator) {
+                continue;
+            }
             if (t.isAvailable()) {
                 return t;
             }

tika-core/src/main/java/org/apache/tika/parser/EmptyParser.java

@@ -23,6 +23,7 @@
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
 
+import org.apache.tika.config.TikaComponent;
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.mime.MediaType;
 import org.apache.tika.sax.XHTMLContentHandler;
@@ -32,6 +33,7 @@
  * attempting to parse the given document stream. Useful as a sentinel parser
  * for unknown document types.
  */
+@TikaComponent(spi = false)
 public class EmptyParser implements Parser {
     /**
      * Singleton instance of this class.

tika-core/src/main/java/org/apache/tika/parser/ErrorParser.java

@@ -22,6 +22,7 @@
 
 import org.xml.sax.ContentHandler;
 
+import org.apache.tika.config.TikaComponent;
 import org.apache.tika.exception.TikaException;
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.mime.MediaType;
@@ -31,6 +32,7 @@
  * attempting to parse the given document stream. Useful as a sentinel parser
  * for unknown document types.
  */
+@TikaComponent(spi = false)
 public class ErrorParser implements Parser {
     /**
      * Singleton instance of this class.

tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/config/TikaConfigSerializerTest.java

@@ -15,22 +15,11 @@
  * limitations under the License.
  */
 package org.apache.tika.config;
-
-import static org.apache.tika.TikaTest.assertContains;
-import static org.apache.tika.TikaTest.assertContainsCount;
-import static org.apache.tika.TikaTest.assertNotContained;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.StringWriter;
-import java.nio.charset.StandardCharsets;
-
 import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
 
 @Disabled("TODO -- convert to TikaLoader/serializer")
 public class TikaConfigSerializerTest {
-
+/*
     @Test
     public void testBasicParams() throws Exception {
         TikaConfig tikaConfig = TikaConfig.getDefaultConfig();
@@ -73,6 +62,6 @@ public void testOfficeParserParams() throws Exception {
         assertContainsCount("<param name=\"concatenatePhoneticRuns\" type=\"bool\">true</param>",
                 writer.toString(), 3);
     }
-
+*/
 
 }

tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/config/TikaDetectorConfigTest.java

@@ -24,6 +24,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.apache.tika.TikaLoaderHelper;
+import org.apache.tika.TikaTest;
 import org.apache.tika.config.loader.TikaLoader;
 import org.apache.tika.detect.CompositeDetector;
 import org.apache.tika.detect.DefaultDetector;
@@ -33,15 +34,12 @@
 import org.apache.tika.detect.zip.DefaultZipContainerDetector;
 import org.apache.tika.io.TikaInputStream;
 import org.apache.tika.metadata.Metadata;
-import org.apache.tika.mime.MimeTypes;
 import org.apache.tika.parser.microsoft.pst.OutlookPSTParser;
 
 /**
- * Junit test class for {@link TikaConfig}, which cover things
- * that {@link TikaConfigTest} can't do due to a need for the
- * full set of detectors
+ * Junit test class for detector configuration via JSON.
  */
-public class TikaDetectorConfigTest extends AbstractTikaConfigTest {
+public class TikaDetectorConfigTest extends TikaTest {
 
     @Test
     public void testDetectorExcludeFromDefault() throws Exception {
@@ -53,30 +51,23 @@ public void testDetectorExcludeFromDefault() throws Exception {
         // Should be wrapping two detectors
         assertEquals(2, detector.getDetectors().size());
 
-
         // First should be DefaultDetector, second Empty, that order
         assertEquals(DefaultDetector.class, detector.getDetectors().get(0).getClass());
         assertEquals(EmptyDetector.class, detector.getDetectors().get(1).getClass());
 
-
         // Get the DefaultDetector from the config
         DefaultDetector confDetector = (DefaultDetector) detector.getDetectors().get(0);
 
-        // Get a fresh "default" DefaultParser
-        TikaLoader.getMediaTypeRegistry().getTypes();
-        MimeTypes mimeTypes = new MimeTypes();
+        // Get a fresh "default" DefaultDetector
         DefaultDetector normDetector = new DefaultDetector(TikaLoader.getMimeTypes());
 
-
         // The default one will offer the Zip and POIFS detectors
         assertDetectors(normDetector, true, true);
 
-
         // The one from the config won't, as we excluded those
         assertDetectors(confDetector, false, false);
     }
 
-
     /**
      * TIKA-1708 - If the Zip detector is disabled, either explicitly,
      * or via giving a list of detectors that it isn't part of, ensure
@@ -93,30 +84,24 @@ public void testPSTDetectionWithoutZipDetector() throws Exception {
         // Check it has the POIFS one, but not the zip one
         assertDetectors(detectorWX, true, false);
 
-
         // Check the one with an explicit list
-        TikaConfig configCL = getConfig("TIKA-1708-detector-composite.xml");
-        assertNotNull(configCL.getParser());
-        assertNotNull(configCL.getDetector());
-        CompositeDetector detectorCL = (CompositeDetector) configCL.getDetector();
+        TikaLoader configCL = TikaLoaderHelper.getLoader("TIKA-1708-detector-composite.json");
+        assertNotNull(configCL.loadParsers());
+        assertNotNull(configCL.loadDetectors());
+        CompositeDetector detectorCL = (CompositeDetector) configCL.loadDetectors();
         assertEquals(2, detectorCL.getDetectors().size());
 
         // Check it also has the POIFS one, but not the zip one
         assertDetectors(detectorCL, true, false);
 
-
-        // Check that both detectors have a mimetypes with entries
-        assertTrue(configWX.getMediaTypeRegistry().getTypes().size() > 100,
-                "Not enough mime types: " + configWX.getMediaTypeRegistry().getTypes().size());
-        assertTrue(configCL.getMediaTypeRegistry().getTypes().size() > 100,
-                "Not enough mime types: " + configCL.getMediaTypeRegistry().getTypes().size());
-
+        // Check that media type registry has entries
+        assertTrue(TikaLoader.getMediaTypeRegistry().getTypes().size() > 100,
+                "Not enough mime types: " + TikaLoader.getMediaTypeRegistry().getTypes().size());
 
         // Now check they detect PST files correctly
         try (TikaInputStream outer = TikaInputStream
                 .get(getResourceAsStream("/test-documents/testPST.pst"))) {
             try (TikaInputStream stream = TikaInputStream.get(outer.getPath())) {
-
                 assertEquals(OutlookPSTParser.MS_OUTLOOK_PST_MIMETYPE,
                         detectorWX.detect(stream, new Metadata()));
                 assertEquals(OutlookPSTParser.MS_OUTLOOK_PST_MIMETYPE,
@@ -152,5 +137,4 @@ private void assertDetectors(CompositeDetector detector, boolean shouldHavePOIFS
             assertTrue(hasZip, "Should have the ZipContainerDetector");
         }
     }
-
 }

tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/config/TikaEncodingDetectorTest.java

@@ -32,6 +32,7 @@
 
 import org.apache.tika.Tika;
 import org.apache.tika.TikaLoaderHelper;
+import org.apache.tika.TikaTest;
 import org.apache.tika.config.loader.TikaLoader;
 import org.apache.tika.detect.CompositeEncodingDetector;
 import org.apache.tika.detect.EncodingDetector;
@@ -49,7 +50,7 @@
 import org.apache.tika.parser.txt.TXTParser;
 import org.apache.tika.parser.txt.UniversalEncodingDetector;
 
-public class TikaEncodingDetectorTest extends AbstractTikaConfigTest {
+public class TikaEncodingDetectorTest extends TikaTest {
 
     @Test
     public void testDefault() throws TikaConfigException {