update function name to generateUuid()

Signed-off-by: Xun Zhang <xunzh@amazon.com>

Author: Zhangxunmt

data-prepper-expression/src/main/java/org/opensearch/dataprepper/expression/GenerateUuidExpressionFunction.java

@@ -18,12 +18,12 @@
 
 /**
  * Expression function that generates a random UUID (version 4) string.
- * Usage: {@code generate_uuid()}
+ * Usage: {@code generateUuid()}
  */
 @Named
 public class GenerateUuidExpressionFunction implements ExpressionFunction {
 
-    static final String FUNCTION_NAME = "generate_uuid";
+    static final String FUNCTION_NAME = "generateUuid";
 
     @Override
     public String getFunctionName() {

data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/GenerateUuidExpressionFunctionTest.java

@@ -21,6 +21,7 @@
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.mock;
 
@@ -31,17 +32,17 @@ class GenerateUuidExpressionFunctionTest {
     private final Function<Object, Object> convertLiteralType = v -> v;
 
     @Test
-    void getFunctionName_returns_generate_uuid() {
-        assertThat(function.getFunctionName(), equalTo("generate_uuid"));
+    void getFunctionName_returns_generateUuid() {
+        assertThat(function.getFunctionName(), equalTo("generateUuid"));
     }
 
     @Test
     void evaluate_returns_valid_uuid_string() {
         final Object result = function.evaluate(Collections.emptyList(), event, convertLiteralType);
         assertThat(result, instanceOf(String.class));
         final String uuidStr = (String) result;
-        // UUID.fromString throws if invalid
-        assertThat(UUID.fromString(uuidStr).toString(), equalTo(uuidStr));
+        final UUID regeneratedUuid = assertDoesNotThrow(() -> UUID.fromString(uuidStr));
+        assertThat(regeneratedUuid.toString(), equalTo(uuidStr));
     }
 
     @Test

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

@@ -1089,8 +1089,8 @@ public void testAddFlattenedNestedEntryIterateOn() {
     }
 
     @Test
-    void test_generate_uuid_expression_adds_uuid_string_to_event() {
-        final String uuidExpr = "generate_uuid()";
+    void test_generateUuid_expression_adds_uuid_string_to_event() {
+        final String uuidExpr = "generateUuid()";
         final String generatedUuid = UUID.randomUUID().toString();
         when(mockConfig.getEntries()).thenReturn(createListOfEntries(
                 createEntry("recordId", null, null, null, uuidExpr, false, false, null, null, null)));
@@ -1107,8 +1107,8 @@ void test_generate_uuid_expression_adds_uuid_string_to_event() {
     }
 
     @Test
-    void test_generate_uuid_expression_produces_unique_values_per_event() {
-        final String uuidExpr = "generate_uuid()";
+    void test_generateUuid_expression_produces_unique_values_per_event() {
+        final String uuidExpr = "generateUuid()";
         final String uuid1 = UUID.randomUUID().toString();
         final String uuid2 = UUID.randomUUID().toString();
         when(mockConfig.getEntries()).thenReturn(createListOfEntries(
@@ -1128,8 +1128,8 @@ void test_generate_uuid_expression_produces_unique_values_per_event() {
     }
 
     @Test
-    void test_generate_uuid_expression_does_not_overwrite_existing_key_by_default() {
-        final String uuidExpr = "generate_uuid()";
+    void test_generateUuid_expression_does_not_overwrite_existing_key_by_default() {
+        final String uuidExpr = "generateUuid()";
         when(mockConfig.getEntries()).thenReturn(createListOfEntries(
                 createEntry("existingId", null, null, null, uuidExpr, false, false, null, null, null)));
         when(expressionEvaluator.isValidExpressionStatement(uuidExpr)).thenReturn(true);
@@ -1144,8 +1144,8 @@ void test_generate_uuid_expression_does_not_overwrite_existing_key_by_default()
     }
 
     @Test
-    void test_generate_uuid_expression_overwrites_existing_key_when_overwrite_is_true() {
-        final String uuidExpr = "generate_uuid()";
+    void test_generateUuid_expression_overwrites_existing_key_when_overwrite_is_true() {
+        final String uuidExpr = "generateUuid()";
         final String newUuid = UUID.randomUUID().toString();
         when(mockConfig.getEntries()).thenReturn(createListOfEntries(
                 createEntry("existingId", null, null, null, uuidExpr, true, false, null, null, null)));
@@ -1162,8 +1162,8 @@ void test_generate_uuid_expression_overwrites_existing_key_when_overwrite_is_tru
     }
 
     @Test
-    void test_generate_uuid_expression_respects_add_when_condition() {
-        final String uuidExpr = "generate_uuid()";
+    void test_generateUuid_expression_respects_add_when_condition() {
+        final String uuidExpr = "generateUuid()";
         final String addWhen = "/skip == true";
         when(mockConfig.getEntries()).thenReturn(createListOfEntries(
                 createEntry("recordId", null, null, null, uuidExpr, false, false, addWhen, null, null)));