From a12e7ee72daa0fb76556db7afb9493f00fedf905 Mon Sep 17 00:00:00 2001 From: Maxim Date: Sat, 21 Jun 2025 19:48:03 +0300 Subject: [PATCH 1/2] Add warning to policy generator --- .../verapdf/tools/policy/generator/PolicyGenerator.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/policy-generator/src/main/java/org/verapdf/tools/policy/generator/PolicyGenerator.java b/policy-generator/src/main/java/org/verapdf/tools/policy/generator/PolicyGenerator.java index a0f4ca4..0577113 100644 --- a/policy-generator/src/main/java/org/verapdf/tools/policy/generator/PolicyGenerator.java +++ b/policy-generator/src/main/java/org/verapdf/tools/policy/generator/PolicyGenerator.java @@ -33,7 +33,7 @@ public class PolicyGenerator { private static final String HELP = "[options] \n Options:"; - private static final Logger logger = Logger.getLogger(PolicyGenerator.class.getCanonicalName()); + private static final Logger LOGGER = Logger.getLogger(PolicyGenerator.class.getCanonicalName()); private Document document; private StringBuilder content; private String fileName; @@ -83,7 +83,7 @@ public static void main(String[] args) { generator.customProfile = Profiles.profileFromXml(is); } catch (JAXBException | FileNotFoundException e) { generator.customProfile = null; - logger.log(Level.WARNING, "Error while getting profile from xml file. The profile will be selected automatically"); + LOGGER.log(Level.WARNING, "Error while getting profile from xml file. The profile will be selected automatically"); } catch (IOException e) { e.printStackTrace(); } @@ -199,6 +199,9 @@ public void generate(boolean isTagged) { if (nodeList.getLength() == 0) { generateExceptionPolicy(); } else { + if (nodeList.getLength() > 1) { + LOGGER.log(Level.WARNING, "The validation report contains results for several profiles. Policy file is probably incorrect."); + } String profileName = nodeList.item(0).getAttributes().getNamedItem("profileName").getNodeValue(); String isCompliant = nodeList.item(0).getAttributes().getNamedItem("isCompliant").getNodeValue(); if ("true".equals(isCompliant)) { @@ -381,7 +384,7 @@ private void appendLogs() { private static String getSchString(String string) { if (string.contains("\"")) { - logger.log(Level.WARNING, "Log or error message contains double quote"); + LOGGER.log(Level.WARNING, "Log or error message contains double quote"); } return string.replace("&", "&") .replace("<", "<") From ac87e4d7e2e402874c2e0dd6ad71f013af2f95ec Mon Sep 17 00:00:00 2001 From: Maxim Date: Thu, 31 Jul 2025 18:56:31 +0300 Subject: [PATCH 2/2] Update policy generator --- .../org/verapdf/tools/policy/generator/PolicyGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/policy-generator/src/main/java/org/verapdf/tools/policy/generator/PolicyGenerator.java b/policy-generator/src/main/java/org/verapdf/tools/policy/generator/PolicyGenerator.java index 0577113..e2b3fdd 100644 --- a/policy-generator/src/main/java/org/verapdf/tools/policy/generator/PolicyGenerator.java +++ b/policy-generator/src/main/java/org/verapdf/tools/policy/generator/PolicyGenerator.java @@ -170,7 +170,7 @@ private void validate() throws IOException { null, null, fixConf, EnumSet.of(TaskType.VALIDATE), (String) null) : ProcessorFactory.fromValues(ValidatorFactory.createConfig(PDFAFlavour.NO_FLAVOUR, PDFAFlavour.NO_FLAVOUR, true, 0, false, isLogsEnabled, Level.WARNING, - BaseValidator.DEFAULT_MAX_NUMBER_OF_DISPLAYED_FAILED_CHECKS, false, "", false, false), + BaseValidator.DEFAULT_MAX_NUMBER_OF_DISPLAYED_FAILED_CHECKS, true, "", false, false), null, null, fixConf, EnumSet.of(TaskType.VALIDATE), this.customProfile, null); BatchProcessor processor = ProcessorFactory.fileBatchProcessor(processorConfig);