Skip to content
Snippets Groups Projects
Commit e4fb2b81 authored by Ludovic Claude's avatar Ludovic Claude
Browse files

Return only data part of Experiments

Fixes HBPLD-302
parent af1cf0b2
No related branches found
No related tags found
No related merge requests found
......@@ -47,6 +47,7 @@ public class ExperimentActor extends AbstractActor {
experiment.setHasServerError(true);
experiment.setResult(queryResult.error().get());
} else {
// TODO: use new WokenConversions().toJson(queryResult)
experiment.setResult(queryResult.data().get().compactPrint());
}
experiment.setFinished(Date.from(queryResult.timestamp().toInstant()));
......
......@@ -19,7 +19,13 @@ public class PortalErrorAttributes extends DefaultErrorAttributes {
Map<String, Object> errorAttributes = super.getErrorAttributes(requestAttributes, includeStackTrace);
Throwable throwable = getError(requestAttributes);
LOGGER.warn("Reporting server error", throwable);
StringBuilder sb = new StringBuilder("[");
for (String attr: requestAttributes.getAttributeNames(RequestAttributes.SCOPE_REQUEST)) {
Object v = requestAttributes.getAttribute(attr, RequestAttributes.SCOPE_REQUEST);
sb.append(attr).append(" = ").append(v).append('\n');
}
sb.append("]");
LOGGER.error("Reporting server error on request with attributes " + sb.toString(), throwable);
if (throwable != null) {
......
......@@ -272,7 +272,8 @@ public class ExperimentApi extends WokenClientController {
experiment.setHasServerError(true);
LOGGER.error("Experiment failed with message: " + queryResult.error().get());
}
experiment.setResult(new WokenConversions().toJson(queryResult));
// TODO: use new WokenConversions().toJson(queryResult)
experiment.setResult(queryResult.data().get().compactPrint());
experiment.setFinished(Date.from(queryResult.timestamp().toInstant()));
experimentRepository.save(experiment);
LOGGER.info("Experiment " + uuid + " updated (finished)");
......
......@@ -309,7 +309,7 @@ public class Experiment {
exp.remove("result");
if (!isExaremeAlgorithm._1) {
JsonArray jsonResult = parser.parse(this.result).getAsJsonArray();
JsonElement jsonResult = parser.parse(this.result);
exp.add("result", jsonResult);
} else {
JsonArray jsonArrayResult = new JsonArray();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment