Move Scripts and dependent classes to web module

ahornace · Vladimir Kotal · commit d8a7afe280a9 · 2020-10-08T20:42:37.000+02:00
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/search/SearchEngine.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/search/SearchEngine.java
@@ -34,13 +34,11 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.zip.GZIPInputStream;
-import javax.servlet.http.HttpServletRequest;
 import org.apache.lucene.analysis.charfilter.HTMLStripCharFilter;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.index.DirectoryReader;
@@ -68,9 +66,7 @@
 import org.opengrok.indexer.search.context.Context;
 import org.opengrok.indexer.search.context.HistoryContext;
 import org.opengrok.indexer.util.TandemPath;
-import org.opengrok.indexer.web.PageConfig;
 import org.opengrok.indexer.web.Prefix;
-import org.opengrok.indexer.web.ProjectHelper;
 
 /**
  * This is an encapsulation of the details on how to search in the index database.
@@ -276,49 +272,11 @@ public IndexSearcher getSearcher() {
      * Call to search() must be eventually followed by call to destroy()
      * so that IndexSearcher objects are properly freed.
      *
-     * @param req request
-     * @param projectNames names of the projects
+     * @param projects projects to search
      * @return The number of hits
-     * @see ProjectHelper#getAllProjects()
-     */
-    public int search(HttpServletRequest req, String... projectNames) {
-        ProjectHelper pHelper = PageConfig.get(req).getProjectHelper();
-        Set<Project> allProjects = pHelper.getAllProjects();
-        List<Project> filteredProjects = new ArrayList<>();
-        for (Project project: allProjects) {
-            for (String name : projectNames) {
-                if (project.getName().equalsIgnoreCase(name)) {
-                    filteredProjects.add(project);
-                }
-            }
-        }
-        return search(
-                filteredProjects,
-                new File(RuntimeEnvironment.getInstance().getDataRootFile(), IndexDatabase.INDEX_DIR));
-    }
-
-    /**
-     * Execute a search aware of current request.
-     *
-     * This filters out all projects which are not allowed for the current request.
-     *
-     * Before calling this function,
-     * you must set the appropriate search criteria with the set-functions. Note
-     * that this search will return the first cachePages of hitsPerPage, for
-     * more you need to call more.
-     *
-     * Call to search() must be eventually followed by call to destroy()
-     * so that IndexSearcher objects are properly freed.
-     *
-     * @param req request
-     * @return The number of hits
-     * @see ProjectHelper#getAllProjects()
      */
