Revert "Jdk19 regexp fix (#10972)"

This reverts commit f755fb3.

languagetool-commandline/src/test/java/org/languagetool/commandline/AbstractSecurityTestCase.java

@@ -0,0 +1,76 @@
+/* LanguageTool, a natural language style checker 
+ * Copyright (C) 2009 Daniel Naber (http://www.danielnaber.de)
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
+ * USA
+ */
+package org.languagetool.commandline;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.security.Permission;
+
+/**
+ * @author Charlie Collins (Maven Test Example from
+ * http://www.screaming-penguin.com/node/7570)
+ */
+public class AbstractSecurityTestCase {
+
+  protected static class ExitException extends SecurityException {
+    private static final long serialVersionUID = 1L;
+    public final int status;
+    public ExitException(int status) {
+      super("There is no escape!");
+      this.status = status;
+    }
+  }
+
+  private static class NoExitSecurityManager extends SecurityManager {
+    @Override
+    public void checkPermission(@SuppressWarnings("unused") Permission perm) {
+      // allow anything.
+    }
+
+    @Override
+    @SuppressWarnings("unused")
+    public void checkPermission(Permission perm, Object context) {
+      // allow anything.
+    }
+
+    @Override
+    public void checkExit(int status) {
+      super.checkExit(status);
+      throw new ExitException(status);
+    }
+  }
+
+  @Before
+  public void setUp() throws Exception {
+    System.setSecurityManager(new NoExitSecurityManager());
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    System.setSecurityManager(null);
+  }
+
+  //get rid of JUnit warning for this helper class
+  @Test
+  public void testSomething() {
+  }
+
+}

languagetool-commandline/src/test/java/org/languagetool/commandline/MainTest.java

@@ -23,7 +23,15 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintStream;
+import java.io.PrintWriter;
 import java.nio.charset.StandardCharsets;
 
 import static org.hamcrest.CoreMatchers.is;
@@ -34,7 +42,7 @@
  *
  * @author Marcin Miłkowski
  */
