From 2d7c299ef700d12c9e2d7e2b8e6e27262df2d7cc Mon Sep 17 00:00:00 2001 From: Zellweger Christof Ralf Date: Tue, 30 Jun 2015 18:54:50 +0200 Subject: [PATCH] ATEST-81: - fixing / trying to fix various bugs --- src/main/java/ch/psi/daq/rest/queries/AbstractQuery.java | 2 ++ src/main/java/ch/psi/daq/rest/queries/PulseRangeQuery.java | 2 ++ src/main/java/ch/psi/daq/rest/queries/TimeRangeQuery.java | 3 ++- src/test/resources/test-requests.txt | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/ch/psi/daq/rest/queries/AbstractQuery.java b/src/main/java/ch/psi/daq/rest/queries/AbstractQuery.java index bcf67c3..8f58c6d 100644 --- a/src/main/java/ch/psi/daq/rest/queries/AbstractQuery.java +++ b/src/main/java/ch/psi/daq/rest/queries/AbstractQuery.java @@ -39,6 +39,8 @@ import ch.psi.daq.hazelcast.query.range.QueryRange; }) public abstract class AbstractQuery implements Query { + private static final long serialVersionUID = 1L; + private static Logger logger = LoggerFactory.getLogger(AbstractQuery.class); private List channels; diff --git a/src/main/java/ch/psi/daq/rest/queries/PulseRangeQuery.java b/src/main/java/ch/psi/daq/rest/queries/PulseRangeQuery.java index 0237c95..87b5378 100644 --- a/src/main/java/ch/psi/daq/rest/queries/PulseRangeQuery.java +++ b/src/main/java/ch/psi/daq/rest/queries/PulseRangeQuery.java @@ -19,6 +19,8 @@ import ch.psi.daq.hazelcast.query.range.QueryRange; */ public class PulseRangeQuery extends AbstractQuery { + + private static final long serialVersionUID = 1L; /** * Constructor. diff --git a/src/main/java/ch/psi/daq/rest/queries/TimeRangeQuery.java b/src/main/java/ch/psi/daq/rest/queries/TimeRangeQuery.java index af4c1cc..53f42ae 100644 --- a/src/main/java/ch/psi/daq/rest/queries/TimeRangeQuery.java +++ b/src/main/java/ch/psi/daq/rest/queries/TimeRangeQuery.java @@ -20,7 +20,8 @@ import ch.psi.daq.hazelcast.query.bin.BinningStrategy; import ch.psi.daq.hazelcast.query.range.QueryRange; public class TimeRangeQuery extends AbstractQuery { - + + private static final long serialVersionUID = 1L; public static final String DATE_FORMAT_STRING = "yyyy/MM/dd hh:mm:ss.SSS"; private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat(DATE_FORMAT_STRING); diff --git a/src/test/resources/test-requests.txt b/src/test/resources/test-requests.txt index aca65fb..baafafe 100644 --- a/src/test/resources/test-requests.txt +++ b/src/test/resources/test-requests.txt @@ -73,4 +73,4 @@ curl -v -X POST -H 'Content-Type: application/json' -d '{"queryType":"timerange" -curl -v -X POST -H 'Content-Type: application/json' -d '{"queryType":"pulserange","ordering":"ASC","channels":["dummy-test"],"fields":["channel","pulseId","globalMillis","globalNanos","dbValueBytes"],"binningStrategy":"bincount","binDuration":100,"aggregateChannels":"false","aggregationType":"index","aggregations":[{"fieldRef":"e_val","type":"max","resultFieldName":"maximum"},{"fieldRef":"e_val","type":"min","resultFieldName":"minimum"}], "queryRange":{"startPulseId":100,"endPulseId":100}}' http://localhost:8080/pulserange \ No newline at end of file +curl -v -X POST -H 'Content-Type: application/json' -d '{"queryType":"pulserange","ordering":"ASC","channels":["dummy-test"],"fields":["channel","pulseId","globalMillis","globalNanos","dbValueBytes"],"binningStrategy":"bincount","binDuration":100,"aggregateChannels":"false","aggregationType":"index","aggregations":[{"fieldRef":"e_val","type":"max","resultFieldName":"maximum"},{"fieldRef":"e_val","type":"min","resultFieldName":"minimum"}], "queryRange":{"startPulseId":100,"endPulseId":100}}' http://localhost:8080/pulserange