Merge pull request #1388 from veraPDF/pretty_print_json

Pretty print JSON report
veraPDF · Nov 23, 2023 · 226f137 · 226f137
2 parents dcd5336 + c853bb6
commit 226f137
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/core/src/main/java/org/verapdf/pdfa/validation/profiles/ErrorArgumentImpl.java b/core/src/main/java/org/verapdf/pdfa/validation/profiles/ErrorArgumentImpl.java
@@ -39,7 +39,7 @@ public final class ErrorArgumentImpl implements ErrorArgument {
     private final String argumentValue;
 
     private ErrorArgumentImpl() {
-        this("argument", "", null);
+        this("argument", null, null);
     }
 
     private ErrorArgumentImpl(final String argument, final String name, final String argumentValue) {

diff --git a/core/src/main/java/org/verapdf/pdfa/validation/profiles/Profiles.java b/core/src/main/java/org/verapdf/pdfa/validation/profiles/Profiles.java
@@ -117,7 +117,7 @@ public static ValidationProfile profileFromValues(final PDFAFlavour flavour, fin
 	 *             description or creator are empty.
 	 */
 	public static ValidationProfile profileFromSortedValues(final PDFAFlavour flavour, final ProfileDetails details,
-			final String hash, final SortedSet<Rule> rules, final Set<Variable> variables) {
+			final String hash, final SortedSet<Rule> rules, final SortedSet<Variable> variables) {
 		if (flavour == null)
 			throw new IllegalArgumentException("Parameter flavour can not be null.");
 		if (details == null)

diff --git a/core/src/main/java/org/verapdf/pdfa/validation/profiles/RuleImpl.java b/core/src/main/java/org/verapdf/pdfa/validation/profiles/RuleImpl.java
@@ -112,7 +112,7 @@ public String getTags() {
 
     @Override
     public Set<String> getTagsSet() {
-        return tags != null ? new HashSet<>(Arrays.asList(tags.split(","))) : Collections.emptySet();
+        return tags != null ? new LinkedHashSet<>(Arrays.asList(tags.split(","))) : Collections.emptySet();
     }
 
     /**

diff --git a/core/src/main/java/org/verapdf/pdfa/validation/profiles/ValidationProfileImpl.java b/core/src/main/java/org/verapdf/pdfa/validation/profiles/ValidationProfileImpl.java
@@ -74,13 +74,13 @@ private ValidationProfileImpl(final PDFAFlavour flavour,
 
     private ValidationProfileImpl(final PDFAFlavour flavour,
                                   final ProfileDetails details, final String hash,
-                                  final SortedSet<Rule> rules, final Set<Variable> variables) {
+                                  final SortedSet<Rule> rules, final SortedSet<Variable> variables) {
         super();
         this.flavour = flavour;
         this.details = details;
         this.hash = hash;
         this.rules = rules;
-        this.variables = new HashSet<>(variables);
+        this.variables = variables;
     }
 
     /**
@@ -132,8 +132,7 @@ public Set<Rule> getRulesByObject(final String objectName) {
             this.objectRuleMap = createObjectRuleMap(this.rules);
         }
         Set<Rule> objRules = this.objectRuleMap.get(objectName);
-        return (objRules == null) ? Collections.<Rule> emptySet() : Collections
-                .unmodifiableSet(objRules);
+        return objRules == null ? Collections.<Rule> emptySet() : Collections.unmodifiableSet(objRules);
     }
 
     /**
@@ -145,8 +144,7 @@ public Set<Variable> getVariablesByObject(String objectName) {
             this.objectVariableMap = createObjectVariableMap(this.variables);
         }
         Set<Variable> objRules = this.objectVariableMap.get(objectName);
-        return (objRules == null) ? Collections.<Variable> emptySet() : Collections
-                .unmodifiableSet(objRules);
+        return objRules == null ? Collections.<Variable> emptySet() : Collections.unmodifiableSet(objRules);
     }
 
     /**
@@ -249,7 +247,7 @@ static ValidationProfile fromValues(final PDFAFlavour flavour,
 
     static ValidationProfile fromSortedValues(final PDFAFlavour flavour,
                                                   final ProfileDetails details, final String hash,
-                                                  final SortedSet<Rule> rules, final Set<Variable> variables) {
+                                                  final SortedSet<Rule> rules, final SortedSet<Variable> variables) {
         return new ValidationProfileImpl(flavour, details, hash, rules,
                 variables);
     }

diff --git a/core/src/main/java/org/verapdf/processor/JsonHandler.java b/core/src/main/java/org/verapdf/processor/JsonHandler.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.Version;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import org.verapdf.ReleaseDetails;
 import org.verapdf.component.AuditDuration;
@@ -49,7 +50,7 @@ public class JsonHandler extends AbstractBatchHandler {
 
 	protected JsonHandler(Writer writer, boolean logPassed) {
 		this.writer = writer;
-		this.objectMapper = new ObjectMapper();
+		this.objectMapper = new ObjectMapper().enable(SerializationFeature.INDENT_OUTPUT);
 		this.logPassed = logPassed;
 		SimpleModule module = new SimpleModule("FeaturesNodeSerializer", new Version(2, 1,
 				3, null, null, null));