diff --git a/src/main/java/ch/psi/daq/rest/DaqRestApplication.java b/src/main/java/ch/psi/daq/rest/DaqRestApplication.java index 2beaadf..3832b2b 100644 --- a/src/main/java/ch/psi/daq/rest/DaqRestApplication.java +++ b/src/main/java/ch/psi/daq/rest/DaqRestApplication.java @@ -31,6 +31,7 @@ import org.springframework.context.annotation.ComponentScan; // comment below @ComponentScan(basePackages = { "ch.psi.daq.rest", + "ch.psi.daq.hazelcast", "ch.psi.daq.cassandra.config", // define the package name with the CassandraConfig // configuration, or @Import it (see above) "ch.psi.daq.cassandra.reader", diff --git a/src/main/java/ch/psi/daq/rest/DaqRestConfiguration.java b/src/main/java/ch/psi/daq/rest/DaqRestConfiguration.java index e4132d3..e7507cf 100644 --- a/src/main/java/ch/psi/daq/rest/DaqRestConfiguration.java +++ b/src/main/java/ch/psi/daq/rest/DaqRestConfiguration.java @@ -3,23 +3,22 @@ package ch.psi.daq.rest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import ch.psi.daq.common.statistic.StorelessStatistics; -import ch.psi.daq.domain.cassandra.ChannelEvent; -import ch.psi.daq.hazelcast.query.processor.QueryProcessor; -import ch.psi.daq.hazelcast.query.processor.cassandra.CassandraQueryProcessorLocal; -import ch.psi.daq.rest.model.PropertyFilterMixin; - import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.databind.ObjectMapper; +import ch.psi.daq.common.statistic.StorelessStatistics; +import ch.psi.daq.domain.cassandra.ChannelEvent; +import ch.psi.daq.hazelcast.query.processor.QueryProcessor; +import ch.psi.daq.hazelcast.query.processor.cassandra.CassandraQueryProcessorDistributed; +import ch.psi.daq.rest.model.PropertyFilterMixin; + @Configuration public class DaqRestConfiguration { @Bean public QueryProcessor queryProcessor() { -// return new DummyQueryProcessor(); - return new CassandraQueryProcessorLocal(); + return new CassandraQueryProcessorDistributed(); } @Bean diff --git a/src/main/resources/rest.properties b/src/main/resources/rest.properties index 919cb7d..653644d 100644 --- a/src/main/resources/rest.properties +++ b/src/main/resources/rest.properties @@ -1 +1,3 @@ +server.port=8080 + cassandra.basekeyspace=daq_zellweger_rest \ No newline at end of file