ATEST-259:

- trying to implement dummy cassandra reader
- fixing some of the tests

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

@@ -2,9 +2,11 @@ package ch.psi.daq.queryrest.controller;
 
 import java.io.IOException;
 import java.util.Collection;
+import java.util.List;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import javax.annotation.Resource;
@@ -27,9 +29,11 @@ import org.springframework.web.bind.annotation.RestController;
 import ch.psi.daq.cassandra.request.validate.RequestProviderValidator;
 import ch.psi.daq.cassandra.util.test.CassandraDataGen;
 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.query.analyzer.QueryAnalyzer;
 import ch.psi.daq.query.model.Aggregation;
+import ch.psi.daq.query.model.AggregationType;
 import ch.psi.daq.query.model.DBMode;
 import ch.psi.daq.query.model.Query;
 import ch.psi.daq.query.model.QueryField;
@@ -39,6 +43,8 @@ import ch.psi.daq.queryrest.config.QueryRestConfig;
 import ch.psi.daq.queryrest.model.ChannelsRequest;
 import ch.psi.daq.queryrest.response.ResponseStreamWriter;
 
+import com.google.common.collect.Lists;
+
 @RestController
 public class QueryRestController {
 
@@ -114,6 +120,68 @@ public class QueryRestController {
       return getChannels(new ChannelsRequest(channelName));
    }
 
+   
+   /**
+    * Returns the current list of {@link Ordering}s available.
+    * 
+    * @return list of {@link Ordering}s as String array
+    */
+   @RequestMapping(value = "ordering", method = {RequestMethod.GET},
+         produces = {MediaType.APPLICATION_JSON_VALUE})
+   public @ResponseBody List<String> getOrderingValues() {
+      List<Ordering> orderings = Lists.newArrayList(Ordering.values());
+      return orderings.stream()
+            .map((Ordering ord) -> {
+               return ord.toString();
+            }).collect(Collectors.toList());
+   }
+   
+   /**
+    * Returns the current list of {@link QueryField}s available.
+    * 
+    * @return list of {@link QueryField}s as String array
+    */
+   @RequestMapping(value = "queryfields", method = {RequestMethod.GET},
+         produces = {MediaType.APPLICATION_JSON_VALUE})
+   public @ResponseBody List<String> getQueryFieldValues() {
+      List<QueryField> orderings = Lists.newArrayList(QueryField.values());
+      return orderings.stream()
+            .map((QueryField qf) -> {
+               return qf.toString();
+            }).collect(Collectors.toList());
+   }
+   
+   /**
+    * Returns the current list of {@link Aggregation}s available.
+    * 
+    * @return list of {@link Aggregation}s as String array
+    */
+   @RequestMapping(value = "aggregations", method = {RequestMethod.GET},
+         produces = {MediaType.APPLICATION_JSON_VALUE})
+   public @ResponseBody List<String> getAggregationsValues() {
+      List<Aggregation> orderings = Lists.newArrayList(Aggregation.values());
+      return orderings.stream()
+            .map((Aggregation value) -> {
+               return value.toString();
+            }).collect(Collectors.toList());
+   }
+   
+   /**
+    * Returns the current list of {@link AggregationType}s available.
+    * 
+    * @return list of {@link AggregationType}s as String array
+    */
+   @RequestMapping(value = "aggregationtypes", method = {RequestMethod.GET},
+         produces = {MediaType.APPLICATION_JSON_VALUE})
+   public @ResponseBody List<String> getAggregationTypesValues() {
+      List<AggregationType> orderings = Lists.newArrayList(AggregationType.values());
+      return orderings.stream()
+            .map((AggregationType value) -> {
+               return value.toString();
+            }).collect(Collectors.toList());
+   }
+   
+
    /**
     * Catch-all query method for getting data from the backend.
     * <p>
@@ -143,8 +211,8 @@ public class QueryRestController {
       QueryAnalyzer queryAnalizer = queryAnalizerFactory.apply(query);
 
       // all the magic happens here
-      Stream<Entry<String, Stream<? extends DataEvent>>> channelToDataEvents = getQueryProcessor(query.getDbMode())
-            .process(queryAnalizer);
+      Stream<Entry<String, Stream<? extends DataEvent>>> channelToDataEvents = 
+            getQueryProcessor(query.getDbMode()).process(queryAnalizer);
 
       // do post-process
       Stream<Entry<String, ?>> channelToData = queryAnalizer.postProcess(channelToDataEvents);