Merge branch 'improve/uuidv5' into 'develop'

[improve][core]GAL-675 UUIDv5新增NAMESPACE_CELL

See merge request galaxy/platform/groot-stream!133

4 files changed, 21 insertions, 4 deletions

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
index a8941e2..0f8c851 100644
--- 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
@@ -13,8 +13,8 @@ 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"));
-
+    NAMESPACE_SUBSCRIBER(UUID.fromString("6ba7b893-9dad-11d1-80b4-00c04fd430c8")),
+    NAMESPACE_CELL(UUID.fromString("6ba7b894-9dad-11d1-80b4-00c04fd430c8"));
     private final UUID uuid;
 
     // Static map to hold the mapping from name to UUID
diff --git a/groot-core/src/test/java/com/geedgenetworks/core/udf/test/simple/UUIDTest.java b/groot-core/src/test/java/com/geedgenetworks/core/udf/test/simple/UUIDTest.java
index 534569b..70216b4 100644
--- a/groot-core/src/test/java/com/geedgenetworks/core/udf/test/simple/UUIDTest.java
+++ b/groot-core/src/test/java/com/geedgenetworks/core/udf/test/simple/UUIDTest.java
@@ -136,4 +136,21 @@ public class UUIDTest {
         Event result1 = uuidv5.evaluate(event);
         assertEquals("9b154520-3c29-541c-bb81-f649354dae67", result1.getExtractedFields().get("uuid").toString());
     }
+    @Test
+    public void testUuidV5ForCell() {
+        udfContext = new UDFContext();
+        UUIDv5 uuidv5 = new UUIDv5();
+        parameters =  new HashMap<>();
+        udfContext.setParameters(parameters);
+        udfContext.setLookupFields(List.of("cell"));
+        udfContext.setOutputFields(Collections.singletonList("uuid"));
+        parameters.put("namespace","NAMESPACE_CELL");
+        uuidv5.open(null, udfContext);
+        Event event = new Event();
+        Map<String, Object> extractedFields = new HashMap<>();
+        extractedFields.put("cell", "test1");
+        event.setExtractedFields(extractedFields);
+        Event result1 = uuidv5.evaluate(event);
+        assertEquals("4693c13f-e97f-5846-bdb0-f80ce2d2869d", result1.getExtractedFields().get("uuid").toString());
+    }
 }
diff --git a/groot-examples/end-to-end-example/src/main/resources/examples/inline_to_print_test.yaml b/groot-examples/end-to-end-example/src/main/resources/examples/inline_to_print_test.yaml
index 65cd3cb..7c583ad 100644
--- a/groot-examples/end-to-end-example/src/main/resources/examples/inline_to_print_test.yaml
+++ b/groot-examples/end-to-end-example/src/main/resources/examples/inline_to_print_test.yaml
@@ -41,7 +41,7 @@ filters:
 preprocessing_pipelines:
   transform_processor:
     type: projection
-    remove_fields: [client_ip]
+    remove_fields: [http_request_line]
 
 processing_pipelines:
   session_record_processor:
diff --git a/pom.xml b/pom.xml
index 36eadf4..f25bfd5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     </modules>
 
     <properties>
-        <revision>1.7.1-SNAPSHOT</revision>
+        <revision>1.7.0</revision>
         <java.version>11</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>${java.version}</maven.compiler.source>