This is an automated email from the ASF dual-hosted git repository. tilman pushed a commit to branch branch_2x in repository https://gitbox.apache.org/repos/asf/tika.git
commit d889f948621be418787d487098208f8d947a8efc Author: Tilman Hausherr <[email protected]> AuthorDate: Mon Mar 16 16:22:59 2026 +0100 TIKA-4614: remove PDFBOX30 preparation; use correct method --- .../tika/parser/xmp/XMPMetadataExtractor.java | 24 +++++++--------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/src/main/java/org/apache/tika/parser/xmp/XMPMetadataExtractor.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/src/main/java/org/apache/tika/parser/xmp/XMPMetadataExtractor.java index 17fff169c8..a350fc741c 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/src/main/java/org/apache/tika/parser/xmp/XMPMetadataExtractor.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xmp-commons/src/main/java/org/apache/tika/parser/xmp/XMPMetadataExtractor.java @@ -28,7 +28,6 @@ import org.apache.xmpbox.schema.XMPBasicSchema; import org.apache.xmpbox.schema.XMPMediaManagementSchema; import org.apache.xmpbox.type.AbstractField; import org.apache.xmpbox.type.ArrayProperty; -import org.apache.xmpbox.type.BadFieldValueException; import org.apache.xmpbox.type.ResourceEventType; import org.apache.xmpbox.type.ResourceRefType; import org.apache.xmpbox.xml.DomXmpParser; @@ -85,19 +84,11 @@ public class XMPMetadataExtractor { } DublinCoreSchema schemaDublinCore = xmp.getDublinCoreSchema(); if (schemaDublinCore != null) { - try { - addMetadata(metadata, DublinCore.TITLE, schemaDublinCore.getTitle()); - addMetadata(metadata, DublinCore.FORMAT, schemaDublinCore.getFormat()); - addMetadata(metadata, DublinCore.DESCRIPTION, schemaDublinCore.getDescription()); - addMetadata(metadata, DublinCore.CREATOR, schemaDublinCore.getCreators()); - addMetadata(metadata, DublinCore.SUBJECT, schemaDublinCore.getSubjects()); - //TODO PDFBOX30 this segment no longer needed with 3.0 - if (false != false) - throw new BadFieldValueException(""); - } - catch (BadFieldValueException ex) { - throw new IOException(ex); - } + addMetadata(metadata, DublinCore.TITLE, schemaDublinCore.getTitle()); + addMetadata(metadata, DublinCore.FORMAT, schemaDublinCore.getFormat()); + addMetadata(metadata, DublinCore.DESCRIPTION, schemaDublinCore.getDescription()); + addMetadata(metadata, DublinCore.CREATOR, schemaDublinCore.getCreators()); + addMetadata(metadata, DublinCore.SUBJECT, schemaDublinCore.getSubjects()); } } @@ -161,9 +152,8 @@ public class XMPMetadataExtractor { metadata.set(XMPMM.INSTANCEID, mmSchema.getInstanceID()); metadata.set(XMPMM.ORIGINAL_DOCUMENTID, mmSchema.getOriginalDocumentID()); - //ResourceRefType derivedFrom = mmSchema.getDerivedFromProperty(); //TODO after XMPBox 3.0.7 - ResourceRefType derivedFrom = mmSchema.getResourceRefProperty(); - + ResourceRefType derivedFrom = mmSchema.getDerivedFromProperty(); + if (derivedFrom != null) { addMetadata(metadata, XMPMM.DERIVED_FROM_DOCUMENTID, derivedFrom.getDocumentID()); addMetadata(metadata, XMPMM.DERIVED_FROM_INSTANCEID, derivedFrom.getInstanceID());
