ATEST-124:

- implement the query validator

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

@@ -15,6 +15,7 @@ import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.util.StringUtils;
+import org.springframework.validation.Validator;
 
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.core.JsonFactory;
@@ -33,6 +34,7 @@ import ch.psi.daq.query.model.AbstractQuery;
 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.QueryValidator;
 import ch.psi.daq.queryrest.model.PropertyFilterMixin;
 import ch.psi.daq.queryrest.response.JsonStreamSerializer;
 import ch.psi.daq.queryrest.response.ResponseStreamWriter;
@@ -140,6 +142,11 @@ public class QueryRestConfig {
 
       return defaultResponseAggregations;
    }
+   
+   @Bean
+   public Validator queryValidator() {
+      return new QueryValidator();
+   }
 
    // ==========================================================================================
    // TODO: This is simply for initial / rudimentary testing - remove once further evolved

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

@@ -2,8 +2,6 @@ package ch.psi.daq.queryrest.controller;
 
 import java.io.IOException;
 import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.function.Function;
@@ -11,6 +9,7 @@ import java.util.stream.Stream;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -86,16 +85,16 @@ public class QueryRestController {
    @RequestMapping(
          value = QUERY,
          method = RequestMethod.POST,
-         consumes = {MediaType.APPLICATION_JSON_VALUE},
-         produces = {MediaType.APPLICATION_JSON_VALUE})
-   public void executeQuery(@RequestBody AbstractQuery query, HttpServletResponse res) throws IOException {
+         consumes = {MediaType.APPLICATION_JSON_VALUE})
+//         , produces = {MediaType.APPLICATION_JSON_VALUE})
+   public void executeQuery(@RequestBody @Valid AbstractQuery query, HttpServletResponse res) throws IOException {
       try {
          LOGGER.debug("Execute query '{}'", query.getClass().getSimpleName());
 
          QueryAnalyzer queryAnalizer = queryAnalizerFactory.apply(query);
          queryAnalizer.validate();
 
-         extendQuery(query);
+//         extendQuery(query);
 
          // all the magic happens here
          Stream<Entry<String, Stream<? extends DataEvent>>> channelToDataEvents = queryProcessor.process(queryAnalizer);
@@ -111,14 +110,14 @@ public class QueryRestController {
       }
    }
 
-   private void extendQuery(AbstractQuery query) {
-      if (query.getFields() == null || query.getFields().isEmpty()) {
-         query.setFields(new LinkedHashSet<>(defaultResponseFields));
-      }
-      if(query.getAggregations() == null || query.getAggregations().isEmpty()){
-         query.setAggregations(new LinkedList<>(defaultResponseAggregations));
-      }
-   }
+//   private void extendQuery(AbstractQuery query) {
+//      if (query.getFields() == null || query.getFields().isEmpty()) {
+//         query.setFields(new LinkedHashSet<>(defaultResponseFields));
+//      }
+//      if(query.getAggregations() == null || query.getAggregations().isEmpty()){
+//         query.setAggregations(new LinkedList<>(defaultResponseAggregations));
+//      }
+//   }
 
    // ==========================================================================================
    // TODO: This is simply for initial / rudimentary testing - remove once further evolved

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

@@ -0,0 +1,57 @@
+/**
+ * 
+ */
+package ch.psi.daq.queryrest.controller;
+
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.Set;
+
+import javax.annotation.Resource;
+
+import org.springframework.validation.Errors;
+import org.springframework.validation.Validator;
+
+import ch.psi.daq.query.model.AbstractQuery;
+import ch.psi.daq.query.model.Aggregation;
+import ch.psi.daq.query.model.QueryField;
+import ch.psi.daq.queryrest.config.QueryRestConfig;
+
+/**
+ * @author zellweger_c
+ *
+ */
+public class QueryValidator implements Validator {
+
+   @Resource(name = QueryRestConfig.BEAN_NAME_DEFAULT_RESPONSE_FIELDS)
+   private Set<QueryField> defaultResponseFields;
+
+   @Resource(name = QueryRestConfig.BEAN_NAME_DEFAULT_RESPONSE_AGGREGATIONS)
+   private Set<Aggregation> defaultResponseAggregations;
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public boolean supports(Class<?> clazz) {
+      return AbstractQuery.class.isAssignableFrom(clazz);
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public void validate(Object target, Errors errors) {
+
+      AbstractQuery query = (AbstractQuery) target;
+
+      if (query.getFields() == null || query.getFields().isEmpty()) {
+         query.setFields(new LinkedHashSet<>(defaultResponseFields));
+      }
+
+      if (query.getAggregations() == null || query.getAggregations().isEmpty()) {
+         query.setAggregations(new LinkedList<>(defaultResponseAggregations));
+      }
+   }
+
+}