Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix jsonmerge for boolean and null values #410

Merged
merged 2 commits into from
Jun 4, 2020
Merged

fix jsonmerge for boolean and null values #410

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e77ab98
fix merge for boolean and null values
maybeec May 5, 2020
11f4540
Merge branch 'master' into fix-jsonmerge
hohwille Jun 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 18 additions & 13 deletions configurator/src/main/java/com/devonfw/tools/ide/configurator/merge/JsonMerger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import javax.json.Json;
import javax.json.JsonArray;
import javax.json.JsonArrayBuilder;
import javax.json.JsonNumber;
import javax.json.JsonObject;
import javax.json.JsonObjectBuilder;
import javax.json.JsonReader;
Expand Down Expand Up @@ -119,23 +118,29 @@ public void inverseMerge(File workspaceFile, VariableResolver resolver, boolean

private JsonValue mergeAndResolve(JsonValue json, JsonValue mergeJson, VariableResolver resolver, Status status) {

if (json instanceof JsonObject) {
return mergeAndResolveObject((JsonObject) json, (JsonObject) mergeJson, resolver, status);
} else if (json instanceof JsonArray) {
return mergeAndResolveArray((JsonArray) json, (JsonArray) mergeJson, resolver, status);
} else if (json instanceof JsonString) {
return mergeAndResolveString((JsonString) json, (JsonString) mergeJson, resolver, status);
} else if (json instanceof JsonNumber) {
return mergeAndResolveNumber((JsonNumber) json, (JsonNumber) mergeJson, resolver, status);
} else if (json == null) {
if (json == null) {
if (mergeJson == null) {
return null;
} else {
return mergeAndResolve(mergeJson, null, resolver, status);
}
} else {
Log.err("Undefined JSON type: " + json);
return null;
switch (json.getValueType()) {
case OBJECT:
return mergeAndResolveObject((JsonObject) json, (JsonObject) mergeJson, resolver, status);
case ARRAY:
return mergeAndResolveArray((JsonArray) json, (JsonArray) mergeJson, resolver, status);
case STRING:
return mergeAndResolveString((JsonString) json, (JsonString) mergeJson, resolver, status);
case NUMBER:
case FALSE:
case TRUE:
case NULL:
return mergeAndResolveNativeType(json, mergeJson, resolver, status);
default:
Log.err("Undefined JSON type: " + json.getClass());
return null;
}
}
}

Expand Down Expand Up @@ -207,7 +212,7 @@ private JsonString mergeAndResolveString(JsonString json, JsonString mergeJson,
return Json.createValue(resolvedString);
}

private JsonNumber mergeAndResolveNumber(JsonNumber json, JsonNumber mergeJson, VariableResolver resolver,
private JsonValue mergeAndResolveNativeType(JsonValue json, JsonValue mergeJson, VariableResolver resolver,
Status status) {

if (mergeJson == null) {
Expand Down