[FIXED JENKINS-40793] Add location information to validation errors

Specifically to the JSON output. This also moves us to not doing conversion between JSONObject and JsonNode, which is nice. There's probably some cleanup/optimization that could still be done in JSONParser.
jenkinsci · Jan 10, 2017 · 0a9ba67 · 0a9ba67
1 parent f1a0249
commit 0a9ba67
Show file tree

Hide file tree

Showing 18 changed files with 367 additions and 302 deletions.
diff --git a/...l-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTValue.java b/...l-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTValue.java
@@ -122,8 +122,10 @@ public String toGroovy() {
                     } else {
                         return "'''" + (str.replace("'''", "\\'\\'\\'")) + "'''";
                     }
-                } else {
+                } else if (getValue() != null) {
                     return getValue().toString();
+                } else {
+                    return "";
                 }
             }
         };

diff --git a/...el-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/Utils.groovy b/...el-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/Utils.groovy
@@ -383,7 +383,4 @@ public class Utils {
 
         return wrapper
     }
-
-
-
 }
diff --git a/...on/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/Converter.groovy b/...on/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/Converter.groovy
@@ -30,6 +30,9 @@ import com.fasterxml.jackson.datatype.jsonorg.JsonOrgModule
 import com.github.fge.jsonschema.exceptions.ProcessingException
 import com.github.fge.jsonschema.main.JsonSchema
 import com.github.fge.jsonschema.report.ProcessingReport
+import com.github.fge.jsonschema.tree.JsonTree
+import com.github.fge.jsonschema.tree.SimpleJsonTree
+import com.github.fge.jsonschema.util.JsonLoader
 import net.sf.json.JSONObject
 import org.apache.commons.lang.reflect.FieldUtils
 import org.codehaus.groovy.control.CompilationFailedException
@@ -67,8 +70,10 @@ public class Converter {
      * @throws ProcessingException If an error of high enough severity is detected in processing.
      */
     public static ProcessingReport validateJSONAgainstSchema(JSONObject origJson) throws ProcessingException {
-        JsonNode jsonNode = jacksonJSONFromJSONObject(origJson);
+        return validateJSONAgainstSchema(jacksonJSONFromJSONObject(origJson))
+    }
 
+    public static ProcessingReport validateJSONAgainstSchema(JsonNode jsonNode) throws ProcessingException {
         JsonSchema schema = ASTSchema.getJSONSchema();
 
         return schema.validate(jsonNode)
@@ -87,6 +92,10 @@ public class Converter {
         return mapper.valueToTree(input);
     }
 
+    public static JsonTree jsonTreeFromJSONObject(JSONObject input) {
+        return new SimpleJsonTree(jacksonJSONFromJSONObject(input))
+    }
+
     /**
      * Converts a script at a given URL into {@link ModelASTPipelineDef}
      *