ATEST-316

src/main/java/ch/psi/daq/queryrest/config/QueryRestConfig.java

@@ -25,12 +25,12 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
 
 import ch.psi.daq.common.statistic.StorelessStatistics;
 import ch.psi.daq.domain.DataEvent;
+import ch.psi.daq.domain.query.operation.Aggregation;
+import ch.psi.daq.domain.query.operation.QueryField;
 import ch.psi.daq.query.analyzer.QueryAnalyzer;
 import ch.psi.daq.query.analyzer.QueryAnalyzerImpl;
 import ch.psi.daq.query.config.QueryConfig;
-import ch.psi.daq.query.model.Aggregation;
 import ch.psi.daq.query.model.Query;
-import ch.psi.daq.query.model.QueryField;
 import ch.psi.daq.queryrest.controller.validator.QueryValidator;
 import ch.psi.daq.queryrest.model.PropertyFilterMixin;
 import ch.psi.daq.queryrest.response.csv.CSVResponseStreamWriter;

src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java

@@ -2,7 +2,6 @@ package ch.psi.daq.queryrest.controller;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -37,43 +36,43 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import ch.psi.daq.cassandra.config.CassandraConfig;
-import ch.psi.daq.cassandra.request.validate.RequestProviderValidator;
 import ch.psi.daq.common.json.deserialize.AttributeBasedDeserializer;
 import ch.psi.daq.common.ordering.Ordering;
 import ch.psi.daq.domain.DataEvent;
-import ch.psi.daq.domain.cassandra.FieldNames;
+import ch.psi.daq.domain.FieldNames;
+import ch.psi.daq.domain.config.DomainConfig;
 import ch.psi.daq.domain.json.ChannelName;
+import ch.psi.daq.domain.query.DAQQueries;
+import ch.psi.daq.domain.query.DAQQuery;
+import ch.psi.daq.domain.query.DAQQueryElement;
+import ch.psi.daq.domain.query.channels.ChannelsRequest;
+import ch.psi.daq.domain.query.channels.ChannelsResponse;
+import ch.psi.daq.domain.query.operation.Aggregation;
+import ch.psi.daq.domain.query.operation.AggregationType;
+import ch.psi.daq.domain.query.operation.QueryField;
+import ch.psi.daq.domain.query.operation.ResponseFormat;
 import ch.psi.daq.domain.reader.Backend;
+import ch.psi.daq.domain.request.validate.RequestProviderValidator;
 import ch.psi.daq.query.analyzer.QueryAnalyzer;
 import ch.psi.daq.query.config.QueryConfig;
-import ch.psi.daq.query.model.Aggregation;
-import ch.psi.daq.query.model.AggregationType;
 import ch.psi.daq.query.model.Query;
-import ch.psi.daq.query.model.QueryField;
-import ch.psi.daq.query.model.ResponseFormat;
 import ch.psi.daq.query.model.impl.BackendQuery;
-import ch.psi.daq.query.model.impl.DAQQueries;
-import ch.psi.daq.query.model.impl.DAQQuery;
-import ch.psi.daq.query.model.impl.DAQQueryElement;
 import ch.psi.daq.query.processor.ChannelNameCache;
 import ch.psi.daq.query.processor.QueryProcessor;
-import ch.psi.daq.query.request.ChannelsRequest;
-import ch.psi.daq.query.request.ChannelsResponse;
 import ch.psi.daq.queryrest.response.csv.CSVResponseStreamWriter;
 import ch.psi.daq.queryrest.response.json.JSONResponseStreamWriter;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
