Tighten up this implementation

joegallo · joegallo · commit cb7ae4defde8 · 2025-04-03T12:48:43.000-04:00
diff --git a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/CefParser.java b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/CefParser.java
@@ -8,6 +8,7 @@
  */
 package org.elasticsearch.ingest.common;
 
+import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.network.NetworkAddress;
 import org.elasticsearch.common.time.DateFormatters;
 import org.elasticsearch.core.Nullable;
@@ -508,7 +509,7 @@ private static String insertMACSeparators(String v) {
     }
 
     private static void removeEmptyValue(Map<String, String> map) {
-        map.entrySet().removeIf(entry -> Objects.isNull(entry.getValue()) || entry.getValue().isEmpty());
+        map.values().removeIf(Strings::isEmpty);
     }
 
     private static String convertArrayLikeKey(String key) {

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`*/`
`9`	`9`	`package org.elasticsearch.ingest.common;`
`10`	`10`
	`11`	`+import org.elasticsearch.common.Strings;`
`11`	`12`	`import org.elasticsearch.common.network.NetworkAddress;`
`12`	`13`	`import org.elasticsearch.common.time.DateFormatters;`
`13`	`14`	`import org.elasticsearch.core.Nullable;`
`@@ -508,7 +509,7 @@ private static String insertMACSeparators(String v) {`
`508`	`509`	`}`
`509`	`510`
`510`	`511`	`private static void removeEmptyValue(Map<String, String> map) {`
`511`		`- map.entrySet().removeIf(entry -> Objects.isNull(entry.getValue()) \|\| entry.getValue().isEmpty());`
	`512`	`+ map.values().removeIf(Strings::isEmpty);`
`512`	`513`	`}`
`513`	`514`
`514`	`515`	`private static String convertArrayLikeKey(String key) {`