Fix issue where android would not parse regex correctly (#134)

KatsuteDev · Mar 17, 2021 · 6faaedf · 6faaedf
1 parent 31ae498
commit 6faaedf
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/java_ci.yml b/.github/workflows/java_ci.yml
@@ -20,4 +20,4 @@ jobs:
           architecture: x64
 
       - name: ✔ Test with Maven
-        run: mvn test -fae
+        run: mvn test -fae --no-transfer-progress
diff --git a/.github/workflows/mal_ci.yml b/.github/workflows/mal_ci.yml
@@ -21,4 +21,4 @@ jobs:
           echo ${{ secrets.MAL_OAUTH }} > src/test/java/resources/oauth.txt
 
       - name: ✔ Test with Maven
-        run: mvn test -fae
+        run: mvn test -fae --no-transfer-progress
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.kttdevelopment</groupId>
     <artifactId>mal4j</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
 
     <profiles>
         <profile>

diff --git a/src/main/java/com/kttdevelopment/mal4j/APICall.java b/src/main/java/com/kttdevelopment/mal4j/APICall.java
@@ -104,7 +104,8 @@ else if(type == Field.class)
     private final Map<String,String> headers = new HashMap<>();
 
     // \{(.*?)\}
-    private static final Pattern pathArg = Pattern.compile("\\{(.*?)}");
+    @SuppressWarnings("RegExpRedundantEscape") // android requires this syntax (#133)
+    private static final Pattern pathArg = Pattern.compile("\\{(.*?)\\}");
 
     private final Map<String,String> pathVars = new HashMap<>();
     private final Map<String,String> queries  = new HashMap<>();

diff --git a/src/main/java/com/kttdevelopment/mal4j/Json.java b/src/main/java/com/kttdevelopment/mal4j/Json.java
@@ -35,7 +35,8 @@ class Json {
      */
 
     // [\{\}\[\],]
-    private static final Pattern split = Pattern.compile("[{}\\[\\],]");
+    @SuppressWarnings("RegExpRedundantEscape") // android requires this syntax (#133)
+    private static final Pattern split = Pattern.compile("[\\{\\}\\[\\],]");
 
     // (?<!\\)(?:\\\\)*"
     private static final Pattern nonEscQuote = Pattern.compile("(?<!\\\\)(?:\\\\\\\\)*\"");
@@ -47,8 +48,9 @@ class Json {
     private static final Function<MatchResult,String> unicodeReplacer = matchResult -> String.valueOf((char) Integer.parseInt(matchResult.group(1), 16));
 
     // \\"|\\\/|\\\\
+    @SuppressWarnings("RegExpRedundantEscape") // android requires this syntax (#133)
     private static final Pattern escapedCharacters =
-        Pattern.compile("\\\\\"|\\\\/|\\\\\\\\");
+        Pattern.compile("\\\\\"|\\\\\\/|\\\\\\\\");
 
     private static final Function<MatchResult,String> escapedReplacer = matchResult -> {
         final String chars = matchResult.group(0);
@@ -68,8 +70,9 @@ class Json {
     private static final Pattern mapType =
         Pattern.compile("^\\s*(?<!\\\\)\"(?<key>.+(?<!\\\\)(?:\\\\\\\\)*)\": ?((?<double>-?\\d+\\.\\d+) *,?|(?<int>-?\\d+) *,?|(?<boolean>\\Qtrue\\E|\\Qfalse\\E) *,?|(?<null>\\Qnull\\E) *,?|(?<!\\\\)\"(?<string>.*(?<!\\\\)(?:\\\\\\\\)*)\" *,?|(?<array>\\[)|(?<map>\\{))\\s*$");
     // ^\s*} *,?\s*$
+    @SuppressWarnings("RegExpRedundantEscape") // android requires this syntax (#133)
     private static final Pattern mapClose =
-        Pattern.compile("^\\s*} *,?\\s*$");
+        Pattern.compile("^\\s*\\} *,?\\s*$");
 
     // ^\s*((?<double>-?\d+\.\d+) *,?|(?<int>-?\d+) *,?|(?<boolean>\Qtrue\E|\Qfalse\E) *,?|(?<null>\Qnull\E) *,?|(?<!\\)"(?<string>.*(?<!\\)(?:\\\\)*)" *,?|(?<array>\[)|(?<map>\{))\s*$
     private static final Pattern arrType =