- refactor: reworked general cli result output

- fix: debug output

java/org/slub/rosetta/dps/repository/plugin/ValidationResultHandle.java

@@ -62,20 +62,31 @@ public class ValidationResultHandle {
         this.result = true;
     }
     public List<String> getErrors() {
-        System.out.println("---------------->");
-        print(ValidationLevel.debug);
-        System.out.println("<----------------");
+//        System.out.println("---------------->");
+//        print(ValidationLevel.debug);
+//        System.out.println("<----------------");
         return log
                 .stream()
                 .filter(f -> f.startsWith("[ERROR]") || f.startsWith("FATAL"))
                 .toList()
                 ;
     }
-    public String getLog() {
+    public String getInfoLogAsOneLine() {
         return log
                 .stream()
                 .filter(f -> !f.startsWith("[DEBUG]"))
                 .reduce( "\n", String::concat)
                 ;
+
+    }
+    public List<String> getInfoLog() {
+        return log
+                .stream()
+                .filter(f -> !f.startsWith("[DEBUG]"))
+                .toList()
+                ;
+    }
+    public List<String> getDebugLog() {
+        return log.stream().toList();
     }
 }

java/org/slub/rosetta/dps/repository/plugin/XmlFormatValidationPlugin.java

@@ -418,7 +418,20 @@ public class XmlFormatValidationPlugin implements FormatValidationPlugin {
 
     @Override
     public String getValidationDetails() {
-        return resultHandle.getLog();
+        return resultHandle.getInfoLogAsOneLine();
+    }
+    public List<String> getValidationInfoLog() {
+        return resultHandle.getInfoLog();
+    }
+
+    public List<String> getValidationDebugLog() {
+        return resultHandle.getDebugLog();
+    }
+
+    private static void printList(List<String> list) {
+        for (String entry: list) {
+            System.out.println(entry);
+        }
     }
 
     /** stand-alone check, main file to call local installed clamd
@@ -494,32 +507,35 @@ public class XmlFormatValidationPlugin implements FormatValidationPlugin {
         plugin.initParams(initp);
 
         // output result
-        System.out.println("----------------------------------");
-        System.out.println("Agent          : '" + plugin.getAgent() + "'");
-        System.out.println("DTD-Catalog    : '" + initp.get("catalog").trim() + "'");
-        System.out.println("Schema-Catalog : '" + initp.get("schemacatalog").trim() + "'");
-        System.out.println("Debug          : '" + plugin.debug + "'");
-        System.out.println();
+        if (plugin.debug) {
+            System.out.println("----------------------------------");
+            System.out.println("Agent          : '" + plugin.getAgent() + "'");
+            System.out.println("Profile        : '" + plugin.getProfile() + "'");
+            System.out.println("DTD-Catalog    : '" + initp.get("catalog").trim() + "'");
+            System.out.println("Schema-Catalog : '" + initp.get("schemacatalog").trim() + "'");
+            System.out.println("Debug          : '" + plugin.debug + "'");
+            System.out.println();
+        }
         for (String file : args) {
-            System.out.println("validation of file " + file);
+            System.out.println("----------------------------------");
+            System.out.println("Validation of file '" + file + "'");
             plugin.validateFormat( file );
-            System.out.println("\tisValid: " + plugin.isValid());
-            System.out.println("\tgetValidationDetails: ");
+            System.out.println("\tValidation details:");
             System.out.println("\t..........");
-            System.out.println(plugin.getValidationDetails());
+            printList(plugin.getValidationInfoLog());
             System.out.println("\t..........");
-            System.out.println("\tgetErrors : ");
+            System.out.println("\tValidation errors:");
             System.out.println("\t..........");
-            System.out.println(plugin.getErrors());
+            printList(plugin.getErrors());
             System.out.println("\t..........");
+            if (plugin.debug) {
+                System.out.println("\tValidation debug log:");
+                System.out.println("\t..........");
+                printList(plugin.getValidationDebugLog());
+                System.out.println("\t..........");
+            }
+            System.out.println("\tisValid: " + plugin.isValid());
         }
-        System.out.println("----------------------------------");
-        System.out.println("getAgent:");
-        System.out.println( plugin.getAgent());
-        System.out.println("----------------------------------");
-        System.out.println("getProfile:");
-        System.out.println( plugin.getProfile());
-        System.out.println("----------------------------------");
 
         // exit code
         if (plugin.isValid()) {