Fix QueryLimiter CDI injection

web-services/cached-results/src/main/java/datawave/webservice/results/cached/CachedResultsBean.java

@@ -240,6 +240,7 @@ public class CachedResultsBean {
     private AccumuloConnectionRequestBean accumuloConnectionRequestBean;
 
     @Inject
+    @SpringBean(name = "queryLimiter")
     private QueryLimiter queryLimiter;
 
     protected static final String COMMA = ",";

web-services/query/src/main/java/datawave/webservice/query/cache/QueryExpirationBean.java

@@ -43,45 +43,27 @@ public class QueryExpirationBean {
 
     private static final Logger log = Logger.getLogger(QueryExpirationBean.class);
 
-    private QueryCache queryCache;
-    private QueryExpirationProperties config;
-    private AccumuloConnectionFactory connectionFactory;
-    private CreatedQueryLogicCacheBean queryLogicCacheBean;
-    private QueryMetricsBean metricsBean;
-    private QueryLimiter queryLimiter;
-
-    private boolean clearAll = false;
-
     @Inject
-    public void setQueryCache(QueryCache cache) {
-        this.queryCache = cache;
-    }
+    private QueryCache queryCache;
 
     @Inject
     @SpringBean(refreshable = true)
-    public void setQueryExpirationProperties(QueryExpirationProperties properties) {
-        this.config = properties;
-    }
+    private QueryExpirationProperties config;
 
     @Inject
-    public void setConnectionFactory(AccumuloConnectionFactory connectionFactory) {
-        this.connectionFactory = connectionFactory;
-    }
+    private AccumuloConnectionFactory connectionFactory;
 
     @Inject
-    public void setCreatedQueryLogicCacheBean(CreatedQueryLogicCacheBean cacheBean) {
-        this.queryLogicCacheBean = cacheBean;
-    }
+    private CreatedQueryLogicCacheBean queryLogicCacheBean;
 
     @Inject
-    public void setQueryMetricsBean(QueryMetricsBean metrics) {
-        this.metricsBean = metrics;
-    }
+    private QueryMetricsBean metricsBean;
 
     @Inject
-    public void setQueryLimiter(QueryLimiter queryLimiter) {
-        this.queryLimiter = queryLimiter;
-    }
+    @SpringBean(name = "queryLimiter")
+    private QueryLimiter queryLimiter;
+
+    private boolean clearAll = false;
 
     @PostConstruct
     public void init() {

web-services/query/src/test/java/datawave/webservice/query/cache/QueryExpirationBeanTest.java

@@ -12,6 +12,7 @@
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
+import org.springframework.test.util.ReflectionTestUtils;
 
 import datawave.core.common.connection.AccumuloConnectionFactory;
 import datawave.core.query.logic.QueryLogic;
@@ -49,12 +50,12 @@ public void setUp() throws Exception {
         queryLimiter = Mockito.mock(QueryLimiter.class);
 
         this.bean = new QueryExpirationBean();
-        bean.setQueryCache(queryCache);
-        bean.setQueryExpirationProperties(properties);
-        bean.setConnectionFactory(connectionFactory);
-        bean.setCreatedQueryLogicCacheBean(queryLogicCache);
-        bean.setQueryMetricsBean(metricsBean);
-        bean.setQueryLimiter(queryLimiter);
+        ReflectionTestUtils.setField(bean, "queryCache", queryCache);
+        ReflectionTestUtils.setField(bean, "config", properties);
+        ReflectionTestUtils.setField(bean, "connectionFactory", connectionFactory);
+        ReflectionTestUtils.setField(bean, "queryLogicCacheBean", queryLogicCache);
+        ReflectionTestUtils.setField(bean, "metricsBean", metricsBean);
+        ReflectionTestUtils.setField(bean, "queryLimiter", queryLimiter);
 
         bean.init();
     }