This is an automated email from the ASF dual-hosted git repository. riemer pushed a commit to branch STREAMPIPES-319 in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-extensions.git
commit 7dfb31e67ff1386f7e82683aa09e889a91eaffe1 Merge: 8f013da 82478c7 Author: Dominik Riemer <[email protected]> AuthorDate: Mon May 10 14:17:53 2021 +0200 Merge branch 'dev' into STREAMPIPES-319 pom.xml | 11 + .../streampipes/connect/ConnectAdapterInit.java | 2 +- .../connect/adapters/opcua/OpcNode.java | 50 +++ .../streampipes/connect/adapters/opcua/OpcUa.java | 236 +++++++++++--- .../connect/adapters/opcua/OpcUaAdapter.java | 354 ++++++++------------- .../opcua/{ => utils}/OpcUaNodeVariants.java | 7 +- .../adapters/opcua/{ => utils}/OpcUaTypes.java | 11 +- .../connect/adapters/opcua/utils/OpcUaUtil.java | 181 +++++++++++ .../documentation.md | 41 ++- .../strings.en | 29 +- .../extensions/all/jvm/AllExtensionsInit.java | 2 + .../pe/jvm/AllPipelineElementsInit.java | 10 +- .../processors/filters/jvm/FiltersJvmInit.java | 16 +- .../processor/schema/MergeBySchemaProcessor.java | 77 +++++ .../documentation.md | 19 +- .../strings.en | 3 + .../jvm/processor/imagecropper/ImageCropper.java | 3 +- .../imagecropper/ImageCropperController.java | 2 +- .../stat/summary/StatisticsSummaryController.java | 1 + .../transformation/jvm/TransformationJvmInit.java | 6 +- .../logical/BooleanOperationInputConfigs.java | 34 +- .../logical/BooleanOperatorProcessor.java | 129 ++++++++ .../logical/enums/BooleanOperatorType.java | 64 ++++ .../logical/operations/ANDBoolOperation.java | 31 +- .../logical/operations/IBoolOperation.java | 41 +-- .../logical/operations/NORBoolOperation.java | 31 +- .../logical/operations/NOTBooleanOperation.java | 31 +- .../logical/operations/ORBooleanOperation.java | 31 +- .../logical/operations/XNORBoolOperation.java | 31 +- .../logical/operations/XORBooleanOperation.java | 31 +- .../operations/factory/BoolOperationFactory.java | 56 ++++ .../booloperator/state/BooleanToState.java | 16 +- .../state/BooleanToStateController.java | 31 +- .../state/BooleanToStateParameters.java | 13 +- .../fieldrename/FiledRenameProcessor.java | 77 +++++ .../jvm/processor/state/labeler/LabelerUtils.java | 33 ++ .../state/labeler/buffer/StateBufferLabeler.java | 4 +- .../buffer/StateBufferLabelerController.java | 23 +- .../buffer/StateBufferLabelerParameters.java | 15 +- .../state/labeler/model/StatementUtils.java | 19 +- .../state/labeler/number/NumberLabeler.java | 5 +- .../labeler/number/NumberLabelerController.java | 34 +- .../labeler/number/NumberLabelerParameters.java | 15 +- .../documentation.md | 17 +- .../strings.en | 9 + .../documentation.md | 29 +- .../strings.en | 10 + .../documentation.md | 9 +- .../strings.en | 5 +- .../strings.en | 4 + .../strings.en | 3 + streampipes-sinks-brokers-jvm/pom.xml | 4 + .../sinks/brokers/jvm/BrokersJvmInit.java | 4 +- .../sinks/brokers/jvm/nats/NatsController.java | 122 +++++++ .../sinks/brokers/jvm/nats/NatsParameters.java | 61 ++++ .../sinks/brokers/jvm/nats/NatsPublisher.java | 119 +++++++ .../brokers/jvm/websocket/WebsocketServerSink.java | 4 +- .../documentation.md | 45 ++- .../icon.png | Bin 0 -> 6986 bytes .../strings.en | 39 +++ streampipes-sinks-databases-jvm/pom.xml | 8 + .../sinks/databases/jvm/iotdb/IotDb.java | 1 + .../sinks/databases/jvm/jdbcclient/JdbcClient.java | 29 +- .../sinks/databases/jvm/mysql/Mysql.java | 1 + .../sinks/databases/jvm/opcua/OpcUa.java | 61 +++- .../sinks/databases/jvm/postgresql/PostgreSql.java | 1 + .../jvm/postgresql/PostgreSqlController.java | 15 +- .../jvm/postgresql/PostgreSqlParameters.java | 8 +- .../strings.en | 4 +- .../strings.en | 2 + 70 files changed, 1899 insertions(+), 571 deletions(-) diff --cc streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/FiltersJvmInit.java index 41929fb,abe18c8..e3cb629 --- a/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/FiltersJvmInit.java +++ b/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/FiltersJvmInit.java @@@ -18,56 -18,53 +18,70 @@@ package org.apache.streampipes.processors.filters.jvm; -import org.apache.streampipes.container.init.DeclarersSingleton; +import org.apache.streampipes.container.model.SpServiceDefinition; +import org.apache.streampipes.container.model.SpServiceDefinitionBuilder; import org.apache.streampipes.container.standalone.init.StandaloneModelSubmitter; import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory; -import org.apache.streampipes.dataformat.fst.FstDataFormatFactory; import org.apache.streampipes.dataformat.json.JsonDataFormatFactory; -import org.apache.streampipes.dataformat.smile.SmileDataFormatFactory; import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory; import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory; -import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory; -import org.apache.streampipes.processors.filters.jvm.config.FiltersJvmConfig; + import org.apache.streampipes.processors.filters.jvm.processor.compose.ComposeController; + import org.apache.streampipes.processors.filters.jvm.processor.enrich.MergeByEnrichController; + import org.apache.streampipes.processors.filters.jvm.processor.limit.RateLimitController; + import org.apache.streampipes.processors.filters.jvm.processor.merge.MergeByTimeController; import org.apache.streampipes.processors.filters.jvm.processor.numericalfilter.NumericalFilterController; + import org.apache.streampipes.processors.filters.jvm.processor.numericaltextfilter.NumericalTextFilterController; + import org.apache.streampipes.processors.filters.jvm.processor.projection.ProjectionController; + import org.apache.streampipes.processors.filters.jvm.processor.schema.MergeBySchemaProcessor; import org.apache.streampipes.processors.filters.jvm.processor.textfilter.TextFilterController; import org.apache.streampipes.processors.filters.jvm.processor.threshold.ThresholdDetectionController; public class FiltersJvmInit extends StandaloneModelSubmitter { public static void main(String[] args) { - DeclarersSingleton.getInstance() - .add(new NumericalFilterController()) - .add(new ThresholdDetectionController()) - .add(new TextFilterController()) - .add(new ProjectionController()) - .add(new MergeByEnrichController()) - .add(new MergeByTimeController()) - .add(new MergeBySchemaProcessor()) - .add(new ComposeController()) - .add(new NumericalTextFilterController()) - .add(new RateLimitController()); - DeclarersSingleton.getInstance().registerDataFormats( - new JsonDataFormatFactory(), - new CborDataFormatFactory(), - new SmileDataFormatFactory(), - new FstDataFormatFactory()); + SpServiceDefinition serviceDef = SpServiceDefinitionBuilder.create("org.apache.streampipes.processors.filters.jvm", + "StreamPipes Processors Filters (JVM)", + "", + 8090) +// .registerAdapters(new MqttProtocol(), +// new IssAdapter()) + .registerPipelineElements(new TextFilterController(), + new NumericalFilterController(), - new ThresholdDetectionController()) ++ new ThresholdDetectionController(), ++ new ProjectionController(), ++ new MergeByEnrichController(), ++ new MergeByTimeController(), ++ new MergeBySchemaProcessor(), ++ new ComposeController(), ++ new NumericalTextFilterController(), ++ new RateLimitController()) + .registerMessagingFormats(new JsonDataFormatFactory(), new CborDataFormatFactory()) + .registerMessagingProtocols(new SpKafkaProtocolFactory(), new SpJmsProtocolFactory()) + .build(); - DeclarersSingleton.getInstance().registerProtocols( - new SpKafkaProtocolFactory(), - new SpMqttProtocolFactory(), - new SpJmsProtocolFactory()); +// DeclarersSingleton.getInstance() +// .add(new NumericalFilterController()) +// .add(new ThresholdDetectionController()) +// .add(new TextFilterController()) +// .add(new ProjectionController()) +// .add(new MergeByEnrichController()) +// .add(new MergeByTimeController()) +// .add(new ComposeController()) +// .add(new NumericalTextFilterController()) +// .add(new RateLimitController()); +// +// DeclarersSingleton.getInstance().registerDataFormats( +// new JsonDataFormatFactory(), +// new CborDataFormatFactory(), +// new SmileDataFormatFactory(), +// new FstDataFormatFactory()); +// +// DeclarersSingleton.getInstance().registerProtocols( +// new SpKafkaProtocolFactory(), +// new SpMqttProtocolFactory(), +// new SpJmsProtocolFactory()); - new FiltersJvmInit().init(FiltersJvmConfig.INSTANCE); + new FiltersJvmInit().init(serviceDef); } }
