Just cleanup thanks to IDEA

Author: idodeclare

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

@@ -20,7 +20,7 @@
 /*
  * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright 2011 Jens Elkner.
- * Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
+ * Portions Copyright (c) 2018-2020, Chris Fraire <[email protected]>.
  */
 package org.opengrok.indexer.search.context;
 
@@ -70,8 +70,7 @@ public class Context {
      * whose values tell if the field is case insensitive (true for
      * insensitivity, false for sensitivity).
      */
-    private static final Map<String, Boolean> TOKEN_FIELDS =
-            new HashMap<String, Boolean>();
+    private static final Map<String, Boolean> TOKEN_FIELDS = new HashMap<>();
     static {
         TOKEN_FIELDS.put(QueryBuilder.FULL, Boolean.TRUE);
         TOKEN_FIELDS.put(QueryBuilder.REFS, Boolean.FALSE);
@@ -188,7 +187,7 @@ public boolean getContext2(RuntimeEnvironment env, IndexSearcher searcher,
 
         ContextArgs args = new ContextArgs(env.getContextSurround(),
             env.getContextLimit());
-        /**
+        /*
          * Lucene adds to the following value in FieldHighlighter, so avoid
          * integer overflow by not using Integer.MAX_VALUE -- Short is good
          * enough.
@@ -204,7 +203,7 @@ public boolean getContext2(RuntimeEnvironment env, IndexSearcher searcher,
 
         OGKUnifiedHighlighter uhi = new OGKUnifiedHighlighter(env,
             searcher, anz);
-        uhi.setBreakIterator(() -> new StrictLineBreakIterator());
+        uhi.setBreakIterator(StrictLineBreakIterator::new);
         uhi.setFormatter(formatter);
         uhi.setTabSize(tabSize);
 
@@ -251,11 +250,15 @@ private String buildQueryAsURI(Map<String, String> subqueries) {
 
     private boolean alt = true;
 
-    public boolean getContext(Reader in, Writer out, String urlPrefix,
+    /**
+     * This method exists only for testing.
+     */
+    boolean getContext(Reader in, Writer out, String urlPrefix,
         String morePrefix, String path, Definitions tags,
         boolean limit, boolean isDefSearch, List<Hit> hits) {
         return getContext(in, out, urlPrefix, morePrefix, path, tags, limit, isDefSearch, hits, null);
     }
+
     /**
      * ???.
      * Closes the given <var>in</var> reader on return.
@@ -285,11 +288,11 @@ public boolean getContext(Reader in, Writer out, String urlPrefix,
                 (urlPrefix == null) ? "" : Util.URIEncodePath(urlPrefix);
         String pathE = Util.URIEncodePath(path);
         if (tags != null) {
-            matchingTags = new TreeMap<Integer, String[]>();
+            matchingTags = new TreeMap<>();
             try {
                 for (Definitions.Tag tag : tags.getTags()) {
-                    for (int i = 0; i < m.length; i++) {
-                        if (m[i].match(tag.symbol) == LineMatcher.MATCHED) {
+                    for (LineMatcher lineMatcher : m) {
+                        if (lineMatcher.match(tag.symbol) == LineMatcher.MATCHED) {
                             String scope = null;
                             String scopeUrl = null;
                             if (scopes != null) {
@@ -359,7 +362,7 @@ public boolean getContext(Reader in, Writer out, String urlPrefix,
                 }
             }
         }
-        /**
+        /*
          * Just to get the matching tag send a null in
          */
         if (in == null) {
@@ -419,8 +422,8 @@ public boolean getContext(Reader in, Writer out, String urlPrefix,
             int matchedLines = 0;
             while ((token = tokens.yylex()) != null && (!lim ||
                     matchedLines < limit_max_lines)) {
-                for (int i = 0; i < m.length; i++) {
-                    matchState = m[i].match(token);
+                for (LineMatcher lineMatcher : m) {
+                    matchState = lineMatcher.match(token);
                     if (matchState == LineMatcher.MATCHED) {
                         if (!isDefSearch) {
                             tokens.printContext();