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

13
src/main/java/ch/psi/daq/queryrest/config/QueryRestConfig.java
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.cassandra.util.test.CassandraDataGen;
import ch.psi.daq.common.json.deserialize.AttributeBasedDeserializer; import ch.psi.daq.common.json.deserialize.AttributeBasedDeserializer;
import ch.psi.daq.common.statistic.StorelessStatistics; 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.CassandraQueryAnalyzer;
import ch.psi.daq.query.analyzer.QueryAnalyzer; import ch.psi.daq.query.analyzer.QueryAnalyzer;
import ch.psi.daq.query.config.QueryConfig; 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.AbstractQuery;
import ch.psi.daq.query.model.Aggregation; import ch.psi.daq.query.model.Aggregation;
import ch.psi.daq.query.model.Query; import ch.psi.daq.query.model.Query;
@ -63,6 +65,9 @@ public class QueryRestConfig {
@Resource @Resource
private Environment env; private Environment env;
@Resource
private QueryRunMode queryRunMode;
@Bean @Bean
public ObjectMapper objectMapper() { public ObjectMapper objectMapper() {
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
@ -98,7 +103,11 @@ public class QueryRestConfig {
@Bean @Bean
public Function<Query, QueryAnalyzer> queryAnalizerFactory() { 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 @Bean

2
src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java
View File

@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import ch.psi.daq.cassandra.util.test.CassandraDataGen; 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.analyzer.QueryAnalyzer;
import ch.psi.daq.query.model.AbstractQuery; import ch.psi.daq.query.model.AbstractQuery;
import ch.psi.daq.query.model.Aggregation; import ch.psi.daq.query.model.Aggregation;

2
src/test/java/ch/psi/daq/test/queryrest/DaqWebMvcConfig.java
View File

@ -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.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; 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.QueryProcessor;
import ch.psi.daq.query.processor.cassandra.CassandraQueryProcessorLocal; import ch.psi.daq.query.processor.cassandra.CassandraQueryProcessorLocal;
import ch.psi.daq.test.query.config.LocalQueryTestConfig; import ch.psi.daq.test.query.config.LocalQueryTestConfig;

4
src/test/java/ch/psi/daq/test/queryrest/query/DummyDataReader.java
View File

@ -8,10 +8,10 @@ import java.util.stream.Stream;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import ch.psi.daq.cassandra.reader.DataReader;
import ch.psi.daq.common.ordering.Ordering; 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.ChannelEvent;
import ch.psi.daq.domain.cassandra.DataEvent; import ch.psi.daq.domain.reader.DataReader;
public class DummyDataReader implements DataReader { public class DummyDataReader implements DataReader {