ATEST-75: simple testing whether externally configuring the cassandra
application works
This commit is contained in:
@@ -5,6 +5,9 @@ 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 annotated classes.
|
||||
@@ -31,9 +34,16 @@ import org.springframework.context.annotation.ComponentScan;
|
||||
* them accordingly.
|
||||
*/
|
||||
@SpringBootApplication
|
||||
@ComponentScan(basePackages = { "ch.psi.daq" })
|
||||
//@Import(CassandraConfig.class) // either define the context to be imported, or see ComponentScan comment below
|
||||
@ComponentScan(basePackages = {
|
||||
"ch.psi.daq.rest",
|
||||
"ch.psi.daq.cassandra.config", // define the package name with the CassandraConfig configuration, or @Import it (see above)
|
||||
"ch.psi.daq.cassandra.reader",
|
||||
"ch.psi.daq.cassandra.writer"
|
||||
})
|
||||
public class DaqRestApplication extends SpringBootServletInitializer {
|
||||
|
||||
|
||||
public static void main(final String[] args) {
|
||||
SpringApplication.run(DaqRestApplication.class, args);
|
||||
}
|
||||
@@ -42,4 +52,11 @@ public class DaqRestApplication extends SpringBootServletInitializer {
|
||||
protected final SpringApplicationBuilder configure(final SpringApplicationBuilder application) {
|
||||
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 { }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user