TIKA-4809: Remove the maxEmbeddedResources/maxEmbeddedCount headers

Author: tballison

tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/RecursiveMetadataResource.java

@@ -37,7 +37,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.tika.config.EmbeddedLimits;
 import org.apache.tika.io.TikaInputStream;
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.parser.ParseContext;
@@ -64,40 +63,20 @@ public RecursiveMetadataResource(TikaResource tikaResource) {
      */
     public List<Metadata> parseMetadata(TikaInputStream tis, Metadata metadata,
                                                MultivaluedMap<String, String> httpHeaders,
-                                               ServerHandlerConfig handlerConfig)
+                                               String handlerTypeName)
             throws Exception {
 
         final ParseContext context = tikaResource.createParseContext();
 
         fillMetadata(null, metadata, httpHeaders);
         TikaResource.logRequest(LOG, "/rmeta", metadata);
 
-        // Set up handler factory in context using shared utility
-        setupContentHandlerFactory(context, handlerConfig.type().toString());
-
-        // Set up embedded limits if specified
-        if (handlerConfig.maxEmbeddedCount() >= 0) {
-            EmbeddedLimits limits = new EmbeddedLimits();
-            limits.setMaxCount(handlerConfig.maxEmbeddedCount());
-            context.set(EmbeddedLimits.class, limits);
-        }
+        setupContentHandlerFactory(context, handlerTypeName);
 
         // Filtering is done in child process, no need to filter again
         return tikaResource.parseWithPipes(tis, metadata, context, ParseMode.RMETA);
     }
 
-    static ServerHandlerConfig buildHandlerConfig(MultivaluedMap<String, String> httpHeaders, String handlerTypeName, ParseMode parseMode) {
-        int maxEmbeddedCount = -1;
-        // Support both old header name and new for backwards compatibility
-        if (httpHeaders.containsKey("maxEmbeddedResources")) {
-            maxEmbeddedCount = Integer.parseInt(httpHeaders.getFirst("maxEmbeddedResources"));
-        } else if (httpHeaders.containsKey("maxEmbeddedCount")) {
-            maxEmbeddedCount = Integer.parseInt(httpHeaders.getFirst("maxEmbeddedCount"));
-        }
-        return new ServerHandlerConfig(BasicContentHandlerFactory.parseHandlerType(handlerTypeName, DEFAULT_HANDLER_TYPE),
-                parseMode, maxEmbeddedCount);
-    }
-
     /**
      * Returns an InputStream that can be deserialized as a list of
      * {@link Metadata} objects.
@@ -132,7 +111,7 @@ public Response getMetadataFromMultipart(Attachment att, @PathParam(HANDLER_TYPE
         try (TikaInputStream tis = TikaInputStream.get(att.getObject(InputStream.class))) {
             tis.getPath(); // Spool to temp file for pipes-based parsing
             List<Metadata> metadataList = parseMetadata(tis, Metadata.newInstance(context), att.getHeaders(),
-                    buildHandlerConfig(att.getHeaders(), handlerTypeName, ParseMode.RMETA));
+                    handlerTypeName);
             return Response.ok(new MetadataList(metadataList)).build();
         }
     }
@@ -157,17 +136,14 @@ public Response getMetadataWithConfig(
             TikaResource.logRequest(LOG, "/rmeta/config", metadata);
 
             return Response
-                    .ok(parseMetadataWithContext(tis, metadata, httpHeaders.getRequestHeaders(),
-                            buildHandlerConfig(httpHeaders.getRequestHeaders(), null, ParseMode.RMETA),
-                            context))
+                    .ok(parseMetadataWithContext(tis, metadata, null, context))
                     .build();
         }
     }
 
-    private MetadataList parseMetadataWithContext(TikaInputStream tis, Metadata metadata, MultivaluedMap<String, String> httpHeaders,
-                                                  ServerHandlerConfig handlerConfig, ParseContext context) throws Exception {
-        // Set up handler factory in context if not already set using shared utility
-        setupContentHandlerFactoryIfNeeded(context, handlerConfig.type().toString());
+    private MetadataList parseMetadataWithContext(TikaInputStream tis, Metadata metadata,
+                                                  String handlerTypeName, ParseContext context) throws Exception {
+        setupContentHandlerFactoryIfNeeded(context, handlerTypeName);
 
         // Filtering is done in child process, no need to filter again
         List<Metadata> metadataList = tikaResource.parseWithPipes(tis, metadata, context, ParseMode.RMETA);
@@ -207,7 +183,7 @@ public Response getMetadata(InputStream is, @Context HttpHeaders httpHeaders, @P
         try (TikaInputStream tis = TikaInputStream.get(is)) {
             tis.getPath(); // Spool to temp file for pipes-based parsing
             List<Metadata> metadataList = parseMetadata(tis, metadata, httpHeaders.getRequestHeaders(),
-                    buildHandlerConfig(httpHeaders.getRequestHeaders(), handlerTypeName, ParseMode.RMETA));
+                    handlerTypeName);
             return Response.ok(new MetadataList(metadataList)).build();
         }
     }

tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/ServerHandlerConfig.java

@@ -469,9 +469,6 @@ public void testHandlerTypeInMultipartXML() throws Exception {
         assertContains("plundered our seas", content);
     }
 
-    // TIKA-3227 - TODO: re-enable once maxEmbeddedResources is configurable via JSON
-    // Use maxEmbeddedResources=0 in config to skip embedded documents
-
     @Test
     public void testXFA() throws Exception {
         Response response = WebClient