From a5277c7fd9296da8a8d5c9bdf27c95e81d945c43 Mon Sep 17 00:00:00 2001 From: Zellweger Christof Ralf Date: Thu, 3 Dec 2015 12:15:01 +0100 Subject: [PATCH] - removing unused injected fields --- .../queryrest/controller/QueryRestController.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java b/src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java index 3127e39..e0db109 100644 --- a/src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java +++ b/src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java @@ -4,7 +4,6 @@ import java.io.IOException; import java.util.Collection; import java.util.List; import java.util.Map.Entry; -import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -27,8 +26,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import com.google.common.collect.Lists; - import ch.psi.daq.cassandra.request.validate.RequestProviderValidator; import ch.psi.daq.common.concurrent.singleton.Deferred; import ch.psi.daq.common.json.deserialize.AttributeBasedDeserializer; @@ -44,9 +41,10 @@ import ch.psi.daq.query.model.QueryField; import ch.psi.daq.query.model.impl.DAQQuery; import ch.psi.daq.query.processor.QueryProcessor; import ch.psi.daq.query.request.ChannelsRequest; -import ch.psi.daq.queryrest.config.QueryRestConfig; import ch.psi.daq.queryrest.response.ResponseStreamWriter; +import com.google.common.collect.Lists; + @RestController public class QueryRestController { @@ -75,12 +73,6 @@ public class QueryRestController { @Resource private Function queryAnalizerFactory; - @Resource(name = QueryRestConfig.BEAN_NAME_DEFAULT_RESPONSE_FIELDS) - private Set defaultResponseFields; - - @Resource(name = QueryRestConfig.BEAN_NAME_DEFAULT_RESPONSE_AGGREGATIONS) - private Set defaultResponseAggregations; - @InitBinder protected void initBinder(WebDataBinder binder) { if (binder.getTarget() != null) {