Flatten the map structure

Author: joegallo

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

@@ -10,7 +10,6 @@
 
 import org.elasticsearch.common.network.NetworkAddress;
 import org.elasticsearch.common.time.DateFormatters;
-import org.elasticsearch.common.util.Maps;
 import org.elasticsearch.core.Nullable;
 
 import java.net.InetAddress;
@@ -372,7 +371,6 @@ private void processExtensions(String cefString, int extensionStart, CefEvent ev
             removeEmptyValue(parsedExtensions);
         }
         // Translate extensions to possible ECS fields
-        final Map<String, Object> extensions = Maps.newHashMapWithExpectedSize(parsedExtensions.size());
         for (Map.Entry<String, String> entry : parsedExtensions.entrySet()) {
             ExtensionMapping mapping = EXTENSION_MAPPINGS.get(entry.getKey());
             if (mapping != null) {
@@ -382,17 +380,13 @@ private void processExtensions(String cefString, int extensionStart, CefEvent ev
                     event.addRootMapping(ecsKey, convertValueToType(entry.getValue(), mapping.dataType()));
                 } else {
                     // Add the extension to the CEF mappings if it doesn't have an ECS translation
-                    extensions.put(mapping.key(), convertValueToType(entry.getValue(), mapping.dataType()));
+                    event.addCefMapping("extensions." + mapping.key(), convertValueToType(entry.getValue(), mapping.dataType()));
                 }
             } else {
                 // Add the extension if the key is not in the mapping
-                extensions.put(entry.getKey(), entry.getValue());
+                event.addCefMapping("extensions." + entry.getKey(), entry.getValue());
             }
         }
-        // Bang the extensions into the cef mappings
-        if (extensions.isEmpty() == false) {
-            event.addCefMapping("extensions", extensions);
-        }
     }
 
     private static Map<String, String> parseExtensions(String extensionString) {