add method to wait for suggester init

Author: Vladimir Kotal

opengrok-web/src/main/java/org/opengrok/web/api/v1/suggester/provider/service/SuggesterService.java

@@ -69,6 +69,13 @@ public interface SuggesterService {
      */
     void waitForRebuild(long timeout, TimeUnit unit) throws InterruptedException;
 
+    /**
+     * Wait for the initialization. For testing.
+     * @param timeout timeout to wait for
+     * @param unit timeout unit
+     */
+    void waitForInit(long timeout, TimeUnit unit) throws InterruptedException;
+
     /**
      * Deletes all suggester data for the {@code project}.
      * @param project name of the project to delete

opengrok-web/src/main/java/org/opengrok/web/api/v1/suggester/provider/service/impl/SuggesterServiceImpl.java

@@ -403,6 +403,10 @@ public void waitForRebuild(long timeout, TimeUnit unit) throws InterruptedExcept
         suggester.waitForRebuild(timeout, unit);
     }
 
+    public void waitForInit(long timeout, TimeUnit unit) throws InterruptedException {
+        suggester.waitForInit(timeout, unit);
+    }
+
     /** {@inheritDoc} */
     @Override
     public void close() {

opengrok-web/src/test/java/org/opengrok/web/api/v1/controller/SuggesterControllerTest.java

@@ -32,7 +32,6 @@
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 import org.opengrok.indexer.util.TestCasePrinterRule;
-import org.opengrok.suggest.Suggester;
 import org.opengrok.indexer.configuration.RuntimeEnvironment;
 import org.opengrok.indexer.configuration.SuggesterConfig;
 import org.opengrok.indexer.index.Indexer;
@@ -46,18 +45,15 @@
 import javax.ws.rs.core.Application;
 import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.Response;
-import java.lang.reflect.Field;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-import static org.awaitility.Awaitility.await;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
 import static org.junit.Assert.assertEquals;
@@ -129,24 +125,12 @@ public static void tearDownClass() {
     }
 
     @Before
-    public void before() {
-        await().atMost(15, TimeUnit.SECONDS).until(() ->
-                getSuggesterProjectDataSize() == env.getProjectList().size());
+    public void before() throws InterruptedException {
+        SuggesterServiceImpl.getInstance().waitForInit(15, TimeUnit.SECONDS);
 
         env.setSuggesterConfig(new SuggesterConfig());
     }
 
-    private static int getSuggesterProjectDataSize() throws Exception {
-        Field f = SuggesterServiceImpl.class.getDeclaredField("suggester");
-        f.setAccessible(true);
-        Suggester suggester = (Suggester) f.get(SuggesterServiceImpl.getInstance());
-
-        Field f2 = Suggester.class.getDeclaredField("projectData");
-        f2.setAccessible(true);
-
-        return ((Map) f2.get(suggester)).size();
-    }
-
     @Test
     public void testGetSuggesterConfig() {
         SuggesterConfig config = target(SuggesterController.PATH)

suggester/src/main/java/org/opengrok/suggest/Suggester.java

@@ -49,6 +49,7 @@
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -94,6 +95,8 @@ public final class Suggester implements Closeable {
     private final Lock rebuildLock = new ReentrantLock();
     private final Condition rebuildDone = rebuildLock.newCondition();
 
+    private final CountDownLatch initDone = new CountDownLatch(1);
+
     // do NOT use fork join thread pool (work stealing thread pool) because it does not send interrupts upon cancellation
     private final ExecutorService executorService = Executors.newFixedThreadPool(
             Runtime.getRuntime().availableProcessors(),
@@ -166,9 +169,14 @@ public void init(final Collection<NamedIndexDir> luceneIndexes) {
             }
 
             shutdownAndAwaitTermination(executor, start, "Suggester successfully initialized");
+            initDone.countDown();
         }
     }
 
+    public void waitForInit(long timeout, TimeUnit unit) throws InterruptedException {
+        initDone.await(timeout, unit);
+    }
+
     private void submitInitIfIndexExists(final ExecutorService executorService, final NamedIndexDir indexDir) {
         try {
             if (indexExists(indexDir.path)) {