Merge pull request #250 from companieshouse/feature/ASM-306-fix-constructer-wiring-elasticsearch-requests

ASM-306- rewrite constructor setup for es search requests classes

Author: daisysanson

src/main/java/uk/gov/companieshouse/search/api/elasticsearch/AbstractSearchRequest.java

@@ -24,7 +24,7 @@ public abstract class AbstractSearchRequest {
 
     abstract AbstractSearchQuery getSearchQuery();
 
-    private EnvironmentReader environmentReader;
+    protected final EnvironmentReader environmentReader;
 
     private static final String ORDERED_ALPHA_KEY_WITH_ID = "ordered_alpha_key_with_id";
 

src/main/java/uk/gov/companieshouse/search/api/elasticsearch/AlphabeticalSearchRequests.java

@@ -1,6 +1,5 @@
 package uk.gov.companieshouse.search.api.elasticsearch;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import uk.gov.companieshouse.environment.EnvironmentReader;
@@ -10,18 +9,16 @@
 @Component
 public class AlphabeticalSearchRequests extends AbstractSearchRequest {
 
-    private AlphabeticalSearchRestClientService searchRestClient;
-
-    private AlphabeticalSearchQueries alphabeticalSearchQueries;
+    private final AlphabeticalSearchRestClientService searchRestClient;
+    private final AlphabeticalSearchQueries alphabeticalSearchQueries;
 
     private static final String INDEX = "ALPHABETICAL_SEARCH_INDEX";
     private static final String RESULTS_SIZE = "ALPHABETICAL_SEARCH_RESULT_MAX";
 
-    @Autowired
     public AlphabeticalSearchRequests(
-        EnvironmentReader environmentReader,
-        AlphabeticalSearchRestClientService searchRestClient,
-        AlphabeticalSearchQueries alphabeticalSearchQueries
+            EnvironmentReader environmentReader,
+            AlphabeticalSearchRestClientService searchRestClient,
+            AlphabeticalSearchQueries alphabeticalSearchQueries
     ) {
         super(environmentReader);
         this.searchRestClient = searchRestClient;

src/main/java/uk/gov/companieshouse/search/api/elasticsearch/DissolvedSearchRequests.java

@@ -5,7 +5,6 @@
 import org.elasticsearch.search.SearchHits;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.search.fetch.subphase.FetchSourceContext;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import uk.gov.companieshouse.environment.EnvironmentReader;
 import uk.gov.companieshouse.logging.util.DataMap;
@@ -23,13 +22,10 @@ public class DissolvedSearchRequests extends AbstractSearchRequest {
 
     private DissolvedSearchQueries searchQueries;
 
-    private EnvironmentReader environmentReader;
-
     private static final String INDEX = "DISSOLVED_SEARCH_INDEX";
     private static final String RESULTS_SIZE = "DISSOLVED_SEARCH_RESULT_MAX";
     private static final String BEST_MATCH_SEARCH_TYPE = "best-match";
 
-    @Autowired
     public DissolvedSearchRequests(
             EnvironmentReader environmentReader,
             DissolvedSearchRestClientService searchRestClient,

src/test/java/uk/gov/companieshouse/search/api/elasticsearch/AlphabeticalSearchRequestsTest.java

@@ -9,6 +9,7 @@
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
@@ -44,6 +45,15 @@ class AlphabeticalSearchRequestsTest {
     private static final String ENV_READER_RESULT = "1";
     private static final Integer SIZE = 10;
 
+    @BeforeEach
+    void setUp() {
+        alphabeticalSearchRequests = new AlphabeticalSearchRequests(
+                mockEnvironmentReader,
+                mockSearchRestClient,
+                mockAlphabeticalSearchQueries
+        );
+    }
+
     @Test
     @DisplayName("Get best match response")
     void getBestMatchResponse() throws Exception {

src/test/java/uk/gov/companieshouse/search/api/elasticsearch/DissolvedSearchRequestsTest.java

@@ -16,6 +16,7 @@
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
@@ -46,6 +47,16 @@ class DissolvedSearchRequestsTest {
     private static final Integer SIZE = 10;
     private static final Integer START_INDEX = 0;
 
+    @BeforeEach
+    void setUp() {
+        dissolvedSearchRequests = new DissolvedSearchRequests(
+                mockEnvironmentReader,
+                mockSearchRestClient,
+                mockDissolvedSearchQueries
+        );
+    }
+
+
     @Test
     @DisplayName("Get best match response")
     void getBestMatchResponse() throws Exception {