From b7c20ee03e5dfe6237b34c0d9263058b897bff81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=A4rki?= Date: Wed, 16 Aug 2017 16:23:05 +0200 Subject: [PATCH] Some fixes. --- .../psi/daq/queryrest/controller/QueryRestController.java | 6 +++++- src/test/resources/queryrest-test.properties | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java b/src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java index b4b5bb1..41dfaa1 100644 --- a/src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java +++ b/src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java @@ -96,7 +96,11 @@ public class QueryRestController { produces = {MediaType.APPLICATION_JSON_VALUE}) public @ResponseBody List getChannels(@RequestBody(required = false) ChannelsRequest request) throws Throwable { - return queryManager.getChannels(request); + List channels = queryManager.getChannels(request); + channels = channels.stream() + .filter(channelsResponse -> activeBackends.contains(channelsResponse.getBackend())) + .collect(Collectors.toList()); + return channels; } /** diff --git a/src/test/resources/queryrest-test.properties b/src/test/resources/queryrest-test.properties index 6a9a476..8eddfcc 100644 --- a/src/test/resources/queryrest-test.properties +++ b/src/test/resources/queryrest-test.properties @@ -5,4 +5,5 @@ dispatcher.validate.mainheader=false dispatcher.validate.mainheader.log=false query.min.time=1970-01-01T00:00:00.000000000+00:00 # enable/disable validation -filestorage.pulseidtime.store.validate.range=false \ No newline at end of file +filestorage.pulseidtime.store.validate.range=false +filestorage.pulseidtime.cache.commit.period=0 \ No newline at end of file