First steps in porting 4.x sax ooxml -> 3.x - checkpoint

Author: tballison

tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java

@@ -21,6 +21,7 @@
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.util.Locale;
+import java.util.Set;
 
 import org.apache.poi.extractor.ExtractorFactory;
 import org.apache.poi.ooxml.POIXMLDocument;
@@ -182,6 +183,10 @@ public static void parse(InputStream stream, ContentHandler baseHandler, Metadat
                         XSLFEventBasedPowerPointExtractor.class.getCanonicalName());
             } else if (poiExtractor instanceof XPSTextExtractor) {
                 extractor = new XPSExtractorDecorator(context, poiExtractor);
+            } else if (isVisioType(type)) {
+                //SAX-based .vsdx extractor; the XDGF-based poiExtractor is used only for its
+                //OPCPackage (VSDXExtractorDecorator reads the package directly)
+                extractor = new VSDXExtractorDecorator(context, poiExtractor);
             } else if (document == null) {
                 throw new TikaException(
                         "Expecting UserModel based POI OOXML extractor with a document, but none" +
@@ -295,5 +300,17 @@ private static POIXMLTextExtractor tryXSLF(OPCPackage pkg, boolean eventBased)
         return null;
     }
 
+    private static final Set<String> VISIO_SUBTYPES = Set.of(
+            "vnd.ms-visio.drawing",
+            "vnd.ms-visio.drawing.macroenabled.12",
+            "vnd.ms-visio.stencil",
+            "vnd.ms-visio.stencil.macroenabled.12",
+            "vnd.ms-visio.template",
+            "vnd.ms-visio.template.macroenabled.12"
+    );
+
+    private static boolean isVisioType(MediaType type) {
+        return type != null && VISIO_SUBTYPES.contains(type.getSubtype());
+    }
 
 }

tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/TikaSheetContentsHandler.java

@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tika.parser.microsoft.ooxml;
+
+/**
+ * Sheet contents handler that uses {@link XSSFCommentsShim.CommentData}
+ * instead of POI's XMLBeans-dependent {@code XSSFComment}.
+ */
+interface TikaSheetContentsHandler {
+
+    void startRow(int rowNum);
+
+    void endRow(int rowNum);
+
+    void cell(String cellRef, String formattedValue, XSSFCommentsShim.CommentData comment);
+
+    default void headerFooter(String text, boolean isHeader, String tagName) {
+    }
+
+    default void endSheet() {
+    }
+}