One of these things is not like the others

Author: joegallo

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

@@ -312,7 +312,7 @@ private enum DataType {
         TimestampType;
     }
 
-    CEFEvent process(String cefString) {
+    CefEvent process(String cefString) {
         List<String> headers = new ArrayList<>();
         Matcher matcher = HEADER_NEXT_FIELD_PATTERN.matcher(cefString);
         int extensionStart = 0;
@@ -325,7 +325,7 @@ CEFEvent process(String cefString) {
         }
 
         if (headers.isEmpty() == false && headers.getFirst().startsWith("CEF:")) {
-            CEFEvent event = new CEFEvent();
+            CefEvent event = new CefEvent();
             // Add error message if there are not enough header fields
             if (headers.size() != 7) {
                 event.addRootMapping("error.message", new HashSet<>(ERROR_MESSAGE_INCOMPLETE_CEF_HEADER));
@@ -338,7 +338,7 @@ CEFEvent process(String cefString) {
         }
     }
 
-    private static void processHeaders(List<String> headers, CEFEvent event) {
+    private static void processHeaders(List<String> headers, CefEvent event) {
         for (int i = 0; i < headers.size(); i++) {
             final String value = headers.get(i);
             switch (i) {
@@ -365,7 +365,7 @@ private static void processHeaders(List<String> headers, CEFEvent event) {
         }
     }
 
-    private void processExtensions(String cefString, int extensionStart, CEFEvent event) {
+    private void processExtensions(String cefString, int extensionStart, CefEvent event) {
         String extensionString = cefString.substring(extensionStart);
         final Map<String, String> parsedExtensions = parseExtensions(extensionString);
         // Cleanup empty values in extensions
@@ -534,7 +534,7 @@ private static String desanitizeExtensionVal(String value) {
         return desanitized;
     }
 
-    static class CEFEvent implements AutoCloseable {
+    static class CefEvent implements AutoCloseable {
         private Map<String, Object> rootMappings = new HashMap<>();
         private Map<String, Object> cefMappings = new HashMap<>();
 

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

@@ -14,7 +14,7 @@
 import org.elasticsearch.ingest.ConfigurationUtils;
 import org.elasticsearch.ingest.IngestDocument;
 import org.elasticsearch.ingest.Processor;
-import org.elasticsearch.ingest.common.CefParser.CEFEvent;
+import org.elasticsearch.ingest.common.CefParser.CefEvent;
 import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.script.TemplateScript;
 
@@ -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, removeEmptyValue).process(line)) {
             event.getRootMappings().forEach(document::setFieldValue);
             event.getCefMappings().forEach((k, v) -> document.setFieldValue(targetField + "." + k, v));
         }