From 3561e4afe5ce42e2664bdfb09ed1da4baea104a7 Mon Sep 17 00:00:00 2001 From: Kakhnovich Raman Date: Tue, 24 Mar 2026 13:59:42 +0300 Subject: [PATCH 1/2] Update fixRevProperty method --- .../fixer/gf/impl/model/MetadataImpl.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/metadata-fixer/src/main/java/org/verapdf/metadata/fixer/gf/impl/model/MetadataImpl.java b/metadata-fixer/src/main/java/org/verapdf/metadata/fixer/gf/impl/model/MetadataImpl.java index 24059fbd3..c6c7b9545 100644 --- a/metadata-fixer/src/main/java/org/verapdf/metadata/fixer/gf/impl/model/MetadataImpl.java +++ b/metadata-fixer/src/main/java/org/verapdf/metadata/fixer/gf/impl/model/MetadataImpl.java @@ -56,8 +56,7 @@ public class MetadataImpl implements Metadata { private static final Logger LOGGER = Logger.getLogger(MetadataImpl.class.getCanonicalName()); private static final String YEAR_2020 = "2020"; - private static final String YEAR_202X = "0000"; - private static final String YEAR_REGEX = "^\\d{4}$"; + private static final String YEAR_2024 = "2024"; private static final String ADD_PROPERTY_MESSAGE = "Added property '%s' with value '%s' to Identification schema"; private static final String REMOVE_PROPERTY_MESSAGE = "Removed property '%s' from Identification schema"; @@ -316,16 +315,16 @@ private void fixRevProperty(MetadataFixerResultImpl.Builder resultBuilder, PDFAF return; } String namespaceURI = PDFFlavours.isFlavour(flavour, PDFAFlavour.PDFUA_2) ? XMPConst.NS_PDFUA_ID : XMPConst.NS_PDFA_ID; + String expectedRev = PDFFlavours.isFlavour(flavour, PDFAFlavour.PDFUA_2) ? YEAR_2024 : YEAR_2020; try { VeraPDFXMPNode rev = this.metadata.getProperty(namespaceURI, VeraPDFMeta.REVISION_YEAR); - if (rev == null) { - this.metadata.setIdentificationRevisionYear(namespaceURI, YEAR_202X); + if (rev == null || !expectedRev.equals(rev.getValue())) { + this.metadata.setIdentificationRevisionYear(namespaceURI, expectedRev); this.setNeedToBeUpdated(true); - resultBuilder.addFix(String.format(ADD_PROPERTY_MESSAGE, VeraPDFMeta.REVISION_YEAR, YEAR_2020)); - } else if (!rev.getValue().matches(YEAR_REGEX)) { - this.metadata.setIdentificationRevisionYear(namespaceURI, YEAR_202X); - this.setNeedToBeUpdated(true); - resultBuilder.addFix(String.format(SET_PROPERTY_MESSAGE, VeraPDFMeta.REVISION_YEAR, YEAR_2020)); + String message = (rev == null) + ? String.format(ADD_PROPERTY_MESSAGE, VeraPDFMeta.REVISION_YEAR, expectedRev) + : String.format(SET_PROPERTY_MESSAGE, VeraPDFMeta.REVISION_YEAR, expectedRev); + resultBuilder.addFix(message); } } catch (XMPException e) { LOGGER.log(Level.FINE, "Can not obtain identification fields.", e); From 43534a9dad4e6abe7f3c6d109187edfb5830f347 Mon Sep 17 00:00:00 2001 From: Kakhnovich Raman Date: Thu, 2 Apr 2026 11:33:38 +0300 Subject: [PATCH 2/2] Update MetadataImpl.java --- .../verapdf/metadata/fixer/gf/impl/model/MetadataImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/metadata-fixer/src/main/java/org/verapdf/metadata/fixer/gf/impl/model/MetadataImpl.java b/metadata-fixer/src/main/java/org/verapdf/metadata/fixer/gf/impl/model/MetadataImpl.java index c6c7b9545..588dcddab 100644 --- a/metadata-fixer/src/main/java/org/verapdf/metadata/fixer/gf/impl/model/MetadataImpl.java +++ b/metadata-fixer/src/main/java/org/verapdf/metadata/fixer/gf/impl/model/MetadataImpl.java @@ -321,9 +321,7 @@ private void fixRevProperty(MetadataFixerResultImpl.Builder resultBuilder, PDFAF if (rev == null || !expectedRev.equals(rev.getValue())) { this.metadata.setIdentificationRevisionYear(namespaceURI, expectedRev); this.setNeedToBeUpdated(true); - String message = (rev == null) - ? String.format(ADD_PROPERTY_MESSAGE, VeraPDFMeta.REVISION_YEAR, expectedRev) - : String.format(SET_PROPERTY_MESSAGE, VeraPDFMeta.REVISION_YEAR, expectedRev); + String message = String.format((rev == null) ? ADD_PROPERTY_MESSAGE : SET_PROPERTY_MESSAGE, VeraPDFMeta.REVISION_YEAR, expectedRev); resultBuilder.addFix(message); } } catch (XMPException e) {