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

ATEST-371

Browse Source
This commit is contained in:
Fabian Märki
2016-06-09 10:15:02 +02:00
parent 24daa85e0b
commit 738d87bc16
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/ch/psi/daq/queryrest/controller/validator/QueryValidator.java
View File

@ -56,19 +56,19 @@ public class QueryValidator implements Validator {
if (query.getAggregation() != null) {
// check if only one binning element is defined
long msPerBin = query.getAggregation().getMsPerBin();
long durationPerBin = query.getAggregation().getDurationPerBin();
long pulsesPerBin = query.getAggregation().getPulsesPerBin();
int nrOfBins = query.getAggregation().getNrOfBins();
if ((msPerBin != Request.NOT_SET && (pulsesPerBin != Request.NOT_SET || nrOfBins != Request.NOT_SET))
|| (pulsesPerBin != Request.NOT_SET && (msPerBin != Request.NOT_SET || nrOfBins != Request.NOT_SET))
|| (nrOfBins != Request.NOT_SET && (msPerBin != Request.NOT_SET || pulsesPerBin != Request.NOT_SET))) {
errors.reject("msPerBin", "Only one binning element must be defined.");
if ((durationPerBin != Request.NOT_SET && (pulsesPerBin != Request.NOT_SET || nrOfBins != Request.NOT_SET))
|| (pulsesPerBin != Request.NOT_SET && (durationPerBin != Request.NOT_SET || nrOfBins != Request.NOT_SET))
|| (nrOfBins != Request.NOT_SET && (durationPerBin != Request.NOT_SET || pulsesPerBin != Request.NOT_SET))) {
errors.reject("durationPerBin", "Only one binning element must be defined.");
errors.reject("pulsesPerBin", "Only one binning element must be defined.");
errors.reject("nrOfBins", "Only one binning element must be defined.");
}
if (query.getRange().isPulseIdRangeDefined() && msPerBin != Request.NOT_SET) {
errors.reject("msPerBin", "Pulse range queries only support pulse based binning.");
if (query.getRange().isPulseIdRangeDefined() && durationPerBin != Request.NOT_SET) {
errors.reject("durationPerBin", "Pulse range queries only support pulse based binning.");
}
if (query.getRange().isTimeRangeDefined() && pulsesPerBin != Request.NOT_SET) {
errors.reject("pulsesPerBin", "Time range queries only support time based binning.");

2
src/test/java/ch/psi/daq/test/queryrest/controller/QueryRestControllerCsvTest.java
View File

@ -843,7 +843,7 @@ public class QueryRestControllerCsvTest extends AbstractDaqRestTest {
startDate,
endDate),
channels);
request.setAggregation(new AggregationDescriptor().setMsPerBin(100).setAggregations(aggregations));
request.setAggregation(new AggregationDescriptor().setDurationPerBin(100).setAggregations(aggregations));
request.setResponse(new CSVHTTPResponse());
LinkedHashSet<QueryField> queryFields = new LinkedHashSet<>();

6
src/test/java/ch/psi/daq/test/queryrest/controller/QueryRestControllerJsonTest.java
View File

@ -598,7 +598,7 @@ public class QueryRestControllerJsonTest extends AbstractDaqRestTest {
new RequestRangeDate(
startDate,
endDate),
new AggregationDescriptor().setMsPerBin(100),
new AggregationDescriptor().setDurationPerBin(100),
TEST_CHANNEL_01);
String content = mapper.writeValueAsString(request);
@ -711,7 +711,7 @@ public class QueryRestControllerJsonTest extends AbstractDaqRestTest {
new RequestRangePulseId(
10,
11),
new AggregationDescriptor().setMsPerBin(1000),
new AggregationDescriptor().setDurationPerBin(1000),
TEST_CHANNEL_NAMES);
String content = mapper.writeValueAsString(request);
@ -755,7 +755,7 @@ public class QueryRestControllerJsonTest extends AbstractDaqRestTest {
new RequestRangePulseId(
10,
11),
new AggregationDescriptor().setMsPerBin(1000).setNrOfBins(100),
new AggregationDescriptor().setDurationPerBin(1000).setNrOfBins(100),
TEST_CHANNEL_NAMES);
String content = mapper.writeValueAsString(request);