[Improve][UUID] UUID class name use uppercase for abbreviations in naming conventions.

7 files changed, 94 insertions, 73 deletions

diff --git a/groot-core/pom.xml b/groot-core/pom.xml
index e526024..322f63d 100644
--- a/groot-core/pom.xml
+++ b/groot-core/pom.xml
@@ -15,8 +15,8 @@
         <dependency>
             <groupId>com.fasterxml.uuid</groupId>
             <artifactId>java-uuid-generator</artifactId>
-            <version>5.1.0</version>
         </dependency>
+
         <dependency>
             <groupId>com.uber</groupId>
             <artifactId>h3</artifactId>
diff --git a/groot-core/src/main/java/com/geedgenetworks/core/udf/uuid/NameSpaceType.java b/groot-core/src/main/java/com/geedgenetworks/core/udf/uuid/NameSpaceType.java
deleted file mode 100644
index 1f6fd85..0000000
--- a/groot-core/src/main/java/com/geedgenetworks/core/udf/uuid/NameSpaceType.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.geedgenetworks.core.udf.uuid;
-
-import com.geedgenetworks.common.exception.GrootStreamRuntimeException;
-
-import java.util.UUID;
-
-import static com.geedgenetworks.common.exception.CommonErrorCode.ILLEGAL_ARGUMENT;
-
-public enum NameSpaceType {
-
-    NAMESPACE_IP("NAMESPACE_IP",UUID.fromString("6ba7b890-9dad-11d1-80b4-00c04fd430c8")),
-    NAMESPACE_DOMAIN("NAMESPACE_DOMAIN", UUID.fromString("6ba7b891-9dad-11d1-80b4-00c04fd430c8")),
-    NAMESPACE_APP("NAMESPACE_APP", UUID.fromString("6ba7b892-9dad-11d1-80b4-00c04fd430c8")),
-    NAMESPACE_SUBSCRIBER("NAMESPACE_SUBSCRIBER", UUID.fromString("6ba7b893-9dad-11d1-80b4-00c04fd430c8"));
-    private final String name;
-    private final UUID uuid;
-    NameSpaceType(String name, UUID uuid) {
-        this.name = name;
-        this.uuid = uuid;
-    }
-    public static UUID getUuidByName(String name) {
-        for (NameSpaceType nameSpaceType : NameSpaceType.values()) {
-            if (nameSpaceType.name.equals(name)) {
-                return nameSpaceType.uuid;
-            }
-        }
-        throw new GrootStreamRuntimeException(ILLEGAL_ARGUMENT,"No enum constant " + NameSpaceType.class.getCanonicalName() + "." + name);
-    }
-
-}
diff --git a/groot-core/src/main/java/com/geedgenetworks/core/udf/uuid/Uuid.java b/groot-core/src/main/java/com/geedgenetworks/core/udf/uuid/UUID.java
index 2c77108..1ce65bc 100644
--- a/groot-core/src/main/java/com/geedgenetworks/core/udf/uuid/Uuid.java
+++ b/groot-core/src/main/java/com/geedgenetworks/core/udf/uuid/UUID.java
@@ -11,7 +11,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.flink.api.common.functions.RuntimeContext;
 
 @Slf4j
