Change in JSON table format.
This commit is contained in:
@ -38,7 +38,7 @@ import ch.psi.daq.queryrest.response.ResponseStreamWriter;
|
|||||||
*/
|
*/
|
||||||
public class JSONResponseStreamWriter implements 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);
|
private static final Logger LOGGER = LoggerFactory.getLogger(JSONResponseStreamWriter.class);
|
||||||
|
|
||||||
|
@ -170,7 +170,10 @@ public class JSONTableResponseStreamWriter implements ResponseStreamWriter {
|
|||||||
Iterator<List<DataEvent>> streamsMatchIter = streamMatcher.iterator();
|
Iterator<List<DataEvent>> streamsMatchIter = streamMatcher.iterator();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
generator.writeStartObject();
|
||||||
|
generator.writeFieldName(JSONResponseStreamWriter.DATA_RESP_FIELD);
|
||||||
writer.writeValue(generator, streamsMatchIter);
|
writer.writeValue(generator, streamsMatchIter);
|
||||||
|
generator.writeEndObject();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
LOGGER.error("Exception while writing json for '{}'", daqQuery.getChannels(), e);
|
LOGGER.error("Exception while writing json for '{}'", daqQuery.getChannels(), e);
|
||||||
exception.compareAndSet(null, e);
|
exception.compareAndSet(null, e);
|
||||||
|
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user