Merge pull request #405 from Sarenor/autoload-in-validator

Moved Autoload to validator
ZUGFeRD · Jul 10, 2024 · 56b0749 · 56b0749
2 parents fb7fe28 + 94b7b75
commit 56b0749
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/validator/src/main/java/org/mustangproject/validator/PDFValidator.java b/validator/src/main/java/org/mustangproject/validator/PDFValidator.java
@@ -65,6 +65,7 @@ public PDFValidator(ValidationContext ctx) {
 	private String Signature;
 
 	private String zfXML = null;
+	protected boolean autoload=true;
 
 	protected static boolean stringArrayContains(String[] arr, String targetValue) {
 		return Arrays.asList(arr).contains(targetValue);
@@ -319,13 +320,13 @@ public void validate() throws IrrecoverableValidationError {
 	@Override
 	public void setFilename(String filename) throws IrrecoverableValidationError {
 		this.pdfFilename = filename;
-		try {
-			fileContents=Files.readAllBytes(Paths.get(pdfFilename));
-		} catch (IOException ex) {
-			throw new IrrecoverableValidationError("Could not read file");
+		if(autoload) {
+			try {
+				fileContents=Files.readAllBytes(Paths.get(pdfFilename));
+			} catch (IOException ex) {
+				throw new IrrecoverableValidationError("Could not read file");
+			}
 		}
-
-
 	}
 
 	public void setFileContents(byte[] fileContents) {

diff --git a/validator/src/main/java/org/mustangproject/validator/Validator.java b/validator/src/main/java/org/mustangproject/validator/Validator.java
@@ -19,6 +19,7 @@ public abstract class Validator {
 	private static final Logger LOGGER = LoggerFactory.getLogger(Validator.class.getCanonicalName()); // log output
 
 	protected ValidationContext context;
+	protected boolean autoload=true;
 
 	public Validator(ValidationContext ctx){
 		this.context=ctx;
@@ -77,6 +78,10 @@ public ValidationContext getValidationContext() {
 		return context;
 	}
 
+	public void setAutoload(boolean autoload) {
+		this.autoload = autoload;
+	}
+
 
 
 }
diff --git a/validator/src/main/java/org/mustangproject/validator/XMLValidator.java b/validator/src/main/java/org/mustangproject/validator/XMLValidator.java
@@ -36,7 +36,6 @@ public class XMLValidator extends Validator {
 
 	protected String zfXML = "";
 	protected String filename = "";
-	protected boolean autoload=true;
 	int firedRules = 0;
 	int failedRules = 0;
 	boolean disableNotices = false;
@@ -74,11 +73,6 @@ public void setFilename(String name) throws IrrecoverableValidationError { // fr
 
 	}
 
-	public void disableAutoload() {
-		// for streaming, which sets a fake filename
-		autoload=false;
-	}
-
 	/***
 	 * manually set the xml content
 	 * @param xml the xml to be checked

diff --git a/validator/src/main/java/org/mustangproject/validator/ZUGFeRDValidator.java b/validator/src/main/java/org/mustangproject/validator/ZUGFeRDValidator.java
@@ -257,6 +257,7 @@ public String validate(InputStream inputStream, String fileNameOfInputStream) {
 				isPDF = ByteArraySearcher.contains(content, new byte[]{'%', 'P', 'D', 'F'});
 				XMLValidator xv = new XMLValidator(context);
 				if (isPDF) {
+					pdfv.setAutoload(false);
 					pdfv.setFilename(fileNameOfInputStream);
 					pdfv.setFileContents(content);
 
@@ -296,7 +297,7 @@ public String validate(InputStream inputStream, String fileNameOfInputStream) {
 					if (isXML) {
 						pdfValidity = true;
 						optionsRecognized = true;
-						xv.disableAutoload();
+						xv.setAutoload(false);
 						xv.setFilename(fileNameOfInputStream);
 						sha1Checksum = calcSHA1(inputStream);