translator fixes

Author: tballison

tika-pipes/tika-pipes-core/src/main/java/org/apache/tika/pipes/core/emitter/EmitterManager.java

@@ -46,7 +46,8 @@ public class EmitterManager {
     private final Map<String, Emitter> emitterMap = new ConcurrentHashMap<>();
 
     public static EmitterManager load(PluginManager pluginManager, TikaConfigs tikaConfigs) throws IOException, TikaConfigException {
-        JsonNode fetchersNode = tikaConfigs.getRoot().get(CONFIG_KEY);
+        JsonNode fetchersNode = tikaConfigs.getTikaJsonConfig()
+                                           .getRootNode().get(CONFIG_KEY);
         Map<String, Emitter> fetchers =
                 PluginComponentLoader.loadInstances(pluginManager, EmitterFactory.class, fetchersNode);
         return new EmitterManager(fetchers);

tika-pipes/tika-pipes-core/src/main/java/org/apache/tika/pipes/core/fetcher/FetcherManager.java

@@ -45,7 +45,8 @@ public class FetcherManager {
 
 
     public static FetcherManager load(PluginManager pluginManager, TikaConfigs tikaConfigs) throws TikaConfigException, IOException {
-        JsonNode fetchersNode = tikaConfigs.getRoot().get(CONFIG_KEY);
+        JsonNode fetchersNode = tikaConfigs.getTikaJsonConfig()
+                                           .getRootNode().get(CONFIG_KEY);
         Map<String, Fetcher> fetchers =
                 PluginComponentLoader.loadInstances(pluginManager, FetcherFactory.class, fetchersNode);
         return new FetcherManager(fetchers);

tika-pipes/tika-pipes-core/src/main/java/org/apache/tika/pipes/core/pipesiterator/PipesIteratorManager.java

@@ -39,7 +39,8 @@ public class PipesIteratorManager {
 
     public static Optional<PipesIterator> load(PluginManager pluginManager, TikaConfigs tikaConfigs) throws IOException, TikaConfigException {
 
-        JsonNode node = tikaConfigs.getRoot().get(CONFIG_KEY);
+        JsonNode node = tikaConfigs.getTikaJsonConfig()
+                                   .getRootNode().get(CONFIG_KEY);
 
         return PluginComponentLoader.loadSingleton(pluginManager, PipesIteratorFactory.class, node);
     }

tika-pipes/tika-pipes-core/src/main/java/org/apache/tika/pipes/core/reporter/ReporterManager.java

@@ -39,7 +39,8 @@ public class ReporterManager {
 
     public static PipesReporter load(PluginManager pluginManager, TikaConfigs tikaConfigs) throws IOException, TikaConfigException {
 
-        JsonNode node = tikaConfigs.getRoot().get(CONFIG_KEY);
+        JsonNode node = tikaConfigs.getTikaJsonConfig()
+                                   .getRootNode().get(CONFIG_KEY);
 
         List<PipesReporter> reporters =  PluginComponentLoader.loadUnnamedInstances(pluginManager, PipesReporterFactory.class, node);
         if (reporters.isEmpty()) {

tika-plugins-core/src/main/java/org/apache/tika/plugins/TikaPluginManager.java

@@ -23,14 +23,15 @@
 import java.util.List;
 
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.pf4j.DefaultExtensionFinder;
 import org.pf4j.DefaultPluginManager;
 import org.pf4j.ExtensionFinder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.tika.config.loader.PolymorphicObjectMapperFactory;
 import org.apache.tika.config.loader.TikaJsonConfig;
 import org.apache.tika.exception.TikaConfigException;
 
@@ -44,6 +45,14 @@ public class TikaPluginManager extends DefaultPluginManager {
 
     private static final Logger LOG = LoggerFactory.getLogger(TikaPluginManager.class);
 
+    //we're only using this to convert a single path or a list of paths to a list
+    //we don't need all the functionality of the polymorphic objectmapper in tika-serialization
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+
+    static {
+        OBJECT_MAPPER.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
+    }
+
     /**
      * Loads plugin manager from a pre-parsed TikaJsonConfig.
      * This is the preferred method when sharing configuration across
@@ -89,7 +98,7 @@ public static TikaPluginManager load(TikaConfigs tikaConfigs)
         if (pluginRoots == null) {
             throw new TikaConfigException("plugin-roots must be specified");
         }
-        List<Path> roots = PolymorphicObjectMapperFactory.getMapper().convertValue(pluginRoots,
+        List<Path> roots = OBJECT_MAPPER.convertValue(pluginRoots,
                 new TypeReference<List<Path>>() {});
         if (roots.isEmpty()) {
             throw new TikaConfigException("plugin-roots must not be empty");

tika-serialization/src/main/java/org/apache/tika/config/loader/PolymorphicObjectMapperFactory.java

@@ -92,10 +92,6 @@ public static ObjectMapper createPolymorphicMapper() {
         //Need to allow creation of classes without setters/getters -- we may want to revisit this
         mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
 
-        mapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
-
-
-
         // Build polymorphic type validator
         BasicPolymorphicTypeValidator.Builder builder = BasicPolymorphicTypeValidator.builder()
                 .allowIfSubType("org.apache.tika.")

tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaResourceFetcherTest.java

@@ -94,6 +94,7 @@ protected String getPipesInputPath() {
     protected InputStreamFactory getInputStreamFactory(InputStream is) {
         try (TikaInputStream tis = TikaInputStream.get(is)) {
             TikaConfigs tikaConfigs = TikaConfigs.load(tis.getPath());
+            System.out.println(tikaConfigs.getTikaJsonConfig().getRootNode().toPrettyString());
             TikaPluginManager pluginManager = TikaPluginManager.load(tikaConfigs);
             FetcherManager fetcherManager = FetcherManager.load(pluginManager, tikaConfigs);
             return new FetcherStreamFactory(fetcherManager);

tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TranslateResourceTest.java

@@ -27,7 +27,6 @@
 import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
 import org.apache.cxf.jaxrs.client.WebClient;
 import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import org.apache.tika.server.core.resource.TranslateResource;

tika-translate/pom.xml

@@ -143,6 +143,7 @@
               org.apache.tika.*,
               *;resolution:=optional
             </Import-Package>
+            <Include-Resource>{maven-resources},META-INF=target/classes/META-INF</Include-Resource>
           </instructions>
         </configuration>
       </plugin>
@@ -172,6 +173,19 @@
         <artifactId>maven-site-plugin</artifactId>
         <version>3.21.0</version>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <annotationProcessorPaths>
+            <path>
+              <groupId>org.apache.tika</groupId>
+              <artifactId>tika-annotation-processor</artifactId>
+              <version>${project.version}</version>
+            </path>
+          </annotationProcessorPaths>
+        </configuration>
+      </plugin>
     </plugins>
 
     <pluginManagement>