Change in JSON table format.

This commit is contained in:
Fabian Märki
2016-11-15 10:04:29 +01:00
parent a4cdf8f1c4
commit ebac00d678
3 changed files with 1280 additions and 1277 deletions

View File

@ -38,7 +38,7 @@ import ch.psi.daq.queryrest.response.ResponseStreamWriter;
*/
public class JSONResponseStreamWriter implements ResponseStreamWriter {
private static final String DATA_RESP_FIELD = "data";
public static final String DATA_RESP_FIELD = "data";
private static final Logger LOGGER = LoggerFactory.getLogger(JSONResponseStreamWriter.class);

View File

@ -170,7 +170,10 @@ public class JSONTableResponseStreamWriter implements ResponseStreamWriter {
Iterator<List<DataEvent>> streamsMatchIter = streamMatcher.iterator();
try {
generator.writeStartObject();
generator.writeFieldName(JSONResponseStreamWriter.DATA_RESP_FIELD);
writer.writeValue(generator, streamsMatchIter);
generator.writeEndObject();
} catch (Exception e) {
LOGGER.error("Exception while writing json for '{}'", daqQuery.getChannels(), e);
exception.compareAndSet(null, e);