Remove RuntimeEnvironment parameter

Author: idodeclare

opengrok-indexer/src/main/java/org/opengrok/indexer/search/Results.java

@@ -45,7 +45,6 @@
 import org.apache.lucene.analysis.charfilter.HTMLStripCharFilter;
 import org.apache.lucene.document.DateTools;
 import org.apache.lucene.document.Document;
-import org.apache.lucene.index.CorruptIndexException;
 import org.apache.lucene.index.IndexableField;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.ScoreDoc;
@@ -82,12 +81,10 @@ private Results() {
      * @param startIdx the index of the first hit to check
      * @param stopIdx the index of the last hit to check
      * @return a (directory, hitDocument) hashmap
-     * @throws CorruptIndexException
-     * @throws IOException
      */
     private static Map<String, ArrayList<Integer>> createMap(
         IndexSearcher searcher, ScoreDoc[] hits, int startIdx, long stopIdx)
-            throws CorruptIndexException, IOException {
+            throws IOException {
 
         LinkedHashMap<String, ArrayList<Integer>> dirHash =
                 new LinkedHashMap<>();
@@ -201,7 +198,7 @@ public static void prettyPrint(Writer out, SearchHelper sh, int start,
             }
 
             int tabSize = sh.getTabSize(p);
-            PrintPlainFinalArgs fargs = new PrintPlainFinalArgs(out, sh, env,
+            PrintPlainFinalArgs fargs = new PrintPlainFinalArgs(out, sh,
                 xrefPrefix, tabSize, morePrefix);
 
             out.write("</td></tr>");
@@ -272,7 +269,7 @@ private static void printPlain(PrintPlainFinalArgs fargs, Document doc,
 
         fargs.shelp.sourceContext.toggleAlt();
 
-        boolean didPresentNew = fargs.shelp.sourceContext.getContext2(fargs.env,
+        boolean didPresentNew = fargs.shelp.sourceContext.getContext2(
             fargs.shelp.searcher, docId, fargs.out, fargs.xrefPrefix,
             fargs.morePrefix, true, fargs.tabSize);
 
@@ -321,17 +318,15 @@ private static String htmlize(String raw) {
     private static class PrintPlainFinalArgs {
         final Writer out;
         final SearchHelper shelp;
-        final RuntimeEnvironment env;
         final String xrefPrefix;
         final String morePrefix;
         final int tabSize;
 
         PrintPlainFinalArgs(Writer out, SearchHelper shelp,
-                RuntimeEnvironment env, String xrefPrefix, int tabSize,
+                String xrefPrefix, int tabSize,
                 String morePrefix) {
             this.out = out;
             this.shelp = shelp;
-            this.env = env;
             this.xrefPrefix = xrefPrefix;
             this.morePrefix = morePrefix;
             this.tabSize = tabSize;

opengrok-indexer/src/main/java/org/opengrok/indexer/search/context/Context.java

@@ -60,6 +60,7 @@ public class Context {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(Context.class);
 
+    private final RuntimeEnvironment env;
     private final Query query;
     private final QueryBuilder qbuilder;
     private final LineMatcher[] m;
@@ -89,6 +90,7 @@ public Context(Query query, QueryBuilder qbuilder) {
             throw new IllegalArgumentException("qbuilder is null");
         }
 
+        this.env = RuntimeEnvironment.getInstance();
         this.query = query;
         this.qbuilder = qbuilder;
         QueryMatchers qm = new QueryMatchers();
@@ -114,7 +116,6 @@ public boolean isEmpty() {
     /**
      * Look for context for this instance's initialized query in a search result
      * {@link Document}, and output according to the parameters.
-     * @param env required environment
      * @param searcher required search that produced the document
      * @param docId document ID for producing context
      * @param dest required target to write
@@ -131,7 +132,7 @@ public boolean isEmpty() {
      * re-indexing
      * @return Did it get any matching context?
      */
-    public boolean getContext2(RuntimeEnvironment env, IndexSearcher searcher,
+    public boolean getContext2(IndexSearcher searcher,
         int docId, Appendable dest, String urlPrefix, String morePrefix,
         boolean limit, int tabSize) {
 
@@ -372,7 +373,6 @@ public boolean getContext(Reader in, Writer out, String urlPrefix,
         PlainLineTokenizer tokens = new PlainLineTokenizer(null);
         boolean truncated = false;
         boolean lim = limit;
-        RuntimeEnvironment env = RuntimeEnvironment.getInstance();
         if (!env.isQuickContextScan()) {
             lim = false;
         }

opengrok-web/src/main/webapp/more.jsp

@@ -20,7 +20,7 @@ CDDL HEADER END
 
 Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
 Portions Copyright 2011 Jens Elkner.
-Portions Copyright (c) 2018, 2020, Chris Fraire <cfraire@me.com>.
+Portions Copyright (c) 2018-2020, Chris Fraire <cfraire@me.com>.
 
 --%><%@page errorPage="error.jsp" import="
 java.io.File,
@@ -88,12 +88,12 @@ file="mast.jsp"
             String xrefPrefix = request.getContextPath() + Prefix.XREF_P;
             boolean didPresentNew = false;
             if (docId >= 0) {
-                didPresentNew = searchHelper.sourceContext.getContext2(env,
+                didPresentNew = searchHelper.sourceContext.getContext2(
                     searchHelper.searcher, docId, out, xrefPrefix, null, false,
                     tabSize);
             }
             if (!didPresentNew) {
-                /**
+                /*
                  * Fall back to the old view, which re-analyzes text using
                  * PlainLinetokenizer. E.g., when source code is updated (thus
                  * affecting timestamps) but re-indexing is not yet complete.