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 for container conversions in JsonConverter #417

Merged
merged 1 commit into from
Aug 30, 2023
Merged

Fix for container conversions in JsonConverter #417

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 13 additions & 8 deletions api/src/main/java/edu/cornell/mannlib/vitro/webapp/dynapi/data/conversion/JSONConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,7 @@ private static DocumentContext getOutputTemplate(Procedure procedure) {
public static void readParam(DataStore dataStore, ReadContext ctx, String name, Parameter param, Procedure procedure) throws ConversionException {
String paramPath = getReadPath(name, param, procedure);
JsonNode node = ctx.read(paramPath, JsonNode.class);
Data data = new Data(param);
data.setRawString(node.asText());
data.earlyInitialization();
dataStore.addData(name, data);
readParam(dataStore, name, param, node);
}

public static void readOptionalParam(DataStore dataStore, ReadContext ctx, String name, Parameter param,
Expand All @@ -169,16 +166,24 @@ public static void readOptionalParam(DataStore dataStore, ReadContext ctx, Strin
try {
JsonNode node = ctx.read(paramPath, JsonNode.class);
if (node != null && !node.isMissingNode() && !node.isNull()) {
Data data = new Data(param);
data.setRawString(node.asText());
data.earlyInitialization();
dataStore.addData(name, data);
readParam(dataStore, name, param, node);
}
} catch (Exception e) {
log.debug(e,e);
}
}

private static void readParam(DataStore dataStore, String name, Parameter param, JsonNode node) {
Data data = new Data(param);
if (node.isContainerNode()) {
data.setRawString(node.toString());
} else {
data.setRawString(node.asText());
}
data.earlyInitialization();
dataStore.addData(name, data);
}

private static JsonNode injectResourceId(String jsonString, DataStore dataStore, Procedure procedure)
throws ConversionException {
final String resourceId = dataStore.getResourceId();
Expand Down
Loading