[tika] branch main updated: Repalce const in OPCPackageDetector (#345)

[tallison]

This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/main by this push:
     new f41fdd0  Repalce const in OPCPackageDetector (#345)
f41fdd0 is described below

commit f41fdd0d15e196ef04b4e833cb0a498d51bd9bfd
Author: Lee <55973914+peteralfred...@users.noreply.github.com>
AuthorDate: Fri Sep 18 22:21:27 2020 +0800

    Repalce const in OPCPackageDetector (#345)
    
    Use const which in class PackageRelationshipTypes.
---
 .../tika/detect/microsoft/ooxml/OPCPackageDetector.java      | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git 
a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/detect/microsoft/ooxml/OPCPackageDetector.java
 
b/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/detect/microsoft/ooxml/OPCPackageDetector.java
index 83f5521..bf00156 100644
--- 
a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/detect/microsoft/ooxml/OPCPackageDetector.java
+++ 
b/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/detect/microsoft/ooxml/OPCPackageDetector.java
@@ -151,14 +151,6 @@ public class OPCPackageDetector implements 
ZipContainerDetector {
 
     }
 
-
-    // TODO Remove this constant once we upgrade to POI 3.12 beta 2, then use 
PackageRelationshipTypes
-    private static final String VISIO_DOCUMENT =
-            "http://schemas.microsoft.com/visio/2010/relationships/document";;
-    // TODO Remove this constant once we upgrade to POI 3.12 beta 2, then use 
PackageRelationshipTypes
-    private static final String STRICT_CORE_DOCUMENT =
-            
"http://purl.oclc.org/ooxml/officeDocument/relationships/officeDocument";;
-
     private static final String XPS_DOCUMENT =
             "http://schemas.microsoft.com/xps/2005/06/fixedrepresentation";;
 
@@ -206,10 +198,10 @@ public class OPCPackageDetector implements 
ZipContainerDetector {
                 
pkg.getRelationshipsByType(PackageRelationshipTypes.CORE_DOCUMENT);
         // Otherwise check for some other Office core document types
         if (core.size() == 0) {
-            core = pkg.getRelationshipsByType(STRICT_CORE_DOCUMENT);
+            core = 
pkg.getRelationshipsByType(PackageRelationshipTypes.STRICT_CORE_DOCUMENT);
         }
         if (core.size() == 0) {
-            core = pkg.getRelationshipsByType(VISIO_DOCUMENT);
+            core = 
pkg.getRelationshipsByType(PackageRelationshipTypes.VISIO_CORE_DOCUMENT);
         }
         if (core.size() == 0) {
             core = pkg.getRelationshipsByType(XPS_DOCUMENT);