-public class Uuid implements ScalarFunction {
+public class UUID implements ScalarFunction {
     private String outputFieldName;
     private RandomBasedGenerator randomBasedGenerator;
     @Override
@@ -42,7 +42,6 @@ public class Uuid implements ScalarFunction {
 
     @Override
     public void close() {
-
     }
 
 
diff --git a/groot-core/src/main/java/com/geedgenetworks/core/udf/uuid/UUIDNameSpace.java b/groot-core/src/main/java/com/geedgenetworks/core/udf/uuid/UUIDNameSpace.java
new file mode 100644
index 0000000..a8941e2
--- /dev/null
+++ b/groot-core/src/main/java/com/geedgenetworks/core/udf/uuid/UUIDNameSpace.java
@@ -0,0 +1,43 @@
+package com.geedgenetworks.core.udf.uuid;
+
+import com.geedgenetworks.common.exception.GrootStreamRuntimeException;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import static com.geedgenetworks.common.exception.CommonErrorCode.ILLEGAL_ARGUMENT;
+
+public enum UUIDNameSpace {
+
+    NAMESPACE_IP(UUID.fromString("6ba7b890-9dad-11d1-80b4-00c04fd430c8")),
+    NAMESPACE_DOMAIN(UUID.fromString("6ba7b891-9dad-11d1-80b4-00c04fd430c8")),
+    NAMESPACE_APP(UUID.fromString("6ba7b892-9dad-11d1-80b4-00c04fd430c8")),
+    NAMESPACE_SUBSCRIBER(UUID.fromString("6ba7b893-9dad-11d1-80b4-00c04fd430c8"));
+
+    private final UUID uuid;
+
+    // Static map to hold the mapping from name to UUID
+    private static final Map<String, UUID> NAME_TO_UUID_MAP = new HashMap<>();
+
+    // Static block to populate the map
+    static {
+        for (UUIDNameSpace namespace : UUIDNameSpace.values()) {
+            NAME_TO_UUID_MAP.put(namespace.name(), namespace.uuid);
+        }
+    }
+
+    UUIDNameSpace(UUID uuid) {
+        this.uuid = uuid;
+    }
+
+    public static UUID getUUID(String name) {
+        UUID uuid = NAME_TO_UUID_MAP.get(name);
+        if (uuid == null) {
+            throw new GrootStreamRuntimeException(ILLEGAL_ARGUMENT,"No enum constant " + UUIDNameSpace.class.getCanonicalName() + "." + name);
+        }
+        return uuid;
+    }
+
+
+}
diff --git a/groot-core/src/main/java/com/geedgenetworks/core/udf/uuid/UuidV5.java b/groot-core/src/main/java/com/geedgenetworks/core/udf/uuid/UUIDv5.java
index ad46ec4..b4ad808 100644
--- a/groot-core/src/main/java/com/geedgenetworks/core/udf/uuid/UuidV5.java
+++ b/groot-core/src/main/java/com/geedgenetworks/core/udf/uuid/UUIDv5.java
@@ -13,39 +13,46 @@ import org.apache.flink.api.common.functions.RuntimeContext;
 import java.util.List;
 
 @Slf4j
-public class UuidV5 implements ScalarFunction {
+public class UUIDv5 implements ScalarFunction {
     private List<String> lookupFieldNames;
     private String outputFieldName;
     private NameBasedGenerator nameBasedGenerator;
+    private static final String NAMESPACE_KEY = "namespace";
     @Override
     public void open(RuntimeContext runtimeContext, UDFContext udfContext) {
 
-        if(udfContext.getOutput_fields()==null || udfContext.getParameters()==null || udfContext.getLookup_fields()==null){
+        if(udfContext.getOutput_fields() == null || udfContext.getParameters() == null || udfContext.getLookup_fields() == null){
             throw new GrootStreamRuntimeException(CommonErrorCode.ILLEGAL_ARGUMENT, "Missing required parameters");
         }
         if(udfContext.getOutput_fields().size() != 1){
             throw new GrootStreamRuntimeException(CommonErrorCode.ILLEGAL_ARGUMENT, "The function output fields only support 1 value");
         }
-        if(!udfContext.getParameters().containsKey("namespace") ){
-            throw new GrootStreamRuntimeException(CommonErrorCode.ILLEGAL_ARGUMENT, "parameters must containkey namespace");
+        if(!udfContext.getParameters().containsKey(NAMESPACE_KEY) ){
+            throw new GrootStreamRuntimeException(CommonErrorCode.ILLEGAL_ARGUMENT, "Parameters must contain key: " + NAMESPACE_KEY);
         }
+
         this.outputFieldName = udfContext.getOutput_fields().get(0);
         this.lookupFieldNames = udfContext.getLookup_fields();
-        this.nameBasedGenerator = Generators.nameBasedGenerator(NameSpaceType.getUuidByName(udfContext.getParameters().get("namespace").toString()));
+        String namespace = udfContext.getParameters().get(NAMESPACE_KEY).toString();
+        this.nameBasedGenerator = Generators.nameBasedGenerator(UUIDNameSpace.getUUID(namespace));
     }
 
     @Override
     public Event evaluate(Event event) {
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < lookupFieldNames.size(); i++) {
-            sb.append(event.getExtractedFields().getOrDefault(lookupFieldNames.get(i), ""));
-            if (i < lookupFieldNames.size() - 1) {
-                sb.append("_");
-            }
-        }
-        event.getExtractedFields()
-                .put(outputFieldName, nameBasedGenerator.generate(sb.toString()).toString());
+
+        String concatenatedFields = String.join("_",
+                lookupFieldNames.stream()
+                        .map(field -> event.getExtractedFields().getOrDefault(field, ""))
+                        .toArray(String[]::new)
+        );
+
+        // Generate the UUID based on concatenated fields
+        String generatedUUID = nameBasedGenerator.generate(concatenatedFields).toString();
+
+        // Set the generated UUID in the output field
+        event.getExtractedFields().put(outputFieldName, generatedUUID);
         return event;
+
     }
 
     @Override
@@ -57,4 +64,5 @@ public class UuidV5 implements ScalarFunction {
     public void close() {
 
     }
+
 }
diff --git a/groot-core/src/main/java/com/geedgenetworks/core/udf/uuid/UuidV7.java b/groot-core/src/main/java/com/geedgenetworks/core/udf/uuid/UUIDv7.java
index 9dfbce3..49025ef 100644
--- a/groot-core/src/main/java/com/geedgenetworks/core/udf/uuid/UuidV7.java
+++ b/groot-core/src/main/java/com/geedgenetworks/core/udf/uuid/UUIDv7.java
@@ -1,7 +1,6 @@
 package com.geedgenetworks.core.udf.uuid;
 
 import com.fasterxml.uuid.Generators;
-import com.fasterxml.uuid.impl.NameBasedGenerator;
 import com.fasterxml.uuid.impl.TimeBasedEpochGenerator;
 import com.geedgenetworks.common.Event;
 import com.geedgenetworks.common.exception.CommonErrorCode;
@@ -12,7 +11,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.flink.api.common.functions.RuntimeContext;
 
 @Slf4j
-public class UuidV7 implements ScalarFunction {
+public class UUIDv7 implements ScalarFunction {
     private String outputFieldName;
     private TimeBasedEpochGenerator timeBasedEpochRandomGenerator;
 
@@ -44,6 +43,5 @@ public class UuidV7 implements ScalarFunction {
 
     @Override
     public void close() {
-
     }
 }
diff --git a/groot-core/src/test/java/com/geedgenetworks/core/udf/test/simple/UuidFunctionTest.java b/groot-core/src/test/java/com/geedgenetworks/core/udf/test/simple/UUIDTest.java
index 65e5a94..ef79d51 100644
--- a/groot-core/src/test/java/com/geedgenetworks/core/udf/test/simple/UuidFunctionTest.java
+++ b/groot-core/src/test/java/com/geedgenetworks/core/udf/test/simple/UUIDTest.java
@@ -3,17 +3,18 @@ package com.geedgenetworks.core.udf.test.simple;
 import com.geedgenetworks.common.Event;
 import com.geedgenetworks.common.exception.GrootStreamRuntimeException;
 import com.geedgenetworks.common.udf.UDFContext;
-import com.geedgenetworks.core.udf.uuid.Uuid;
-import com.geedgenetworks.core.udf.uuid.UuidV5;
-import com.geedgenetworks.core.udf.uuid.UuidV7;
+import com.geedgenetworks.core.udf.uuid.UUID;
+import com.geedgenetworks.core.udf.uuid.UUIDv5;
+import com.geedgenetworks.core.udf.uuid.UUIDv7;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import java.util.*;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
-public class UuidFunctionTest {
+public class UUIDTest {
 
     private UDFContext udfContext;
     private Map<String, Object> parameters ;
@@ -22,7 +23,7 @@ public class UuidFunctionTest {
     @Test
     public void testInit(){
         udfContext = new UDFContext();
-        UuidV5 uuidv5 = new UuidV5();
+        UUIDv5 uuidv5 = new UUIDv5();
         parameters =  new HashMap<>();
         udfContext.setParameters(parameters);
         udfContext.setLookup_fields(List.of("client_ip","server_ip"));
@@ -35,9 +36,9 @@ public class UuidFunctionTest {
     }
 
     @Test
-    public void testUuid() {
+    public void testUUID() {
         udfContext = new UDFContext();
-        Uuid uuid = new Uuid();
+        UUID uuid = new UUID();
         parameters =  new HashMap<>();
         udfContext.setParameters(parameters);
         udfContext.setOutput_fields(Collections.singletonList("uuid"));
@@ -49,9 +50,9 @@ public class UuidFunctionTest {
         assertEquals(36, result1.getExtractedFields().get("uuid").toString().length());
     }
     @Test
-    public void testUuidV7() {
+    public void testUUIDV7() {
         udfContext = new UDFContext();
-        UuidV7 uuid = new UuidV7();
+        UUIDv7 uuid = new UUIDv7();
         parameters =  new HashMap<>();
         udfContext.setParameters(parameters);
         udfContext.setOutput_fields(Collections.singletonList("uuid"));
@@ -63,28 +64,30 @@ public class UuidFunctionTest {
         assertEquals(36, result1.getExtractedFields().get("uuid").toString().length());
     }
     @Test
-    public void testUuidV5ForNameSpaceIp() {
+    public void testUUIDV5ForNameSpaceIp() {
         udfContext = new UDFContext();
-        UuidV5 uuidv5 = new UuidV5();
+        UUIDv5 uuidv5 = new UUIDv5();
         parameters =  new HashMap<>();
         udfContext.setParameters(parameters);
-        udfContext.setLookup_fields(List.of("client_ip","server_ip"));
+        udfContext.setLookup_fields(List.of("client_ip", "server_ip"));
         udfContext.setOutput_fields(Collections.singletonList("uuid"));
         parameters.put("namespace","NAMESPACE_IP");
         uuidv5.open(null, udfContext);
         Event event = new Event();
         Map<String, Object> extractedFields = new HashMap<>();
         extractedFields.put("client_ip", "1.1.1.1");
-        extractedFields.put("server_ip", "1.1.1.2");
+        extractedFields.put("server_ip", "");
         event.setExtractedFields(extractedFields);
-        Event result1 = uuidv5.evaluate(event);
-        assertEquals("52530d0c-07df-5c4b-a659-661242575386", result1.getExtractedFields().get("uuid").toString());
+        Event result = uuidv5.evaluate(event);
+        System.out.printf("uuid: %s\n", result.getExtractedFields().get("uuid").toString());
+        assertEquals("5394a6a8-b9b8-5147-b5b2-01365f158acb", result.getExtractedFields().get("uuid").toString());
+        assertNotEquals("ecc67867-1f76-580c-a4c1-6a3d16ad6d02", result.getExtractedFields().get("uuid").toString());
     }
 
     @Test
-    public void testUuidV5ForNameSpaceDomain() {
+    public void testUUIDV5ForNameSpaceDomain() {
         udfContext = new UDFContext();
-        UuidV5 uuidv5 = new UuidV5();
+        UUIDv5 uuidv5 = new UUIDv5();
         parameters =  new HashMap<>();
         udfContext.setParameters(parameters);
         udfContext.setLookup_fields(List.of("domain"));
@@ -99,9 +102,9 @@ public class UuidFunctionTest {
         assertEquals("fd67cec1-6b33-5def-835c-fbe32f1ce4a4", result1.getExtractedFields().get("uuid").toString());
     }
     @Test
-    public void testUuidV5ForNameSpaceApp() {
+    public void testUUIDv5ForNameSpaceApp() {
         udfContext = new UDFContext();
-        UuidV5 uuidv5 = new UuidV5();
+        UUIDv5 uuidv5 = new UUIDv5();
         parameters =  new HashMap<>();
         udfContext.setParameters(parameters);
         udfContext.setLookup_fields(List.of("app"));
@@ -117,18 +120,18 @@ public class UuidFunctionTest {
     }
 
     @Test
-    public void testUuidV5ForNameSpaceSubid() {
+    public void testUUIDV5ForNameSpaceSubscriberID() {
         udfContext = new UDFContext();
-        UuidV5 uuidv5 = new UuidV5();
+        UUIDv5 uuidv5 = new UUIDv5();
         parameters =  new HashMap<>();
         udfContext.setParameters(parameters);
-        udfContext.setLookup_fields(List.of("subid"));
+        udfContext.setLookup_fields(List.of("subscriber_id"));
         udfContext.setOutput_fields(Collections.singletonList("uuid"));
         parameters.put("namespace","NAMESPACE_SUBSCRIBER");
         uuidv5.open(null, udfContext);
         Event event = new Event();
         Map<String, Object> extractedFields = new HashMap<>();
-        extractedFields.put("subid", "test1");
+        extractedFields.put("subscriber_id", "test1");
         event.setExtractedFields(extractedFields);
         Event result1 = uuidv5.evaluate(event);
         assertEquals("9b154520-3c29-541c-bb81-f649354dae67", result1.getExtractedFields().get("uuid").toString());