Merge branch 'master' of github.com:ZUGFeRD/mustangproject

Mustang-CLI/pom.xml

@@ -30,7 +30,7 @@
    <dependencies>
       <dependency>
          <groupId>org.mustangproject</groupId>
-         <artifactId>libraryExtended</artifactId>
+         <artifactId>validator</artifactId>
          <version>2.0.0-SNAPSHOT</version>
          <!-- prototypes of new mustangproject versions can be installed by referring to them and installed to the local repo from a jar file with
         mvn install:install-file -Dfile=mustang-1.5.4-SNAPSHOT.jar -DgroupId=org.mustangproject.ZUGFeRD -DartifactId=mustang -Dversion=1.5.4 -Dpackaging=jar -DgeneratePom=true
@@ -53,6 +53,21 @@
          <version>4.12</version>
          <scope>test</scope>
       </dependency>
+
+<!-- for directory validation: -->
+      <dependency>
+         <groupId>org.xmlunit</groupId>
+         <artifactId>xmlunit-core</artifactId>
+         <version>2.6.3</version>
+      </dependency>
+      <dependency>
+         <groupId>org.xmlunit</groupId>
+         <artifactId>xmlunit-assertj</artifactId>
+         <version>2.6.3</version>
+      </dependency>
+
+<!-- /directory validation: -->
+
    </dependencies>
    <build>
       <pluginManagement>

Mustang-CLI/src/main/java/org/mustangproject/commandline/Main.java

@@ -35,7 +35,7 @@ import org.mustangproject.ZUGFeRD.ZUGFeRDExporter;
 import org.mustangproject.ZUGFeRD.ZUGFeRDExporterFromA1Factory;
 import org.mustangproject.ZUGFeRD.ZUGFeRDImporter;
 import org.mustangproject.ZUGFeRD.ZUGFeRDMigrator;
