fix: Used generic predictaes for null check

Signed-off-by: ABHIJEET SHUKLA <[email protected]>
eclipse-jkube · Feb 1, 2021 · ef07a12 · ef07a12
1 parent e2849d9
commit ef07a12
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/EnvUtil.java b/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/EnvUtil.java
@@ -34,8 +34,6 @@
 import java.util.TreeMap;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.function.UnaryOperator;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -135,14 +133,10 @@ public static List<String[]> splitOnLastColon(List<String> listToSplit) {
         return Collections.emptyList();
     }
 
-    private static final Predicate<String> NOT_EMPTY = s -> s != null && !s.isEmpty();
-
-    private static final UnaryOperator<String> TRIM = s ->  s != null ? s.trim() : null;
-
     private static final Function<String, List<String>> COMMA_SPLITTER =
             input -> Arrays.stream(input.split(COMMA))
-                    .map(TRIM)
-                    .filter(NOT_EMPTY)
+                    .filter(StringUtils::isNotBlank)
+                    .map(StringUtils::trim)
                     .collect(Collectors.toList());
 
     /**
@@ -156,7 +150,7 @@ public static List<String> removeEmptyEntries(@Nullable List<String> input) {
         if (input == null) {
             return Collections.emptyList();
         }
-        return input.stream().map(TRIM).filter(NOT_EMPTY).collect(Collectors.toList());
+        return input.stream().filter(StringUtils::isNotBlank).map(StringUtils::trim).collect(Collectors.toList());
     }
 
     /**
@@ -171,7 +165,7 @@ public static List<String> splitAtCommasAndTrim(Iterable<String> input) {
             return Collections.emptyList();
         }
         return StreamSupport.stream(input.spliterator(), false)
-                .filter(NOT_EMPTY).map(COMMA_SPLITTER).flatMap(Collection::stream)
+                .filter(StringUtils::isNotBlank).map(COMMA_SPLITTER).flatMap(Collection::stream)
                 .collect(Collectors.toList());
     }