ATEST-285

src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java

@@ -15,6 +15,7 @@ import javax.validation.Valid;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.context.ApplicationContext;
 import org.springframework.http.MediaType;
 import org.springframework.validation.Validator;
 import org.springframework.web.bind.WebDataBinder;
@@ -28,10 +29,12 @@ import org.springframework.web.bind.annotation.RestController;
 
 import ch.psi.daq.cassandra.request.validate.RequestProviderValidator;
 import ch.psi.daq.cassandra.util.test.CassandraDataGen;
+import ch.psi.daq.common.concurrent.singleton.Deferred;
 import ch.psi.daq.common.json.deserialize.AttributeBasedDeserializer;
 import ch.psi.daq.common.ordering.Ordering;
 import ch.psi.daq.domain.DataEvent;
 import ch.psi.daq.query.analyzer.QueryAnalyzer;
+import ch.psi.daq.query.config.QueryConfig;
 import ch.psi.daq.query.model.Aggregation;
 import ch.psi.daq.query.model.AggregationType;
 import ch.psi.daq.query.model.DBMode;
@@ -61,10 +64,14 @@ public class QueryRestController {
    private ResponseStreamWriter responseStreamWriter;
 
    @Resource
-   private QueryProcessor cassandraQueryProcessor;
+   private ApplicationContext appContext;
 
-   @Resource
+   // using Deferred ensures that data-api startup succeeds even if DataBuffer/ArchiverAppliance is
-   private QueryProcessor archiverApplianceQueryProcessor;
+   // not reachable at startup
+   private Deferred<QueryProcessor> cassandraQueryProcessor = new Deferred<QueryProcessor>(
+         () -> appContext.getBean(QueryConfig.BEAN_NAME_CASSANDRA_QUERY_PROCESSOR, QueryProcessor.class));
+   private Deferred<QueryProcessor> archiverApplianceQueryProcessor = new Deferred<QueryProcessor>(
+         () -> appContext.getBean(QueryConfig.BEAN_NAME_ARCHIVER_APPLIANCE_QUERY_PROCESSOR, QueryProcessor.class));
 
    @Resource
    private Function<Query, QueryAnalyzer> queryAnalizerFactory;
@@ -87,7 +94,8 @@ public class QueryRestController {
       }
    }
 
-   @RequestMapping(value = CHANNELS, method = {RequestMethod.GET, RequestMethod.POST}, produces = {MediaType.APPLICATION_JSON_VALUE})
+   @RequestMapping(value = CHANNELS, method = {RequestMethod.GET, RequestMethod.POST},
+         produces = {MediaType.APPLICATION_JSON_VALUE})
    public @ResponseBody Collection<String> getChannels(@RequestBody(required = false) ChannelsRequest request)
          throws Throwable {
       // in case not specified use default (e.g. GET)
@@ -112,7 +120,8 @@ public class QueryRestController {
     * @return Collection of channel names matching the specified input channel name
     * @throws Throwable in case something goes wrong
     */
-   @RequestMapping(value = CHANNELS + "/{channelName}", method = {RequestMethod.GET}, produces = {MediaType.APPLICATION_JSON_VALUE})
+   @RequestMapping(value = CHANNELS + "/{channelName}", method = {RequestMethod.GET},
+         produces = {MediaType.APPLICATION_JSON_VALUE})
    public @ResponseBody Collection<String> getChannels(@PathVariable(value = "channelName") String channelName)
          throws Throwable {
       return getChannels(new ChannelsRequest(channelName));
@@ -166,7 +175,8 @@ public class QueryRestController {
     * 
     * @return list of {@link AggregationType}s as String array
     */
-   @RequestMapping(value = "aggregationtypes", method = {RequestMethod.GET}, produces = {MediaType.APPLICATION_JSON_VALUE})
+   @RequestMapping(value = "aggregationtypes", method = {RequestMethod.GET},
+         produces = {MediaType.APPLICATION_JSON_VALUE})
    public @ResponseBody List<String> getAggregationTypesValues() {
       List<AggregationType> orderings = Lists.newArrayList(AggregationType.values());
       return orderings.stream()
@@ -193,9 +203,9 @@ public class QueryRestController {
    /**
     * Catch-all query method for getting data from the backend.
     * <p>
-    * The {@link DAQQuery} object will be a concrete subclass based on the combination of
+    * The {@link DAQQuery} object will be a concrete subclass based on the combination of fields
-    * fields defined in the user's query. The {@link AttributeBasedDeserializer} decides which class
+    * defined in the user's query. The {@link AttributeBasedDeserializer} decides which class to
-    * to deserialize the information into and has been configured (see
+    * deserialize the information into and has been configured (see
     * QueryRestConfig#afterPropertiesSet) accordingly.
     * 
     * @param query concrete implementation of {@link DAQQuery}
@@ -230,9 +240,9 @@ public class QueryRestController {
 
    private QueryProcessor getQueryProcessor(DBMode dbMode) {
       if (DBMode.databuffer.equals(dbMode)) {
-         return cassandraQueryProcessor;
+         return cassandraQueryProcessor.get();
       } else if (DBMode.archiverappliance.equals(dbMode)) {
-         return archiverApplianceQueryProcessor;
+         return archiverApplianceQueryProcessor.get();
       } else {
          LOGGER.error("Unknown DBMode '{}'!", dbMode);
          throw new IllegalArgumentException(String.format("Unknown DBMode '%s'", dbMode));