fix unit tests

Signed-off-by: Kat Shen <[email protected]>
opensearch-project · Jul 4, 2023 · a89d64a · a89d64a
1 parent e7918bd
commit a89d64a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/data-prepper-plugins/key-value-processor/README.md b/data-prepper-plugins/key-value-processor/README.md
@@ -62,7 +62,7 @@ When run, the processor will parse the message into the following output:
   * Cannot be an empty string
   * Example: `delete_value_regex` is `"\s"`. `{"key1=value1 "}` will parse into `{"key1": "value1"}`
 * `transform_key` - Change keys to lowercase, uppercase, or all capitals.
-  * Default is an empty string
+  * Default is an empty string (no transformation)
   * Example: `transform_key` is `lowercase`. `{"Key1=value1"}` will parse into `{"key1": "value1"}`
   * Example: `transform_key` is `uppercase`. `{"key1=value1"}` will parse into `{"Key1": "value1"}`
   * Example: `transform_key` is `capitalize`. `{"key1=value1"}` will parse into `{"KEY1": "value1"}`

diff --git a/...or/bin/main/org/opensearch/dataprepper/plugins/processor/keyvalue/KeyValueProcessor.class b/...or/bin/main/org/opensearch/dataprepper/plugins/processor/keyvalue/KeyValueProcessor.class
diff --git a/...n/test/org/opensearch/dataprepper/plugins/processor/keyvalue/KeyValueProcessorTests.class b/...n/test/org/opensearch/dataprepper/plugins/processor/keyvalue/KeyValueProcessorTests.class
diff --git a/...rc/main/java/org/opensearch/dataprepper/plugins/processor/keyvalue/KeyValueProcessor.java b/...rc/main/java/org/opensearch/dataprepper/plugins/processor/keyvalue/KeyValueProcessor.java
@@ -15,7 +15,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -36,7 +35,7 @@ public class KeyValueProcessor extends AbstractProcessor<Record<Event>, Record<E
     private final Pattern fieldDelimiterPattern;
     private final Pattern keyValueDelimiterPattern;
     private final Set<String> includeKeysSet = new HashSet<String>();
-    private final Set<String> validTransformOptionSet = new HashSet<>(Arrays.asList("lowercase", "uppercase", "capitalize"));
+    private final Set<String> validTransformOptionSet = Set.of("", "lowercase", "uppercase", "capitalize");
 
     @DataPrepperPluginConstructor
     public KeyValueProcessor(final PluginMetrics pluginMetrics, final KeyValueProcessorConfig keyValueProcessorConfig) {
@@ -97,11 +96,8 @@ public KeyValueProcessor(final PluginMetrics pluginMetrics, final KeyValueProces
             includeKeysSet.addAll(keyValueProcessorConfig.getIncludeKeys());
         }
 
-        if(keyValueProcessorConfig.getTransformKey() != null
-                && !keyValueProcessorConfig.getTransformKey().isEmpty()) {
-            if(!validTransformOptionSet.contains(keyValueProcessorConfig.getTransformKey())) {
-                throw new IllegalArgumentException("transform_key is not a valid option");
-            }
+        if(!validTransformOptionSet.contains(keyValueProcessorConfig.getTransformKey())) {
+            throw new IllegalArgumentException(String.format("The transform_key value: %s is not a valid option", keyValueProcessorConfig.getTransformKey()));
         }
     }
 

diff --git a/...st/java/org/opensearch/dataprepper/plugins/processor/keyvalue/KeyValueProcessorTests.java b/...st/java/org/opensearch/dataprepper/plugins/processor/keyvalue/KeyValueProcessorTests.java
@@ -374,6 +374,8 @@ void testDeleteValueAndKeyRegexKvProcessor() {
 
     @Test
     void testLowercaseTransformKvProcessor() {
+        when(mockConfig.getTransformKey()).thenReturn("lowercase");
+
         final Record<Event> record = getMessage("Key1=value1");
         final List<Record<Event>> editedRecords = (List<Record<Event>>) keyValueProcessor.doExecute(Collections.singletonList(record));
         final LinkedHashMap<String, Object> parsed_message = getLinkedHashMap(editedRecords);
@@ -384,6 +386,8 @@ void testLowercaseTransformKvProcessor() {
 
     @Test
     void testUppercaseTransformKvProcessor() {
+        when(mockConfig.getTransformKey()).thenReturn("uppercase");
+
         final Record<Event> record = getMessage("key1=value1");
         final List<Record<Event>> editedRecords = (List<Record<Event>>) keyValueProcessor.doExecute(Collections.singletonList(record));
         final LinkedHashMap<String, Object> parsed_message = getLinkedHashMap(editedRecords);
@@ -394,6 +398,8 @@ void testUppercaseTransformKvProcessor() {
 
     @Test
     void testCapitalizeTransformKvProcessor() {
+        when(mockConfig.getTransformKey()).thenReturn("capitalize");
+
         final Record<Event> record = getMessage("key1=value1");
         final List<Record<Event>> editedRecords = (List<Record<Event>>) keyValueProcessor.doExecute(Collections.singletonList(record));
         final LinkedHashMap<String, Object> parsed_message = getLinkedHashMap(editedRecords);