ITQC/gls_docs
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ATEST-81:

Browse Source 
- fixing / trying to fix various bugs
This commit is contained in:
Zellweger Christof Ralf
2015-06-30 18:54:50 +02:00
parent 1614905a5e
commit 2d7c299ef7
4 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/ch/psi/daq/rest/queries/AbstractQuery.java
View File

@ -39,6 +39,8 @@ import ch.psi.daq.hazelcast.query.range.QueryRange;
}) })
public abstract class AbstractQuery implements Query { public abstract class AbstractQuery implements Query {
private static final long serialVersionUID = 1L;
private static Logger logger = LoggerFactory.getLogger(AbstractQuery.class); private static Logger logger = LoggerFactory.getLogger(AbstractQuery.class);
private List<String> channels; private List<String> channels;

2
src/main/java/ch/psi/daq/rest/queries/PulseRangeQuery.java
View File

@ -19,6 +19,8 @@ import ch.psi.daq.hazelcast.query.range.QueryRange;
*/ */
public class PulseRangeQuery extends AbstractQuery { public class PulseRangeQuery extends AbstractQuery {
private static final long serialVersionUID = 1L;
/** /**
* Constructor. * Constructor.

3
src/main/java/ch/psi/daq/rest/queries/TimeRangeQuery.java
View File

@ -20,7 +20,8 @@ import ch.psi.daq.hazelcast.query.bin.BinningStrategy;
import ch.psi.daq.hazelcast.query.range.QueryRange; import ch.psi.daq.hazelcast.query.range.QueryRange;
public class TimeRangeQuery extends AbstractQuery { 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"; 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); private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat(DATE_FORMAT_STRING);

2
src/test/resources/test-requests.txt
View File

@ -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 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