Sink is able to accept Map Composite now

FYP-Live-Query · Dec 23, 2022 · 63d909f · 63d909f
1 parent 80abd1a
commit 63d909f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/src/main/java/App.java b/src/main/java/App.java
@@ -27,7 +27,7 @@ public static void main(String[] args) throws JSQLParserException {
                         new LiveSource().addSourceComposite(new KeyValue<>("newFieldToSourceAnnotation", "FieldValue")),
                         new JsonMap().addMapComposite(new KeyValue<>("enclosing.element", "$.properties")),
                         new JsonMapAttributes(),
-                        new LogSink(),
+                        new LogSink().addMapComposite(new JsonMap()),
                         new QueryInfo().setQueryName("SQL-SiddhiQL-dev")
                 );
 

diff --git a/src/main/java/SiddhiApp/Annotation/Map/JsonMap.java b/src/main/java/SiddhiApp/Annotation/Map/JsonMap.java
@@ -19,14 +19,14 @@ public JsonMap() {
     public String getSiddhiAppCompositeAsString() {
         jsonMapAnnotation
                 .append(jsonMapSignature.getAnnotationTypeSignature())
-                .append("(").append("type = '").append(jsonMap.getMapTypeSignature()).append("',"); // @map(type = "json",
+                .append("(").append("type = '").append(jsonMap.getMapTypeSignature()).append("'"); // @map(type = "json",
         Iterator<ISiddhiAppComposite> sourceAnnotationCompositesIterator = annotationComposites.iterator();
 
         while(sourceAnnotationCompositesIterator.hasNext()){
-            jsonMapAnnotation.append(sourceAnnotationCompositesIterator.next().getSiddhiAppCompositeAsString());
             if(sourceAnnotationCompositesIterator.hasNext()){
                 jsonMapAnnotation.append(",");
             }
+            jsonMapAnnotation.append(sourceAnnotationCompositesIterator.next().getSiddhiAppCompositeAsString());
         }
 
         jsonMapAnnotation

diff --git a/src/main/java/SiddhiApp/Annotation/Sink/ISink.java b/src/main/java/SiddhiApp/Annotation/Sink/ISink.java
@@ -2,6 +2,7 @@
 
 import SiddhiApp.Annotation.IAnnotation;
 import SiddhiApp.Annotation.Common.ICommonAnnotationComposite;
+import SiddhiApp.Annotation.Map.IMap;
 import SiddhiApp.ISiddhiAppComposite;
 
 import java.util.ArrayList;
@@ -10,8 +11,13 @@
 public abstract class ISink implements IAnnotation {
     List<ISiddhiAppComposite> annotationComposites = new ArrayList<>(10);;
 
-    ISink addSourceComposite(ICommonAnnotationComposite iCommonAnnotationComposite){
+    public ISink addSourceComposite(ICommonAnnotationComposite iCommonAnnotationComposite){
         this.annotationComposites.add(iCommonAnnotationComposite);
         return this;
     }
+
+    public ISink addMapComposite(IMap mapComposite){
+        this.annotationComposites.add(mapComposite);
+        return this;
+    }
 }
diff --git a/src/main/java/SiddhiApp/Annotation/Sink/LogSink.java b/src/main/java/SiddhiApp/Annotation/Sink/LogSink.java
@@ -28,7 +28,7 @@ public String getSiddhiAppCompositeAsString() {
         for (ISiddhiAppComposite annotationComposite : annotationComposites) {
             sinkAnnotation
                     .append(",")
-                    .append(annotationComposite);
+                    .append(annotationComposite.getSiddhiAppCompositeAsString());
         }
 
         sinkAnnotation