You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2022/12/30 08:54:58 UTC
[streampipes] branch SP-956 created (now 15aef7a4a)
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a change to branch SP-956
in repository https://gitbox.apache.org/repos/asf/streampipes.git
at 15aef7a4a Use ExtensionsModelSubmitter over StandaloneModelSubmitter (#956)
This branch includes the following new commits:
new 15aef7a4a Use ExtensionsModelSubmitter over StandaloneModelSubmitter (#956)
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: Use ExtensionsModelSubmitter over StandaloneModelSubmitter (#956)
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch SP-956
in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit 15aef7a4a5cf5e5d62463db8a8b0ac563a1e75ad
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Fri Dec 30 09:54:44 2022 +0100
Use ExtensionsModelSubmitter over StandaloneModelSubmitter (#956)
---
.../container/standalone/init/StandaloneModelSubmitter.java | 5 -----
.../apache/streampipes/pe/flink/AllFlinkPipelineElementsInit.java | 4 ++--
.../java/org/apache/streampipes/pe/jvm/AllPipelineElementsInit.java | 4 ++--
.../processors/aggregation/flink/AggregationFlinkInit.java | 4 ++--
.../processors/changedetection/jvm/ChangeDetectionJvmInit.java | 4 ++--
.../streampipes/processors/enricher/flink/EnricherFlinkInit.java | 4 ++--
.../apache/streampipes/processors/enricher/jvm/EnricherJvmInit.java | 4 ++--
.../apache/streampipes/processors/filters/jvm/FiltersJvmInit.java | 4 ++--
.../org/apache/streampipes/processors/siddhi/FiltersSiddhiInit.java | 4 ++--
.../org/apache/streampipes/processor/geo/flink/GeoFlinkInit.java | 4 ++--
.../java/org/apache/streampipes/processors/geo/jvm/GeoJvmInit.java | 4 ++--
.../processors/imageprocessing/jvm/ImageProcessingJvmInit.java | 4 ++--
.../pattern/detection/flink/PatternDetectionFlinkInit.java | 4 ++--
.../streampipes/processors/statistics/flink/StatisticsFlinkInit.java | 4 ++--
.../streampipes/processors/textmining/flink/TextMiningFlinkInit.java | 4 ++--
.../streampipes/processors/textmining/jvm/TextMiningJvmInit.java | 4 ++--
.../processors/transformation/flink/TransformationFlinkInit.java | 4 ++--
.../processors/transformation/jvm/TransformationJvmInit.java | 4 ++--
.../org/apache/streampipes/sinks/brokers/jvm/BrokersJvmInit.java | 4 ++--
.../apache/streampipes/sinks/databases/flink/DatabasesFlinkInit.java | 4 ++--
.../org/apache/streampipes/sinks/databases/jvm/DatabasesJvmInit.java | 4 ++--
.../apache/streampipes/sinks/internal/jvm/SinksInternalJvmInit.java | 4 ++--
.../sinks/notifications/jvm/SinksNotificationsJvmInit.java | 4 ++--
.../streampipes/sources/vehicle/simulator/VehicleSimulatorInit.java | 4 ++--
.../sources/watertank/simulator/WatertankSimulatorInit.java | 4 ++--
25 files changed, 48 insertions(+), 53 deletions(-)
diff --git a/streampipes-container-standalone/src/main/java/org/apache/streampipes/container/standalone/init/StandaloneModelSubmitter.java b/streampipes-container-standalone/src/main/java/org/apache/streampipes/container/standalone/init/StandaloneModelSubmitter.java
index bf9dc8024..9a4bc23dc 100644
--- a/streampipes-container-standalone/src/main/java/org/apache/streampipes/container/standalone/init/StandaloneModelSubmitter.java
+++ b/streampipes-container-standalone/src/main/java/org/apache/streampipes/container/standalone/init/StandaloneModelSubmitter.java
@@ -27,8 +27,6 @@ import org.apache.streampipes.service.extensions.base.StreamPipesExtensionsServi
import org.apache.streampipes.service.extensions.base.WebSecurityConfig;
import org.apache.streampipes.svcdiscovery.api.model.SpServiceTag;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
@@ -42,9 +40,6 @@ import java.util.List;
@Import({PipelineElementContainerResourceConfig.class, WebSecurityConfig.class})
public abstract class StandaloneModelSubmitter extends StreamPipesExtensionsServiceBase {
- private static final Logger LOG =
- LoggerFactory.getLogger(StandaloneModelSubmitter.class.getCanonicalName());
-
@Deprecated
public void init(PeConfig peConfig) {
DeclarersSingleton.getInstance()
diff --git a/streampipes-extensions/streampipes-pipeline-elements-all-flink/src/main/java/org/apache/streampipes/pe/flink/AllFlinkPipelineElementsInit.java b/streampipes-extensions/streampipes-pipeline-elements-all-flink/src/main/java/org/apache/streampipes/pe/flink/AllFlinkPipelineElementsInit.java
index 3edfc2dcd..033c47bb7 100644
--- a/streampipes-extensions/streampipes-pipeline-elements-all-flink/src/main/java/org/apache/streampipes/pe/flink/AllFlinkPipelineElementsInit.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-all-flink/src/main/java/org/apache/streampipes/pe/flink/AllFlinkPipelineElementsInit.java
@@ -17,9 +17,9 @@
*/
package org.apache.streampipes.pe.flink;
+import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
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;
@@ -37,7 +37,7 @@ import org.apache.streampipes.processors.transformation.flink.TransformationFlin
import org.apache.streampipes.sinks.databases.flink.DatabasesFlinkInit;
-public class AllFlinkPipelineElementsInit extends StandaloneModelSubmitter {
+public class AllFlinkPipelineElementsInit extends ExtensionsModelSubmitter {
public static void main(String[] args) {
new AllFlinkPipelineElementsInit().init();
diff --git a/streampipes-extensions/streampipes-pipeline-elements-all-jvm/src/main/java/org/apache/streampipes/pe/jvm/AllPipelineElementsInit.java b/streampipes-extensions/streampipes-pipeline-elements-all-jvm/src/main/java/org/apache/streampipes/pe/jvm/AllPipelineElementsInit.java
index 493ace802..5abc87a24 100644
--- a/streampipes-extensions/streampipes-pipeline-elements-all-jvm/src/main/java/org/apache/streampipes/pe/jvm/AllPipelineElementsInit.java
+++ b/streampipes-extensions/streampipes-pipeline-elements-all-jvm/src/main/java/org/apache/streampipes/pe/jvm/AllPipelineElementsInit.java
@@ -17,9 +17,9 @@
*/
package org.apache.streampipes.pe.jvm;
+import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
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;
@@ -40,7 +40,7 @@ import org.apache.streampipes.sinks.databases.jvm.DatabasesJvmInit;
import org.apache.streampipes.sinks.internal.jvm.SinksInternalJvmInit;
import org.apache.streampipes.sinks.notifications.jvm.SinksNotificationsJvmInit;
-public class AllPipelineElementsInit extends StandaloneModelSubmitter {
+public class AllPipelineElementsInit extends ExtensionsModelSubmitter {
public static void main(String[] args) {
new AllPipelineElementsInit().init();
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/AggregationFlinkInit.java b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/AggregationFlinkInit.java
index d076a8465..4326dcca0 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/AggregationFlinkInit.java
+++ b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/AggregationFlinkInit.java
@@ -18,9 +18,9 @@
package org.apache.streampipes.processors.aggregation.flink;
+import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
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;
@@ -34,7 +34,7 @@ import org.apache.streampipes.processors.aggregation.flink.processor.count.Count
import org.apache.streampipes.processors.aggregation.flink.processor.eventcount.EventCountController;
import org.apache.streampipes.processors.aggregation.flink.processor.rate.EventRateController;
-public class AggregationFlinkInit extends StandaloneModelSubmitter {
+public class AggregationFlinkInit extends ExtensionsModelSubmitter {
public static final String SERVICE_GROUP = "org.apache.streampipes.processors.aggregation.flink";
diff --git a/streampipes-extensions/streampipes-processors-change-detection-jvm/src/main/java/org/apache/streampipes/processors/changedetection/jvm/ChangeDetectionJvmInit.java b/streampipes-extensions/streampipes-processors-change-detection-jvm/src/main/java/org/apache/streampipes/processors/changedetection/jvm/ChangeDetectionJvmInit.java
index 5ad06cd1e..584ae2186 100644
--- a/streampipes-extensions/streampipes-processors-change-detection-jvm/src/main/java/org/apache/streampipes/processors/changedetection/jvm/ChangeDetectionJvmInit.java
+++ b/streampipes-extensions/streampipes-processors-change-detection-jvm/src/main/java/org/apache/streampipes/processors/changedetection/jvm/ChangeDetectionJvmInit.java
@@ -19,9 +19,9 @@
package org.apache.streampipes.processors.changedetection.jvm;
+import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
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;
@@ -32,7 +32,7 @@ import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
import org.apache.streampipes.processors.changedetection.jvm.cusum.CusumController;
import org.apache.streampipes.processors.changedetection.jvm.welford.WelfordChangeDetection;
-public class ChangeDetectionJvmInit extends StandaloneModelSubmitter {
+public class ChangeDetectionJvmInit extends ExtensionsModelSubmitter {
public static void main(String[] args) {
new ChangeDetectionJvmInit().init();
diff --git a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/EnricherFlinkInit.java b/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/EnricherFlinkInit.java
index 71570ccc5..c5d6b89af 100644
--- a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/EnricherFlinkInit.java
+++ b/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/EnricherFlinkInit.java
@@ -18,9 +18,9 @@
package org.apache.streampipes.processors.enricher.flink;
+import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
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;
@@ -32,7 +32,7 @@ import org.apache.streampipes.processors.enricher.flink.config.ConfigKeys;
import org.apache.streampipes.processors.enricher.flink.processor.timestamp.TimestampController;
import org.apache.streampipes.processors.enricher.flink.processor.urldereferencing.UrlDereferencingController;
-public class EnricherFlinkInit extends StandaloneModelSubmitter {
+public class EnricherFlinkInit extends ExtensionsModelSubmitter {
public static void main(String[] args) {
new EnricherFlinkInit().init();
diff --git a/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/EnricherJvmInit.java b/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/EnricherJvmInit.java
index 6b0bc1caf..23be38a73 100644
--- a/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/EnricherJvmInit.java
+++ b/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/EnricherJvmInit.java
@@ -18,9 +18,9 @@
package org.apache.streampipes.processors.enricher.jvm;
+import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
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;
@@ -35,7 +35,7 @@ import org.apache.streampipes.processors.enricher.jvm.processor.sizemeasure.Size
import org.apache.streampipes.processors.enricher.jvm.processor.trigonometry.TrigonometryProcessor;
import org.apache.streampipes.processors.enricher.jvm.processor.valuechange.ValueChangeProcessor;
-public class EnricherJvmInit extends StandaloneModelSubmitter {
+public class EnricherJvmInit extends ExtensionsModelSubmitter {
public static void main(String[] args) {
new EnricherJvmInit().init();
diff --git a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/FiltersJvmInit.java b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/FiltersJvmInit.java
index 07b63242b..9afc703ed 100644
--- a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/FiltersJvmInit.java
+++ b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/FiltersJvmInit.java
@@ -18,9 +18,9 @@
package org.apache.streampipes.processors.filters.jvm;
+import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
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;
@@ -42,7 +42,7 @@ import org.apache.streampipes.processors.filters.jvm.processor.textfilter.TextFi
import org.apache.streampipes.processors.filters.jvm.processor.threshold.ThresholdDetectionProcessor;
import org.apache.streampipes.processors.filters.jvm.processor.throughputmon.ThroughputMonitorProcessor;
-public class FiltersJvmInit extends StandaloneModelSubmitter {
+public class FiltersJvmInit extends ExtensionsModelSubmitter {
public static void main(String[] args) {
new FiltersJvmInit().init();
diff --git a/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/FiltersSiddhiInit.java b/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/FiltersSiddhiInit.java
index bfa8ae67d..41193418d 100644
--- a/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/FiltersSiddhiInit.java
+++ b/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/FiltersSiddhiInit.java
@@ -18,9 +18,9 @@
package org.apache.streampipes.processors.siddhi;
+import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
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;
@@ -35,7 +35,7 @@ import org.apache.streampipes.processors.siddhi.listfilter.ListFilter;
import org.apache.streampipes.processors.siddhi.topk.TopK;
import org.apache.streampipes.processors.siddhi.trend.TrendController;
-public class FiltersSiddhiInit extends StandaloneModelSubmitter {
+public class FiltersSiddhiInit extends ExtensionsModelSubmitter {
public static void main(String[] args) {
new FiltersSiddhiInit().init();
diff --git a/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/GeoFlinkInit.java b/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/GeoFlinkInit.java
index 81531cad1..596ef7da3 100644
--- a/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/GeoFlinkInit.java
+++ b/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/GeoFlinkInit.java
@@ -18,9 +18,9 @@
package org.apache.streampipes.processor.geo.flink;
+import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
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;
@@ -31,7 +31,7 @@ import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
import org.apache.streampipes.processor.geo.flink.config.ConfigKeys;
import org.apache.streampipes.processor.geo.flink.processor.gridenricher.SpatialGridEnrichmentController;
-public class GeoFlinkInit extends StandaloneModelSubmitter {
+public class GeoFlinkInit extends ExtensionsModelSubmitter {
public static void main(String[] args) {
new GeoFlinkInit().init();
diff --git a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/GeoJvmInit.java b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/GeoJvmInit.java
index a1924e371..8b671a680 100644
--- a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/GeoJvmInit.java
+++ b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/GeoJvmInit.java
@@ -18,9 +18,9 @@
package org.apache.streampipes.processors.geo.jvm;
+import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
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;
@@ -39,7 +39,7 @@ import org.apache.streampipes.processors.geo.jvm.latlong.processor.geocoder.goog
import org.apache.streampipes.processors.geo.jvm.latlong.processor.revgeocoder.geocityname.GeoCityNameRevdecodeProcessor;
import org.apache.streampipes.processors.geo.jvm.latlong.processor.speedcalculator.SpeedCalculatorProcessor;
-public class GeoJvmInit extends StandaloneModelSubmitter {
+public class GeoJvmInit extends ExtensionsModelSubmitter {
@Override
public SpServiceDefinition provideServiceDefinition() {
diff --git a/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/ImageProcessingJvmInit.java b/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/ImageProcessingJvmInit.java
index 879d2c6fd..c5073cae3 100644
--- a/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/ImageProcessingJvmInit.java
+++ b/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/ImageProcessingJvmInit.java
@@ -18,9 +18,9 @@
package org.apache.streampipes.processors.imageprocessing.jvm;
+import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
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;
@@ -33,7 +33,7 @@ import org.apache.streampipes.processors.imageprocessing.jvm.processor.imagecrop
import org.apache.streampipes.processors.imageprocessing.jvm.processor.imageenrichment.ImageEnrichmentController;
import org.apache.streampipes.processors.imageprocessing.jvm.processor.qrreader.QrCodeReaderController;
-public class ImageProcessingJvmInit extends StandaloneModelSubmitter {
+public class ImageProcessingJvmInit extends ExtensionsModelSubmitter {
@Override
public SpServiceDefinition provideServiceDefinition() {
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/PatternDetectionFlinkInit.java b/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/PatternDetectionFlinkInit.java
index c4abe0e22..ebdc73f21 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/PatternDetectionFlinkInit.java
+++ b/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/PatternDetectionFlinkInit.java
@@ -18,9 +18,9 @@
package org.apache.streampipes.processors.pattern.detection.flink;
+import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
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;
@@ -34,7 +34,7 @@ import org.apache.streampipes.processors.pattern.detection.flink.processor.and.A
import org.apache.streampipes.processors.pattern.detection.flink.processor.peak.PeakDetectionController;
import org.apache.streampipes.processors.pattern.detection.flink.processor.sequence.SequenceController;
-public class PatternDetectionFlinkInit extends StandaloneModelSubmitter {
+public class PatternDetectionFlinkInit extends ExtensionsModelSubmitter {
public static final String SERVICE_GROUP = "org.apache.streampipes.processors.patterndetection.flink";
diff --git a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/StatisticsFlinkInit.java b/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/StatisticsFlinkInit.java
index 23b75d234..0f1c1972e 100644
--- a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/StatisticsFlinkInit.java
+++ b/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/StatisticsFlinkInit.java
@@ -18,9 +18,9 @@
package org.apache.streampipes.processors.statistics.flink;
+import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
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;
@@ -32,7 +32,7 @@ import org.apache.streampipes.processors.statistics.flink.config.ConfigKeys;
import org.apache.streampipes.processors.statistics.flink.processor.stat.summary.StatisticsSummaryController;
import org.apache.streampipes.processors.statistics.flink.processor.stat.window.StatisticsSummaryControllerWindow;
-public class StatisticsFlinkInit extends StandaloneModelSubmitter {
+public class StatisticsFlinkInit extends ExtensionsModelSubmitter {
public static void main(String[] args) {
new StatisticsFlinkInit().init();
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/TextMiningFlinkInit.java b/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/TextMiningFlinkInit.java
index 8be14fee8..c62692502 100644
--- a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/TextMiningFlinkInit.java
+++ b/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/TextMiningFlinkInit.java
@@ -18,9 +18,9 @@
package org.apache.streampipes.processors.textmining.flink;
+import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
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;
@@ -31,7 +31,7 @@ import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
import org.apache.streampipes.processors.textmining.flink.config.ConfigKeys;
import org.apache.streampipes.processors.textmining.flink.processor.wordcount.WordCountController;
-public class TextMiningFlinkInit extends StandaloneModelSubmitter {
+public class TextMiningFlinkInit extends ExtensionsModelSubmitter {
public static void main(String[] args) {
new TextMiningFlinkInit().init();
diff --git a/streampipes-extensions/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/TextMiningJvmInit.java b/streampipes-extensions/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/TextMiningJvmInit.java
index 7f30cdd0a..5aa5cf795 100644
--- a/streampipes-extensions/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/TextMiningJvmInit.java
+++ b/streampipes-extensions/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/TextMiningJvmInit.java
@@ -18,9 +18,9 @@
package org.apache.streampipes.processors.textmining.jvm;
+import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
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;
@@ -35,7 +35,7 @@ import org.apache.streampipes.processors.textmining.jvm.processor.partofspeech.P
import org.apache.streampipes.processors.textmining.jvm.processor.sentencedetection.SentenceDetectionController;
import org.apache.streampipes.processors.textmining.jvm.processor.tokenizer.TokenizerController;
-public class TextMiningJvmInit extends StandaloneModelSubmitter {
+public class TextMiningJvmInit extends ExtensionsModelSubmitter {
public static void main(String[] args) {
new TextMiningJvmInit().init();
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/TransformationFlinkInit.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/TransformationFlinkInit.java
index bf576afd2..bc0f98928 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/TransformationFlinkInit.java
+++ b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/TransformationFlinkInit.java
@@ -18,9 +18,9 @@
package org.apache.streampipes.processors.transformation.flink;
+import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
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;
@@ -36,7 +36,7 @@ import org.apache.streampipes.processors.transformation.flink.processor.mapper.F
import org.apache.streampipes.processors.transformation.flink.processor.measurementunitonverter.MeasurementUnitConverterController;
import org.apache.streampipes.processors.transformation.flink.processor.rename.FieldRenamerController;
-public class TransformationFlinkInit extends StandaloneModelSubmitter {
+public class TransformationFlinkInit extends ExtensionsModelSubmitter {
public static final String SERVICE_GROUP = "org.apache.streampipes.processors.transformation.flink";
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/TransformationJvmInit.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/TransformationJvmInit.java
index 25dc90b32..2b3995d13 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/TransformationJvmInit.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/TransformationJvmInit.java
@@ -18,9 +18,9 @@
package org.apache.streampipes.processors.transformation.jvm;
+import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
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;
@@ -52,7 +52,7 @@ import org.apache.streampipes.processors.transformation.jvm.processor.transformt
import org.apache.streampipes.processors.transformation.jvm.processor.value.change.ChangedValueDetectionController;
import org.apache.streampipes.processors.transformation.jvm.processor.value.duration.CalculateDurationController;
-public class TransformationJvmInit extends StandaloneModelSubmitter {
+public class TransformationJvmInit extends ExtensionsModelSubmitter {
public static void main(String[] args) {
new TransformationJvmInit().init();
diff --git a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/BrokersJvmInit.java b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/BrokersJvmInit.java
index 4b3121062..e41d8b7f0 100644
--- a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/BrokersJvmInit.java
+++ b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/BrokersJvmInit.java
@@ -18,9 +18,9 @@
package org.apache.streampipes.sinks.brokers.jvm;
+import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
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;
@@ -39,7 +39,7 @@ import org.apache.streampipes.sinks.brokers.jvm.rest.RestController;
import org.apache.streampipes.sinks.brokers.jvm.rocketmq.RocketMQPublisherSink;
import org.apache.streampipes.sinks.brokers.jvm.websocket.WebsocketServerSink;
-public class BrokersJvmInit extends StandaloneModelSubmitter {
+public class BrokersJvmInit extends ExtensionsModelSubmitter {
public static void main(String[] args) {
new BrokersJvmInit().init();
diff --git a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/DatabasesFlinkInit.java b/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/DatabasesFlinkInit.java
index deded3c7c..b29ba66fc 100644
--- a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/DatabasesFlinkInit.java
+++ b/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/DatabasesFlinkInit.java
@@ -18,9 +18,9 @@
package org.apache.streampipes.sinks.databases.flink;
+import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
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;
@@ -31,7 +31,7 @@ import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
import org.apache.streampipes.sinks.databases.flink.config.ConfigKeys;
import org.apache.streampipes.sinks.databases.flink.elasticsearch.ElasticSearchController;
-public class DatabasesFlinkInit extends StandaloneModelSubmitter {
+public class DatabasesFlinkInit extends ExtensionsModelSubmitter {
public static void main(String[] args) {
new DatabasesFlinkInit().init();
diff --git a/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/DatabasesJvmInit.java b/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/DatabasesJvmInit.java
index 5cf2c95d9..7b46b5c2d 100644
--- a/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/DatabasesJvmInit.java
+++ b/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/DatabasesJvmInit.java
@@ -18,9 +18,9 @@
package org.apache.streampipes.sinks.databases.jvm;
+import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
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;
@@ -36,7 +36,7 @@ import org.apache.streampipes.sinks.databases.jvm.opcua.UpcUaController;
import org.apache.streampipes.sinks.databases.jvm.postgresql.PostgreSqlController;
import org.apache.streampipes.sinks.databases.jvm.redis.RedisController;
-public class DatabasesJvmInit extends StandaloneModelSubmitter {
+public class DatabasesJvmInit extends ExtensionsModelSubmitter {
public static void main(String[] args) {
new DatabasesJvmInit().init();
diff --git a/streampipes-extensions/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/SinksInternalJvmInit.java b/streampipes-extensions/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/SinksInternalJvmInit.java
index 7ad36c823..aa53ef604 100644
--- a/streampipes-extensions/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/SinksInternalJvmInit.java
+++ b/streampipes-extensions/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/SinksInternalJvmInit.java
@@ -18,9 +18,9 @@
package org.apache.streampipes.sinks.internal.jvm;
+import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
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.dataexplorer.commons.configs.CouchDbConfigurations;
import org.apache.streampipes.dataexplorer.commons.configs.DataExplorerConfigurations;
import org.apache.streampipes.dataformat.cbor.CborDataFormatFactory;
@@ -33,7 +33,7 @@ import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
import org.apache.streampipes.sinks.internal.jvm.datalake.DataLakeSink;
import org.apache.streampipes.sinks.internal.jvm.notification.NotificationProducer;
-public class SinksInternalJvmInit extends StandaloneModelSubmitter {
+public class SinksInternalJvmInit extends ExtensionsModelSubmitter {
@Override
public SpServiceDefinition provideServiceDefinition() {
diff --git a/streampipes-extensions/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/SinksNotificationsJvmInit.java b/streampipes-extensions/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/SinksNotificationsJvmInit.java
index 8988dc718..be1b41877 100644
--- a/streampipes-extensions/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/SinksNotificationsJvmInit.java
+++ b/streampipes-extensions/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/SinksNotificationsJvmInit.java
@@ -18,9 +18,9 @@
package org.apache.streampipes.sinks.notifications.jvm;
+import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
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;
@@ -34,7 +34,7 @@ import org.apache.streampipes.sinks.notifications.jvm.onesignal.OneSignalControl
import org.apache.streampipes.sinks.notifications.jvm.slack.SlackNotificationController;
import org.apache.streampipes.sinks.notifications.jvm.telegram.TelegramController;
-public class SinksNotificationsJvmInit extends StandaloneModelSubmitter {
+public class SinksNotificationsJvmInit extends ExtensionsModelSubmitter {
@Override
public SpServiceDefinition provideServiceDefinition() {
diff --git a/streampipes-extensions/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/VehicleSimulatorInit.java b/streampipes-extensions/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/VehicleSimulatorInit.java
index e3a0010c2..f0396a963 100644
--- a/streampipes-extensions/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/VehicleSimulatorInit.java
+++ b/streampipes-extensions/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/VehicleSimulatorInit.java
@@ -18,13 +18,13 @@
package org.apache.streampipes.sources.vehicle.simulator;
+import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
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.sources.vehicle.simulator.config.ConfigKeys;
import org.apache.streampipes.sources.vehicle.simulator.vehicle.streams.VehicleStream;
-public class VehicleSimulatorInit extends StandaloneModelSubmitter {
+public class VehicleSimulatorInit extends ExtensionsModelSubmitter {
public static void main(String[] args) {
new VehicleSimulatorInit().init();
diff --git a/streampipes-extensions/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/WatertankSimulatorInit.java b/streampipes-extensions/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/WatertankSimulatorInit.java
index 37a7d0706..6f6bd73e9 100644
--- a/streampipes-extensions/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/WatertankSimulatorInit.java
+++ b/streampipes-extensions/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/WatertankSimulatorInit.java
@@ -18,9 +18,9 @@
package org.apache.streampipes.sources.watertank.simulator;
+import org.apache.streampipes.container.extensions.ExtensionsModelSubmitter;
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.sources.watertank.simulator.config.ConfigKeys;
import org.apache.streampipes.sources.watertank.simulator.watertank.streams.FlowRate1Stream;
import org.apache.streampipes.sources.watertank.simulator.watertank.streams.FlowRate2Stream;
@@ -28,7 +28,7 @@ import org.apache.streampipes.sources.watertank.simulator.watertank.streams.Pres
import org.apache.streampipes.sources.watertank.simulator.watertank.streams.WaterLevel1Stream;
import org.apache.streampipes.sources.watertank.simulator.watertank.streams.WaterLevel2Stream;
-public class WatertankSimulatorInit extends StandaloneModelSubmitter {
+public class WatertankSimulatorInit extends ExtensionsModelSubmitter {
public static void main(String[] args) {
new WatertankSimulatorInit().init();