refactor: inject IndexWriter through constructor

With the latest spring upgrade, indexWriter was not injected using
@Autowired annotation on the attribute. By using constructor injection,
the tests were green again

(cherry picked from commit e58fc11)

Author: jgiovaresco

gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/rest/api/service/impl/search/lucene/searcher/AbstractDocumentSearcher.java

@@ -53,9 +53,12 @@ protected static void increaseMaxClauseCountIfNecessary(int size) {
 
     protected Analyzer analyzer = new CustomWhitespaceAnalyzer();
 
-    @Autowired
     protected IndexWriter indexWriter;
 
+    protected AbstractDocumentSearcher(IndexWriter indexWriter) {
+        this.indexWriter = indexWriter;
+    }
+
     protected SearchResult search(Query query) throws TechnicalException {
         return search(query, null, null, FIELD_ID);
     }

gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/rest/api/service/impl/search/lucene/searcher/ApiDocumentSearcher.java

@@ -37,6 +37,7 @@
 import java.util.Optional;
 import java.util.Set;
 import org.apache.lucene.analysis.core.KeywordAnalyzer;
+import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.queryparser.classic.MultiFieldQueryParser;
 import org.apache.lucene.queryparser.classic.ParseException;
@@ -120,6 +121,10 @@ public class ApiDocumentSearcher extends AbstractDocumentSearcher {
         FIELD_DEFINITION_VERSION,
     };
 
+    public ApiDocumentSearcher(IndexWriter indexWriter) {
+        super(indexWriter);
+    }
+
     private BooleanQuery.Builder buildApiQuery(ExecutionContext executionContext, Optional<Query> filterQuery) {
         BooleanQuery.Builder apiQuery = new BooleanQuery.Builder()
             .add(new TermQuery(new Term(FIELD_TYPE, FIELD_API_TYPE_VALUE)), BooleanClause.Occur.FILTER);

gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/rest/api/service/impl/search/lucene/searcher/PageDocumentSearcher.java

@@ -23,6 +23,7 @@
 import io.gravitee.rest.api.service.common.ExecutionContext;
 import io.gravitee.rest.api.service.impl.search.SearchResult;
 import java.util.Optional;
+import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.queryparser.classic.MultiFieldQueryParser;
 import org.apache.lucene.queryparser.classic.ParseException;
@@ -40,6 +41,10 @@ public class PageDocumentSearcher extends AbstractDocumentSearcher {
 
     protected static final String FIELD_TYPE_VALUE = "page";
 
+    public PageDocumentSearcher(IndexWriter indexWriter) {
+        super(indexWriter);
+    }
+
     @Override
     public SearchResult searchReference(ExecutionContext executionContext, io.gravitee.rest.api.service.search.query.Query query)
         throws TechnicalException {

gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/rest/api/service/impl/search/lucene/searcher/UserDocumentSearcher.java

@@ -25,6 +25,7 @@
 import io.gravitee.rest.api.service.search.query.Query;
 import java.util.UUID;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.queryparser.classic.MultiFieldQueryParser;
 import org.apache.lucene.queryparser.classic.ParseException;
@@ -45,6 +46,10 @@ public class UserDocumentSearcher extends AbstractDocumentSearcher {
 
     protected static final String FIELD_TYPE_VALUE = "user";
 
+    public UserDocumentSearcher(IndexWriter indexWriter) {
+        super(indexWriter);
+    }
+
     @Override
     public SearchResult search(ExecutionContext executionContext, Query query) throws TechnicalException {
         QueryParser parser = new MultiFieldQueryParser(

gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/rest/api/service/impl/SearchEngineServiceTest.java

@@ -19,6 +19,7 @@
 import static io.gravitee.rest.api.service.impl.search.lucene.transformer.ApiDocumentTransformer.FIELD_DEFINITION_VERSION;
 import static io.gravitee.rest.api.service.impl.search.lucene.transformer.ApiDocumentTransformer.FIELD_NAME;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.in;
 import static org.mockito.Mockito.mock;
 
 import inmemory.ApiCrudServiceInMemory;
@@ -62,24 +63,27 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.FSDirectory;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
 /**
  * @author Guillaume Cusnieux (guillaume.cusnieux at graviteesource.com)
  * @author GraviteeSource Team
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = { SearchEngineServiceTest.TestConfig.class }, loader = AnnotationConfigContextLoader.class)
 public class SearchEngineServiceTest {
 
@@ -629,7 +633,7 @@ public void shouldFindWithExcludedFilters_multiple() {
         assertThat(matches.getHits()).isZero();
     }
 
-    @Before
+    @BeforeEach
     public void initIndexer() {
         // TODO: Remove this hack and use @BeforeAll when move to junit 5.x
         if (!isIndexed) {
@@ -720,18 +724,18 @@ public Directory indexDirectory() throws IOException {
         }
 
         @Bean
-        public ApiDocumentSearcher apiDocumentSearcher() {
-            return new ApiDocumentSearcher();
+        public ApiDocumentSearcher apiDocumentSearcher(IndexWriter indexWriter) {
+            return new ApiDocumentSearcher(indexWriter);
         }
 
         @Bean
-        public PageDocumentSearcher pageDocumentSearcher() {
-            return new PageDocumentSearcher();
+        public PageDocumentSearcher pageDocumentSearcher(IndexWriter indexWriter) {
+            return new PageDocumentSearcher(indexWriter);
         }
 
         @Bean
-        public UserDocumentSearcher userDocumentSearcher() {
-            return new UserDocumentSearcher();
+        public UserDocumentSearcher userDocumentSearcher(IndexWriter indexWriter) {
+            return new UserDocumentSearcher(indexWriter);
         }
 
         @Bean
@@ -745,8 +749,12 @@ public Collection<DocumentTransformer> transformers() {
         }
 
         @Bean
-        public Collection<DocumentSearcher> searchers() {
-            return Arrays.asList(new ApiDocumentSearcher(), new PageDocumentSearcher(), new UserDocumentSearcher());
+        public Collection<DocumentSearcher> searchers(
+            ApiDocumentSearcher apiDocumentSearcher,
+            PageDocumentSearcher pageDocumentSearcher,
+            UserDocumentSearcher userDocumentSearcher
+        ) {
+            return Arrays.asList(apiDocumentSearcher, pageDocumentSearcher, userDocumentSearcher);
         }
 
         @Bean

gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/rest/api/service/impl/search/lucene/searcher/ApiDocumentSearcherTest.java

@@ -31,7 +31,7 @@
 @RunWith(MockitoJUnitRunner.class)
 public class ApiDocumentSearcherTest {
 
-    ApiDocumentSearcher searcher = new ApiDocumentSearcher();
+    ApiDocumentSearcher searcher = new ApiDocumentSearcher(null);
 
     @Test
     public void shouldCompleteQueryWithFilters() {