Fix naming bug, update tests and expected test results

jeroenvandisseldorp · Jun 27, 2024 · 9df72fd · 9df72fd
1 parent 6912d44
commit 9df72fd
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/ksml/src/main/java/io/axual/ksml/operation/parser/ToOperationParser.java b/ksml/src/main/java/io/axual/ksml/operation/parser/ToOperationParser.java
@@ -59,7 +59,7 @@ public StructsParser<ToOperation> parser() {
                 (name, tags) -> {
                     // Try to find a corresponding topic definition
                     final var topic = resources().topic(name);
-                    return topic != null ? new ToOperation(operationConfig(defaultLongName(), tags), topic, null) : null;
+                    return topic != null ? new ToOperation(operationConfig(null, tags), topic, null) : null;
                 },
                 new ToOperationDefinitionParser());
     }

diff --git a/ksml/src/main/java/io/axual/ksml/operation/parser/ToTopicNameExtractorOperationParser.java b/ksml/src/main/java/io/axual/ksml/operation/parser/ToTopicNameExtractorOperationParser.java
@@ -59,7 +59,7 @@ public StructsParser<ToTopicNameExtractorOperation> parser() {
                 (name, tags) -> {
                     // Try to find a corresponding topic definition
                     final var tne = resources().function(name);
-                    return tne != null ? new ToTopicNameExtractorOperation(operationConfig(defaultLongName(), tags), tne, null) : null;
+                    return tne != null ? new ToTopicNameExtractorOperation(operationConfig(null, tags), tne, null) : null;
                 },
                 new ToOperationDefinitionParser());
     }

diff --git a/ksml/src/test/resources/pipelines/5-demo.yaml b/ksml/src/test/resources/pipelines/5-demo.yaml
@@ -28,11 +28,12 @@ pipelines:
       - name: before-peek
         type: peek
         forEach: print_message
-    toExtractor:
-      code: |
-        if key == 'sensor1':
-          return 'ksml_sensordata_sensor1'
-        elif key == 'sensor2':
-          return 'ksml_sensordata_sensor2'
-        else:
-          return 'ksml_sensordata_sensor0'
+    toTopicNameExtractor:
+      topicNameExtractor:
+        code: |
+          if key == 'sensor1':
+            return 'ksml_sensordata_sensor1'
+          elif key == 'sensor2':
+            return 'ksml_sensordata_sensor2'
+          else:
+            return 'ksml_sensordata_sensor0'
diff --git a/ksml/src/test/resources/pipelines/test-routing.yaml b/ksml/src/test/resources/pipelines/test-routing.yaml
@@ -28,7 +28,7 @@ pipelines:
       - name: before_peek
         type: peek
         forEach: print_message
-    to:
+    toTopicNameExtractor:
       topicNameExtractor:
         code: |
           if key == 'sensor1':

diff --git a/ksml/src/test/resources/reference/5-reference.txt b/ksml/src/test/resources/reference/5-reference.txt
@@ -3,5 +3,7 @@ Topologies:
     Source: ksml_sensordata_avro (topics: [ksml_sensordata_avro])
       --> test_before-peek
     Processor: test_before-peek (stores: [])
-      --> none
+      --> test_pipelines_main_toTopicNameExtractor
       <-- ksml_sensordata_avro
+    Sink: test_pipelines_main_toTopicNameExtractor (extractor class: io.axual.ksml.user.UserTopicNameExtractor)
+      <-- test_before-peek