ATEST-79:

- implementing first draft of timerange and pulserange queries
- adding tests, again based on an embedded local cassandra instance
This commit is contained in:
Zellweger Christof Ralf
2015-06-19 15:14:54 +02:00
parent aaaf5a72fe
commit c1098a398f
17 changed files with 589 additions and 167 deletions
@@ -5,9 +5,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.context.web.SpringBootServletInitializer;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Import;
import ch.psi.daq.cassandra.config.CassandraConfig;
/**
* Entry point to our rest-frontend of the Swissfel application which most importantly wires all the @RestController
@@ -30,7 +27,7 @@ import ch.psi.daq.cassandra.config.CassandraConfig;
* beans and inject them accordingly.
*/
@SpringBootApplication
//@Import(CassandraConfig.class) // either define the context to be imported, or see ComponentScan
// @Import(CassandraConfig.class) // either define the context to be imported, or see ComponentScan
// comment below
@ComponentScan(basePackages = {
"ch.psi.daq.rest",
@@ -51,11 +48,4 @@ public class DaqRestApplication extends SpringBootServletInitializer {
return application.sources(DaqRestApplication.class);
}
// a nested configuration
// this guarantees that the ordering of the properties file is as expected
// see:
// https://jira.spring.io/browse/SPR-10409?focusedCommentId=101393&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-101393
// @Configuration
// @Import(CassandraConfig.class)
// static class InnerConfiguration { }
}