ATEST-530

src/main/java/ch/psi/daq/queryrest/response/ResponseStreamWriter.java

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.tuple.Triple;
 
 import ch.psi.daq.domain.json.ChannelName;
 import ch.psi.daq.domain.query.DAQQueryElement;
-import ch.psi.daq.query.model.impl.BackendQuery;
+import ch.psi.daq.domain.query.backend.BackendQuery;
 
 public interface ResponseStreamWriter {
 

src/main/java/ch/psi/daq/queryrest/response/csv/CSVHTTPResponse.java

@@ -18,11 +18,12 @@ import ch.psi.daq.domain.FieldNames;
 import ch.psi.daq.domain.json.ChannelName;
 import ch.psi.daq.domain.query.DAQQueries;
 import ch.psi.daq.domain.query.DAQQueryElement;
+import ch.psi.daq.domain.query.backend.BackendQuery;
+import ch.psi.daq.domain.query.backend.BackendQueryImpl;
 import ch.psi.daq.domain.query.operation.AggregationType;
 import ch.psi.daq.domain.query.operation.Compression;
 import ch.psi.daq.domain.query.operation.QueryField;
 import ch.psi.daq.domain.query.operation.ResponseFormat;
-import ch.psi.daq.query.model.impl.BackendQuery;
 import ch.psi.daq.queryrest.query.QueryManager;
 import ch.psi.daq.queryrest.response.AbstractHTTPResponse;
 
@@ -56,7 +57,7 @@ public class CSVHTTPResponse extends AbstractHTTPResponse {
 
          // execute query
          List<Entry<DAQQueryElement, Stream<Triple<BackendQuery, ChannelName, ?>>>> result =
-               queryManager.executeQueries(queries);
+               queryManager.getEvents(queries);
          // write the response back to the client using java 8 streams
          streamWriter.respond(result, out);
       } catch (Exception e) {

src/main/java/ch/psi/daq/queryrest/response/csv/CSVResponseStreamWriter.java

@@ -34,12 +34,12 @@ import ch.psi.daq.common.stream.StreamMatcher;
 import ch.psi.daq.domain.DataEvent;
 import ch.psi.daq.domain.json.ChannelName;
 import ch.psi.daq.domain.query.DAQQueryElement;
+import ch.psi.daq.domain.query.backend.BackendQuery;
+import ch.psi.daq.domain.query.backend.BackendQueryImpl;
+import ch.psi.daq.domain.query.backend.analyzer.BackendQueryAnalyzer;
 import ch.psi.daq.domain.query.operation.Aggregation;
 import ch.psi.daq.domain.query.operation.Extrema;
 import ch.psi.daq.domain.query.operation.QueryField;
-import ch.psi.daq.query.analyzer.QueryAnalyzer;
-import ch.psi.daq.query.model.Query;
-import ch.psi.daq.query.model.impl.BackendQuery;
 import ch.psi.daq.queryrest.response.ResponseStreamWriter;
 
 /**
@@ -61,7 +61,7 @@ public class CSVResponseStreamWriter implements ResponseStreamWriter {
          .getGlobalMillis() / 10L;
 
    @Resource
-   private Function<Query, QueryAnalyzer> queryAnalizerFactory;
+   private Function<BackendQuery, BackendQueryAnalyzer> queryAnalizerFactory;
 
    @Override
    public void respond(final List<Entry<DAQQueryElement, Stream<Triple<BackendQuery, ChannelName, ?>>>> results,
@@ -158,7 +158,7 @@ public class CSVResponseStreamWriter implements ResponseStreamWriter {
             daqQuery.getAggregation() != null ? daqQuery.getAggregation().getAggregations() : null;
       List<Extrema> extrema = daqQuery.getAggregation() != null ? daqQuery.getAggregation().getExtrema() : null;
 
-      QueryAnalyzer queryAnalyzer = queryAnalizerFactory.apply(backendQuery);
+      BackendQueryAnalyzer queryAnalyzer = queryAnalizerFactory.apply(backendQuery);
 
       for (QueryField field : queryFields) {
          if (!(QueryField.value.equals(field) && queryAnalyzer.isAggregationEnabled())) {

src/main/java/ch/psi/daq/queryrest/response/json/JSONHTTPResponse.java

@@ -16,9 +16,9 @@ import org.springframework.http.MediaType;
 import ch.psi.daq.domain.json.ChannelName;
 import ch.psi.daq.domain.query.DAQQueries;
 import ch.psi.daq.domain.query.DAQQueryElement;
+import ch.psi.daq.domain.query.backend.BackendQuery;
 import ch.psi.daq.domain.query.operation.Compression;
 import ch.psi.daq.domain.query.operation.ResponseFormat;
-import ch.psi.daq.query.model.impl.BackendQuery;
 import ch.psi.daq.queryrest.query.QueryManager;
 import ch.psi.daq.queryrest.response.AbstractHTTPResponse;
 
@@ -48,7 +48,7 @@ public class JSONHTTPResponse extends AbstractHTTPResponse {
          JSONResponseStreamWriter streamWriter = context.getBean(JSONResponseStreamWriter.class);
 
          // execute query
-         List<Entry<DAQQueryElement, Stream<Triple<BackendQuery, ChannelName, ?>>>> result = queryManager.executeQueries(queries);
+         List<Entry<DAQQueryElement, Stream<Triple<BackendQuery, ChannelName, ?>>>> result = queryManager.getEvents(queries);
          // write the response back to the client using java 8 streams
          streamWriter.respond(result, out);
       } catch (Exception e) {

src/main/java/ch/psi/daq/queryrest/response/json/JSONResponseStreamWriter.java

@@ -25,10 +25,10 @@ import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
 
 import ch.psi.daq.domain.json.ChannelName;
 import ch.psi.daq.domain.query.DAQQueryElement;
+import ch.psi.daq.domain.query.backend.BackendQuery;
 import ch.psi.daq.domain.query.operation.Aggregation;
 import ch.psi.daq.domain.query.operation.Extrema;
 import ch.psi.daq.domain.query.operation.QueryField;
-import ch.psi.daq.query.model.impl.BackendQuery;
 import ch.psi.daq.queryrest.response.ResponseStreamWriter;
 
 /**