ITQC/gls_docs
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ATEST-123

Browse Source
This commit is contained in:
Fabian Märki
2015-07-30 15:33:53 +02:00
parent 9057d7e32e
commit 107bddbd72
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ch/psi/daq/queryrest/config/QueryRestConfig.java
+11 -2
View File
@@ -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
src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java
+1 -1
View File
@@ -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;