-import org.mustangproject.library.extended.ZUGFeRDValidator;
+import org.mustangproject.validator.ZUGFeRDValidator;
 
 /***
  * This is the command line interface to mustangproject
@@ -324,6 +324,10 @@ public class Main {
 
 				optionsRecognized=performValidate(sourceName);
 
+			} else if ((action!=null)&&(action.equals("validateExpectValid"))) {
+
+				optionsRecognized=performValidateExpect(true, directoryName);
+
 			} else {
 				// no argument or argument unknown
 				printUsage();
@@ -354,6 +358,20 @@ public class Main {
 		return optionsRecognized;
 	}
 
+	private static boolean performValidateExpect(boolean valid, String dirName) {
+		ValidatorFileWalker zfWalk = new ValidatorFileWalker();
+		Path startingDir = Paths.get(dirName);
+		try {
+			Files.walkFileTree(startingDir, zfWalk);
+
+		} catch (IOException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+
+		return true;
+	}
+
 	private static void performUpgrade(String xmlName, String outName) throws IOException, TransformerException {
 
 		// Get params from user if not already defined

Mustang-CLI/src/main/java/org/mustangproject/commandline/ValidatorFileWalker.java

@@ -0,0 +1,78 @@
+package org.mustangproject.commandline;
+
+
+
+import java.io.IOException;
+import java.nio.file.FileSystems;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Path;
+import java.nio.file.PathMatcher;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.xmlunit.builder.Input;
+import org.xmlunit.xpath.JAXPXPathEngine;
+import org.xmlunit.xpath.XPathEngine;
+import org.mustangproject.validator.ZUGFeRDValidator;
+
+import static org.xmlunit.assertj.XmlAssert.assertThat;
+
+public  class ValidatorFileWalker
+    extends SimpleFileVisitor<Path> {
+	private static final Logger LOGGER = LoggerFactory.getLogger(ValidatorFileWalker.class.getCanonicalName()); // log
+	protected PathMatcher matcher;
+	protected ZUGFeRDValidator zul;
+	protected int fileCount=1;
+
+	public ValidatorFileWalker() {
+		this.zul = new ZUGFeRDValidator();
+		;
+		matcher = FileSystems.getDefault().getPathMatcher("glob:*.{pdf,xml}");
+
+	}
+    // Print information about
+    // each type of file.
+    @Override
+    public FileVisitResult visitFile(Path file,
+                                   BasicFileAttributes attr) {
+    	DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        //get current date time with Date()
+        Date date = new Date();
+        if ((attr!=null)&&(attr.isRegularFile())) {
+        	if (matcher.matches(file.getFileName())) {
+        		
+                LOGGER.info(String.format("\n@%s Testing file %d: %s ", dateFormat.format(date), fileCount++, file));
+                assertThat(zul.validate(file.toAbsolutePath().toString())).valueByXPath("/validation/summary/@status") 
+    			.asString() 
+    			.isEqualTo(
+    					"valid");
+
+        	}
+        }
+        return FileVisitResult.CONTINUE;
+    }
+
+    // Print each directory visited.
+    @Override
+    public FileVisitResult postVisitDirectory(Path dir,
+                                          IOException exc) {
+        LOGGER.info("\nDirectory: %s%n", dir);
+        return FileVisitResult.CONTINUE;
+    }
+
+    // If there is some error accessing
+    // the file, let the user know.
+    // If you don't override this method
+    // and an error occurs, an IOException 
+    // is thrown.
+    @Override
+    public FileVisitResult visitFileFailed(Path file,
+                                       IOException exc) {
+        LOGGER.error(exc.getMessage(),exc);
+        return FileVisitResult.CONTINUE;
+    }
+}

validator/pom.xml

@@ -75,7 +75,7 @@
         </dependency>
         <dependency>
             <groupId>org.mustangproject</groupId>
-            <artifactId>libraryBasic</artifactId>
+            <artifactId>library</artifactId>
             <version>2.0.0-SNAPSHOT</version>
             <!-- prototypes of new mustangproject versions can be installed by referring to them and installed to the local repo from a jar file with
            mvn install:install-file -Dfile=mustang-1.5.4-SNAPSHOT.jar -DgroupId=org.mustangproject.ZUGFeRD -DartifactId=mustang -Dversion=1.5.4 -Dpackaging=jar -DgeneratePom=true

validator/src/main/java/org/mustangproject/library/extended/EPart.java

@@ -1,5 +0,0 @@
-package org.mustangproject.library.extended;
-
-public enum EPart {
-	fx, xr, pdf, none
-}

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

@@ -0,0 +1,5 @@
+package org.mustangproject.validator;
+
+public enum EPart {
+	fx, xr, pdf, none
+}

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

@@ -1,4 +1,4 @@
-package org.mustangproject.library.extended;
+package org.mustangproject.validator;
 
 public enum ESeverity {
 	notice, warning, error, fatal, exception

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

@@ -1,4 +1,4 @@
-package org.mustangproject.library.extended;
+package org.mustangproject.validator;
 
 public class IrrecoverableValidationError extends Exception {
 

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

@@ -1,4 +1,4 @@
-package org.mustangproject.library.extended;
+package org.mustangproject.validator;
 
 import java.io.File;
 

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

@@ -1,4 +1,4 @@
-package org.mustangproject.library.extended;
+package org.mustangproject.validator;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

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

@@ -1,4 +1,4 @@
-package org.mustangproject.library.extended;
+package org.mustangproject.validator;
 
 import java.io.File;
 import java.io.FileOutputStream;

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

@@ -1,4 +1,4 @@
-package org.mustangproject.library.extended;
+package org.mustangproject.validator;
 
 import java.util.ArrayList;
 import java.util.Vector;

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

@@ -1,4 +1,4 @@
-package org.mustangproject.library.extended;
+package org.mustangproject.validator;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

@@ -1,4 +1,4 @@
-package org.mustangproject.library.extended;
+package org.mustangproject.validator;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

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

@@ -1,4 +1,4 @@
-package org.mustangproject.library.extended;
+package org.mustangproject.validator;
 
 import org.dom4j.io.XMLWriter;
 

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

@@ -1,4 +1,4 @@
-package org.mustangproject.library.extended;
+package org.mustangproject.validator;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;

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

@@ -1,4 +1,4 @@
-package org.mustangproject.library.extended;
+package org.mustangproject.validator;
 
 import java.io.File;
 import java.io.FileInputStream;

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

@@ -1,4 +1,4 @@
-package org.mustangproject.library.extended;
+package org.mustangproject.validator;
 
 import java.io.BufferedWriter;
 import java.io.File;

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

@@ -1,4 +1,4 @@
-package org.mustangproject.library.extended;
+package org.mustangproject.validator;
 
 import java.io.File;
 

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

@@ -1,5 +1,4 @@
-package org.mustangproject.library.extended;
-
+package org.mustangproject.validator;
 
 import java.io.File;
 import java.io.FileOutputStream;

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

@@ -1,5 +1,4 @@
-package org.mustangproject.library.extended;
-
+package org.mustangproject.validator;
 import static org.xmlunit.assertj.XmlAssert.assertThat;
 import java.io.File;
 import java.io.FileOutputStream;

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

@@ -1,6 +1,5 @@
-package org.mustangproject.library.extended;
+package org.mustangproject.validator;
 
-import static org.xmlunit.assertj.XmlAssert.assertThat;
 import java.io.File;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;