Fix issues after merge

Author: ahornace

opengrok-indexer/pom.xml

@@ -139,6 +139,11 @@ Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
             <version>2.19.0</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.cronutils</groupId>
+            <artifactId>cron-utils</artifactId>
+            <version>7.0.2</version>
+        </dependency>
     </dependencies>
 
     <build>

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/AnalyzerGuru.java

@@ -172,9 +172,9 @@ public class AnalyzerGuru {
 
     /**
      * Appended when
-     * {@link #addExtension(java.lang.String, org.opensolaris.opengrok.analysis.FileAnalyzerFactory)}
+     * {@link #addExtension(java.lang.String, org.opengrok.indexer.analysis.FileAnalyzerFactory)}
      * or
-     * {@link #addPrefix(java.lang.String, org.opensolaris.opengrok.analysis.FileAnalyzerFactory)}
+     * {@link #addPrefix(java.lang.String, org.opengrok.indexer.analysis.FileAnalyzerFactory)}
      * are called to augment the value in {@link #getVersionNo()}.
      */
     private static final TreeSet<String> CUSTOMIZATION_KEYS = new TreeSet<>();
@@ -328,9 +328,9 @@ public class AnalyzerGuru {
      * @return a value whose lower 32-bits are a static value
      * 20171230_00
      * for the current implementation and whose higher-32 bits are non-zero if
-     * {@link #addExtension(java.lang.String, org.opensolaris.opengrok.analysis.FileAnalyzerFactory)}
+     * {@link #addExtension(java.lang.String, org.opengrok.indexer.analysis.FileAnalyzerFactory)}
      * or
-     * {@link #addPrefix(java.lang.String, org.opensolaris.opengrok.analysis.FileAnalyzerFactory)}
+     * {@link #addPrefix(java.lang.String, org.opengrok.indexer.analysis.FileAnalyzerFactory)}
      * has been called.
      */
     public static long getVersionNo() {

src/org/opensolaris/opengrok/configuration/SuggesterConfig.java renamed to opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/SuggesterConfig.java

@@ -20,12 +20,12 @@
 /*
  * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
  */
-package org.opensolaris.opengrok.configuration;
+package org.opengrok.indexer.configuration;
 
 import com.cronutils.model.CronType;
 import com.cronutils.model.definition.CronDefinitionBuilder;
 import com.cronutils.parser.CronParser;
-import org.opensolaris.opengrok.search.QueryBuilder;
+import org.opengrok.indexer.search.QueryBuilder;
 
 import java.util.Arrays;
 import java.util.Collections;

opengrok-indexer/src/main/java/org/opengrok/indexer/web/SearchHelper.java

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

opengrok-indexer/src/main/java/org/opengrok/indexer/web/api/constraints/PositiveDuration.java

@@ -37,7 +37,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 public @interface PositiveDuration {
 
-    String message() default "{org.opensolaris.opengrok.web.constraints.PositiveDuration.message}";
+    String message() default "{org.opengrok.indexer.web.api.constraints.PositiveDuration.message}";
 
     Class<?>[] groups() default {};
 

test/org/opensolaris/opengrok/util/ClassUtilTest.java renamed to opengrok-indexer/src/test/java/org/opengrok/indexer/util/ClassUtilTest.java

@@ -20,7 +20,7 @@
 /*
  * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
  */
-package org.opensolaris.opengrok.util;
+package org.opengrok.indexer.util;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Before;

opengrok-web/pom.xml

@@ -26,6 +26,11 @@
             <artifactId>opengrok</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>suggester</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
@@ -85,6 +90,12 @@
             <version>1.3</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>3.1.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

opengrok-web/src/main/java/org/opengrok/web/WebappListener.java

@@ -36,6 +36,8 @@
 import org.opengrok.indexer.authorization.AuthorizationFramework;
 import org.opengrok.indexer.configuration.RuntimeEnvironment;
 import org.opengrok.indexer.logger.LoggerFactory;
+import org.opengrok.indexer.web.PageConfig;
+import org.opengrok.indexer.web.SearchHelper;
 import org.opengrok.web.api.v1.suggester.provider.service.SuggesterServiceFactory;
 
 /**

src/org/opensolaris/opengrok/web/api/v1/controller/SuggesterController.java renamed to opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/SuggesterController.java

@@ -20,7 +20,7 @@
 /*
  * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
  */
-package org.opensolaris.opengrok.web.api.v1.controller;
+package org.opengrok.web.api.v1.controller;
 
 import org.apache.lucene.index.Term;
 import org.apache.lucene.queryparser.classic.ParseException;
@@ -30,17 +30,17 @@
 import org.opengrok.suggest.LookupResultItem;
 import org.opengrok.suggest.Suggester.Suggestions;
 import org.opengrok.suggest.SuggesterUtils;
-import org.opensolaris.opengrok.configuration.RuntimeEnvironment;
-import org.opensolaris.opengrok.configuration.SuggesterConfig;
-import org.opensolaris.opengrok.logger.LoggerFactory;
-import org.opensolaris.opengrok.search.QueryBuilder;
-import org.opensolaris.opengrok.web.Util;
-import org.opensolaris.opengrok.web.api.v1.suggester.model.SuggesterData;
-import org.opensolaris.opengrok.web.api.v1.suggester.model.SuggesterQueryData;
-import org.opensolaris.opengrok.web.api.v1.suggester.parser.SuggesterQueryDataParser;
-import org.opensolaris.opengrok.web.api.v1.suggester.provider.filter.Authorized;
-import org.opensolaris.opengrok.web.api.v1.suggester.provider.filter.Suggester;
-import org.opensolaris.opengrok.web.api.v1.suggester.provider.service.SuggesterService;
+import org.opengrok.indexer.configuration.RuntimeEnvironment;
+import org.opengrok.indexer.configuration.SuggesterConfig;
+import org.opengrok.indexer.logger.LoggerFactory;
+import org.opengrok.indexer.search.QueryBuilder;
+import org.opengrok.indexer.web.Util;
+import org.opengrok.web.api.v1.suggester.model.SuggesterData;
+import org.opengrok.web.api.v1.suggester.model.SuggesterQueryData;
+import org.opengrok.web.api.v1.suggester.parser.SuggesterQueryDataParser;
+import org.opengrok.web.api.v1.suggester.provider.filter.Authorized;
+import org.opengrok.web.api.v1.suggester.provider.filter.Suggester;
+import org.opengrok.web.api.v1.suggester.provider.service.SuggesterService;
 
 import javax.inject.Inject;
 import javax.validation.Valid;
@@ -152,8 +152,8 @@ private boolean satisfiesConfiguration(final SuggesterData data, final Suggester
 
     /**
      * Returns the suggester configuration {@link SuggesterConfig}.
-     * Because of the {@link org.opensolaris.opengrok.web.api.v1.filter.LocalhostFilter}, the
-     * {@link org.opensolaris.opengrok.web.api.v1.controller.ConfigurationController} cannot be accessed from the
+     * Because of the {@link org.opengrok.web.api.v1.filter.LocalhostFilter}, the
+     * {@link org.opengrok.web.api.v1.controller.ConfigurationController} cannot be accessed from the
      * web page by the remote user. To resolve the problem, this method exposes this functionality.
      * @return suggester configuration
      */

opengrok-web/src/main/java/org/opengrok/web/api/v1/filter/LocalhostFilter.java

@@ -52,7 +52,7 @@ public class LocalhostFilter implements ContainerRequestFilter {
      * Endpoint paths that are exempted from this filter.
      * @see SearchController#search(HttpServletRequest, String, String, String, String, String, String,
      * java.util.List, int, int)
-     * @see SuggesterController#getSuggestions(org.opensolaris.opengrok.web.api.v1.suggester.model.SuggesterQueryData)
+     * @see SuggesterController#getSuggestions(org.opengrok.web.api.v1.suggester.model.SuggesterQueryData)
      * @see SuggesterController#getConfig()
      */
     private static final Set<String> allowedPaths = new HashSet<>(Arrays.asList(