You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ze...@apache.org on 2023/01/03 13:36:05 UTC
[streampipes] branch siddhi-checkstyle created (now f26d8e030)
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a change to branch siddhi-checkstyle
in repository https://gitbox.apache.org/repos/asf/streampipes.git
at f26d8e030 [hotfix] Add checkstyle to module wrapper-siddhi
This branch includes the following new commits:
new f26d8e030 [hotfix] Add checkstyle to module wrapper-siddhi
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[streampipes] 01/01: [hotfix] Add checkstyle to module wrapper-siddhi
Posted by ze...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch siddhi-checkstyle
in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit f26d8e030789e14eb364aa3d0b5539b88ad1e464
Author: Philipp Zehnder <te...@users.noreply.github.com>
AuthorDate: Tue Jan 3 14:35:48 2023 +0100
[hotfix] Add checkstyle to module wrapper-siddhi
---
streampipes-wrapper-siddhi/pom.xml | 9 ++++-
.../wrapper/siddhi/SiddhiAppConfig.java | 4 +--
.../wrapper/siddhi/SiddhiAppConfigBuilder.java | 2 +-
.../wrapper/siddhi/SiddhiQueryBuilder.java | 12 +++++--
.../wrapper/siddhi/constants/SiddhiConstants.java | 1 -
.../wrapper/siddhi/engine/SiddhiEngine.java | 37 ++++++++++----------
.../wrapper/siddhi/engine/SiddhiEventEngine.java | 14 ++++----
.../siddhi/engine/SiddhiStatementGenerator.java | 4 +--
.../siddhi/engine/StreamPipesSiddhiProcessor.java | 11 +++---
.../callback/SiddhiOutputStreamCallback.java | 29 ++++++++--------
.../callback/SiddhiOutputStreamDebugCallback.java | 10 +++---
.../engine/generator/EventTypeGenerator.java | 18 ++++++----
.../engine/generator/InputStreamNameGenerator.java | 6 ++--
.../engine/generator/SiddhiAppGenerator.java | 31 ++++++++---------
.../generator/SiddhiInvocationConfigGenerator.java | 16 +++++----
.../siddhi/model/SiddhiProcessorParams.java | 20 +++++------
.../wrapper/siddhi/query/FromClause.java | 5 +--
.../wrapper/siddhi/query/GroupByClause.java | 2 +-
.../wrapper/siddhi/query/InsertIntoClause.java | 8 ++---
.../wrapper/siddhi/query/LimitClause.java | 2 +-
.../wrapper/siddhi/query/OffsetClause.java | 2 +-
.../wrapper/siddhi/query/SelectClause.java | 4 +--
.../wrapper/siddhi/query/SiddhiQuery.java | 2 +-
.../siddhi/query/expression/Expressions.java | 8 +++--
.../query/expression/PropertyRenameExpression.java | 10 +++---
.../query/expression/RelationalOperator.java | 2 +-
.../expression/RelationalOperatorExpression.java | 12 +++----
.../siddhi/query/expression/SiddhiTimeUnit.java | 2 +-
.../query/expression/StreamFilterExpression.java | 16 ++++++---
.../siddhi/query/expression/WithinExpression.java | 10 +++---
.../aggregation/AggregationFunction.java | 39 +++++++++++-----------
.../expression/aggregation/AndExpression.java | 25 +++++++-------
.../expression/aggregation/AverageExpression.java | 24 ++++++-------
.../expression/aggregation/CountExpression.java | 10 +++---
.../aggregation/DistinctCountExpression.java | 24 ++++++-------
.../expression/aggregation/MaxExpression.java | 25 +++++++-------
.../aggregation/MaxForeverExpression.java | 27 +++++++--------
.../expression/aggregation/MinExpression.java | 25 +++++++-------
.../aggregation/MinForeverExpression.java | 25 +++++++-------
.../query/expression/aggregation/OrExpression.java | 25 +++++++-------
.../aggregation/StandardDeviationExpression.java | 27 +++++++--------
.../expression/aggregation/SumExpression.java | 26 +++++++--------
.../expression/aggregation/UnionSetExpression.java | 25 +++++++-------
.../expression/list/CollectListExpression.java | 10 +++---
.../expression/list/ContainsListExpression.java | 16 ++++-----
.../query/expression/math/MathExpression.java | 12 +++----
.../siddhi/query/expression/math/MathOperator.java | 2 +-
.../expression/orderby/OrderByExpression.java | 7 ++--
.../query/expression/pattern/EveryExpression.java | 2 +-
.../expression/pattern/PatternCountExpression.java | 2 +-
.../expression/pattern/PatternCountOperator.java | 2 +-
.../expression/pattern/PatternExpression.java | 4 +--
.../expression/window/SortWindowExpression.java | 20 ++++++-----
.../window/TimeBatchWindowExpression.java | 2 +-
.../expression/window/TimeWindowExpression.java | 2 +-
.../wrapper/siddhi/utils/SiddhiUtils.java | 36 ++++++++++----------
56 files changed, 403 insertions(+), 350 deletions(-)
diff --git a/streampipes-wrapper-siddhi/pom.xml b/streampipes-wrapper-siddhi/pom.xml
index b8d43fcf4..9141379c3 100644
--- a/streampipes-wrapper-siddhi/pom.xml
+++ b/streampipes-wrapper-siddhi/pom.xml
@@ -65,5 +65,12 @@
</exclusions>
</dependency>
</dependencies>
-
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/SiddhiAppConfig.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/SiddhiAppConfig.java
index 997fbc93c..d74ff7b19 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/SiddhiAppConfig.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/SiddhiAppConfig.java
@@ -26,8 +26,8 @@ import java.util.List;
public class SiddhiAppConfig {
- private List<String> queries;
- private List<String> definitions;
+ private final List<String> queries;
+ private final List<String> definitions;
private SiddhiOutputConfig outputConfig;
public SiddhiAppConfig() {
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/SiddhiAppConfigBuilder.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/SiddhiAppConfigBuilder.java
index 2e4729aa5..85dbf0d54 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/SiddhiAppConfigBuilder.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/SiddhiAppConfigBuilder.java
@@ -24,7 +24,7 @@ import org.apache.streampipes.wrapper.siddhi.query.SiddhiQuery;
public class SiddhiAppConfigBuilder {
- private SiddhiAppConfig siddhiAppConfig;
+ private final SiddhiAppConfig siddhiAppConfig;
public static SiddhiAppConfigBuilder create(SiddhiOutputConfig outputConfig) {
return new SiddhiAppConfigBuilder(outputConfig);
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/SiddhiQueryBuilder.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/SiddhiQueryBuilder.java
index de07c4cf5..f3e9cb09c 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/SiddhiQueryBuilder.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/SiddhiQueryBuilder.java
@@ -17,11 +17,19 @@
*/
package org.apache.streampipes.wrapper.siddhi;
-import org.apache.streampipes.wrapper.siddhi.query.*;
+import org.apache.streampipes.wrapper.siddhi.query.FromClause;
+import org.apache.streampipes.wrapper.siddhi.query.GroupByClause;
+import org.apache.streampipes.wrapper.siddhi.query.HavingClause;
+import org.apache.streampipes.wrapper.siddhi.query.InsertIntoClause;
+import org.apache.streampipes.wrapper.siddhi.query.LimitClause;
+import org.apache.streampipes.wrapper.siddhi.query.OffsetClause;
+import org.apache.streampipes.wrapper.siddhi.query.OrderByClause;
+import org.apache.streampipes.wrapper.siddhi.query.SelectClause;
+import org.apache.streampipes.wrapper.siddhi.query.SiddhiQuery;
public class SiddhiQueryBuilder {
- private SiddhiQuery siddhiQuery;
+ private final SiddhiQuery siddhiQuery;
public static SiddhiQueryBuilder create(FromClause fromClause, InsertIntoClause insertIntoClause) {
return new SiddhiQueryBuilder(fromClause.toSiddhiEpl(), insertIntoClause.toSiddhiEpl());
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/constants/SiddhiConstants.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/constants/SiddhiConstants.java
index f89e7d3b1..04abd5d5e 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/constants/SiddhiConstants.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/constants/SiddhiConstants.java
@@ -20,7 +20,6 @@ package org.apache.streampipes.wrapper.siddhi.constants;
public class SiddhiConstants {
public static final String SELECT = "select";
- public static final String INSERT = "insert";
public static final String FROM = "from";
public static final String OFFSET = "offset";
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/SiddhiEngine.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/SiddhiEngine.java
index 4c18d4cdd..d3c81beda 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/SiddhiEngine.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/SiddhiEngine.java
@@ -17,12 +17,6 @@
*/
package org.apache.streampipes.wrapper.siddhi.engine;
-import io.siddhi.core.SiddhiAppRuntime;
-import io.siddhi.core.SiddhiManager;
-import io.siddhi.core.stream.input.InputHandler;
-import io.siddhi.core.stream.output.StreamCallback;
-import io.siddhi.query.api.definition.Attribute;
-import io.siddhi.query.api.definition.StreamDefinition;
import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
import org.apache.streampipes.wrapper.routing.SpOutputCollector;
@@ -33,6 +27,13 @@ import org.apache.streampipes.wrapper.siddhi.engine.generator.SiddhiInvocationCo
import org.apache.streampipes.wrapper.siddhi.manager.SpSiddhiManager;
import org.apache.streampipes.wrapper.siddhi.model.EventPropertyDef;
import org.apache.streampipes.wrapper.siddhi.utils.SiddhiUtils;
+
+import io.siddhi.core.SiddhiAppRuntime;
+import io.siddhi.core.SiddhiManager;
+import io.siddhi.core.stream.input.InputHandler;
+import io.siddhi.core.stream.output.StreamCallback;
+import io.siddhi.query.api.definition.Attribute;
+import io.siddhi.query.api.definition.StreamDefinition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -73,11 +74,11 @@ public class SiddhiEngine {
siddhiAppRuntime = siddhiManager.createSiddhiAppRuntime(settings.getSiddhiAppString());
settings.getSiddhiProcessorParams().getParams()
- .getInEventTypes()
- .forEach((key, value) -> {
- String preparedKey = SiddhiUtils.prepareName(key);
- siddhiInputHandlers.put(key, siddhiAppRuntime.getInputHandler(preparedKey));
- });
+ .getInEventTypes()
+ .forEach((key, value) -> {
+ String preparedKey = SiddhiUtils.prepareName(key);
+ siddhiInputHandlers.put(key, siddhiAppRuntime.getInputHandler(preparedKey));
+ });
StreamCallback callback;
Map<String, StreamDefinition> streamDef = siddhiAppRuntime.getStreamDefinitionMap();
@@ -85,9 +86,9 @@ public class SiddhiEngine {
List<Attribute> streamAttributes = streamDef.get(outputKey).getAttributeList();
if (!debugMode) {
callback = new SiddhiOutputStreamCallback(spOutputCollector,
- runtimeContext,
- streamAttributes,
- settings.getSiddhiAppConfig().getOutputConfig());
+ runtimeContext,
+ streamAttributes,
+ settings.getSiddhiAppConfig().getOutputConfig());
} else {
callback = new SiddhiOutputStreamDebugCallback(debugCallback, settings.getSiddhiAppConfig().getOutputConfig());
}
@@ -101,10 +102,10 @@ public class SiddhiEngine {
String sourceId = event.getSourceInfo().getSourceId();
InputHandler inputHandler = siddhiInputHandlers.get(sourceId);
List<String> eventKeys = this.typeInfo
- .get(sourceId)
- .stream()
- .map(EventPropertyDef::getFieldName)
- .collect(Collectors.toList());
+ .get(sourceId)
+ .stream()
+ .map(EventPropertyDef::getFieldName)
+ .collect(Collectors.toList());
inputHandler.send(SiddhiUtils.toObjArr(eventKeys, event.getRaw()));
} catch (InterruptedException e) {
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/SiddhiEventEngine.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/SiddhiEventEngine.java
index 89aed321c..c37de6537 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/SiddhiEventEngine.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/SiddhiEventEngine.java
@@ -24,15 +24,16 @@ import org.apache.streampipes.wrapper.runtime.EventProcessor;
import org.apache.streampipes.wrapper.siddhi.engine.callback.SiddhiDebugCallback;
import org.apache.streampipes.wrapper.siddhi.engine.generator.SiddhiInvocationConfigGenerator;
import org.apache.streampipes.wrapper.siddhi.utils.SiddhiUtils;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public abstract class SiddhiEventEngine<B extends EventProcessorBindingParams> implements
- EventProcessor<B>, SiddhiStatementGenerator<B> {
+public abstract class SiddhiEventEngine<T extends EventProcessorBindingParams> implements
+ EventProcessor<T>, SiddhiStatementGenerator<T> {
private static final Logger LOG = LoggerFactory.getLogger(SiddhiEventEngine.class);
- private SiddhiEngine siddhiEngine;
+ private final SiddhiEngine siddhiEngine;
public SiddhiEventEngine() {
this.siddhiEngine = new SiddhiEngine();
@@ -43,9 +44,10 @@ public abstract class SiddhiEventEngine<B extends EventProcessorBindingParams> i
}
@Override
- public void onInvocation(B parameters, SpOutputCollector spOutputCollector, EventProcessorRuntimeContext runtimeContext) {
- SiddhiInvocationConfigGenerator<B> siddhiConfigGenerator = new SiddhiInvocationConfigGenerator<>(parameters,
- this::makeStatements);
+ public void onInvocation(T parameters, SpOutputCollector spOutputCollector,
+ EventProcessorRuntimeContext runtimeContext) {
+ SiddhiInvocationConfigGenerator<T> siddhiConfigGenerator = new SiddhiInvocationConfigGenerator<>(parameters,
+ this::makeStatements);
this.siddhiEngine.initializeEngine(siddhiConfigGenerator, spOutputCollector, runtimeContext);
}
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/SiddhiStatementGenerator.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/SiddhiStatementGenerator.java
index f220bb777..1fa2daee4 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/SiddhiStatementGenerator.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/SiddhiStatementGenerator.java
@@ -21,8 +21,8 @@ import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams
import org.apache.streampipes.wrapper.siddhi.SiddhiAppConfig;
import org.apache.streampipes.wrapper.siddhi.model.SiddhiProcessorParams;
-public interface SiddhiStatementGenerator<B extends EventProcessorBindingParams> {
+public interface SiddhiStatementGenerator<T extends EventProcessorBindingParams> {
- SiddhiAppConfig makeStatements(SiddhiProcessorParams<B> siddhiParams, String finalInsertIntoStreamName);
+ SiddhiAppConfig makeStatements(SiddhiProcessorParams<T> siddhiParams, String finalInsertIntoStreamName);
}
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/StreamPipesSiddhiProcessor.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/StreamPipesSiddhiProcessor.java
index 3166a11a9..392478ca3 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/StreamPipesSiddhiProcessor.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/StreamPipesSiddhiProcessor.java
@@ -26,9 +26,10 @@ import org.apache.streampipes.wrapper.siddhi.engine.generator.SiddhiInvocationCo
import org.apache.streampipes.wrapper.standalone.ProcessorParams;
import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
-public abstract class StreamPipesSiddhiProcessor extends StreamPipesDataProcessor implements SiddhiStatementGenerator<ProcessorParams> {
+public abstract class StreamPipesSiddhiProcessor extends StreamPipesDataProcessor
+ implements SiddhiStatementGenerator<ProcessorParams> {
- private SiddhiEngine siddhiEngine;
+ private final SiddhiEngine siddhiEngine;
public StreamPipesSiddhiProcessor() {
this.siddhiEngine = new SiddhiEngine();
@@ -39,8 +40,10 @@ public abstract class StreamPipesSiddhiProcessor extends StreamPipesDataProcesso
}
@Override
- public void onInvocation(ProcessorParams parameters, SpOutputCollector spOutputCollector, EventProcessorRuntimeContext runtimeContext) throws SpRuntimeException {
- SiddhiInvocationConfigGenerator<ProcessorParams> siddhiConfigGenerator = new SiddhiInvocationConfigGenerator<>(parameters,
+ public void onInvocation(ProcessorParams parameters, SpOutputCollector spOutputCollector,
+ EventProcessorRuntimeContext runtimeContext) throws SpRuntimeException {
+ SiddhiInvocationConfigGenerator<ProcessorParams> siddhiConfigGenerator =
+ new SiddhiInvocationConfigGenerator<>(parameters,
this::makeStatements);
this.siddhiEngine.initializeEngine(siddhiConfigGenerator, spOutputCollector, runtimeContext);
}
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/callback/SiddhiOutputStreamCallback.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/callback/SiddhiOutputStreamCallback.java
index 6ad37b6bf..6bed54724 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/callback/SiddhiOutputStreamCallback.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/callback/SiddhiOutputStreamCallback.java
@@ -17,9 +17,6 @@
*/
package org.apache.streampipes.wrapper.siddhi.engine.callback;
-import io.siddhi.core.event.Event;
-import io.siddhi.core.stream.output.StreamCallback;
-import io.siddhi.query.api.definition.Attribute;
import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
import org.apache.streampipes.wrapper.routing.SpOutputCollector;
import org.apache.streampipes.wrapper.siddhi.output.SiddhiListOutputConfig;
@@ -27,16 +24,20 @@ import org.apache.streampipes.wrapper.siddhi.output.SiddhiOutputConfig;
import org.apache.streampipes.wrapper.siddhi.output.SiddhiOutputType;
import org.apache.streampipes.wrapper.siddhi.utils.SiddhiUtils;
+import io.siddhi.core.event.Event;
+import io.siddhi.core.stream.output.StreamCallback;
+import io.siddhi.query.api.definition.Attribute;
+
import java.util.Arrays;
import java.util.List;
public class SiddhiOutputStreamCallback extends StreamCallback {
- private SpOutputCollector collector;
- private EventProcessorRuntimeContext runtimeContext;
- private SiddhiOutputConfig outputConfig;
+ private final SpOutputCollector collector;
+ private final EventProcessorRuntimeContext runtimeContext;
+ private final SiddhiOutputConfig outputConfig;
- private List<Attribute> streamAttributes;
+ private final List<Attribute> streamAttributes;
public SiddhiOutputStreamCallback(SpOutputCollector collector,
EventProcessorRuntimeContext runtimeContext,
@@ -50,17 +51,17 @@ public class SiddhiOutputStreamCallback extends StreamCallback {
private void sendEvents(List<Event> events) {
collector.collect(SiddhiUtils.toSpEvent(events,
- ((SiddhiListOutputConfig) outputConfig).getListFieldName(),
- runtimeContext.getOutputSchemaInfo(),
- runtimeContext.getOutputSourceInfo(),
- streamAttributes));
+ ((SiddhiListOutputConfig) outputConfig).getListFieldName(),
+ runtimeContext.getOutputSchemaInfo(),
+ runtimeContext.getOutputSourceInfo(),
+ streamAttributes));
}
private void sendEvent(Event event) {
collector.collect(SiddhiUtils.toSpEvent(event,
- runtimeContext.getOutputSchemaInfo(),
- runtimeContext.getOutputSourceInfo(),
- streamAttributes));
+ runtimeContext.getOutputSchemaInfo(),
+ runtimeContext.getOutputSourceInfo(),
+ streamAttributes));
}
@Override
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/callback/SiddhiOutputStreamDebugCallback.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/callback/SiddhiOutputStreamDebugCallback.java
index b3ec5a73a..05d553bdf 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/callback/SiddhiOutputStreamDebugCallback.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/callback/SiddhiOutputStreamDebugCallback.java
@@ -17,10 +17,12 @@
*/
package org.apache.streampipes.wrapper.siddhi.engine.callback;
-import io.siddhi.core.event.Event;
-import io.siddhi.core.stream.output.StreamCallback;
+
import org.apache.streampipes.wrapper.siddhi.output.SiddhiOutputConfig;
import org.apache.streampipes.wrapper.siddhi.output.SiddhiOutputType;
+
+import io.siddhi.core.event.Event;
+import io.siddhi.core.stream.output.StreamCallback;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -30,8 +32,8 @@ public class SiddhiOutputStreamDebugCallback extends StreamCallback {
private static final Logger LOG = LoggerFactory.getLogger(SiddhiOutputStreamDebugCallback.class);
- private SiddhiDebugCallback callback;
- private SiddhiOutputConfig outputConfig;
+ private final SiddhiDebugCallback callback;
+ private final SiddhiOutputConfig outputConfig;
public SiddhiOutputStreamDebugCallback(SiddhiDebugCallback callback,
SiddhiOutputConfig outputConfig) {
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/generator/EventTypeGenerator.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/generator/EventTypeGenerator.java
index f6c8da2c5..b68c5e8d3 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/generator/EventTypeGenerator.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/generator/EventTypeGenerator.java
@@ -21,22 +21,26 @@ import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams
import org.apache.streampipes.wrapper.siddhi.constants.SiddhiConstants;
import org.apache.streampipes.wrapper.siddhi.model.EventPropertyDef;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.concurrent.atomic.AtomicReference;
-public class EventTypeGenerator<B extends EventProcessorBindingParams> {
+public class EventTypeGenerator<T extends EventProcessorBindingParams> {
- private B params;
+ private final T params;
- public EventTypeGenerator(B params) {
+ public EventTypeGenerator(T params) {
this.params = params;
}
public List<EventPropertyDef> generateOutEventTypes() {
List<EventPropertyDef> sortedEventKeys = new ArrayList<>();
params.getOutEventType().forEach((key, value) -> {
- sortedEventKeys.add(makeEventType(key, value));
- sortedEventKeys.sort(Comparator.comparing(EventPropertyDef::getFieldName));
+ sortedEventKeys.add(makeEventType(key, value));
+ sortedEventKeys.sort(Comparator.comparing(EventPropertyDef::getFieldName));
});
return sortedEventKeys;
}
@@ -80,7 +84,7 @@ public class EventTypeGenerator<B extends EventProcessorBindingParams> {
return SiddhiConstants.SIDDHI_DOUBLE_TYPE;
} else if (o.equals(Boolean.class)) {
return SiddhiConstants.SIDDHI_BOOLEAN_TYPE;
- } else if (o.equals(String.class)){
+ } else if (o.equals(String.class)) {
return SiddhiConstants.SIDDHI_STRING_TYPE;
} else {
return SiddhiConstants.SIDDHI_OBJECT_TYPE;
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/generator/InputStreamNameGenerator.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/generator/InputStreamNameGenerator.java
index 0bd8ee932..c3d247d2d 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/generator/InputStreamNameGenerator.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/generator/InputStreamNameGenerator.java
@@ -23,11 +23,11 @@ import org.apache.streampipes.wrapper.siddhi.utils.SiddhiUtils;
import java.util.ArrayList;
import java.util.List;
-public class InputStreamNameGenerator<B extends EventProcessorBindingParams> {
+public class InputStreamNameGenerator<T extends EventProcessorBindingParams> {
- private B params;
+ private final T params;
- public InputStreamNameGenerator(B params) {
+ public InputStreamNameGenerator(T params) {
this.params = params;
}
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/generator/SiddhiAppGenerator.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/generator/SiddhiAppGenerator.java
index a3adedcdb..3aa5738f6 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/generator/SiddhiAppGenerator.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/generator/SiddhiAppGenerator.java
@@ -19,24 +19,25 @@ package org.apache.streampipes.wrapper.siddhi.engine.generator;
import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
import org.apache.streampipes.wrapper.siddhi.SiddhiAppConfig;
-import org.apache.streampipes.wrapper.siddhi.model.SiddhiProcessorParams;
import org.apache.streampipes.wrapper.siddhi.model.EventPropertyDef;
+import org.apache.streampipes.wrapper.siddhi.model.SiddhiProcessorParams;
import org.apache.streampipes.wrapper.siddhi.utils.SiddhiUtils;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List;
import java.util.StringJoiner;
-public class SiddhiAppGenerator<B extends EventProcessorBindingParams> {
+public class SiddhiAppGenerator<T extends EventProcessorBindingParams> {
private static final Logger LOG = LoggerFactory.getLogger(SiddhiAppGenerator.class);
- private final SiddhiProcessorParams<B> siddhiParams;
+ private final SiddhiProcessorParams<T> siddhiParams;
private final SiddhiAppConfig siddhiAppConfig;
private final StringBuilder siddhiAppString;
- public SiddhiAppGenerator(SiddhiProcessorParams<B> siddhiParams,
+ public SiddhiAppGenerator(SiddhiProcessorParams<T> siddhiParams,
SiddhiAppConfig siddhiAppConfig) {
this.siddhiParams = siddhiParams;
this.siddhiAppConfig = siddhiAppConfig;
@@ -57,26 +58,26 @@ public class SiddhiAppGenerator<B extends EventProcessorBindingParams> {
String defineStreamPrefix = "define stream " + SiddhiUtils.prepareName(eventTypeName);
StringJoiner joiner = new StringJoiner(",");
- eventSchema.forEach(typeInfo -> {
- joiner.add(typeInfo.getSelectorPrefix() + typeInfo.getFieldName() + " " + typeInfo.getFieldType());
- });
+ eventSchema
+ .forEach(typeInfo ->
+ joiner.add(typeInfo.getSelectorPrefix() + typeInfo.getFieldName() + " " + typeInfo.getFieldType()));
this.siddhiAppString
- .append(defineStreamPrefix)
- .append("(")
- .append(joiner.toString())
- .append(") ;\n");
+ .append(defineStreamPrefix)
+ .append("(")
+ .append(joiner)
+ .append(") ;\n");
}
private void registerStatements(SiddhiAppConfig siddhiAppConfig) {
siddhiAppConfig
- .getDefinitions()
- .forEach(definition -> this.siddhiAppString.append(definition).append("\n"));
+ .getDefinitions()
+ .forEach(definition -> this.siddhiAppString.append(definition).append("\n"));
siddhiAppConfig
- .getQueries()
- .forEach(query -> this.siddhiAppString.append(query).append("\n"));
+ .getQueries()
+ .forEach(query -> this.siddhiAppString.append(query).append("\n"));
LOG.info("Registering statement: \n" + this.siddhiAppString);
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/generator/SiddhiInvocationConfigGenerator.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/generator/SiddhiInvocationConfigGenerator.java
index 125cb81db..0a8f35157 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/generator/SiddhiInvocationConfigGenerator.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/engine/generator/SiddhiInvocationConfigGenerator.java
@@ -28,23 +28,25 @@ import java.util.List;
import java.util.Map;
import java.util.function.BiFunction;
-public class SiddhiInvocationConfigGenerator<B extends EventProcessorBindingParams> {
+public class SiddhiInvocationConfigGenerator<T extends EventProcessorBindingParams> {
private final String siddhiAppString;
private final SiddhiAppConfig siddhiAppConfig;
- private final SiddhiProcessorParams<B> siddhiProcessorParams;
+ private final SiddhiProcessorParams<T> siddhiProcessorParams;
- public SiddhiInvocationConfigGenerator(B params,
- BiFunction<SiddhiProcessorParams<B>, String, SiddhiAppConfig> statementFunction) {
+ public SiddhiInvocationConfigGenerator(T params,
+ BiFunction<SiddhiProcessorParams<T>,
+ String, SiddhiAppConfig> statementFunction) {
List<String> inputStreamNames = new InputStreamNameGenerator<>(params).generateInputStreamNames();
Map<String, List<EventPropertyDef>> eventTypeInfo = new EventTypeGenerator<>(params).generateInEventTypes();
List<EventPropertyDef> outTypeInfo = new EventTypeGenerator<>(params).generateOutEventTypes();
List<String> outputEventKeys = new ArrayList<>(params.getOutEventType().keySet());
- this.siddhiProcessorParams = new SiddhiProcessorParams<>(params, inputStreamNames, eventTypeInfo, outputEventKeys, outTypeInfo);
+ this.siddhiProcessorParams =
+ new SiddhiProcessorParams<>(params, inputStreamNames, eventTypeInfo, outputEventKeys, outTypeInfo);
this.siddhiAppConfig = statementFunction.apply(siddhiProcessorParams, getOutputStreamName());
this.siddhiAppString = new SiddhiAppGenerator<>(siddhiProcessorParams, siddhiAppConfig)
- .generateSiddhiApp();
+ .generateSiddhiApp();
}
private String getOutputStreamName() {
@@ -55,7 +57,7 @@ public class SiddhiInvocationConfigGenerator<B extends EventProcessorBindingPara
return siddhiAppString;
}
- public SiddhiProcessorParams<B> getSiddhiProcessorParams() {
+ public SiddhiProcessorParams<T> getSiddhiProcessorParams() {
return siddhiProcessorParams;
}
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/model/SiddhiProcessorParams.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/model/SiddhiProcessorParams.java
index a18a25368..714b4962b 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/model/SiddhiProcessorParams.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/model/SiddhiProcessorParams.java
@@ -27,15 +27,15 @@ import org.apache.streampipes.wrapper.siddhi.utils.SiddhiUtils;
import java.util.List;
import java.util.Map;
-public class SiddhiProcessorParams<B extends EventProcessorBindingParams> {
+public class SiddhiProcessorParams<T extends EventProcessorBindingParams> {
- private final B params;
+ private final T params;
private final List<String> inputStreamNames;
private final Map<String, List<EventPropertyDef>> eventTypeInfo;
private final List<String> outputEventKeys;
private final List<EventPropertyDef> outTypeInfo;
- public SiddhiProcessorParams(B params,
+ public SiddhiProcessorParams(T params,
List<String> inputStreamNames,
Map<String, List<EventPropertyDef>> eventTypeInfo,
List<String> outputEventKeys,
@@ -47,7 +47,7 @@ public class SiddhiProcessorParams<B extends EventProcessorBindingParams> {
this.outTypeInfo = outTypeInfo;
}
- public B getParams() {
+ public T getParams() {
return params;
}
@@ -73,15 +73,15 @@ public class SiddhiProcessorParams<B extends EventProcessorBindingParams> {
selectString.append(SiddhiConstants.SELECT).append(" ");
if (outputEventKeys.size() > 0) {
- for (int i=0; i<outputEventKeys.size() - 1; i++) {
+ for (int i = 0; i < outputEventKeys.size() - 1; i++) {
selectString
- .append(SiddhiConstants.FIRST_STREAM_PREFIX)
- .append(outputEventKeys.get(i))
- .append(",");
+ .append(SiddhiConstants.FIRST_STREAM_PREFIX)
+ .append(outputEventKeys.get(i))
+ .append(",");
}
selectString
- .append(SiddhiConstants.FIRST_STREAM_PREFIX)
- .append(outputEventKeys.get(outputEventKeys.size() - 1));
+ .append(SiddhiConstants.FIRST_STREAM_PREFIX)
+ .append(outputEventKeys.get(outputEventKeys.size() - 1));
}
return selectString.toString();
}
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/FromClause.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/FromClause.java
index 5079f5028..b20ac87ec 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/FromClause.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/FromClause.java
@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
public class FromClause extends SiddhiStatement {
- private List<Expression> fromExpressions;
+ private final List<Expression> fromExpressions;
private FromClause() {
this.fromExpressions = new ArrayList<>();
@@ -42,7 +42,8 @@ public class FromClause extends SiddhiStatement {
@Override
public String toSiddhiEpl() {
- List<String> fromExpressions = this.fromExpressions.stream().map(Expression::toSiddhiEpl).collect(Collectors.toList());
+ List<String> fromExpressions =
+ this.fromExpressions.stream().map(Expression::toSiddhiEpl).collect(Collectors.toList());
return join(SiddhiConstants.WHITESPACE, SiddhiConstants.FROM, join(SiddhiConstants.COMMA, fromExpressions));
}
}
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/GroupByClause.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/GroupByClause.java
index 0de83c344..066fc8cb4 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/GroupByClause.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/GroupByClause.java
@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
public class GroupByClause extends SiddhiStatement {
- private List<PropertyExpression> propertyExpressions;
+ private final List<PropertyExpression> propertyExpressions;
public static GroupByClause create(List<PropertyExpression> groupByProperties) {
return new GroupByClause(groupByProperties);
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/InsertIntoClause.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/InsertIntoClause.java
index 68466bcdd..2e077a349 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/InsertIntoClause.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/InsertIntoClause.java
@@ -21,8 +21,8 @@ import org.apache.streampipes.wrapper.siddhi.constants.SiddhiConstants;
public class InsertIntoClause extends SiddhiStatement {
- private boolean insertAllEvents;
- private String streamName;
+ private final boolean insertAllEvents;
+ private final String streamName;
public static InsertIntoClause create(String streamName) {
return new InsertIntoClause(streamName, false);
@@ -40,7 +40,7 @@ public class InsertIntoClause extends SiddhiStatement {
@Override
public String toSiddhiEpl() {
- return join(SiddhiConstants.WHITESPACE, this.insertAllEvents ?
- "insert all events into" : "insert into", streamName);
+ return join(SiddhiConstants.WHITESPACE, this.insertAllEvents
+ ? "insert all events into" : "insert into", streamName);
}
}
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/LimitClause.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/LimitClause.java
index 1d993c6a8..9325d8f75 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/LimitClause.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/LimitClause.java
@@ -21,7 +21,7 @@ import org.apache.streampipes.wrapper.siddhi.constants.SiddhiConstants;
public class LimitClause extends SiddhiStatement {
- private Integer limit;
+ private final Integer limit;
public static LimitClause create(Integer limit) {
return new LimitClause(limit);
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/OffsetClause.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/OffsetClause.java
index cea0e96ea..ccf282b27 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/OffsetClause.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/OffsetClause.java
@@ -21,7 +21,7 @@ import org.apache.streampipes.wrapper.siddhi.constants.SiddhiConstants;
public class OffsetClause extends SiddhiStatement {
- private Integer offset;
+ private final Integer offset;
public static OffsetClause create(Integer offset) {
return new OffsetClause(offset);
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/SelectClause.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/SelectClause.java
index ba95f8e9e..1cdbc9a65 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/SelectClause.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/SelectClause.java
@@ -27,8 +27,8 @@ import java.util.stream.Collectors;
public class SelectClause extends SiddhiStatement {
- private boolean wildcard;
- private List<Expression> outputProperties;
+ private final boolean wildcard;
+ private final List<Expression> outputProperties;
private SelectClause(boolean wildcard) {
this.wildcard = wildcard;
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/SiddhiQuery.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/SiddhiQuery.java
index 0d365a3b2..ff0519e34 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/SiddhiQuery.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/SiddhiQuery.java
@@ -136,6 +136,6 @@ public class SiddhiQuery {
joiner.add(insertIntoClause);
- return joiner.toString() + ";";
+ return joiner + ";";
}
}
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/Expressions.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/Expressions.java
index 40dfbdaa9..674107848 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/Expressions.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/Expressions.java
@@ -17,7 +17,6 @@
*/
package org.apache.streampipes.wrapper.siddhi.query.expression;
-import io.siddhi.query.api.execution.query.selection.OrderByAttribute;
import org.apache.streampipes.wrapper.siddhi.constants.SiddhiStreamSelector;
import org.apache.streampipes.wrapper.siddhi.model.EventPropertyDef;
import org.apache.streampipes.wrapper.siddhi.query.expression.aggregation.AndExpression;
@@ -46,6 +45,8 @@ import org.apache.streampipes.wrapper.siddhi.query.expression.window.TimeBatchWi
import org.apache.streampipes.wrapper.siddhi.query.expression.window.TimeWindowExpression;
import org.apache.streampipes.wrapper.siddhi.query.expression.window.WindowExpression;
+import io.siddhi.query.api.execution.query.selection.OrderByAttribute;
+
import java.util.Arrays;
public class Expressions {
@@ -109,6 +110,7 @@ public class Expressions {
public static PropertyExpressionBase stdDev(PropertyExpression property) {
return new StandardDeviationExpression(property);
}
+
public static PropertyExpressionBase unionSet(PropertyExpression property) {
return new UnionSetExpression(property);
}
@@ -133,8 +135,8 @@ public class Expressions {
PatternCountExpression patternCountExpression,
Expression... filterExpressions) {
return new StreamFilterExpression(streamExpression,
- Arrays.asList(filterExpressions),
- patternCountExpression);
+ Arrays.asList(filterExpressions),
+ patternCountExpression);
}
public static RelationalOperatorExpression ge(PropertyExpressionBase exp1, PropertyExpressionBase exp2) {
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/PropertyRenameExpression.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/PropertyRenameExpression.java
index 6ac1bbcc7..e2a760d25 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/PropertyRenameExpression.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/PropertyRenameExpression.java
@@ -23,8 +23,8 @@ import static org.apache.streampipes.wrapper.siddhi.utils.SiddhiUtils.preparePro
public class PropertyRenameExpression extends Expression {
- private PropertyExpressionBase propertyExpression;
- private String newPropertyName;
+ private final PropertyExpressionBase propertyExpression;
+ private final String newPropertyName;
public PropertyRenameExpression(PropertyExpressionBase property, String newPropertyName) {
this.propertyExpression = property;
@@ -34,8 +34,8 @@ public class PropertyRenameExpression extends Expression {
@Override
public String toSiddhiEpl() {
return join(SiddhiConstants.WHITESPACE,
- propertyExpression.toSiddhiEpl(),
- SiddhiConstants.AS,
- prepareProperty(newPropertyName));
+ propertyExpression.toSiddhiEpl(),
+ SiddhiConstants.AS,
+ prepareProperty(newPropertyName));
}
}
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/RelationalOperator.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/RelationalOperator.java
index 16e38e395..1c8b3cc44 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/RelationalOperator.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/RelationalOperator.java
@@ -26,7 +26,7 @@ public enum RelationalOperator {
LESSER_EQUALS("<="),
NOT_EQUALS("!=");
- private String operator;
+ private final String operator;
RelationalOperator(String operator) {
this.operator = operator;
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/RelationalOperatorExpression.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/RelationalOperatorExpression.java
index 848c43b62..19a2777cc 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/RelationalOperatorExpression.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/RelationalOperatorExpression.java
@@ -21,10 +21,10 @@ import org.apache.streampipes.wrapper.siddhi.constants.SiddhiConstants;
public class RelationalOperatorExpression extends Expression {
- private PropertyExpressionBase exp1;
- private PropertyExpressionBase exp2;
+ private final PropertyExpressionBase exp1;
+ private final PropertyExpressionBase exp2;
- private RelationalOperator operator;
+ private final RelationalOperator operator;
public RelationalOperatorExpression(RelationalOperator operator,
PropertyExpressionBase exp1,
@@ -38,8 +38,8 @@ public class RelationalOperatorExpression extends Expression {
@Override
public String toSiddhiEpl() {
return joinWithParenthesis(SiddhiConstants.EMPTY,
- exp1.toSiddhiEpl(),
- operator.toOperatorString(),
- exp2.toSiddhiEpl());
+ exp1.toSiddhiEpl(),
+ operator.toOperatorString(),
+ exp2.toSiddhiEpl());
}
}
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/SiddhiTimeUnit.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/SiddhiTimeUnit.java
index 388c81991..35608b2c8 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/SiddhiTimeUnit.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/SiddhiTimeUnit.java
@@ -23,7 +23,7 @@ public enum SiddhiTimeUnit {
MINUTES("minute"),
HOURS("hour");
- String timeUnitString;
+ final String timeUnitString;
SiddhiTimeUnit(String timeUnitString) {
this.timeUnitString = timeUnitString;
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/StreamFilterExpression.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/StreamFilterExpression.java
index 27e055686..02ee680d6 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/StreamFilterExpression.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/StreamFilterExpression.java
@@ -25,8 +25,8 @@ import java.util.stream.Collectors;
public class StreamFilterExpression extends StreamExpression {
- private StreamExpression streamExpression;
- private List<Expression> filterExpressions;
+ private final StreamExpression streamExpression;
+ private final List<Expression> filterExpressions;
private PatternCountExpression patternCountExpression;
public StreamFilterExpression(StreamExpression streamExpression,
@@ -44,12 +44,18 @@ public class StreamFilterExpression extends StreamExpression {
@Override
public String toSiddhiEpl() {
- String filterExpressions = join(SiddhiConstants.COMMA, this.filterExpressions.stream().map(Expression::toSiddhiEpl).collect(Collectors.toList()));
+ String filterExpressions = join(SiddhiConstants.COMMA, this.filterExpressions
+ .stream()
+ .map(Expression::toSiddhiEpl)
+ .collect(Collectors.toList()));
- filterExpressions = join(SiddhiConstants.EMPTY, this.streamExpression.toSiddhiEpl(), joinWithSquareBracket(SiddhiConstants.EMPTY, filterExpressions));
+ filterExpressions = join(SiddhiConstants.EMPTY,
+ this.streamExpression.toSiddhiEpl(),
+ joinWithSquareBracket(SiddhiConstants.EMPTY, filterExpressions));
if (this.patternCountExpression != null) {
- filterExpressions = join(SiddhiConstants.WHITESPACE, filterExpressions, this.patternCountExpression.toSiddhiEpl());
+ filterExpressions =
+ join(SiddhiConstants.WHITESPACE, filterExpressions, this.patternCountExpression.toSiddhiEpl());
}
return filterExpressions;
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/WithinExpression.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/WithinExpression.java
index 6cf269192..a9f540360 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/WithinExpression.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/WithinExpression.java
@@ -21,8 +21,8 @@ import org.apache.streampipes.wrapper.siddhi.constants.SiddhiConstants;
public class WithinExpression extends Expression {
- private SiddhiTimeUnit timeUnit;
- private Integer duration;
+ private final SiddhiTimeUnit timeUnit;
+ private final Integer duration;
public WithinExpression(Integer duration, SiddhiTimeUnit timeUnit) {
this.duration = duration;
@@ -32,9 +32,9 @@ public class WithinExpression extends Expression {
@Override
public String toSiddhiEpl() {
return join(SiddhiConstants.WHITESPACE,
- SiddhiConstants.WITHIN,
- String.valueOf(this.duration),
- this.timeUnit.toTimeUnitString());
+ SiddhiConstants.WITHIN,
+ String.valueOf(this.duration),
+ this.timeUnit.toTimeUnitString());
}
}
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/AggregationFunction.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/AggregationFunction.java
index baaa4eb98..cdb94135f 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/AggregationFunction.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/AggregationFunction.java
@@ -19,25 +19,26 @@
package org.apache.streampipes.wrapper.siddhi.query.expression.aggregation;
public enum AggregationFunction {
- SUM("sum"),
- COUNT("count"),
- DISTINCT_COUNT("distinctCount"),
- AVERAGE("avg"),
- MAX("max"),
- MIN("min"),
- MAX_FOREVER("maxForever"),
- MIN_FOREVER("minForever"),
- STANDARD_DEVIATION("stdDev"),
- AND("and"),
- OR("or"),
- UNION_SET("unionSet");
+ SUM("sum"),
+ COUNT("count"),
+ DISTINCT_COUNT("distinctCount"),
+ AVERAGE("avg"),
+ MAX("max"),
+ MIN("min"),
+ MAX_FOREVER("maxForever"),
+ MIN_FOREVER("minForever"),
+ STANDARD_DEVIATION("stdDev"),
+ AND("and"),
+ OR("or"),
+ UNION_SET("unionSet");
- private String aggregationFunction;
- AggregationFunction(String aggregationFunction) {
- this.aggregationFunction = aggregationFunction;
- }
+ private String aggregationFunction;
- public String toAggregationFunction() {
- return this.aggregationFunction;
- }
+ AggregationFunction(String aggregationFunction) {
+ this.aggregationFunction = aggregationFunction;
+ }
+
+ public String toAggregationFunction() {
+ return this.aggregationFunction;
+ }
}
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/AndExpression.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/AndExpression.java
index 87d0f66fa..fee6c2c9e 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/AndExpression.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/AndExpression.java
@@ -23,17 +23,18 @@ import org.apache.streampipes.wrapper.siddhi.query.expression.PropertyExpression
import org.apache.streampipes.wrapper.siddhi.query.expression.PropertyExpressionBase;
public class AndExpression extends PropertyExpressionBase {
- private PropertyExpression propertyExpression;
+ private final PropertyExpression propertyExpression;
- public AndExpression(PropertyExpression property) {
- this.propertyExpression = property;
- }
- @Override
- public String toSiddhiEpl() {
- return join(SiddhiConstants.EMPTY,
- AggregationFunction.AND.toAggregationFunction(),
- SiddhiConstants.PARENTHESIS_OPEN,
- propertyExpression.toSiddhiEpl(),
- SiddhiConstants.PARENTHESIS_CLOSE);
- }
+ public AndExpression(PropertyExpression property) {
+ this.propertyExpression = property;
+ }
+
+ @Override
+ public String toSiddhiEpl() {
+ return join(SiddhiConstants.EMPTY,
+ AggregationFunction.AND.toAggregationFunction(),
+ SiddhiConstants.PARENTHESIS_OPEN,
+ propertyExpression.toSiddhiEpl(),
+ SiddhiConstants.PARENTHESIS_CLOSE);
+ }
}
\ No newline at end of file
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/AverageExpression.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/AverageExpression.java
index 6cdc4257f..ba424fa39 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/AverageExpression.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/AverageExpression.java
@@ -23,18 +23,18 @@ import org.apache.streampipes.wrapper.siddhi.query.expression.PropertyExpression
import org.apache.streampipes.wrapper.siddhi.query.expression.PropertyExpressionBase;
public class AverageExpression extends PropertyExpressionBase {
- private PropertyExpression propertyExpression;
+ private final PropertyExpression propertyExpression;
- public AverageExpression(PropertyExpression property) {
- this.propertyExpression = property;
- }
+ public AverageExpression(PropertyExpression property) {
+ this.propertyExpression = property;
+ }
- @Override
- public String toSiddhiEpl() {
- return join(SiddhiConstants.EMPTY,
- AggregationFunction.AVERAGE.toAggregationFunction(),
- SiddhiConstants.PARENTHESIS_OPEN,
- propertyExpression.toSiddhiEpl(),
- SiddhiConstants.PARENTHESIS_CLOSE);
- }
+ @Override
+ public String toSiddhiEpl() {
+ return join(SiddhiConstants.EMPTY,
+ AggregationFunction.AVERAGE.toAggregationFunction(),
+ SiddhiConstants.PARENTHESIS_OPEN,
+ propertyExpression.toSiddhiEpl(),
+ SiddhiConstants.PARENTHESIS_CLOSE);
+ }
}
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/CountExpression.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/CountExpression.java
index e0dbe57cb..65727aae1 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/CountExpression.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/CountExpression.java
@@ -23,7 +23,7 @@ import org.apache.streampipes.wrapper.siddhi.query.expression.PropertyExpression
public class CountExpression extends PropertyExpressionBase {
- private PropertyExpression propertyExpression;
+ private final PropertyExpression propertyExpression;
public CountExpression(PropertyExpression property) {
this.propertyExpression = property;
@@ -32,9 +32,9 @@ public class CountExpression extends PropertyExpressionBase {
@Override
public String toSiddhiEpl() {
return join(SiddhiConstants.EMPTY,
- AggregationFunction.COUNT.toAggregationFunction(),
- SiddhiConstants.PARENTHESIS_OPEN,
- propertyExpression.toSiddhiEpl(),
- SiddhiConstants.PARENTHESIS_CLOSE);
+ AggregationFunction.COUNT.toAggregationFunction(),
+ SiddhiConstants.PARENTHESIS_OPEN,
+ propertyExpression.toSiddhiEpl(),
+ SiddhiConstants.PARENTHESIS_CLOSE);
}
}
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/DistinctCountExpression.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/DistinctCountExpression.java
index 5d2e951fe..f709bcb57 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/DistinctCountExpression.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/DistinctCountExpression.java
@@ -23,18 +23,18 @@ import org.apache.streampipes.wrapper.siddhi.query.expression.PropertyExpression
import org.apache.streampipes.wrapper.siddhi.query.expression.PropertyExpressionBase;
public class DistinctCountExpression extends PropertyExpressionBase {
- private PropertyExpression propertyExpression;
+ private final PropertyExpression propertyExpression;
- public DistinctCountExpression(PropertyExpression property) {
- this.propertyExpression = property;
- }
+ public DistinctCountExpression(PropertyExpression property) {
+ this.propertyExpression = property;
+ }
- @Override
- public String toSiddhiEpl() {
- return join(SiddhiConstants.EMPTY,
- AggregationFunction.DISTINCT_COUNT.toAggregationFunction(),
- SiddhiConstants.PARENTHESIS_OPEN,
- propertyExpression.toSiddhiEpl(),
- SiddhiConstants.PARENTHESIS_CLOSE);
- }
+ @Override
+ public String toSiddhiEpl() {
+ return join(SiddhiConstants.EMPTY,
+ AggregationFunction.DISTINCT_COUNT.toAggregationFunction(),
+ SiddhiConstants.PARENTHESIS_OPEN,
+ propertyExpression.toSiddhiEpl(),
+ SiddhiConstants.PARENTHESIS_CLOSE);
+ }
}
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/MaxExpression.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/MaxExpression.java
index 0b0733923..d256f8455 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/MaxExpression.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/MaxExpression.java
@@ -22,17 +22,18 @@ import org.apache.streampipes.wrapper.siddhi.query.expression.PropertyExpression
import org.apache.streampipes.wrapper.siddhi.query.expression.PropertyExpressionBase;
public class MaxExpression extends PropertyExpressionBase {
- private PropertyExpression propertyExpression;
+ private final PropertyExpression propertyExpression;
- public MaxExpression(PropertyExpression property) {
- this.propertyExpression = property;
- }
- @Override
- public String toSiddhiEpl() {
- return join(SiddhiConstants.EMPTY,
- AggregationFunction.MAX.toAggregationFunction(),
- SiddhiConstants.PARENTHESIS_OPEN,
- propertyExpression.toSiddhiEpl(),
- SiddhiConstants.PARENTHESIS_CLOSE);
- }
+ public MaxExpression(PropertyExpression property) {
+ this.propertyExpression = property;
+ }
+
+ @Override
+ public String toSiddhiEpl() {
+ return join(SiddhiConstants.EMPTY,
+ AggregationFunction.MAX.toAggregationFunction(),
+ SiddhiConstants.PARENTHESIS_OPEN,
+ propertyExpression.toSiddhiEpl(),
+ SiddhiConstants.PARENTHESIS_CLOSE);
+ }
}
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/MaxForeverExpression.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/MaxForeverExpression.java
index 687649725..305114fa7 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/MaxForeverExpression.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/MaxForeverExpression.java
@@ -21,19 +21,20 @@ import org.apache.streampipes.wrapper.siddhi.constants.SiddhiConstants;
import org.apache.streampipes.wrapper.siddhi.query.expression.PropertyExpression;
import org.apache.streampipes.wrapper.siddhi.query.expression.PropertyExpressionBase;
-public class MaxForeverExpression extends PropertyExpressionBase {
+public class MaxForeverExpression extends PropertyExpressionBase {
- private PropertyExpression propertyExpression;
+ private final PropertyExpression propertyExpression;
- public MaxForeverExpression(PropertyExpression property) {
- this.propertyExpression = property;
- }
- @Override
- public String toSiddhiEpl() {
- return join(SiddhiConstants.EMPTY,
- AggregationFunction.MAX_FOREVER.toAggregationFunction(),
- SiddhiConstants.PARENTHESIS_OPEN,
- propertyExpression.toSiddhiEpl(),
- SiddhiConstants.PARENTHESIS_CLOSE);
- }
+ public MaxForeverExpression(PropertyExpression property) {
+ this.propertyExpression = property;
+ }
+
+ @Override
+ public String toSiddhiEpl() {
+ return join(SiddhiConstants.EMPTY,
+ AggregationFunction.MAX_FOREVER.toAggregationFunction(),
+ SiddhiConstants.PARENTHESIS_OPEN,
+ propertyExpression.toSiddhiEpl(),
+ SiddhiConstants.PARENTHESIS_CLOSE);
+ }
}
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/MinExpression.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/MinExpression.java
index 0793ae4f3..5ac0373eb 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/MinExpression.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/MinExpression.java
@@ -22,17 +22,18 @@ import org.apache.streampipes.wrapper.siddhi.query.expression.PropertyExpression
import org.apache.streampipes.wrapper.siddhi.query.expression.PropertyExpressionBase;
public class MinExpression extends PropertyExpressionBase {
- private PropertyExpression propertyExpression;
+ private final PropertyExpression propertyExpression;
- public MinExpression(PropertyExpression property) {
- this.propertyExpression = property;
- }
- @Override
- public String toSiddhiEpl() {
- return join(SiddhiConstants.EMPTY,
- AggregationFunction.MIN.toAggregationFunction(),
- SiddhiConstants.PARENTHESIS_OPEN,
- propertyExpression.toSiddhiEpl(),
- SiddhiConstants.PARENTHESIS_CLOSE);
- }
+ public MinExpression(PropertyExpression property) {
+ this.propertyExpression = property;
+ }
+
+ @Override
+ public String toSiddhiEpl() {
+ return join(SiddhiConstants.EMPTY,
+ AggregationFunction.MIN.toAggregationFunction(),
+ SiddhiConstants.PARENTHESIS_OPEN,
+ propertyExpression.toSiddhiEpl(),
+ SiddhiConstants.PARENTHESIS_CLOSE);
+ }
}
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/MinForeverExpression.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/MinForeverExpression.java
index 06f999cfd..fb909bbf9 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/MinForeverExpression.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/MinForeverExpression.java
@@ -22,17 +22,18 @@ import org.apache.streampipes.wrapper.siddhi.query.expression.PropertyExpression
import org.apache.streampipes.wrapper.siddhi.query.expression.PropertyExpressionBase;
public class MinForeverExpression extends PropertyExpressionBase {
- private PropertyExpression propertyExpression;
+ private final PropertyExpression propertyExpression;
- public MinForeverExpression(PropertyExpression property) {
- this.propertyExpression = property;
- }
- @Override
- public String toSiddhiEpl() {
- return join(SiddhiConstants.EMPTY,
- AggregationFunction.MIN_FOREVER.toAggregationFunction(),
- SiddhiConstants.PARENTHESIS_OPEN,
- propertyExpression.toSiddhiEpl(),
- SiddhiConstants.PARENTHESIS_CLOSE);
- }
+ public MinForeverExpression(PropertyExpression property) {
+ this.propertyExpression = property;
+ }
+
+ @Override
+ public String toSiddhiEpl() {
+ return join(SiddhiConstants.EMPTY,
+ AggregationFunction.MIN_FOREVER.toAggregationFunction(),
+ SiddhiConstants.PARENTHESIS_OPEN,
+ propertyExpression.toSiddhiEpl(),
+ SiddhiConstants.PARENTHESIS_CLOSE);
+ }
}
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/OrExpression.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/OrExpression.java
index 7abe868f7..ceba39646 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/OrExpression.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/OrExpression.java
@@ -22,17 +22,18 @@ import org.apache.streampipes.wrapper.siddhi.query.expression.PropertyExpression
import org.apache.streampipes.wrapper.siddhi.query.expression.PropertyExpressionBase;
public class OrExpression extends PropertyExpressionBase {
- private PropertyExpression propertyExpression;
+ private final PropertyExpression propertyExpression;
- public OrExpression(PropertyExpression property) {
- this.propertyExpression = property;
- }
- @Override
- public String toSiddhiEpl() {
- return join(SiddhiConstants.EMPTY,
- AggregationFunction.OR.toAggregationFunction(),
- SiddhiConstants.PARENTHESIS_OPEN,
- propertyExpression.toSiddhiEpl(),
- SiddhiConstants.PARENTHESIS_CLOSE);
- }
+ public OrExpression(PropertyExpression property) {
+ this.propertyExpression = property;
+ }
+
+ @Override
+ public String toSiddhiEpl() {
+ return join(SiddhiConstants.EMPTY,
+ AggregationFunction.OR.toAggregationFunction(),
+ SiddhiConstants.PARENTHESIS_OPEN,
+ propertyExpression.toSiddhiEpl(),
+ SiddhiConstants.PARENTHESIS_CLOSE);
+ }
}
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/StandardDeviationExpression.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/StandardDeviationExpression.java
index 930f2b4d4..320c64b1b 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/StandardDeviationExpression.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/StandardDeviationExpression.java
@@ -21,19 +21,20 @@ import org.apache.streampipes.wrapper.siddhi.constants.SiddhiConstants;
import org.apache.streampipes.wrapper.siddhi.query.expression.PropertyExpression;
import org.apache.streampipes.wrapper.siddhi.query.expression.PropertyExpressionBase;
-public class StandardDeviationExpression extends PropertyExpressionBase {
+public class StandardDeviationExpression extends PropertyExpressionBase {
- private PropertyExpression propertyExpression;
+ private final PropertyExpression propertyExpression;
- public StandardDeviationExpression(PropertyExpression property) {
- this.propertyExpression = property;
- }
- @Override
- public String toSiddhiEpl() {
- return join(SiddhiConstants.EMPTY,
- AggregationFunction.STANDARD_DEVIATION.toAggregationFunction(),
- SiddhiConstants.PARENTHESIS_OPEN,
- propertyExpression.toSiddhiEpl(),
- SiddhiConstants.PARENTHESIS_CLOSE);
- }
+ public StandardDeviationExpression(PropertyExpression property) {
+ this.propertyExpression = property;
+ }
+
+ @Override
+ public String toSiddhiEpl() {
+ return join(SiddhiConstants.EMPTY,
+ AggregationFunction.STANDARD_DEVIATION.toAggregationFunction(),
+ SiddhiConstants.PARENTHESIS_OPEN,
+ propertyExpression.toSiddhiEpl(),
+ SiddhiConstants.PARENTHESIS_CLOSE);
+ }
}
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/SumExpression.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/SumExpression.java
index ac649478e..50c0b2cdd 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/SumExpression.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/SumExpression.java
@@ -21,20 +21,20 @@ import org.apache.streampipes.wrapper.siddhi.constants.SiddhiConstants;
import org.apache.streampipes.wrapper.siddhi.query.expression.PropertyExpression;
import org.apache.streampipes.wrapper.siddhi.query.expression.PropertyExpressionBase;
-public class SumExpression extends PropertyExpressionBase {
+public class SumExpression extends PropertyExpressionBase {
- private PropertyExpression propertyExpression;
+ private final PropertyExpression propertyExpression;
- public SumExpression(PropertyExpression property) {
- this.propertyExpression = property;
- }
+ public SumExpression(PropertyExpression property) {
+ this.propertyExpression = property;
+ }
- @Override
- public String toSiddhiEpl() {
- return join(SiddhiConstants.EMPTY,
- AggregationFunction.SUM.toAggregationFunction(),
- SiddhiConstants.PARENTHESIS_OPEN,
- propertyExpression.toSiddhiEpl(),
- SiddhiConstants.PARENTHESIS_CLOSE);
- }
+ @Override
+ public String toSiddhiEpl() {
+ return join(SiddhiConstants.EMPTY,
+ AggregationFunction.SUM.toAggregationFunction(),
+ SiddhiConstants.PARENTHESIS_OPEN,
+ propertyExpression.toSiddhiEpl(),
+ SiddhiConstants.PARENTHESIS_CLOSE);
+ }
}
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/UnionSetExpression.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/UnionSetExpression.java
index 3ab19a2c4..02cb6866a 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/UnionSetExpression.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/aggregation/UnionSetExpression.java
@@ -22,17 +22,18 @@ import org.apache.streampipes.wrapper.siddhi.query.expression.PropertyExpression
import org.apache.streampipes.wrapper.siddhi.query.expression.PropertyExpressionBase;
public class UnionSetExpression extends PropertyExpressionBase {
- private PropertyExpression propertyExpression;
+ private final PropertyExpression propertyExpression;
- public UnionSetExpression(PropertyExpression property) {
- this.propertyExpression = property;
- }
- @Override
- public String toSiddhiEpl() {
- return join(SiddhiConstants.EMPTY,
- AggregationFunction.UNION_SET.toAggregationFunction(),
- SiddhiConstants.PARENTHESIS_OPEN,
- propertyExpression.toSiddhiEpl(),
- SiddhiConstants.PARENTHESIS_CLOSE);
- }
+ public UnionSetExpression(PropertyExpression property) {
+ this.propertyExpression = property;
+ }
+
+ @Override
+ public String toSiddhiEpl() {
+ return join(SiddhiConstants.EMPTY,
+ AggregationFunction.UNION_SET.toAggregationFunction(),
+ SiddhiConstants.PARENTHESIS_OPEN,
+ propertyExpression.toSiddhiEpl(),
+ SiddhiConstants.PARENTHESIS_CLOSE);
+ }
}
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/list/CollectListExpression.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/list/CollectListExpression.java
index 51c75218b..0e855b416 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/list/CollectListExpression.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/list/CollectListExpression.java
@@ -23,7 +23,7 @@ import org.apache.streampipes.wrapper.siddhi.query.expression.PropertyExpression
public class CollectListExpression extends PropertyExpressionBase {
- private PropertyExpression propertyExpression;
+ private final PropertyExpression propertyExpression;
public CollectListExpression(PropertyExpression propertyExp) {
this.propertyExpression = propertyExp;
@@ -32,9 +32,9 @@ public class CollectListExpression extends PropertyExpressionBase {
@Override
public String toSiddhiEpl() {
return join(SiddhiConstants.EMPTY,
- "list:collect",
- SiddhiConstants.PARENTHESIS_OPEN,
- propertyExpression.toSiddhiEpl(),
- SiddhiConstants.PARENTHESIS_CLOSE);
+ "list:collect",
+ SiddhiConstants.PARENTHESIS_OPEN,
+ propertyExpression.toSiddhiEpl(),
+ SiddhiConstants.PARENTHESIS_CLOSE);
}
}
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/list/ContainsListExpression.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/list/ContainsListExpression.java
index 840f8c9eb..c13353b3a 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/list/ContainsListExpression.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/list/ContainsListExpression.java
@@ -23,8 +23,8 @@ import org.apache.streampipes.wrapper.siddhi.query.expression.PropertyExpression
public class ContainsListExpression extends PropertyExpressionBase {
- private Object value;
- private PropertyExpression propertyExpression;
+ private final Object value;
+ private final PropertyExpression propertyExpression;
public ContainsListExpression(PropertyExpression propertyExp, Object value) {
this.propertyExpression = propertyExp;
@@ -34,12 +34,12 @@ public class ContainsListExpression extends PropertyExpressionBase {
@Override
public String toSiddhiEpl() {
return join(SiddhiConstants.EMPTY,
- "list:contains",
- SiddhiConstants.PARENTHESIS_OPEN,
- propertyExpression.toSiddhiEpl(),
- SiddhiConstants.COMMA,
- prepare(value),
- SiddhiConstants.PARENTHESIS_CLOSE);
+ "list:contains",
+ SiddhiConstants.PARENTHESIS_OPEN,
+ propertyExpression.toSiddhiEpl(),
+ SiddhiConstants.COMMA,
+ prepare(value),
+ SiddhiConstants.PARENTHESIS_CLOSE);
}
public String prepare(Object value) {
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/math/MathExpression.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/math/MathExpression.java
index 7a2b5cd15..6e32bc302 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/math/MathExpression.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/math/MathExpression.java
@@ -22,9 +22,9 @@ import org.apache.streampipes.wrapper.siddhi.query.expression.PropertyExpression
public class MathExpression extends PropertyExpressionBase {
- private MathOperator operator;
- private PropertyExpressionBase op1;
- private PropertyExpressionBase op2;
+ private final MathOperator operator;
+ private final PropertyExpressionBase op1;
+ private final PropertyExpressionBase op2;
public MathExpression(MathOperator operator,
PropertyExpressionBase op1,
@@ -37,8 +37,8 @@ public class MathExpression extends PropertyExpressionBase {
@Override
public String toSiddhiEpl() {
return joinWithParenthesis(SiddhiConstants.WHITESPACE,
- op1.toSiddhiEpl(),
- operator.toOperatorString(),
- op2.toSiddhiEpl());
+ op1.toSiddhiEpl(),
+ operator.toOperatorString(),
+ op2.toSiddhiEpl());
}
}
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/math/MathOperator.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/math/MathOperator.java
index 3547c6bd7..ea72b402f 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/math/MathOperator.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/math/MathOperator.java
@@ -24,7 +24,7 @@ public enum MathOperator {
MULTIPLY("*"),
DIVIDE("/");
- private String operator;
+ private final String operator;
MathOperator(String operator) {
this.operator = operator;
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/orderby/OrderByExpression.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/orderby/OrderByExpression.java
index 8c91b4b44..ab2ef6cd0 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/orderby/OrderByExpression.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/orderby/OrderByExpression.java
@@ -17,15 +17,16 @@
*/
package org.apache.streampipes.wrapper.siddhi.query.expression.orderby;
-import io.siddhi.query.api.execution.query.selection.OrderByAttribute;
import org.apache.streampipes.wrapper.siddhi.constants.SiddhiConstants;
import org.apache.streampipes.wrapper.siddhi.query.expression.Expression;
import org.apache.streampipes.wrapper.siddhi.query.expression.PropertyExpression;
+import io.siddhi.query.api.execution.query.selection.OrderByAttribute;
+
public class OrderByExpression extends Expression {
- private PropertyExpression property;
- private OrderByAttribute.Order order;
+ private final PropertyExpression property;
+ private final OrderByAttribute.Order order;
public OrderByExpression(PropertyExpression property, OrderByAttribute.Order order) {
this.property = property;
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/pattern/EveryExpression.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/pattern/EveryExpression.java
index 48accbba5..09a9cd4c8 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/pattern/EveryExpression.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/pattern/EveryExpression.java
@@ -22,7 +22,7 @@ import org.apache.streampipes.wrapper.siddhi.query.expression.StreamExpression;
public class EveryExpression extends StreamExpression {
- private StreamExpression streamExpression;
+ private final StreamExpression streamExpression;
public EveryExpression(StreamExpression streamExpression) {
this.streamExpression = streamExpression;
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/pattern/PatternCountExpression.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/pattern/PatternCountExpression.java
index b6aebb07b..369390929 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/pattern/PatternCountExpression.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/pattern/PatternCountExpression.java
@@ -22,7 +22,7 @@ import org.apache.streampipes.wrapper.siddhi.query.expression.Expression;
public class PatternCountExpression extends Expression {
- private String countString;
+ private final String countString;
public PatternCountExpression(Integer count, PatternCountOperator operator) {
String countValue = "";
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/pattern/PatternCountOperator.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/pattern/PatternCountOperator.java
index 60d2d04b6..b59d79a18 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/pattern/PatternCountOperator.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/pattern/PatternCountOperator.java
@@ -21,6 +21,6 @@ public enum PatternCountOperator {
MIN_N,
MAX_N,
- EXACTLY_N;
+ EXACTLY_N
}
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/pattern/PatternExpression.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/pattern/PatternExpression.java
index 9993a64c3..db2437798 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/pattern/PatternExpression.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/pattern/PatternExpression.java
@@ -27,8 +27,8 @@ import java.util.stream.Collectors;
public abstract class PatternExpression extends Expression {
- private String pattern;
- private List<StreamExpression> streamExpressions;
+ private final String pattern;
+ private final List<StreamExpression> streamExpressions;
private WithinExpression withinExpression;
public PatternExpression(String pattern, List<StreamExpression> streamExpressions) {
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/window/SortWindowExpression.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/window/SortWindowExpression.java
index b19f6eec8..a6970150b 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/window/SortWindowExpression.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/window/SortWindowExpression.java
@@ -17,28 +17,30 @@
*/
package org.apache.streampipes.wrapper.siddhi.query.expression.window;
-import io.siddhi.query.api.execution.query.selection.OrderByAttribute;
import org.apache.streampipes.wrapper.siddhi.constants.SiddhiConstants;
import org.apache.streampipes.wrapper.siddhi.query.expression.PropertyExpression;
+import io.siddhi.query.api.execution.query.selection.OrderByAttribute;
+
public class SortWindowExpression extends WindowExpression {
- private PropertyExpression property;
- private OrderByAttribute.Order order;
+ private final PropertyExpression property;
+ private final OrderByAttribute.Order order;
public SortWindowExpression(Integer number, PropertyExpression property, OrderByAttribute.Order order) {
super(number);
this.property = property;
this.order = order;
}
+
@Override
public String toSiddhiEpl() {
return join(SiddhiConstants.EMPTY,
- windowExpression(),
- "sort",
- windowValue(join(SiddhiConstants.COMMA,
- String.valueOf(windowValue),
- property.toSiddhiEpl(),
- join(SiddhiConstants.EMPTY, "'", order.toString().toLowerCase(), "'"))));
+ windowExpression(),
+ "sort",
+ windowValue(join(SiddhiConstants.COMMA,
+ String.valueOf(windowValue),
+ property.toSiddhiEpl(),
+ join(SiddhiConstants.EMPTY, "'", order.toString().toLowerCase(), "'"))));
}
}
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/window/TimeBatchWindowExpression.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/window/TimeBatchWindowExpression.java
index 0a9e5a454..73a26aa63 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/window/TimeBatchWindowExpression.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/window/TimeBatchWindowExpression.java
@@ -22,7 +22,7 @@ import org.apache.streampipes.wrapper.siddhi.query.expression.SiddhiTimeUnit;
public class TimeBatchWindowExpression extends WindowExpression {
- private SiddhiTimeUnit timeUnit;
+ private final SiddhiTimeUnit timeUnit;
public TimeBatchWindowExpression(Integer windowValue, SiddhiTimeUnit timeUnit) {
super(windowValue);
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/window/TimeWindowExpression.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/window/TimeWindowExpression.java
index c4334bc39..9b01b789f 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/window/TimeWindowExpression.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/query/expression/window/TimeWindowExpression.java
@@ -22,7 +22,7 @@ import org.apache.streampipes.wrapper.siddhi.query.expression.SiddhiTimeUnit;
public class TimeWindowExpression extends WindowExpression {
- private SiddhiTimeUnit timeUnit;
+ private final SiddhiTimeUnit timeUnit;
public TimeWindowExpression(Integer timeWindowSize, SiddhiTimeUnit timeUnit) {
super(timeWindowSize);
diff --git a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/utils/SiddhiUtils.java b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/utils/SiddhiUtils.java
index 0a72e15b9..18822847c 100644
--- a/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/utils/SiddhiUtils.java
+++ b/streampipes-wrapper-siddhi/src/main/java/org/apache/streampipes/wrapper/siddhi/utils/SiddhiUtils.java
@@ -17,14 +17,16 @@
*/
package org.apache.streampipes.wrapper.siddhi.utils;
-import io.siddhi.core.event.Event;
-import io.siddhi.query.api.definition.Attribute;
+
import org.apache.streampipes.model.runtime.EventFactory;
import org.apache.streampipes.model.runtime.SchemaInfo;
import org.apache.streampipes.model.runtime.SourceInfo;
import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
import org.apache.streampipes.wrapper.siddhi.constants.SiddhiConstants;
+import io.siddhi.core.event.Event;
+import io.siddhi.query.api.definition.Attribute;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -33,10 +35,10 @@ import java.util.Map;
public class SiddhiUtils {
public static org.apache.streampipes.model.runtime.Event toSpEvent(List<Event> events,
- String listFieldName,
- SchemaInfo schemaInfo,
- SourceInfo sourceInfo,
- List<Attribute> streamAttributes) {
+ String listFieldName,
+ SchemaInfo schemaInfo,
+ SourceInfo sourceInfo,
+ List<Attribute> streamAttributes) {
List<Map<String, Object>> allEvents = new ArrayList<>();
events.forEach(event -> allEvents.add(toMap(event, streamAttributes)));
@@ -61,8 +63,8 @@ public class SiddhiUtils {
for (int i = 0; i < streamAttributes.size(); i++) {
String outputKey = streamAttributes.get(i).getName();
- if (outputKey.startsWith(SiddhiConstants.FIRST_STREAM_PREFIX) ||
- outputKey.startsWith(SiddhiConstants.SECOND_STREAM_PREFIX)) {
+ if (outputKey.startsWith(SiddhiConstants.FIRST_STREAM_PREFIX)
+ || outputKey.startsWith(SiddhiConstants.SECOND_STREAM_PREFIX)) {
outputKey = outputKey.substring(2);
}
Object data = event.getData(i);
@@ -87,19 +89,19 @@ public class SiddhiUtils {
public static String getOutputTopicName(EventProcessorBindingParams parameters) {
return parameters
- .getGraph()
- .getOutputStream()
- .getEventGrounding()
- .getTransportProtocol()
- .getTopicDefinition()
- .getActualTopicName();
+ .getGraph()
+ .getOutputStream()
+ .getEventGrounding()
+ .getTransportProtocol()
+ .getTopicDefinition()
+ .getActualTopicName();
}
public static String prepareName(String eventName) {
return eventName
- .replaceAll("\\.", "")
- .replaceAll("-", "")
- .replaceAll("::", "");
+ .replaceAll("\\.", "")
+ .replaceAll("-", "")
+ .replaceAll("::", "");
}
public static String prepareProperty(String propertyName) {