Build: Fix minor error-prone warnings (apache#6629)

* Build: Fix minor error-prone warnings * Enforce StringSplitter to avoid future warnings
tlm365 · Jan 23, 2023 · 881be5e · 881be5e
1 parent 4491e7d
commit 881be5e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/baseline.gradle b/baseline.gradle
@@ -84,6 +84,8 @@ subprojects {
           // Enforce hashCode over hash
           '-Xep:ObjectsHashCodeUnnecessaryVarargs:ERROR',
           '-Xep:PreferSafeLogger:OFF',
+          // Enforce safe string splitting
+          '-Xep:StringSplitter:ERROR',
       )
     }
   }

diff --git a/core/src/main/java/org/apache/iceberg/rest/auth/OAuth2Util.java b/core/src/main/java/org/apache/iceberg/rest/auth/OAuth2Util.java
@@ -329,14 +329,14 @@ static Long expiresAtMillis(String token) {
       return null;
     }
 
-    String[] parts = token.split("\\.");
-    if (parts.length != 3) {
+    List<String> parts = Splitter.on('.').splitToList(token);
+    if (parts.size() != 3) {
       return null;
     }
 
     JsonNode node;
     try {
-      node = JsonUtil.mapper().readTree(Base64.getUrlDecoder().decode(parts[1]));
+      node = JsonUtil.mapper().readTree(Base64.getUrlDecoder().decode(parts.get(1)));
     } catch (IOException e) {
       return null;
     }

diff --git a/hive-metastore/src/main/java/org/apache/iceberg/hive/HiveVersion.java b/hive-metastore/src/main/java/org/apache/iceberg/hive/HiveVersion.java
@@ -18,7 +18,9 @@
  */
 package org.apache.iceberg.hive;
 
+import java.util.List;
 import org.apache.hive.common.util.HiveVersionInfo;
+import org.apache.iceberg.relocated.com.google.common.base.Splitter;
 
 public enum HiveVersion {
   HIVE_4(4),
@@ -44,16 +46,16 @@ public static boolean min(HiveVersion other) {
 
   private static HiveVersion calculate() {
     String version = HiveVersionInfo.getShortVersion();
-    String[] versions = version.split("\\.");
-    switch (versions[0]) {
+    List<String> versions = Splitter.on('.').splitToList(version);
+    switch (versions.get(0)) {
       case "4":
         return HIVE_4;
       case "3":
         return HIVE_3;
       case "2":
         return HIVE_2;
       case "1":
-        if (versions[1].equals("2")) {
+        if (versions.get(1).equals("2")) {
           return HIVE_1_2;
         } else {
           return NOT_SUPPORTED;