Leverage util methods from apache commons and java 11

Author: ahornace

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

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2017, 2020, Chris Fraire <[email protected]>.
  */
 package org.opengrok.indexer.analysis;
@@ -44,12 +44,12 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import org.apache.commons.lang3.SystemUtils;
 import org.opengrok.indexer.configuration.RuntimeEnvironment;
 import org.opengrok.indexer.index.IndexerParallelizer;
 import org.opengrok.indexer.logger.LoggerFactory;
 import org.opengrok.indexer.util.Executor;
 import org.opengrok.indexer.util.IOUtils;
-import org.opengrok.indexer.util.PlatformUtils;
 import org.opengrok.indexer.util.SourceSplitter;
 
 /**
@@ -210,7 +210,7 @@ private void initialize() {
     }
 
     private void run() throws IOException {
-        String commandStr = Executor.escapeForShell(command, false, PlatformUtils.isWindows());
+        String commandStr = Executor.escapeForShell(command, false, SystemUtils.IS_OS_WINDOWS);
         LOGGER.log(Level.FINE, "Executing ctags command [{0}]", commandStr);
 
         ProcessBuilder processBuilder = new ProcessBuilder(command);

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/hcl/HCLLexer.java

@@ -94,7 +94,7 @@ public void hereOp(String capture) throws IOException {
         }
 
         // Trim any whitespace, which is allowed by HCL after the HERE op.
-        remaining = remaining.replaceFirst("^\\s+", "");
+        remaining = remaining.stripLeading();
 
         Matcher m = HERE_TERMINATOR_MATCH.matcher(remaining);
         if (!m.find()) {
@@ -128,7 +128,7 @@ public boolean maybeHereStart() throws IOException {
      * @return true if the Here state ended
      */
     public boolean maybeHereEnd(String capture) throws IOException {
-        String trimmed = capture.replaceFirst("^\\s+", "");
+        String trimmed = capture.stripLeading();
         HereDocSettings settings = dataHead.hereSettings.peek();
         assert settings != null;
 

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/perl/PerlLexer.java

@@ -212,7 +212,7 @@ public void qop(boolean doWrite, String capture, int namelength,
         }
 
         String postop = postboundary.substring(qopname.length());
-        String ltpostop = postop.replaceFirst("^\\s+", "");
+        String ltpostop = postop.stripLeading();
         char opc = ltpostop.charAt(0);
         setEndQuoteChar(opc);
         setState(ltpostop, nointerp);
@@ -291,7 +291,7 @@ public void hqopPunc(String capture) throws IOException {
         // `preceding' is everything before the '/'; 'lede' is the initial part
         // before any whitespace; and `intervening' is any whitespace.
         String preceding = capture.substring(0, capture.length() - 1);
-        String lede = preceding.replaceFirst("\\s+$", "");
+        String lede = preceding.stripTrailing();
         String intervening = preceding.substring(lede.length());
 
         // OK to pass a fake "m/" with doWrite=false
@@ -312,7 +312,7 @@ public void hqopSymbol(String capture) throws IOException {
         // `preceding' is everything before the '/'; 'lede' is the initial part
         // before any whitespace; and `intervening' is any whitespace.
         String preceding = capture.substring(0, capture.length() - 1);
-        String lede = preceding.replaceFirst("\\s+$", "");
+        String lede = preceding.stripTrailing();
         String intervening = preceding.substring(lede.length());
 
         // OK to pass a fake "m/" with doWrite=false
@@ -374,7 +374,7 @@ public void hop(String capture) throws IOException {
             indented = true;
             remaining = remaining.substring(1);
         }
-        remaining = remaining.replaceFirst("^\\s+", "");
+        remaining = remaining.stripLeading();
         char c = remaining.charAt(0);
         switch (c) {
             case '\'':
@@ -442,7 +442,7 @@ public boolean maybeStartHere() throws IOException {
      * @return true if the quote state ended
      */
     public boolean maybeEndHere(String capture) throws IOException {
-        String trimmed = capture.replaceFirst("^\\s+", "");
+        String trimmed = capture.stripLeading();
         HereDocSettings settings = hereSettings.peek();
 
         boolean didZspan = false;
@@ -489,7 +489,7 @@ public void sigilID(String capture) throws IOException {
         }
 
         String postsigil = capture.substring(1);
-        String id = postsigil.replaceFirst("^\\s+", "");
+        String id = postsigil.stripLeading();
         String s0 = postsigil.substring(0, postsigil.length() - id.length());
 
         int ohnooo;
@@ -544,13 +544,13 @@ public void bracedSigilID(String capture) throws IOException {
         String sigil = capture.substring(0, 1);
         String rpunc = capture.substring(capture.length() - 1);
         String interior0 = capture.substring(1, capture.length() - 1);
-        String ltinterior0 = interior0.replaceFirst("^\\s+", "");
+        String ltinterior0 = interior0.stripLeading();
         String s0 = interior0.substring(0, interior0.length() -
             ltinterior0.length());
 
         String lpunc = ltinterior0.substring(0, 1);
         String interior1 = ltinterior0.substring(1);
-        String ltinterior1 = interior1.replaceFirst("^\\s+", "");
+        String ltinterior1 = interior1.stripLeading();
         String s1 = interior1.substring(0, interior1.length() -
             ltinterior1.length());
 

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/ruby/RubyLexer.java

@@ -215,7 +215,7 @@ public void hqopPunc(String capture) throws IOException {
         // `preceding' is everything before the '/'; 'lede' is the initial part
         // before any whitespace; and `intervening' is any whitespace.
         String preceding = capture.substring(0, capture.length() - 1);
-        String lede = preceding.replaceFirst("\\s+$", "");
+        String lede = preceding.stripTrailing();
         String intervening = preceding.substring(lede.length());
 
         // OK to pass a fake "m/" with doWrite=false
@@ -240,7 +240,7 @@ public void hqopSymbol(String capture) throws IOException {
         // `preceding' is everything before the '/'; 'lede' is the initial part
         // before any whitespace; and `intervening' is any whitespace.
         String preceding = capture.substring(0, capture.length() - 1);
-        String lede = preceding.replaceFirst("\\s+$", "");
+        String lede = preceding.stripTrailing();
         String intervening = preceding.substring(lede.length());
 
         // OK to pass a fake "m/" with doWrite=false
@@ -365,7 +365,7 @@ public boolean maybeStartHere() throws IOException {
      * @return true if the quote state ended
      */
     public boolean maybeEndHere(String capture) throws IOException {
-        String trimmed = capture.replaceFirst("^\\s+", "");
+        String trimmed = capture.stripLeading();
         HereDocSettings settings = dHead.hereSettings.peek();
         assert settings != null;
 

opengrok-indexer/src/main/java/org/opengrok/indexer/history/RazorHistoryParser.java

@@ -35,7 +35,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.opengrok.indexer.logger.LoggerFactory;
-import org.opengrok.indexer.util.StringUtils;
 
 /**
  * A History Parser for Razor.
@@ -100,7 +99,7 @@ protected History parseContents(BufferedReader contents) throws IOException {
 
             parseDebug("Processing '" + line + "'");
 
-            if (StringUtils.isOnlyWhitespace(line)) {
+            if (line.isBlank()) {
 
                 if (entry != null && entry.getDate() != null) {
                     entries.add(entry);

opengrok-indexer/src/main/java/org/opengrok/indexer/index/Indexer.java

@@ -58,6 +58,7 @@
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.SystemUtils;
 import org.opengrok.indexer.Info;
 import org.opengrok.indexer.Metrics;
 import org.opengrok.indexer.analysis.AnalyzerGuru;
@@ -81,7 +82,6 @@
 import org.opengrok.indexer.util.Executor;
 import org.opengrok.indexer.util.HostUtil;
 import org.opengrok.indexer.util.OptionParser;
-import org.opengrok.indexer.util.PlatformUtils;
 import org.opengrok.indexer.util.Statistics;
 
 /**
@@ -1237,7 +1237,7 @@ private static void exitWithHelp() {
 
     private static String getCtagsCommand() {
         Ctags ctags = CtagsUtil.newInstance(env);
-        return Executor.escapeForShell(ctags.getArgv(), true, PlatformUtils.isWindows());
+        return Executor.escapeForShell(ctags.getArgv(), true, SystemUtils.IS_OS_WINDOWS);
     }
 
     private enum HelpMode {

opengrok-indexer/src/main/java/org/opengrok/indexer/index/NumLinesLOCAccessor.java

@@ -22,6 +22,7 @@
  */
 package org.opengrok.indexer.index;
 
+import org.apache.commons.lang3.math.NumberUtils;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.StoredField;
@@ -41,7 +42,6 @@
 import org.opengrok.indexer.analysis.NullableNumLinesLOC;
 import org.opengrok.indexer.analysis.NumLinesLOC;
 import org.opengrok.indexer.search.QueryBuilder;
-import org.opengrok.indexer.util.NumberUtil;
 
 import java.io.File;
 import java.io.IOException;
@@ -169,8 +169,8 @@ private void updateDocumentData(IndexWriter writer, IndexSearcher searcher,
         if (docID != null) {
             Document doc = searcher.doc(docID);
             if (isAggregatingDeltas) {
-                extantLines = NumberUtil.tryParseLongPrimitive(doc.get(QueryBuilder.NUML));
-                extantLOC = NumberUtil.tryParseLongPrimitive(doc.get(QueryBuilder.LOC));
+                extantLines = NumberUtils.toLong(doc.get(QueryBuilder.NUML));
+                extantLOC = NumberUtils.toLong(doc.get(QueryBuilder.LOC));
             }
             writer.deleteDocuments(new Term(QueryBuilder.D, aggregate.getPath()));
         }

opengrok-indexer/src/main/java/org/opengrok/indexer/util/BooleanUtil.java

@@ -35,6 +35,7 @@
 import java.util.logging.Logger;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.BooleanUtils;
 import org.opengrok.indexer.logger.LoggerFactory;
 
 /**
@@ -87,23 +88,13 @@ private static Object stringToObject(String fieldName, Class<?> c, String value)
              * datatypes</a>.
              */
             if (paramClass.equals("boolean") || paramClass.equals(Boolean.class.getName())) {
-                if (!BooleanUtil.isBoolean(value)) {
+                Boolean parsedValue = BooleanUtils.toBooleanObject(value);
+                if (parsedValue == null) {
                     throw new IOException(String.format("Unsupported type conversion from String to a boolean for name \"%s\" -"
                                     + " got \"%s\" - allowed values are [false, off, 0, true, on, 1].",
                             paramClass, value));
                 }
-                boolean boolValue = Boolean.parseBoolean(value);
-                if (!boolValue) {
-                    /*
-                     * The Boolean.valueOf() returns true only for "true" case
-                     * insensitive so now we have either the false values or
-                     * "on" or "1". These are convenient shortcuts for "on", "1"
-                     * to be interpreted as booleans.
-                     */
-                    boolValue = value.equalsIgnoreCase("on");
-                    boolValue = boolValue || value.equals("1");
-                }
-                v = boolValue;
+                v = parsedValue;
             } else if (paramClass.equals("short") || paramClass.equals(Short.class.getName())) {
                 v = Short.valueOf(value);
             } else if (paramClass.equals("int") || paramClass.equals(Integer.class.getName())) {

opengrok-indexer/src/main/java/org/opengrok/indexer/util/ClassUtil.java

@@ -23,6 +23,7 @@
  */
 package org.opengrok.indexer.util;
 
+import org.apache.commons.lang3.SystemUtils;
 import org.opengrok.indexer.analysis.AnalyzerGuru;
 import org.opengrok.indexer.analysis.Ctags;
 import org.opengrok.indexer.configuration.RuntimeEnvironment;
@@ -99,7 +100,7 @@ public static void deleteTempFiles() {
         Set<String> dirs = new HashSet<>(Arrays.asList(System.getProperty("java.io.tmpdir"),
                 System.getenv("TMPDIR"), System.getenv("TMP")));
 
-        if (PlatformUtils.isUnix()) {
+        if (SystemUtils.IS_OS_UNIX) {
             // hard-coded TMPDIR in Universal Ctags on Unix.
             dirs.add("/tmp");
         }