Use factory for SuggesterService

Author: ahornace

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

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

src/org/opensolaris/opengrok/web/SearchHelper.java

@@ -72,7 +72,7 @@
 import org.opensolaris.opengrok.search.context.HistoryContext;
 import org.opensolaris.opengrok.util.ForbiddenSymlinkException;
 import org.opensolaris.opengrok.util.IOUtils;
-import org.opensolaris.opengrok.web.suggester.provider.service.SuggesterService;
+import org.opensolaris.opengrok.web.suggester.provider.service.SuggesterServiceFactory;
 
 /**
  * Working set for a search basically to factor out/separate search related
@@ -374,7 +374,7 @@ public SearchHelper prepareExec(Project project) {
      * @return this instance
      */
     public SearchHelper executeQuery() {
-        SuggesterService.getInstance().onSearch(projects, query); // notify suggester that query was searched
+        SuggesterServiceFactory.getDefault().onSearch(projects, query); // notify suggester that query was searched
 
         if (redirect != null || errorMsg != null) {
             return this;

src/org/opensolaris/opengrok/web/WebappListener.java

@@ -36,7 +36,7 @@
 import org.opensolaris.opengrok.authorization.AuthorizationFramework;
 import org.opensolaris.opengrok.configuration.RuntimeEnvironment;
 import org.opensolaris.opengrok.logger.LoggerFactory;
-import org.opensolaris.opengrok.web.suggester.provider.service.SuggesterService;
+import org.opensolaris.opengrok.web.suggester.provider.service.SuggesterServiceFactory;
 
 /**
  * Initialize webapp context
@@ -116,7 +116,7 @@ public void contextDestroyed(final ServletContextEvent servletContextEvent) {
 
         // need to explicitly close the suggester service because it might have scheduled rebuild which could prevent
         // the web application from closing
-        SuggesterService.getInstance().close();
+        SuggesterServiceFactory.getDefault().close();
     }
 
     /**

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

@@ -34,7 +34,7 @@
 import org.opensolaris.opengrok.util.ClassUtil;
 import org.opensolaris.opengrok.util.ForbiddenSymlinkException;
 import org.opensolaris.opengrok.util.IOUtils;
-import org.opensolaris.opengrok.web.suggester.provider.service.SuggesterService;
+import org.opensolaris.opengrok.web.suggester.provider.service.SuggesterServiceFactory;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -184,7 +184,7 @@ public void deleteProject(@PathParam("project") final String projectName)
                     }
                 }).collect(Collectors.toSet()));
 
-        SuggesterService.getInstance().delete(projectName);
+        SuggesterServiceFactory.getDefault().delete(projectName);
     }
 
     @PUT
@@ -220,7 +220,7 @@ public void markIndexed(@PathParam("project") final String projectName) throws E
 
         env.refreshDateForLastIndexRun();
 
-        SuggesterService.getInstance().refresh(projectName);
+        SuggesterServiceFactory.getDefault().refresh(projectName);
     }
 
     @PUT

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

@@ -25,7 +25,7 @@
 import org.apache.lucene.search.Query;
 import org.opensolaris.opengrok.search.Hit;
 import org.opensolaris.opengrok.search.SearchEngine;
-import org.opensolaris.opengrok.web.suggester.provider.service.SuggesterService;
+import org.opensolaris.opengrok.web.suggester.provider.service.SuggesterServiceFactory;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.DefaultValue;
@@ -72,7 +72,7 @@ public SearchResult search(
 
             Instant startTime = Instant.now();
 
-            SuggesterService.getInstance().onSearch(projects, engine.getQuery());
+            SuggesterServiceFactory.getDefault().onSearch(projects, engine.getQuery());
 
             Map<String, List<SearchHit>> hits = engine.search(req, projects, startDocIndex, maxResults)
                     .stream()

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

@@ -23,7 +23,7 @@
 package org.opensolaris.opengrok.web.api.v1.controller;
 
 import org.opensolaris.opengrok.configuration.RuntimeEnvironment;
-import org.opensolaris.opengrok.web.suggester.provider.service.SuggesterService;
+import org.opensolaris.opengrok.web.suggester.provider.service.SuggesterServiceFactory;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.PUT;
@@ -41,7 +41,7 @@ public class SystemController {
     @Consumes(MediaType.TEXT_PLAIN)
     public void refresh(final String project) {
         env.maybeRefreshIndexSearchers(Collections.singleton(project));
-        SuggesterService.getInstance().refresh(project);
+        SuggesterServiceFactory.getDefault().refresh(project);
     }
 
 }

src/org/opensolaris/opengrok/web/suggester/SuggesterAppBinder.java

@@ -24,6 +24,7 @@
 
 import org.glassfish.jersey.internal.inject.AbstractBinder;
 import org.opensolaris.opengrok.web.suggester.provider.service.SuggesterService;
+import org.opensolaris.opengrok.web.suggester.provider.service.SuggesterServiceFactory;
 
 /**
  * Binder for dependency injection in {@link SuggesterApp}.
@@ -32,7 +33,7 @@ public class SuggesterAppBinder extends AbstractBinder {
 
     @Override
     protected void configure() {
-        bind(SuggesterService.getInstance()).to(SuggesterService.class);
+        bind(SuggesterServiceFactory.getDefault()).to(SuggesterService.class);
     }
 
 }

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

@@ -27,7 +27,6 @@
 import org.opengrok.suggest.LookupResultItem;
 import org.opengrok.suggest.query.SuggesterQuery;
 import org.opensolaris.opengrok.configuration.Configuration;
-import org.opensolaris.opengrok.web.suggester.provider.service.impl.SuggesterServiceImpl;
 
 import java.util.Collection;
 import java.util.List;
@@ -83,12 +82,4 @@ public interface SuggesterService {
      */
     void close();
 
-    /**
-     * Factory method for this service.
-     * @return default service implementation
-     */
-    static SuggesterService getInstance() {
-        return SuggesterServiceImpl.getInstance();
-    }
-
 }

src/org/opensolaris/opengrok/web/suggester/provider/service/SuggesterServiceFactory.java

@@ -0,0 +1,36 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * See LICENSE.txt included in this distribution for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at LICENSE.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ */
+package org.opensolaris.opengrok.web.suggester.provider.service;
+
+import org.opensolaris.opengrok.web.suggester.provider.service.impl.SuggesterServiceImpl;
+
+public class SuggesterServiceFactory {
+
+    private SuggesterServiceFactory() {
+    }
+
+    public static SuggesterService getDefault() {
+        return SuggesterServiceImpl.getInstance();
+    }
+
+}