honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improve json parsing errors when validating

This commit is contained in:
Grahame Grieve 2019-11-10 21:06:16 +11:00
parent e42d482326
commit f3b97771d5
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/JsonParser.java
View File

@ -118,7 +118,7 @@ public class JsonParser extends ParserBase {
return null; return null;
} else { } else {
String name = rt.getAsString(); String name = rt.getAsString();
String path = "/"+name; String path = name;
StructureDefinition sd = getDefinition(line(object), col(object), name); StructureDefinition sd = getDefinition(line(object), col(object), name);
if (sd == null) if (sd == null)
@ -193,12 +193,14 @@ public class JsonParser extends ParserBase {
private void parseChildComplex(String path, JsonObject object, Element context, Set<String> processed, Property property, String name) throws FHIRException { private void parseChildComplex(String path, JsonObject object, Element context, Set<String> processed, Property property, String name) throws FHIRException {
processed.add(name); processed.add(name);
String npath = path+"/"+property.getName(); String npath = path+"."+property.getName();
JsonElement e = object.get(name); JsonElement e = object.get(name);
if (property.isList() && (e instanceof JsonArray)) { if (property.isList() && (e instanceof JsonArray)) {
JsonArray arr = (JsonArray) e; JsonArray arr = (JsonArray) e;
int c = 0;
for (JsonElement am : arr) { for (JsonElement am : arr) {
parseChildComplexInstance(npath, object, context, property, name, am); parseChildComplexInstance(npath+"["+c+"]", object, context, property, name, am);
c++;
} }
} else { } else {
if (property.isList()) { if (property.isList()) {
@ -231,11 +233,21 @@ public class JsonParser extends ParserBase {
else else
parseChildren(npath, child, n, false); parseChildren(npath, child, n, false);
} else } else
logError(line(e), col(e), npath, IssueType.INVALID, "This property must be "+(property.isList() ? "an Array" : "an Object")+", not a "+e.getClass().getName(), IssueSeverity.ERROR); logError(line(e), col(e), npath, IssueType.INVALID, "This property must be "+(property.isList() ? "an Array" : "an Object")+", not "+describe(e), IssueSeverity.ERROR);
}
private String describe(JsonElement e) {
if (e instanceof JsonArray) {
return "an array";
}
if (e instanceof JsonObject) {
return "an object";
}
return "a primitive property";
} }
private void parseChildPrimitive(JsonObject object, Element context, Set<String> processed, Property property, String path, String name) throws FHIRException { private void parseChildPrimitive(JsonObject object, Element context, Set<String> processed, Property property, String path, String name) throws FHIRException {
String npath = path+"/"+property.getName(); String npath = path+"."+property.getName();
processed.add(name); processed.add(name);
processed.add("_"+name); processed.add("_"+name);
JsonElement main = object.has(name) ? object.get(name) : null; JsonElement main = object.has(name) ? object.get(name) : null;
@ -265,9 +277,9 @@ public class JsonParser extends ParserBase {
private void parseChildPrimitiveInstance(Element context, Property property, String name, String npath, private void parseChildPrimitiveInstance(Element context, Property property, String name, String npath,
JsonElement main, JsonElement fork) throws FHIRException { JsonElement main, JsonElement fork) throws FHIRException {
if (main != null && !(main instanceof JsonPrimitive)) if (main != null && !(main instanceof JsonPrimitive))
logError(line(main), col(main), npath, IssueType.INVALID, "This property must be an simple value, not a "+main.getClass().getName(), IssueSeverity.ERROR); logError(line(main), col(main), npath, IssueType.INVALID, "This property must be an simple value, not "+describe(main), IssueSeverity.ERROR);
else if (fork != null && !(fork instanceof JsonObject)) else if (fork != null && !(fork instanceof JsonObject))
logError(line(fork), col(fork), npath, IssueType.INVALID, "This property must be an object, not a "+fork.getClass().getName(), IssueSeverity.ERROR); logError(line(fork), col(fork), npath, IssueType.INVALID, "This property must be an object, not "+describe(fork), IssueSeverity.ERROR);
else { else {
Element n = new Element(name, property).markLocation(line(main != null ? main : fork), col(main != null ? main : fork)); Element n = new Element(name, property).markLocation(line(main != null ? main : fork), col(main != null ? main : fork));
context.getChildren().add(n); context.getChildren().add(n);