Address PR comments

Signed-off-by: Taylor Gray <tylgry@amazon.com>

Author: graytaylor0

data-prepper-plugins/mutate-event-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutateevent/SelectEntriesProcessor.java

@@ -58,15 +58,7 @@ public Collection<Record<Event>> doExecute(final Collection<Record<Event>> recor
             }
             // To handle nested case, just get the values and store
             // in a temporary map.
-            Map<String, Object> outMap = new HashMap<>();
-            if (keysToInclude != null) {
-                for (String keyToInclude: keysToInclude) {
-                    Object value = recordEvent.get(keyToInclude, Object.class);
-                    if (value != null) {
-                        outMap.put(keyToInclude, value);
-                    }
-                }
-            }
+            Map<String, Object> outMap = getIncludeKeysOutputMap(recordEvent);
 
             Map<String, Object> regexOutMap = getIncludeKeysRegexOutputMap(recordEvent);
 
@@ -98,6 +90,20 @@ public boolean isReadyForShutdown() {
     public void shutdown() {
     }
 
+    private Map<String, Object> getIncludeKeysOutputMap(final Event event) {
+        Map<String, Object> outMap = new HashMap<>();
+        if (keysToInclude != null) {
+            for (String keyToInclude: keysToInclude) {
+                Object value = event.get(keyToInclude, Object.class);
+                if (value != null) {
+                    outMap.put(keyToInclude, value);
+                }
+            }
+        }
+
+        return outMap;
+    }
+
     private Map<String, Object> getIncludeKeysRegexOutputMap(final Event event) {
         if (includeKeysRegex == null || includeKeysRegex.isEmpty()) {
             return Collections.emptyMap();
@@ -107,7 +113,7 @@ private Map<String, Object> getIncludeKeysRegexOutputMap(final Event event) {
 
         Map<String, Object> eventMap;
 
-        if (includeKeysRegexPointer != null) {
+        if (includeKeysRegexPointer != null && !includeKeysRegexPointer.equals("/")) {
             if (!event.containsKey(includeKeysRegexPointer)) {
                 return Collections.emptyMap();
             }
@@ -124,7 +130,7 @@ private Map<String, Object> getIncludeKeysRegexOutputMap(final Event event) {
 
             for (final Pattern includeKeyRegex : includeKeysRegex) {
                 if (includeKeyRegex.matcher(entry.getKey()).matches()) {
-                    final String fullKey = includeKeysRegexPointer != null ? includeKeysRegexPointer + "/" + entry.getKey() : entry.getKey();
+                    final String fullKey = getFullKey(entry.getKey(), includeKeysRegexPointer);
                     outputMap.put(fullKey, entry.getValue());
                     break;
                 }
@@ -133,5 +139,9 @@ private Map<String, Object> getIncludeKeysRegexOutputMap(final Event event) {
 
         return outputMap;
     }
+
+    private String getFullKey(final String key, final String includeKeysRegexPointer) {
+        return includeKeysRegexPointer != null ? includeKeysRegexPointer + "/" + key : key;
+    }
 }
 

data-prepper-plugins/mutate-event-processors/src/main/java/org/opensearch/dataprepper/plugins/processor/mutateevent/SelectEntriesProcessorConfig.java

@@ -63,6 +63,11 @@ public String getSelectWhen() {
         return selectWhen;
     }
 
+    private void setIncludeKeysRegex() {
+        includeKeysRegexPatterns = includeKeysRegex.stream().map(Pattern::compile).collect(Collectors.toList());
+    }
+
+
     @AssertTrue(message = "At least one of include_keys and include_keys_regex is required.")
     boolean isValidIncludeKeys() {
         return (includeKeys != null && !includeKeys.isEmpty()) || (includeKeysRegex != null && !includeKeysRegex.isEmpty());
@@ -72,7 +77,7 @@ boolean isValidIncludeKeys() {
     boolean isValidIncludeKeysRegex() {
         if (includeKeysRegex != null && !includeKeysRegex.isEmpty()) {
             try {
-                includeKeysRegexPatterns = includeKeysRegex.stream().map(Pattern::compile).collect(Collectors.toList());
+                setIncludeKeysRegex();
             } catch (final PatternSyntaxException e) {
                 return false;
             }