From 107bddbd7219e51c75116b09e1cf899345d6ede8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=A4rki?= <fabian.maerki@psi.ch>
Date: Thu, 30 Jul 2015 15:33:53 +0200
Subject: [PATCH] ATEST-123

---
 .../psi/daq/queryrest/config/QueryRestConfig.java   | 13 +++++++++++--
 .../queryrest/controller/QueryRestController.java   |  2 +-
 .../ch/psi/daq/test/queryrest/DaqWebMvcConfig.java  |  2 +-
 .../daq/test/queryrest/query/DummyDataReader.java   |  4 ++--
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/main/java/ch/psi/daq/queryrest/config/QueryRestConfig.java b/src/main/java/ch/psi/daq/queryrest/config/QueryRestConfig.java
index 1e09fac..f49b8ea 100644
--- a/src/main/java/ch/psi/daq/queryrest/config/QueryRestConfig.java
+++ b/src/main/java/ch/psi/daq/queryrest/config/QueryRestConfig.java
@@ -25,10 +25,12 @@ import com.fasterxml.jackson.databind.module.SimpleModule;
 import ch.psi.daq.cassandra.util.test.CassandraDataGen;
 import ch.psi.daq.common.json.deserialize.AttributeBasedDeserializer;
 import ch.psi.daq.common.statistic.StorelessStatistics;
-import ch.psi.daq.domain.cassandra.DataEvent;
+import ch.psi.daq.domain.DataEvent;
+import ch.psi.daq.query.analyzer.ArchiverApplianceQueryAnalyzer;
 import ch.psi.daq.query.analyzer.CassandraQueryAnalyzer;
 import ch.psi.daq.query.analyzer.QueryAnalyzer;
 import ch.psi.daq.query.config.QueryConfig;
+import ch.psi.daq.query.config.QueryRunMode;
 import ch.psi.daq.query.model.AbstractQuery;
 import ch.psi.daq.query.model.Aggregation;
 import ch.psi.daq.query.model.Query;
@@ -63,6 +65,9 @@ public class QueryRestConfig {
    @Resource
    private Environment env;
 
+   @Resource
+   private QueryRunMode queryRunMode;
+
    @Bean
    public ObjectMapper objectMapper() {
       ObjectMapper mapper = new ObjectMapper();
@@ -98,7 +103,11 @@ public class QueryRestConfig {
 
    @Bean
    public Function<Query, QueryAnalyzer> queryAnalizerFactory() {
-      return (query) -> new CassandraQueryAnalyzer(query);
+      if (QueryRunMode.archiverappliance.equals(queryRunMode)) {
+         return (query) -> new ArchiverApplianceQueryAnalyzer(query);
+      } else {
+         return (query) -> new CassandraQueryAnalyzer(query);
+      }
    }
 
    @Bean
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 b243427..1ae6532 100644
--- a/src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java
+++ b/src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java
@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import ch.psi.daq.cassandra.util.test.CassandraDataGen;
-import ch.psi.daq.domain.cassandra.DataEvent;
+import ch.psi.daq.domain.DataEvent;
 import ch.psi.daq.query.analyzer.QueryAnalyzer;
 import ch.psi.daq.query.model.AbstractQuery;
 import ch.psi.daq.query.model.Aggregation;
diff --git a/src/test/java/ch/psi/daq/test/queryrest/DaqWebMvcConfig.java b/src/test/java/ch/psi/daq/test/queryrest/DaqWebMvcConfig.java
index d6112b7..1693604 100644
--- a/src/test/java/ch/psi/daq/test/queryrest/DaqWebMvcConfig.java
+++ b/src/test/java/ch/psi/daq/test/queryrest/DaqWebMvcConfig.java
@@ -8,7 +8,7 @@ import org.springframework.context.annotation.PropertySources;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 
-import ch.psi.daq.cassandra.reader.DataReader;
+import ch.psi.daq.domain.reader.DataReader;
 import ch.psi.daq.query.processor.QueryProcessor;
 import ch.psi.daq.query.processor.cassandra.CassandraQueryProcessorLocal;
 import ch.psi.daq.test.query.config.LocalQueryTestConfig;
diff --git a/src/test/java/ch/psi/daq/test/queryrest/query/DummyDataReader.java b/src/test/java/ch/psi/daq/test/queryrest/query/DummyDataReader.java
index d54bd5b..2dcf153 100644
--- a/src/test/java/ch/psi/daq/test/queryrest/query/DummyDataReader.java
+++ b/src/test/java/ch/psi/daq/test/queryrest/query/DummyDataReader.java
@@ -8,10 +8,10 @@ import java.util.stream.Stream;
 
 import com.google.common.collect.Lists;
 
-import ch.psi.daq.cassandra.reader.DataReader;
 import ch.psi.daq.common.ordering.Ordering;
+import ch.psi.daq.domain.DataEvent;
 import ch.psi.daq.domain.cassandra.ChannelEvent;
-import ch.psi.daq.domain.cassandra.DataEvent;
+import ch.psi.daq.domain.reader.DataReader;
 
 public class DummyDataReader implements DataReader {