Skip to content

Nested Map JSON Schema Support #90

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

Merged
avinas-kumar merged 7 commits into from
Jun 6, 2025
Merged

Nested Map JSON Schema Support #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8efba9a
testing schema failure fix
Jan 4, 2025
52a5db5
Merge remote-tracking branch 'origin/master' into schema_test
Mar 5, 2025
f663451
Merge remote-tracking branch 'origin/master' into schema_test
May 31, 2025
13a6654
Merge remote-tracking branch 'origin/master' into schema_test
Jun 3, 2025
8f3997b
Nested Map JSON Schema Support
Jun 4, 2025
02f7f62
Cleanup of test changes
Jun 4, 2025
a7d0f3f
Making primitive check before object conversion
gautamshanu Jun 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions cdi-core/src/main/java/com/linkedin/cdi/filter/JsonSchemaBasedFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@ private JsonElement filter(JsonIntermediateSchema.JisDataType dataType, JsonElem
return filter(dataType.getChildRecord(), input.getAsJsonObject());
} else if (dataType.getType() == JsonElementTypes.ARRAY) {
return filter(dataType.getItemType(), input.getAsJsonArray());
} else if (dataType.getType() == JsonElementTypes.MAP) {
JsonObject output = new JsonObject();
for (Map.Entry<String, JsonElement> entry: input.getAsJsonObject().entrySet()) {
output.add(entry.getKey(), filter(dataType.getItemType().getChildRecord(), entry.getValue().getAsJsonObject()));
}
return output;
}
return null;
}
Expand Down
8 changes: 8 additions & 0 deletions cdi-core/src/main/java/com/linkedin/cdi/util/JsonIntermediateSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,14 @@ public void setSymbols(JsonArray symbols) {
// an Enum has a list of symbols
this.setSymbols(dataTypeDefinition.get(KEY_WORD_SYMBOLS).getAsJsonArray());
break;
case MAP:
JsonElement valuesElement = dataTypeDefinition.get(KEY_WORD_VALUES);
if(valuesElement.isJsonPrimitive()) {
this.setItemType(new JisDataType(valuesElement.getAsString()));
} else {
this.setItemType(new JisDataType(valuesElement.getAsJsonObject().get(KEY_WORD_DATA_TYPE).getAsJsonObject()));
}
break;
case UNION:
// a Union has 2 or more different types
// TODO
Expand Down
2 changes: 1 addition & 1 deletion version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version=0.2.117
version=0.2.118