(tika) branch branch_2x updated: TIKA-4404: fix conformance retrieval and test

[tilman]

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


The following commit(s) were added to refs/heads/branch_2x by this push:
     new 9548c4256 TIKA-4404: fix conformance retrieval and test
9548c4256 is described below

commit 9548c42564e1f99b6a6395bbf1f41336827883b5
Author: Tilman Hausherr <til...@apache.org>
AuthorDate: Thu Apr 10 16:38:32 2025 +0200

    TIKA-4404: fix conformance retrieval and test
---
 .../src/main/java/org/apache/tika/parser/pdf/PDMetadataExtractor.java | 4 ++--
 .../src/test/java/org/apache/tika/parser/pdf/CustomTikaXMPTest.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDMetadataExtractor.java
 
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDMetadataExtractor.java
index 17b748ebb..f10bf8f3c 100644
--- 
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDMetadataExtractor.java
+++ 
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/main/java/org/apache/tika/parser/pdf/PDMetadataExtractor.java
@@ -171,8 +171,8 @@ public class PDMetadataExtractor {
                     metadata.set(PDF.PDFX_VERSION, version);
                 }
                 String conformance = XMPSchemaPDFX.getPDFXConformance();
-                if (!StringUtils.isBlank(version)) {
-                    metadata.set(PDF.PDFX_CONFORMANCE, version);
+                if (!StringUtils.isBlank(conformance)) {
+                    metadata.set(PDF.PDFX_CONFORMANCE, conformance);
                 }
             }
         } catch (IOException e) {
diff --git 
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/CustomTikaXMPTest.java
 
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/CustomTikaXMPTest.java
index f63d0a3bb..ded6cffd5 100644
--- 
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/CustomTikaXMPTest.java
+++ 
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/CustomTikaXMPTest.java
@@ -51,7 +51,7 @@ public class CustomTikaXMPTest extends TikaTest {
         Metadata metadata = extract("testPDFX.xmp");
         assertEquals("PDF/X-1:2001", metadata.get(PDF.PDFXID_VERSION));
         assertEquals("PDF/X-1:2001", metadata.get(PDF.PDFX_VERSION));
-        assertEquals("PDF/X-1:2001", metadata.get(PDF.PDFX_CONFORMANCE));
+        assertEquals("PDF/X-1a:2001", metadata.get(PDF.PDFX_CONFORMANCE));
     }
 
     @Test