corrently implement xmp exception

Author: jstaerk

validator/src/main/java/org/mustangproject/validator/PDFValidator.java

@@ -66,7 +66,7 @@ public PDFValidator(ValidationContext ctx) {
 	private String Signature;
 
 	private String zfXML = null;
-	protected boolean autoload=true;
+	protected boolean autoload = true;
 
 	protected static boolean stringArrayContains(String[] arr, String targetValue) {
 		return Arrays.asList(arr).contains(targetValue);
@@ -134,8 +134,7 @@ public void validate() throws IrrecoverableValidationError {
 		if (xmp == null || xmp.isEmpty()) {
 			context.addResultItem(new ValidationResultItem(ESeverity.error, "Invalid XMP Metadata not found")
 				.setSection(17).setPart(EPart.pdf));
-		}
-		else {
+		} else {
 			/*
 			 * checking for sth like <zf:ConformanceLevel>EXTENDED</zf:ConformanceLevel>
 			 * <zf:DocumentType>INVOICE</zf:DocumentType>
@@ -150,14 +149,7 @@ public void validate() throws IrrecoverableValidationError {
 
 				final DocumentBuilder builder = factory.newDocumentBuilder();
 				final InputSource is = new InputSource(new StringReader(xmp));
-				try {
-					docXMP = builder.parse(is);					
-				} catch (Exception e) {
-					context.addResultItem(
-						new ValidationResultItem(ESeverity.error, "XMP Metadata: Could not parse XMP metadata")
-							.setSection(10).setPart(EPart.pdf));
-					throw e;
-				}
+				docXMP = builder.parse(is);
 
 				final XPathFactory xpathFactory = XPathFactory.newInstance();
 
@@ -273,7 +265,11 @@ public void validate() throws IrrecoverableValidationError {
 							.setSection(16).setPart(EPart.pdf));
 
 				}
-			} catch (final SAXException | IOException | ParserConfigurationException | XPathExpressionException e) {
+			} catch (final SAXException e) {
+				context.addResultItem(
+					new ValidationResultItem(ESeverity.error, "XMP Metadata: Could not parse XMP metadata (XML invalid)")
+						.setSection(28).setPart(EPart.pdf));
+			} catch (IOException | ParserConfigurationException | XPathExpressionException e) {
 				LOGGER.error(e.getMessage(), e);
 			}
 		}
@@ -288,7 +284,7 @@ public void validate() throws IrrecoverableValidationError {
 		final byte[] pdfMachineSignature = "pdfMachine from Broadgun Software".getBytes(StandardCharsets.UTF_8);
 		final byte[] ghostscriptSignature = "%%Invocation:".getBytes(StandardCharsets.UTF_8);
 		final byte[] cibpdfbrewerSignature = "CIB pdf brewer".getBytes(StandardCharsets.UTF_8);
-		final byte[] lexofficeSignature = "lexoffice".getBytes(StandardCharsets.UTF_8);		
+		final byte[] lexofficeSignature = "lexoffice".getBytes(StandardCharsets.UTF_8);
 		final byte[] s2IndustriesSignature = "s2industries.ZUGFeRD.PDF".getBytes(StandardCharsets.UTF_8); // https://github.com/stephanstapel/ZUGFeRD-csharp
 		final byte[] factoorSharpSignature = "FactoorSharp".getBytes(StandardCharsets.UTF_8); // https://github.com/S2-Industries/FactoorSharp
 		final byte[] sevdeskSignature = "sevdesk".getBytes(StandardCharsets.UTF_8);
@@ -354,23 +350,23 @@ public void validate() throws IrrecoverableValidationError {
 	@Override
 	public void setFilename(String filename) throws IrrecoverableValidationError {
 		this.pdfFilename = filename;
-		if(autoload) {
+		if (autoload) {
 			try {
-				fileContents=Files.readAllBytes(Paths.get(pdfFilename));
+				fileContents = Files.readAllBytes(Paths.get(pdfFilename));
 			} catch (IOException ex) {
 				throw new IrrecoverableValidationError("Could not read file");
 			}
 		}
 	}
 
-  public void setFileContents(byte[] fileContents) {
-    this.fileContents = fileContents;
-  }
+	public void setFileContents(byte[] fileContents) {
+		this.fileContents = fileContents;
+	}
 
-  public void setFilenameAndContents(String filename, byte[] fileContents) {
-    this.pdfFilename = filename;
-    this.fileContents = fileContents;
-  }
+	public void setFilenameAndContents(String filename, byte[] fileContents) {
+		this.pdfFilename = filename;
+		this.fileContents = fileContents;
+	}
 
 	public String getRawXML() {
 		return zfXML;

validator/src/test/java/org/mustangproject/validator/PDFValidatorTest.java

@@ -178,7 +178,7 @@ public void testXMPValidation() {
 			actual = pv.getXMLResult();
 
 			assertEquals(true, actual
-					.contains("<error type=\"10\">XMP Metadata: Could not parse XMP metadata</error>"));
+					.contains("<error type=\"28\">XMP Metadata: Could not parse XMP metadata (XML invalid)</error>"));
 		} catch (final IrrecoverableValidationError e) {
 			// ignore, will be in XML output anyway
 		}