Update property types to Set/List of String

veraPDF · May 15, 2024 · 57360af · 57360af
1 parent e9616d1
commit 57360af
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/core/src/main/resources/org/verapdf/pdfa/validation/PDFUA-1.xml b/core/src/main/resources/org/verapdf/pdfa/validation/PDFUA-1.xml
@@ -79,7 +79,7 @@
         <rule object="SEMarkedContent" tags="artifact">
             <id specification="ISO_14289_1" clause="7.1" testNumber="2"/>
             <description>Tagged content should not present inside content marked as Artifact</description>
-            <test>isTaggedContent == false || parentsTags.split('&amp;').filter(elem =&gt; elem == 'Artifact').length == 0</test>
+            <test>isTaggedContent == false || parentsTags.contains('Artifact') == false</test>
             <error>
                 <message>Tagged content (parent struct element %1) is present inside content marked as Artifact</message>
                 <arguments>
@@ -91,7 +91,7 @@
         <rule object="SESimpleContentItem" tags="artifact">
             <id specification="ISO_14289_1" clause="7.1" testNumber="3"/>
             <description>Content shall be marked as Artifact or tagged as real content</description>
-            <test>isTaggedContent == true || parentsTags.split('&amp;').filter(elem =&gt; elem == 'Artifact').length &gt; 0</test>
+            <test>isTaggedContent == true || parentsTags.contains('Artifact') == true</test>
             <error>
                 <message>Content is neither marked as Artifact nor tagged as real content</message>
                 <arguments/>

diff --git a/core/src/main/resources/org/verapdf/pdfa/validation/PDFUA-2-ISO32005.xml b/core/src/main/resources/org/verapdf/pdfa/validation/PDFUA-2-ISO32005.xml
@@ -91,7 +91,7 @@
         <rule object="SESimpleContentItem" tags="artifact">
             <id specification="ISO_14289_2" clause="8.2.2" testNumber="1"/>
             <description>Content that is not considered real shall be an artifact</description>
-            <test>isTaggedContent == true || parentsTags.split('&amp;').filter(elem =&gt; elem == 'Artifact').length &gt; 0</test>
+            <test>isTaggedContent == true || parentsTags.contains('Artifact') == true</test>
             <error>
                 <message>Content is neither marked as Artifact nor tagged as real content</message>
                 <arguments/>

diff --git a/core/src/main/resources/org/verapdf/pdfa/validation/WTPDF-1-0-Accessibility.xml b/core/src/main/resources/org/verapdf/pdfa/validation/WTPDF-1-0-Accessibility.xml
@@ -9,7 +9,7 @@
         <rule object="MainXMPPackage" tags="metadata">
             <id specification="WTPDF_1_0" clause="6.1.3" testNumber="1"/>
             <description>File conforming to the WTPDF 1.0 conformance level for accessibility shall include a PDF Declaration with the URI identifier "http://pdfa.org/declarations/wtpdf#accessibility1.0" as its pdfd:conformsTo entry</description>
-            <test>declarations.split(',').filter(declarations =&gt; declarations == 'http://pdfa.org/declarations/wtpdf#accessibility1.0').length == 1</test>
+            <test>declarations.contains('http://pdfa.org/declarations/wtpdf#accessibility1.0') == true</test>
             <error>
                 <message>File conforming to the WTPDF 1.0 conformance level for accessibility doesn't include a PDF Declaration with the URI identifier "http://pdfa.org/declarations/wtpdf#accessibility1.0" as its pdfd:conformsTo entry</message>
                 <arguments/>
@@ -43,7 +43,7 @@
         <rule object="SESimpleContentItem" tags="artifact">
             <id specification="WTPDF_1_0" clause="8.2.2" testNumber="1"/>
             <description>Content that is not considered real shall be an artifact</description>
-            <test>isTaggedContent == true || parentsTags.split('&amp;').filter(elem =&gt; elem == 'Artifact').length &gt; 0</test>
+            <test>isTaggedContent == true || parentsTags.contains('Artifact') == true</test>
             <error>
                 <message>Content is neither marked as Artifact nor tagged as real content</message>
                 <arguments/>

diff --git a/core/src/main/resources/org/verapdf/pdfa/validation/WTPDF-1-0-Reuse.xml b/core/src/main/resources/org/verapdf/pdfa/validation/WTPDF-1-0-Reuse.xml
@@ -9,7 +9,7 @@
         <rule object="MainXMPPackage" tags="metadata">
             <id specification="WTPDF_1_0" clause="6.1.2" testNumber="1"/>
             <description>File conforming to the WTPDF 1.0 conformance level for reuse shall include a PDF Declaration with the URI identifier "http://pdfa.org/declarations/wtpdf#reuse1.0" as its pdfd:conformsTo entry</description>
-            <test>declarations.split(',').filter(declarations =&gt; declarations == 'http://pdfa.org/declarations/wtpdf#reuse1.0').length == 1</test>
+            <test>declarations.contains('http://pdfa.org/declarations/wtpdf#reuse1.0') == true</test>
             <error>
                 <message>File conforming to the WTPDF 1.0 conformance level for reuse doesn't include a PDF Declaration with the URI identifier "http://pdfa.org/declarations/wtpdf#reuse1.0" as its pdfd:conformsTo entry</message>
                 <arguments/>
@@ -43,7 +43,7 @@
         <rule object="SESimpleContentItem" tags="artifact">
             <id specification="WTPDF_1_0" clause="8.2.2" testNumber="1"/>
             <description>Content that is not considered real shall be an artifact</description>
-            <test>isTaggedContent == true || parentsTags.split('&amp;').filter(elem =&gt; elem == 'Artifact').length &gt; 0</test>
+            <test>isTaggedContent == true || parentsTags.contains('Artifact') == true</test>
             <error>
                 <message>Content is neither marked as Artifact nor tagged as real content</message>
                 <arguments/>