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

minor improvements to json library

This commit is contained in:
Grahame Grieve 2022-11-25 22:37:18 -03:00
parent 21bd9bf7e9
commit 450fa1d02c
3 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/json/JsonException.java
View File

@ -5,7 +5,7 @@ import org.hl7.fhir.exceptions.FHIRException;
public class JsonException extends FHIRException { public class JsonException extends FHIRException {
public JsonException(String msg) { public JsonException(String msg) {
// TODO Auto-generated constructor stub super(msg);
} }
} }

2
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/json/model/JsonArray.java
View File

@ -79,7 +79,7 @@ public class JsonArray extends JsonElement implements Iterable<JsonElement> {
} }
public JsonObject findByStringProp(JsonArray arr, String prop, String value) { public JsonObject findByStringProp(String prop, String value) {
for (JsonObject obj : asJsonObjects()) { for (JsonObject obj : asJsonObjects()) {
if (obj.has(prop) && value.equals(obj.asString(prop))) if (obj.has(prop) && value.equals(obj.asString(prop)))
return obj; return obj;

25
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/json/model/JsonObject.java
View File

@ -24,7 +24,9 @@ public class JsonObject extends JsonElement {
public JsonObject add(String name, JsonElement value) throws JsonException { public JsonObject add(String name, JsonElement value) throws JsonException {
check(name != null, "Name is null"); check(name != null, "Name is null");
check(value != null, "Value is null"); check(value != null, "Value is null");
check(get(name) == null, "Name '"+name+"' already exists"); if (get(name) != null) {
check(false, "Name '"+name+"' already exists (value = "+get(name).toString()+")");
}
JsonProperty p = new JsonProperty(name, value); JsonProperty p = new JsonProperty(name, value);
properties.add(p); properties.add(p);
propMap.put(name, p); propMap.put(name, p);
@ -116,6 +118,15 @@ public class JsonObject extends JsonElement {
return propMap.containsKey(name); return propMap.containsKey(name);
} }
public boolean has(String... names) {
for (String n : names) {
if (propMap.containsKey(n)) {
return true;
}
}
return false;
}
public void remove(String name) { public void remove(String name) {
if (propMap.containsKey(name)) { if (propMap.containsKey(name)) {
propMap.remove(name); propMap.remove(name);
@ -127,6 +138,10 @@ public class JsonObject extends JsonElement {
return properties; return properties;
} }
public List<String> getNames() {
return Utilities.sorted(propMap.keySet());
}
public String str(String name) { public String str(String name) {
if (hasPrimitive(name)) { if (hasPrimitive(name)) {
return get(name).asJsonPrimitive().getValue(); return get(name).asJsonPrimitive().getValue();
@ -298,6 +313,14 @@ public class JsonObject extends JsonElement {
return new JsonObject(); return new JsonObject();
} }
public JsonObject findByStringProp(String arrName, String prop, String value) {
for (JsonObject obj : getJsonObjects(arrName)) {
if (obj.has(prop) && value.equals(obj.asString(prop)))
return obj;
}
return null;
}
public void merge(JsonObject source) { public void merge(JsonObject source) {
for (JsonProperty pp : source.getProperties()) { for (JsonProperty pp : source.getProperties()) {
if (has(pp.getName())) { if (has(pp.getName())) {