-    public int search(HttpServletRequest req) {
-        ProjectHelper pHelper = PageConfig.get(req).getProjectHelper();
-        return search(
-                new ArrayList<Project>(pHelper.getAllProjects()),
-                new File(RuntimeEnvironment.getInstance().getDataRootFile(), IndexDatabase.INDEX_DIR));
+    public int search(List<Project> projects) {
+        return search(projects, new File(RuntimeEnvironment.getInstance().getDataRootFile(), IndexDatabase.INDEX_DIR));
     }
 
     /**
diff --git a/opengrok-web/src/main/java/org/opengrok/web/AuthorizationFilter.java b/opengrok-web/src/main/java/org/opengrok/web/AuthorizationFilter.java
@@ -37,7 +37,6 @@
 
 import org.opengrok.indexer.configuration.Project;
 import org.opengrok.indexer.logger.LoggerFactory;
-import org.opengrok.indexer.web.PageConfig;
 import org.opengrok.indexer.web.Laundromat;
 import org.opengrok.web.api.v1.RestApp;
 
diff --git a/opengrok-web/src/main/java/org/opengrok/web/GetFile.java b/opengrok-web/src/main/java/org/opengrok/web/GetFile.java
@@ -33,7 +33,6 @@
 import java.io.OutputStream;
 
 import org.opengrok.indexer.history.HistoryGuru;
-import org.opengrok.indexer.web.PageConfig;
 import org.opengrok.indexer.web.Prefix;
 
 import javax.servlet.http.HttpServlet;
diff --git a/opengrok-web/src/main/java/org/opengrok/web/PageConfig.java b/opengrok-web/src/main/java/org/opengrok/web/PageConfig.java
@@ -22,7 +22,7 @@
  * Portions copyright (c) 2011 Jens Elkner.
  * Portions Copyright (c) 2017-2018, 2020, Chris Fraire <cfraire@me.com>.
  */
-package org.opengrok.indexer.web;
+package org.opengrok.web;
 
 import static org.opengrok.indexer.index.Indexer.PATH_SEPARATOR;
 import static org.opengrok.indexer.index.Indexer.PATH_SEPARATOR_STRING;
@@ -81,6 +81,15 @@
 import org.opengrok.indexer.util.IOUtils;
 import org.opengrok.indexer.util.LineBreaker;
 import org.opengrok.indexer.util.TandemPath;
+import org.opengrok.indexer.web.DiffData;
+import org.opengrok.indexer.web.DiffType;
+import org.opengrok.indexer.web.EftarFileReader;
+import org.opengrok.indexer.web.Laundromat;
+import org.opengrok.indexer.web.Prefix;
+import org.opengrok.indexer.web.QueryParameters;
+import org.opengrok.indexer.web.SearchHelper;
+import org.opengrok.indexer.web.SortOrder;
+import org.opengrok.indexer.web.Util;
 import org.opengrok.indexer.web.messages.MessagesContainer.AcceptedMessage;
 import org.suigeneris.jrcs.diff.Diff;
 import org.suigeneris.jrcs.diff.DifferentiationFailedException;
diff --git a/opengrok-web/src/main/java/org/opengrok/web/ProjectHelper.java b/opengrok-web/src/main/java/org/opengrok/web/ProjectHelper.java
@@ -22,9 +22,7 @@
  * Portions Copyright (c) 2018, Chris Fraire <cfraire@me.com>.
  * Portions Copyright (c) 2019, Krystof Tulinger <k.tulinger@seznam.cz>.
  */
-package org.opengrok.indexer.web;
-
-import static org.opengrok.indexer.web.PageConfig.OPEN_GROK_PROJECT;
+package org.opengrok.web;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -40,6 +38,8 @@
 import org.opengrok.indexer.configuration.Project;
 import org.opengrok.indexer.history.RepositoryInfo;
 
+import static org.opengrok.web.PageConfig.OPEN_GROK_PROJECT;
+
 /**
  * Preprocessing of projects, repositories and groups for the UI.
  *
diff --git a/opengrok-web/src/main/java/org/opengrok/web/Scripts.java b/opengrok-web/src/main/java/org/opengrok/web/Scripts.java
@@ -21,7 +21,7 @@
  * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2017, 2020, Chris Fraire <cfraire@me.com>.
  */
-package org.opengrok.indexer.web;
+package org.opengrok.web;
 
 import java.util.Comparator;
 import java.util.Iterator;
diff --git a/opengrok-web/src/main/java/org/opengrok/web/StatisticsFilter.java b/opengrok-web/src/main/java/org/opengrok/web/StatisticsFilter.java
@@ -37,7 +37,6 @@
 import io.micrometer.core.instrument.DistributionSummary;
 import io.micrometer.core.instrument.Timer;
 import org.opengrok.indexer.Metrics;
-import org.opengrok.indexer.web.PageConfig;
 import org.opengrok.indexer.web.SearchHelper;
 
 public class StatisticsFilter implements Filter {
diff --git a/opengrok-web/src/main/java/org/opengrok/web/WebappListener.java b/opengrok-web/src/main/java/org/opengrok/web/WebappListener.java
@@ -31,7 +31,6 @@
 import org.opengrok.indexer.configuration.CommandTimeoutType;
 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;
 
diff --git a/opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/SearchController.java b/opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/SearchController.java
@@ -24,9 +24,11 @@
 package org.opengrok.web.api.v1.controller;
 
 import org.apache.lucene.search.Query;
+import org.opengrok.indexer.configuration.Project;
 import org.opengrok.indexer.search.Hit;
 import org.opengrok.indexer.search.SearchEngine;
 import org.opengrok.indexer.web.QueryParameters;
+import org.opengrok.web.PageConfig;
 import org.opengrok.web.api.v1.filter.CorsEnable;
 import org.opengrok.web.api.v1.suggester.provider.service.SuggesterService;
 
@@ -47,6 +49,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 @Path(SearchController.PATH)
@@ -126,10 +129,13 @@ public List<Hit> search(
                 final int startDocIndex,
                 final int maxResults
         ) {
+            Set<Project> allProjects = PageConfig.get(req).getProjectHelper().getAllProjects();
             if (projects == null || projects.isEmpty()) {
-                numResults = engine.search(req);
+                numResults = engine.search(new ArrayList<>(allProjects));
             } else {
-                numResults = engine.search(req, projects.toArray(new String[0]));
+                numResults = engine.search(allProjects.stream()
+                        .filter(p -> projects.contains(p.getName()))
+                        .collect(Collectors.toList()));
             }
 
             if (startDocIndex > numResults) {
diff --git a/opengrok-web/src/main/webapp/WEB-INF/tags/repositories.tag b/opengrok-web/src/main/webapp/WEB-INF/tags/repositories.tag
@@ -23,7 +23,7 @@ Portions Copyright (c) 2019, Krystof Tulinger <k.tulinger@seznam.cz>.
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib prefix="opengrok" tagdir="/WEB-INF/tags" %>
 
-<%@ attribute name="pageConfig" required="true" type="org.opengrok.indexer.web.PageConfig" %>
+<%@ attribute name="pageConfig" required="true" type="org.opengrok.web.PageConfig" %>
 <%@ attribute name="repositories" required="true" type="java.util.Set<org.opengrok.indexer.configuration.Project>" %>
 
 <c:if test="${repositories.size() > 0}">
diff --git a/opengrok-web/src/main/webapp/WEB-INF/tags/repository.tag b/opengrok-web/src/main/webapp/WEB-INF/tags/repository.tag
@@ -27,7 +27,7 @@ Portions Copyright (c) 2019, Krystof Tulinger <k.tulinger@seznam.cz>.
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%@ attribute name="pageConfig" required="true" type="org.opengrok.indexer.web.PageConfig" %>
+<%@ attribute name="pageConfig" required="true" type="org.opengrok.web.PageConfig" %>
 <%@ attribute name="project" required="true" type="org.opengrok.indexer.configuration.Project" %>
 <%@ attribute name="repositoryInfo" required="true" type="org.opengrok.indexer.history.RepositoryInfo" %>
 <%@ attribute name="isFirst" required="true" type="java.lang.Boolean" %>
diff --git a/opengrok-web/src/main/webapp/eforbidden.jsp b/opengrok-web/src/main/webapp/eforbidden.jsp
@@ -19,7 +19,7 @@ CDDL HEADER END
 Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 Portions Copyright (c) 2018, Chris Fraire <cfraire@me.com>.
 --%>
-<%@page  session="false" import="org.opengrok.indexer.web.PageConfig" %>
+<%@page  session="false" import="org.opengrok.web.PageConfig" %>
 <%
 /* ---------------------- eforbidden.jspf start --------------------- */
 {
diff --git a/opengrok-web/src/main/webapp/foot.jspf b/opengrok-web/src/main/webapp/foot.jspf
@@ -24,7 +24,7 @@ java.util.Date,
 java.util.EnumSet,
 
 org.opengrok.indexer.Info,
-org.opengrok.indexer.web.PageConfig,
+org.opengrok.web.PageConfig,
 org.opengrok.indexer.web.Prefix"
 %>
 <%!
diff --git a/opengrok-web/src/main/webapp/help.jsp b/opengrok-web/src/main/webapp/help.jsp
@@ -23,7 +23,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <cfraire@me.com>.
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page session="false" errorPage="error.jsp" import="
 org.opengrok.indexer.search.SearchEngine,
-org.opengrok.indexer.web.PageConfig,
+org.opengrok.web.PageConfig,
 org.opengrok.indexer.web.QueryParameters"
 %>
 <%
diff --git a/opengrok-web/src/main/webapp/httpheader.jspf b/opengrok-web/src/main/webapp/httpheader.jspf
@@ -36,9 +36,9 @@ to set the title of the document before the include directive for this fragment:
 --%>
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" import="
 org.opengrok.indexer.Info,
-org.opengrok.indexer.web.PageConfig,
+org.opengrok.web.PageConfig,
 org.opengrok.indexer.web.Prefix,
-org.opengrok.indexer.web.Scripts"
+org.opengrok.web.Scripts"
 %><%
 /* ---------------------- httpheader.jsp start --------------------- */
 {
diff --git a/opengrok-web/src/main/webapp/mast.jsp b/opengrok-web/src/main/webapp/mast.jsp
@@ -30,7 +30,7 @@ After include you are here: /body/div#page/div#content/
 <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="org.opengrok.indexer.web.messages.MessagesContainer"%>
 <%@ page session="false" errorPage="error.jsp" import="
-org.opengrok.indexer.web.PageConfig,
+org.opengrok.web.PageConfig,
 org.opengrok.indexer.web.Prefix,
 org.opengrok.indexer.web.Util"%>
 <%@ page import="org.opengrok.indexer.web.messages.MessagesUtils" %>
diff --git a/opengrok-web/src/main/webapp/menu.jspf b/opengrok-web/src/main/webapp/menu.jspf
@@ -30,8 +30,8 @@ java.util.TreeSet,
 org.opengrok.indexer.configuration.Group,
 org.opengrok.indexer.configuration.Project,
 org.opengrok.indexer.search.QueryBuilder,
-org.opengrok.indexer.web.PageConfig,
-org.opengrok.indexer.web.ProjectHelper,
+org.opengrok.web.PageConfig,
+org.opengrok.web.ProjectHelper,
 org.opengrok.indexer.web.QueryParameters,
 org.opengrok.indexer.web.SearchHelper,
 org.opengrok.indexer.web.Util,
diff --git a/opengrok-web/src/main/webapp/minisearch.jspf b/opengrok-web/src/main/webapp/minisearch.jspf
@@ -21,7 +21,7 @@ Portions Copyright (c) 2020, Chris Fraire <cfraire@me.com>.
 --%>
 <%@ page session="false" errorPage="error.jsp" import="
 org.opengrok.indexer.configuration.Project,
-org.opengrok.indexer.web.PageConfig,
+org.opengrok.web.PageConfig,
 org.opengrok.indexer.web.Prefix,
 org.opengrok.indexer.web.QueryParameters,
 org.opengrok.indexer.web.Util"%><%
diff --git a/opengrok-web/src/main/webapp/pageheader.jspf b/opengrok-web/src/main/webapp/pageheader.jspf
@@ -18,7 +18,7 @@ CDDL HEADER END
 
 Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
 
---%><%@page import="org.opengrok.indexer.web.PageConfig"%>
+--%><%@page import="org.opengrok.web.PageConfig"%>
 <%
 /* ---------------------- pageheader.jspf start --------------------- */
 {
diff --git a/opengrok-web/src/main/webapp/projects.jspf b/opengrok-web/src/main/webapp/projects.jspf
@@ -26,7 +26,7 @@ Portions Copyright (c) 2018, Chris Fraire <cfraire@me.com>.
 --%>
 <%@page import="
 java.net.URLEncoder,
-org.opengrok.indexer.web.PageConfig
+org.opengrok.web.PageConfig
 "%><%
 /* ---------------------- projects.jspf start --------------------- */
 {
diff --git a/opengrok-web/src/main/webapp/repos.jspf b/opengrok-web/src/main/webapp/repos.jspf
@@ -31,8 +31,8 @@ Portions Copyright (c) 2019, Krystof Tulinger <k.tulinger@seznam.cz>.
 <%@page import="org.opengrok.indexer.configuration.Group"%>
 <%@page import="org.opengrok.indexer.configuration.Project"%>
 <%@page import="org.opengrok.indexer.history.RepositoryInfo"%>
-<%@page import="org.opengrok.indexer.web.PageConfig"%>
-<%@page import="org.opengrok.indexer.web.ProjectHelper"%>
+<%@page import="org.opengrok.web.PageConfig"%>
+<%@page import="org.opengrok.web.ProjectHelper"%>
 <%@ page import="static org.opengrok.indexer.web.messages.MessagesUtils.printMessages" %>
 <%@ page import="static org.opengrok.indexer.web.messages.MessagesUtils.messagesToJson" %>
 <%
diff --git a/opengrok-web/src/main/webapp/rss.jsp b/opengrok-web/src/main/webapp/rss.jsp
@@ -33,7 +33,7 @@ org.opengrok.indexer.history.HistoryEntry,
 org.opengrok.indexer.history.HistoryGuru,
 org.opengrok.indexer.web.Util,
 org.opengrok.indexer.web.Prefix,
-org.opengrok.indexer.web.PageConfig"
+org.opengrok.web.PageConfig"
 %><%@ page session="false" errorPage="error.jsp"%><%
 /* ---------------------- rss.jsp start --------------------- */
 {
diff --git a/opengrok-web/src/test/java/org/opengrok/web/PageConfigRequestedProjectsTest.java b/opengrok-web/src/test/java/org/opengrok/web/PageConfigRequestedProjectsTest.java
@@ -1,4 +1,4 @@
-package org.opengrok.indexer.web;
+package org.opengrok.web;
 
 import java.util.Arrays;
 import java.util.HashSet;
diff --git a/opengrok-web/src/test/java/org/opengrok/web/PageConfigTest.java b/opengrok-web/src/test/java/org/opengrok/web/PageConfigTest.java
@@ -21,7 +21,7 @@
  * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2020, Chris Fraire <cfraire@me.com>.
  */
-package org.opengrok.indexer.web;
+package org.opengrok.web;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -57,6 +57,7 @@
 import org.opengrok.indexer.history.Annotation;
 import org.opengrok.indexer.history.HistoryGuru;
 import org.opengrok.indexer.util.TestRepository;
+import org.opengrok.indexer.web.DummyHttpServletRequest;
 
 /**
  * Unit tests for the {@code PageConfig} class.
diff --git a/opengrok-web/src/test/java/org/opengrok/web/ProjectHelperExtendedTest.java b/opengrok-web/src/test/java/org/opengrok/web/ProjectHelperExtendedTest.java
@@ -20,7 +20,7 @@
 /*
  * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
  */
-package org.opengrok.indexer.web;
+package org.opengrok.web;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -35,6 +35,7 @@
 import org.opengrok.indexer.configuration.Project;
 import org.opengrok.indexer.configuration.RuntimeEnvironment;
 import org.opengrok.indexer.history.RepositoryInfo;
+import org.opengrok.indexer.web.DummyHttpServletRequest;
 
 public class ProjectHelperExtendedTest extends ProjectHelperTestBase {
 
diff --git a/opengrok-web/src/test/java/org/opengrok/web/ProjectHelperTest.java b/opengrok-web/src/test/java/org/opengrok/web/ProjectHelperTest.java
@@ -21,7 +21,7 @@
  * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2017, Chris Fraire <cfraire@me.com>.
  */
-package org.opengrok.indexer.web;
+package org.opengrok.web;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/opengrok-web/src/test/java/org/opengrok/web/ProjectHelperTestBase.java b/opengrok-web/src/test/java/org/opengrok/web/ProjectHelperTestBase.java
@@ -20,7 +20,7 @@
 /*
  * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
  */
-package org.opengrok.indexer.web;
+package org.opengrok.web;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -44,6 +44,7 @@
 import org.opengrok.indexer.configuration.RuntimeEnvironment;
 import org.opengrok.indexer.history.RepoRepository;
 import org.opengrok.indexer.history.RepositoryInfo;
+import org.opengrok.indexer.web.DummyHttpServletRequest;
 
 public class ProjectHelperTestBase {
 
diff --git a/opengrok-web/src/test/java/org/opengrok/web/ScriptsTest.java b/opengrok-web/src/test/java/org/opengrok/web/ScriptsTest.java
diff --git a/opengrok-web/src/test/java/org/opengrok/web/api/v1/controller/ConfigurationControllerTest.java b/opengrok-web/src/test/java/org/opengrok/web/api/v1/controller/ConfigurationControllerTest.java