-public class MainTest {
+public class MainTest extends AbstractSecurityTestCase {
 
   private final File enTestFile;
   private final File xxRuleFile;
@@ -105,7 +113,8 @@ public MainTest() throws IOException {
   }
 
   @Before
-  public void setUp() {
+  public void setUp() throws Exception {
+    super.setUp();
     this.stdout = System.out;
     this.stderr = System.err;
     this.out = new ByteArrayOutputStream();
@@ -115,33 +124,38 @@ public void setUp() {
   }
 
   @After
-  public void tearDown() {
+  public void tearDown() throws Exception {
     System.setOut(this.stdout);
     System.setErr(this.stderr);
+    super.tearDown();
   }
 
   @Test
   public void testUsageMessage() throws Exception {
-    Process process = new ProcessBuilder(
-      "java", "-cp", System.getProperty("java.class.path"), "org.languagetool.commandline.Main", "-h"
-    ).start();
-    int exitCode = process.waitFor();
-    String output = readProcessOutput(process);
-    assertTrue(output.contains("Usage: java -jar languagetool-commandline.jar"));
-    assertEquals("Exit status", 1, exitCode);
+    try {
+      String[] args = {"-h"};
+      Main.main(args);
+      fail("LT should have exited with status 0!");
+    } catch (ExitException e) {
+      String output = new String(this.out.toByteArray());
+      assertTrue(output.contains("Usage: java -jar languagetool-commandline.jar"));
+      assertEquals("Exit status", 1, e.status);
+    }
   }
 
   @Test
   public void testPrintLanguages() throws Exception {
-    Process process = new ProcessBuilder(
-      "java", "-cp", System.getProperty("java.class.path"), "org.languagetool.commandline.Main", "--list"
-    ).start();
-    int exitCode = process.waitFor();
-    String output = readProcessOutput(process);
-    assertTrue(output.contains("German"));
-    assertTrue(output.contains("de-DE"));
-    assertTrue(output.contains("English"));
-    assertEquals("Exit status", 0, exitCode);
+    try {
+      String[] args = {"--list"};
+      Main.main(args);
+      fail("LT should have exited with status 0!");
+    } catch (ExitException e) {
+      String output = new String(this.out.toByteArray());
+      assertTrue(output.contains("German"));
+      assertTrue(output.contains("de-DE"));
+      assertTrue(output.contains("English"));
+      assertEquals("Exit status", 0, e.status);
+    }
   }
 
   @Test
@@ -656,14 +670,4 @@ private String getExternalFalseFriends() {
     return xxFalseFriendFile.getAbsolutePath();
   }
 
-  private String readProcessOutput(Process process) throws IOException {
-    try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
-      StringBuilder output = new StringBuilder();
-      String line;
-      while ((line = reader.readLine()) != null) {
-        output.append(line).append(System.lineSeparator());
-      }
-      return output.toString();
-    }
-  }
 }

languagetool-core/src/main/java/org/languagetool/rules/AbstractUnitConversionRule.java

@@ -80,7 +80,7 @@ public abstract class AbstractUnitConversionRule extends Rule {
   protected static final String NUMBER_REGEX = "(-?[0-9]{1,32}[0-9,.]{0,32})";
   protected static final String NUMBER_REGEX_WITH_BOUNDARY = "(-?\\b[0-9]{1,32}[0-9,.]{0,32})";
 
-  protected final Pattern numberRangePart = Pattern.compile(NUMBER_REGEX_WITH_BOUNDARY + "$", Pattern.UNICODE_CHARACTER_CLASS);
+  protected final Pattern numberRangePart = Pattern.compile(NUMBER_REGEX_WITH_BOUNDARY + "$");
 
   private static final double DELTA = 1e-2;
   private static final double ROUNDING_DELTA = 0.05;
@@ -196,7 +196,7 @@ protected String formatRounded(String s) {
    */
   protected void addUnit(String pattern, Unit base, String symbol, double factor, boolean metric) {
     Unit unit = base.multiply(factor);
-    unitPatterns.put(Pattern.compile(NUMBER_REGEX_WITH_BOUNDARY + "[\\s\u00A0]{0," + WHITESPACE_LIMIT + "}" + pattern + "\\b", Pattern.UNICODE_CHARACTER_CLASS), unit);
+    unitPatterns.put(Pattern.compile(NUMBER_REGEX_WITH_BOUNDARY + "[\\s\u00A0]{0," + WHITESPACE_LIMIT + "}" + pattern + "\\b"), unit);
     unitSymbols.putIfAbsent(unit, new ArrayList<>());
     unitSymbols.get(unit).add(symbol);
     if (metric && !metricUnits.contains(unit)) {

languagetool-core/src/main/java/org/languagetool/rules/patterns/PatternRuleHandler.java

@@ -776,8 +776,7 @@ private void createRules(List<PatternToken> elemList,
         rule.setDistanceTokens(distanceTokens);
         rule.setXmlLineNumber(xmlLineNumber);
       } else if (regex.length() > 0) {
-//        int flags = regexCaseSensitive ? 0 : Pattern.CASE_INSENSITIVE|Pattern.UNICODE_CASE;
-        int flags = regexCaseSensitive ? Pattern.UNICODE_CHARACTER_CLASS : Pattern.CASE_INSENSITIVE|Pattern.UNICODE_CHARACTER_CLASS;
+        int flags = regexCaseSensitive ? 0 : Pattern.CASE_INSENSITIVE|Pattern.UNICODE_CASE;
         String regexStr = regex.toString();
         if (regexMode == RegexpMode.SMART) {
           // Note: it's not that easy to add \b because the regex might look like '(foo)' or '\d' so we cannot just look at the last character

languagetool-core/src/main/java/org/languagetool/rules/patterns/RegexAntiPatternFilter.java

@@ -42,7 +42,7 @@ public RuleMatch acceptRuleMatch(RuleMatch match, Map<String, String> arguments,
     }
     String[] antiPatterns = antiPatternStr.split("\\|");
     for (String antiPattern : antiPatterns) {
-      Pattern p = Pattern.compile(antiPattern, Pattern.UNICODE_CHARACTER_CLASS);
+      Pattern p = Pattern.compile(antiPattern);
       Matcher matcher = p.matcher(sentenceObj.getText());
       while (matcher.find()) {
         // partial overlap is enough to filter out a match:

languagetool-core/src/main/java/org/languagetool/rules/patterns/XMLRuleHandler.java

@@ -18,18 +18,11 @@
  */
 package org.languagetool.rules.patterns;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.ResourceBundle;
-import java.util.function.Function;
-
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.tuple.Triple;
 import org.jetbrains.annotations.Nullable;
 import org.languagetool.Language;
+import org.languagetool.ResourceBundleTools;
 import org.languagetool.chunking.ChunkTag;
 import org.languagetool.rules.CorrectExample;
 import org.languagetool.rules.ErrorTriggeringExample;
@@ -42,6 +35,9 @@
 import org.xml.sax.SAXParseException;
 import org.xml.sax.helpers.DefaultHandler;
 
+import java.util.*;
+import java.util.function.Function;
+
 /**
  * XML rule handler that loads rules from XML and throws
  * exceptions on errors and warnings.

languagetool-core/src/main/java/org/languagetool/tokenizers/SrxTools.java

@@ -31,7 +31,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.Pattern;
 
 /**
  * Tools for loading an SRX tokenizer file.
@@ -60,8 +59,7 @@ static SrxDocument createSrxDocument(String path) {
 
   static List<String> tokenize(String text, SrxDocument srxDocument, String code) {
     List<String> segments = new ArrayList<>();
-    Map<String, Object> parserParameters = Map.of(SrxTextIterator.DEFAULT_PATTERN_FLAGS_PARAMETER, Pattern.UNICODE_CHARACTER_CLASS);
-    TextIterator textIterator = new SrxTextIterator(srxDocument, code, text, parserParameters);
+    TextIterator textIterator = new SrxTextIterator(srxDocument, code, text);
     while (textIterator.hasNext()) {
       segments.add(textIterator.next());
     }