Rename this parameter and some variables

Author: joegallo

modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/CefParser.java

@@ -53,11 +53,11 @@
 import static org.elasticsearch.ingest.common.CefParser.DataType.TimestampType;
 
 final class CefParser {
-    private final boolean removeEmptyValue;
+    private final boolean removeEmptyValues;
     private final ZoneId timezone;
 
-    CefParser(ZoneId timezone, boolean removeEmptyValue) {
-        this.removeEmptyValue = removeEmptyValue;
+    CefParser(ZoneId timezone, boolean removeEmptyValues) {
+        this.removeEmptyValues = removeEmptyValues;
         this.timezone = timezone;
     }
 
@@ -368,8 +368,8 @@ private void processExtensions(String cefString, int extensionStart, CefEvent ev
         String extensionString = cefString.substring(extensionStart);
         final Map<String, String> parsedExtensions = parseExtensions(extensionString);
         // Cleanup empty values in extensions
-        if (removeEmptyValue) {
-            removeEmptyValue(parsedExtensions);
+        if (removeEmptyValues) {
+            removeEmptyValues(parsedExtensions);
         }
         // Translate extensions to possible ECS fields
         for (Map.Entry<String, String> entry : parsedExtensions.entrySet()) {
@@ -508,7 +508,7 @@ private static String insertMACSeparators(String v) {
         return sb.toString();
     }
 
-    private static void removeEmptyValue(Map<String, String> map) {
+    private static void removeEmptyValues(Map<String, String> map) {
         map.values().removeIf(Strings::isEmpty);
     }
 

modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/CefProcessor.java

@@ -30,7 +30,7 @@ public final class CefProcessor extends AbstractProcessor {
     final String field;
     final String targetField;
     final boolean ignoreMissing;
-    final boolean removeEmptyValue;
+    final boolean ignoreEmptyValues;
     private final TemplateScript.Factory timezone;
 
     CefProcessor(
@@ -39,14 +39,14 @@ public final class CefProcessor extends AbstractProcessor {
         String field,
         String targetField,
         boolean ignoreMissing,
-        boolean removeEmptyValue,
+        boolean ignoreEmptyValues,
         @Nullable TemplateScript.Factory timezone
     ) {
         super(tag, description);
         this.field = field;
         this.targetField = targetField;
         this.ignoreMissing = ignoreMissing;
-        this.removeEmptyValue = removeEmptyValue;
+        this.ignoreEmptyValues = ignoreEmptyValues;
         this.timezone = timezone;
     }
 
@@ -59,7 +59,7 @@ public IngestDocument execute(IngestDocument document) {
             throw new IllegalArgumentException("field [" + field + "] is null, cannot process it.");
         }
         ZoneId timezone = getTimezone(document);
-        try (CefEvent event = new CefParser(timezone, removeEmptyValue).process(line)) {
+        try (CefEvent event = new CefParser(timezone, ignoreEmptyValues).process(line)) {
             event.getRootMappings().forEach(document::setFieldValue);
             event.getCefMappings().forEach((k, v) -> document.setFieldValue(targetField + "." + k, v));
         }
@@ -97,7 +97,7 @@ public CefProcessor create(
             ProjectId projectId
         ) {
             String field = ConfigurationUtils.readStringProperty(TYPE, processorTag, config, "field");
-            boolean removeEmptyValue = ConfigurationUtils.readBooleanProperty(TYPE, processorTag, config, "ignore_empty_value", true);
+            boolean ignoreEmptyValues = ConfigurationUtils.readBooleanProperty(TYPE, processorTag, config, "ignore_empty_values", true);
             boolean ignoreMissing = ConfigurationUtils.readBooleanProperty(TYPE, processorTag, config, "ignore_missing", false);
             String targetField = ConfigurationUtils.readStringProperty(TYPE, processorTag, config, "target_field", "cef");
             String timezoneString = ConfigurationUtils.readOptionalStringProperty(TYPE, processorTag, config, "timezone");
@@ -118,7 +118,7 @@ public CefProcessor create(
                 field,
                 targetField,
                 ignoreMissing,
-                removeEmptyValue,
+                ignoreEmptyValues,
                 compiledTimezoneTemplate
             );
         }

modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/CefProcessorTests.java

@@ -668,7 +668,7 @@ public void testTruncatedHeader() {
         );
     }
 
-    public void testRemoveEmptyValueInExtension() {
+    public void testIgnoreEmptyValuesInExtension() {
         String message = "CEF:26|security|threat=manager|1.0|100|trojan successfully stopped|10|src= dst=12.121.122.82 spt=";
         Map<String, Object> source = new HashMap<>();
         source.put("message", message);