[incubator-streampipes-extensions] branch dev updated: [STREAMPIPES-250] Refactor controller of Numerical Filter

[riemer]

This is an automated email from the ASF dual-hosted git repository.

riemer pushed a commit to branch dev
in repository 
https://gitbox.apache.org/repos/asf/incubator-streampipes-extensions.git


The following commit(s) were added to refs/heads/dev by this push:
     new e9b9cce  [STREAMPIPES-250] Refactor controller of Numerical Filter
e9b9cce is described below

commit e9b9cce159d8bce1bf2bb3d3e6e908bcf495dd95
Author: Dominik Riemer <rie...@fzi.de>
AuthorDate: Wed Oct 21 13:38:06 2020 +0200

    [STREAMPIPES-250] Refactor controller of Numerical Filter
---
 .../processors/siddhi/filter/NumericalFilter.java            | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git 
a/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/filter/NumericalFilter.java
 
b/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/filter/NumericalFilter.java
index dc1f6bc..42152ee 100644
--- 
a/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/filter/NumericalFilter.java
+++ 
b/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/filter/NumericalFilter.java
@@ -17,9 +17,12 @@
  */
 package org.apache.streampipes.processors.siddhi.filter;
 
+import org.apache.streampipes.wrapper.siddhi.constants.SiddhiStreamSelector;
 import org.apache.streampipes.wrapper.siddhi.engine.SiddhiEventEngine;
 import org.apache.streampipes.wrapper.siddhi.model.SiddhiProcessorParams;
 import 
org.apache.streampipes.wrapper.siddhi.engine.callback.SiddhiDebugCallback;
+import org.apache.streampipes.wrapper.siddhi.query.SelectClause;
+import org.apache.streampipes.wrapper.siddhi.query.expression.Expressions;
 
 public class NumericalFilter extends 
SiddhiEventEngine<NumericalFilterParameters> {
 
@@ -59,7 +62,14 @@ public class NumericalFilter extends 
SiddhiEventEngine<NumericalFilterParameters
 
   @Override
   public String 
selectStatement(SiddhiProcessorParams<NumericalFilterParameters> siddhiParams) {
-    return 
siddhiParams.getCustomOutputSelectStatement(siddhiParams.getParams().getGraph());
+    SelectClause selectClause = SelectClause.create();
+    siddhiParams
+            .getOutputEventKeys()
+            .forEach(fieldName -> selectClause.addProperty(Expressions
+                    .property(SiddhiStreamSelector.FIRST_INPUT_STREAM, 
fieldName)));
+
+    return selectClause.toSiddhiEpl();
+    //return 
siddhiParams.getCustomOutputSelectStatement(siddhiParams.getParams().getGraph());
   }
 
 }