refactor(kubernetes): Fix string splitter error prone warning. (#4849)

Switched to using Splitter in PropertyParser.java since the behavior is properly defined, unlike String.split(String). The reason for omitting empty strings here is because otherwise there is a scenario where it will attempt to parse properties with empty values. There is a test case for this scenario.
spinnaker · Aug 28, 2020 · 69f5ee9 · 69f5ee9
1 parent 1e35c6c
commit 69f5ee9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/clouddriver-kubernetes/clouddriver-kubernetes.gradle b/clouddriver-kubernetes/clouddriver-kubernetes.gradle
@@ -32,8 +32,7 @@ tasks.withType(JavaCompile) {
     "EmptyCatch",
     "ImmutableEnumChecker",
     "JdkObsolete",
-    "MissingOverride",
-    "StringSplitter"
+    "MissingOverride"
   )
 }
 

diff --git a/.../main/java/com/netflix/spinnaker/clouddriver/kubernetes/provider/view/PropertyParser.java b/.../main/java/com/netflix/spinnaker/clouddriver/kubernetes/provider/view/PropertyParser.java
@@ -19,8 +19,10 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Splitter;
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
 import org.slf4j.Logger;
@@ -35,20 +37,23 @@ public class PropertyParser {
   private static final Pattern MAGIC_JSON_SEARCH_PATTERN =
       Pattern.compile("^\\s*" + MAGIC_JSON_SEARCH_STRING);
 
+  private static final Splitter lineSplitter = Splitter.on("\n").omitEmptyStrings().trimResults();
+  private static final Splitter equalsSplitter = Splitter.on("=").omitEmptyStrings().trimResults();
+
   public static Map<String, Object> extractPropertiesFromLog(String buildLog) throws IOException {
     final Map<String, Object> map = new HashMap<>();
 
-    for (String line : buildLog.split("\n")) {
+    for (String line : lineSplitter.split(buildLog)) {
       if (MAGIC_SEARCH_PATTERN.matcher(line).find()) {
         log.debug("Identified: " + line);
-        String[] splittedLine = line.split("=");
+        List<String> splittedLine = equalsSplitter.splitToList(line);
         // if the split line doesn't match our expected length it cannot
         // be parsed so we should skip it.
-        if (splittedLine.length != 2) {
+        if (splittedLine.size() != 2) {
           continue;
         }
-        final String key = splittedLine[0].replaceFirst(MAGIC_SEARCH_STRING, "").toLowerCase();
-        final String value = splittedLine[1].trim();
+        final String key = splittedLine.get(0).replaceFirst(MAGIC_SEARCH_STRING, "").toLowerCase();
+        final String value = splittedLine.get(1);
         log.debug(key + ":" + value);
         map.put(key, value);
       }