Output syntax errors when throwing an InvalidSchemaException

For this, depend on -core 1.2.3 (which fixes a missing key) and walk the previous report to search for syntax errors; append these to the ProcessingMessage we use to initialize the exception. Fixes issue java-json-tools#99. Signed-off-by: Francis Galiegue <[email protected]>
steve-khanna · May 25, 2014 · f054843 · f054843
1 parent 376c112
commit f054843
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/project.gradle b/project.gradle
@@ -34,7 +34,7 @@ project.ext {
  */
 dependencies {
     compile(group: "com.github.fge", name: "json-schema-core",
-        version: "1.2.1");
+        version: "1.2.3");
     compile(group: "javax.mail", name: "mailapi", version: "1.4.3");
     compile(group: "joda-time", name: "joda-time", version: "2.3");
     compile(group: "com.googlecode.libphonenumber", name: "libphonenumber",

diff --git a/src/main/java/com/github/fge/jsonschema/processors/validation/ValidationProcessor.java b/src/main/java/com/github/fge/jsonschema/processors/validation/ValidationProcessor.java
@@ -20,6 +20,8 @@
 package com.github.fge.jsonschema.processors.validation;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.github.fge.jackson.JacksonUtils;
 import com.github.fge.jackson.jsonpointer.JsonPointer;
 import com.github.fge.jsonschema.cfg.ValidationConfiguration;
 import com.github.fge.jsonschema.core.exceptions.InvalidSchemaException;
@@ -83,9 +85,27 @@ public FullData process(final ProcessingReport report,
          */
         final ValidatorList fullContext = processor.process(report, context);
 
-        if (fullContext == null)
-            throw new InvalidSchemaException(new ProcessingMessage()
-                .setMessage(syntaxMessages.getMessage("core.invalidSchema")));
+        if (fullContext == null) {
+            /*
+             * OK, that's for issue #99 but that's ugly nevertheless.
+             *
+             * We want syntax error messages to appear in the exception text.
+             */
+            final String msg = syntaxMessages.getMessage("core.invalidSchema");
+            final ArrayNode arrayNode = JacksonUtils.nodeFactory().arrayNode();
+            JsonNode node;
+            for (final ProcessingMessage message: report) {
+                node = message.asJson();
+                if ("syntax".equals(node.path("domain").asText()))
+                    arrayNode.add(node);
+            }
+            final StringBuilder sb = new StringBuilder(msg);
+            sb.append("\nSyntax errors:\n");
+            sb.append(JacksonUtils.prettyPrint(arrayNode));
+            final ProcessingMessage message = new ProcessingMessage()
+                .setMessage(sb.toString());
+            throw new InvalidSchemaException(message);
+        }
 
         /*
          * Get the calculated context. Build the data.