TIKA-4551: support xmpMM:InstanceID

Author: THausherr

tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/src/main/java/org/apache/tika/parser/xmp/JempboxExtractor.java

@@ -131,8 +131,10 @@ public static void extractXMPMM(XMPMetadata xmp, Metadata metadata) {
         }
         if (mmSchema != null) {
             addMetadata(metadata, XMPMM.DOCUMENTID, mmSchema.getDocumentID());
-            //not currently supported by JempBox...
-//          metadata.set(XMPMM.INSTANCEID, mmSchema.getInstanceID());
+            // not currently supported by JempBox...
+            // but might be in 1.8.18 if ever released, see PDFBOX-6116
+            // until then use workaround (won't work if non standard prefix is used)
+            metadata.set(XMPMM.INSTANCEID, mmSchema.getTextProperty("xmpMM:InstanceID" ));
 
             ResourceRef derivedFrom = mmSchema.getDerivedFrom();
             if (derivedFrom != null) {

tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/src/test/java/org/apache/tika/parser/xmp/JempboxExtractorTest.java

@@ -144,4 +144,14 @@ public void testModifiedTZ() throws Exception {
         assertEquals("2014-03-04T22:50:41Z", m.get(XMPMM.HISTORY_WHEN));
     }
 
+    @Test
+    public void testXMPMMMisc() throws Exception {
+        Metadata m = new Metadata();
+        JempboxExtractor ex = new JempboxExtractor(m);
+        try (InputStream is = getResourceAsStream("/test-documents/testXMP.xmp")) {
+            ex.parse(is);
+        }
+        assertEquals("uuid:cccee1fc-51b3-4b52-ac86-672af3974d25", m.getValues(XMPMM.DOCUMENTID)[0]);
+        assertEquals("uuid:afa71b09-7cc5-48ac-8664-ac6dcf8b5ab4", m.getValues(XMPMM.INSTANCEID)[0]);
+    }
 }