Add tests to check if suggester is notified on configuration change

Author: ahornace

src/org/opensolaris/opengrok/configuration/RuntimeEnvironment.java

@@ -89,7 +89,6 @@
 import org.opensolaris.opengrok.util.ForbiddenSymlinkException;
 import org.opensolaris.opengrok.util.PathUtils;
 import org.opensolaris.opengrok.web.Prefix;
-import org.opensolaris.opengrok.web.api.v1.suggester.provider.service.SuggesterServiceFactory;
 
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.Entity;
@@ -1718,7 +1717,6 @@ public void applyConfig(Configuration config, boolean reindex, boolean interacti
         getAuthorizationFramework().reload();
 
         messagesContainer.setMessageLimit(config.getMessageLimit());
-        SuggesterServiceFactory.getDefault().refresh(configuration);
     }
 
     public void setIndexTimestamp() throws IOException {

src/org/opensolaris/opengrok/web/api/v1/controller/ConfigurationController.java

@@ -24,7 +24,9 @@
 
 import org.opensolaris.opengrok.configuration.RuntimeEnvironment;
 import org.opensolaris.opengrok.util.ClassUtil;
+import org.opensolaris.opengrok.web.api.v1.suggester.provider.service.SuggesterService;
 
+import javax.inject.Inject;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
@@ -43,6 +45,9 @@ public class ConfigurationController {
 
     private final RuntimeEnvironment env = RuntimeEnvironment.getInstance();
 
+    @Inject
+    private SuggesterService suggesterService;
+
     @GET
     @Produces(MediaType.APPLICATION_XML)
     public String get() {
@@ -53,6 +58,7 @@ public String get() {
     @Consumes(MediaType.APPLICATION_XML)
     public void set(final String body, @QueryParam("reindex") final boolean reindex) {
         env.applyConfig(body, reindex, !reindex);
+        suggesterService.refresh();
     }
 
     @GET
@@ -77,6 +83,7 @@ public void setField(@PathParam("field") final String field, final String value)
 
         // apply the configuration - let the environment reload the configuration if necessary
         env.applyConfig(env.getConfiguration(), false, true);
+        suggesterService.refresh();
     }
 
     @POST

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

@@ -26,7 +26,6 @@
 import org.apache.lucene.search.Query;
 import org.opengrok.suggest.LookupResultItem;
 import org.opengrok.suggest.query.SuggesterQuery;
-import org.opensolaris.opengrok.configuration.Configuration;
 
 import java.util.Collection;
 import java.util.List;
@@ -46,9 +45,8 @@ public interface SuggesterService {
 
     /**
      * Refreshes the suggester based on the new configuration.
-     * @param configuration new configuration
      */
-    void refresh(Configuration configuration);
+    void refresh();
 
     /**
      * Refreshes the suggester for specified {@code project}.

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

@@ -153,8 +153,8 @@ private List<NamedIndexReader> getNamedIndexReaders(
 
     /** {@inheritDoc} */
     @Override
-    public void refresh(final Configuration configuration) {
-        logger.log(Level.FINE, "Refreshing suggester for new configuration {0}", configuration);
+    public void refresh() {
+        logger.log(Level.FINE, "Refreshing suggester for new configuration {0}", env.getConfiguration());
         lock.writeLock().lock();
         try {
             // close and init from scratch because many things may have changed in the configuration

test/org/opensolaris/opengrok/web/api/v1/controller/ConfigurationControllerTest.java

@@ -22,26 +22,42 @@
  */
 package org.opensolaris.opengrok.web.api.v1.controller;
 
+import org.glassfish.jersey.internal.inject.AbstractBinder;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
 import org.junit.Assert;
 import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 import org.opensolaris.opengrok.configuration.Configuration;
 import org.opensolaris.opengrok.configuration.RuntimeEnvironment;
+import org.opensolaris.opengrok.web.api.v1.suggester.provider.service.SuggesterService;
 
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.core.Application;
 import javax.ws.rs.core.Response;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
 
 public class ConfigurationControllerTest extends JerseyTest {
 
     private RuntimeEnvironment env = RuntimeEnvironment.getInstance();
 
+    @Mock
+    private SuggesterService suggesterService;
+
     @Override
     protected Application configure() {
-        return new ResourceConfig(ConfigurationController.class);
+        MockitoAnnotations.initMocks(this);
+        return new ResourceConfig(ConfigurationController.class)
+                .register(new AbstractBinder() {
+                    @Override
+                    protected void configure() {
+                        bind(suggesterService).to(SuggesterService.class);
+                    }
+                });
     }
 
     @Test
@@ -204,4 +220,20 @@ public void testApplyGetOptionBoolean() {
         Assert.assertEquals(env.getConfiguration().isHistoryCache(), response);
     }
 
+    @Test
+    public void testSuggesterServiceNotifiedOnConfigurationFieldChange() {
+        reset(suggesterService);
+        setValue("sourceRoot", "test");
+        verify(suggesterService).refresh();
+    }
+
+    @Test
+    public void testSuggesterServiceNotifiedOnConfigurationChange() {
+        reset(suggesterService);
+        target("configuration")
+                .request()
+                .put(Entity.xml(new Configuration().getXMLRepresentationAsString()));
+        verify(suggesterService).refresh();
+    }
+
 }

test/org/opensolaris/opengrok/web/api/v1/controller/ProjectsControllerTest.java

@@ -22,7 +22,7 @@
  */
 package org.opensolaris.opengrok.web.api.v1.controller;
 
-import org.glassfish.hk2.utilities.binding.AbstractBinder;
+import org.glassfish.jersey.internal.inject.AbstractBinder;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
 import org.junit.After;
@@ -64,7 +64,6 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
 import static org.opensolaris.opengrok.history.RepositoryFactory.getRepository;
 import static org.opensolaris.opengrok.util.IOUtils.removeRecursive;