-import com.hazelcast.nio.serialization.FieldType;
 
 @RestController
 public class QueryRestController {
 
    private static final Logger LOGGER = LoggerFactory.getLogger(QueryRestController.class);
 
-   public static final String CHANNELS = "/channels";
-   public static final String QUERY = "/query";
-   public static final String QUERIES = "/queries";
+   public static final String PATH_CHANNELS = DomainConfig.PATH_CHANNELS;
+   public static final String PATH_QUERY = DomainConfig.PATH_QUERY;
+   public static final String PATH_QUERIES = DomainConfig.PATH_QUERIES;
 
    @Resource
    private Validator queryValidator;
@@ -100,7 +99,7 @@ public class QueryRestController {
    @PostConstruct
    public void afterPropertiesSet() {
       List<Exception> exceptions = new ArrayList<>();
-      
+
       try {
          QueryProcessor queryProcessor =
                appContext.getBean(QueryConfig.BEAN_NAME_CASSANDRA_QUERY_PROCESSOR, QueryProcessor.class);
@@ -126,13 +125,13 @@ public class QueryRestController {
          LOGGER.warn("##########");
          LOGGER.warn("");
       }
-      
-      if(queryProcessors.isEmpty()){
+
+      if (queryProcessors.isEmpty()) {
          LOGGER.error("No query processor could be loaded! Exceptions were: ");
          for (Exception exception : exceptions) {
             LOGGER.error("", exception);
          }
-         
+
          throw new RuntimeException("No Backends available!");
       }
 
@@ -158,7 +157,7 @@ public class QueryRestController {
       }
    }
 
-   @RequestMapping(value = CHANNELS, method = {RequestMethod.GET, RequestMethod.POST},
+   @RequestMapping(value = PATH_CHANNELS, method = {RequestMethod.GET, RequestMethod.POST},
          produces = {MediaType.APPLICATION_JSON_VALUE})
    public @ResponseBody List<ChannelsResponse> getChannels(@RequestBody(required = false) ChannelsRequest request)
          throws Throwable {
@@ -177,7 +176,7 @@ public class QueryRestController {
     * @return Collection of channel names matching the specified input channel name
     * @throws Throwable in case something goes wrong
     */
-   @RequestMapping(value = CHANNELS + "/{channelName}", method = {RequestMethod.GET},
+   @RequestMapping(value = PATH_CHANNELS + "/{channelName}", method = {RequestMethod.GET},
          produces = {MediaType.APPLICATION_JSON_VALUE})
    public @ResponseBody Collection<ChannelsResponse> getChannels(@PathVariable(value = "channelName") String channelName)
          throws Throwable {
@@ -194,7 +193,7 @@ public class QueryRestController {
     *         {@link #executeQuery(DAQQuery, HttpServletResponse)} fails
     */
    @RequestMapping(
-         value = QUERY,
+         value = PATH_QUERY,
          method = RequestMethod.GET)
    public void executeQueryBodyAsString(@RequestParam String jsonBody, HttpServletResponse res) throws Exception {
       DAQQuery query = objectMapper.readValue(jsonBody, DAQQuery.class);
@@ -209,7 +208,7 @@ public class QueryRestController {
     * @throws IOException thrown if writing to the output stream fails
     */
    @RequestMapping(
-         value = QUERY,
+         value = PATH_QUERY,
          method = RequestMethod.POST,
          consumes = {MediaType.APPLICATION_JSON_VALUE})
    public void executeQuery(@RequestBody @Valid DAQQuery query, HttpServletResponse res) throws Exception {
@@ -226,7 +225,7 @@ public class QueryRestController {
     *         {@link #executeQueries(DAQQueries, HttpServletResponse)} fails
     */
    @RequestMapping(
-         value = QUERIES,
+         value = PATH_QUERIES,
          method = RequestMethod.GET)
    public void executeQueriesBodyAsString(@RequestParam String jsonBody, HttpServletResponse res) throws Exception {
       DAQQueries queries = objectMapper.readValue(jsonBody, DAQQueries.class);
@@ -246,7 +245,7 @@ public class QueryRestController {
     * @throws IOException thrown if writing to the output stream fails
     */
    @RequestMapping(
-         value = QUERIES,
+         value = PATH_QUERIES,
          method = RequestMethod.POST,
          consumes = {MediaType.APPLICATION_JSON_VALUE})
    public void executeQueries(@RequestBody @Valid DAQQueries queries, HttpServletResponse res) throws Exception {
@@ -285,9 +284,9 @@ public class QueryRestController {
             LOGGER.warn(message);
             throw new IllegalArgumentException(message);
          }
-         
-         
-         if(!ArrayUtils.contains(query.getColumns(), FieldNames.FIELD_GLOBAL_TIME)){
+
+
+         if (!ArrayUtils.contains(query.getColumns(), FieldNames.FIELD_GLOBAL_TIME)) {
             query.addField(QueryField.globalMillis);
          }
       }
@@ -312,8 +311,8 @@ public class QueryRestController {
 
       for (DAQQueryElement queryElement : queries) {
          Stream<Triple<BackendQuery, ChannelName, ?>> resultStreams =
-               queryElement
-                     .getBackendQueries()
+               BackendQuery
+                     .getBackendQueries(queryElement)
                      .stream()
                      .filter(query -> {
                         QueryProcessor processor = queryProcessors.get(query.getBackend());
@@ -366,7 +365,8 @@ public class QueryRestController {
     * 
     * @return list of {@link Ordering}s as String array
     */
-   @RequestMapping(value = "responseformat", method = {RequestMethod.GET}, produces = {MediaType.APPLICATION_JSON_VALUE})
+   @RequestMapping(value = "responseformat", method = {RequestMethod.GET},
+         produces = {MediaType.APPLICATION_JSON_VALUE})
    public @ResponseBody List<ResponseFormat> getResponseFormatValues() {
       return Lists.newArrayList(ResponseFormat.values());
    }

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

@@ -9,11 +9,11 @@ import javax.annotation.Resource;
 import org.springframework.validation.Errors;
 import org.springframework.validation.Validator;
 
-import ch.psi.daq.query.model.Aggregation;
-import ch.psi.daq.query.model.QueryField;
-import ch.psi.daq.query.model.impl.DAQQueries;
-import ch.psi.daq.query.model.impl.DAQQuery;
-import ch.psi.daq.query.model.impl.DAQQueryElement;
+import ch.psi.daq.domain.query.DAQQueries;
+import ch.psi.daq.domain.query.DAQQuery;
+import ch.psi.daq.domain.query.DAQQueryElement;
+import ch.psi.daq.domain.query.operation.Aggregation;
+import ch.psi.daq.domain.query.operation.QueryField;
 import ch.psi.daq.queryrest.config.QueryRestConfig;
 
 public class QueryValidator implements Validator {

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

@@ -9,8 +9,8 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.http.MediaType;
 
-import ch.psi.daq.query.model.ResponseFormat;
-import ch.psi.daq.query.model.ResponseOptions;
+import ch.psi.daq.domain.query.operation.ResponseFormat;
+import ch.psi.daq.domain.query.operation.ResponseOptions;
 
 public abstract class AbstractResponseStreamWriter implements ResponseStreamWriter {
 

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

@@ -10,9 +10,9 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.tuple.Triple;
 
 import ch.psi.daq.domain.json.ChannelName;
-import ch.psi.daq.query.model.ResponseOptions;
+import ch.psi.daq.domain.query.DAQQueryElement;
+import ch.psi.daq.domain.query.operation.ResponseOptions;
 import ch.psi.daq.query.model.impl.BackendQuery;
-import ch.psi.daq.query.model.impl.DAQQueryElement;
 
 public interface ResponseStreamWriter {
 

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

@@ -36,13 +36,13 @@ import ch.psi.daq.common.stream.StreamIterable;
 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.operation.Aggregation;
+import ch.psi.daq.domain.query.operation.QueryField;
+import ch.psi.daq.domain.query.operation.ResponseOptions;
 import ch.psi.daq.query.analyzer.QueryAnalyzer;
-import ch.psi.daq.query.model.Aggregation;
 import ch.psi.daq.query.model.Query;
-import ch.psi.daq.query.model.QueryField;
-import ch.psi.daq.query.model.ResponseOptions;
 import ch.psi.daq.query.model.impl.BackendQuery;
-import ch.psi.daq.query.model.impl.DAQQueryElement;
 import ch.psi.daq.queryrest.response.AbstractResponseStreamWriter;
 
 /**

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

@@ -26,11 +26,11 @@ import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
 import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
 
 import ch.psi.daq.domain.json.ChannelName;
-import ch.psi.daq.query.model.Aggregation;
-import ch.psi.daq.query.model.QueryField;
-import ch.psi.daq.query.model.ResponseOptions;
+import ch.psi.daq.domain.query.DAQQueryElement;
+import ch.psi.daq.domain.query.operation.Aggregation;
+import ch.psi.daq.domain.query.operation.QueryField;
+import ch.psi.daq.domain.query.operation.ResponseOptions;
 import ch.psi.daq.query.model.impl.BackendQuery;
-import ch.psi.daq.query.model.impl.DAQQueryElement;
 import ch.psi.daq.queryrest.response.AbstractResponseStreamWriter;
 
 /**