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 e3cf1be85383493b7253fb529444374fd837eaf2 Author: Dominik Riemer <[email protected]> AuthorDate: Tue Jul 13 10:04:39 2021 +0200 [STREAMPIPES-319] Refactor config management --- .../apache/streampipes/connect/config/ConnectWorkerConfig.java | 5 +++-- .../extensions/all/jvm/config/AllExtensionsConfig.java | 2 +- .../main/java/org/apache/streampipes/pe/flink/config/Config.java | 2 +- .../streampipes/pe/jvm/config/AllPipelineElementsConfig.java | 5 +++-- .../aggregation/flink/config/AggregationFlinkConfig.java | 2 +- .../changedetection/jvm/config/ChangeDetectionJvmConfig.java | 5 +++-- .../processors/enricher/flink/config/EnricherFlinkConfig.java | 2 +- .../processors/enricher/jvm/config/EnricherJvmConfig.java | 5 +++-- .../processors/filters/jvm/config/FiltersJvmConfig.java | 5 +++-- .../streampipes/processors/siddhi/config/FilterSiddhiConfig.java | 5 +++-- .../streampipes/processor/geo/flink/config/GeoFlinkConfig.java | 2 +- .../streampipes/processors/geo/jvm/config/GeoJvmConfig.java | 5 +++-- .../imageprocessing/jvm/config/ImageProcessingJvmConfig.java | 9 +++++---- .../detection/flink/config/PatternDetectionFlinkConfig.java | 2 +- .../statistics/flink/config/StatisticsFlinkConfig.java | 2 +- .../textmining/flink/config/TextMiningFlinkConfig.java | 2 +- .../processors/textmining/jvm/config/TextMiningJvmConfig.java | 5 +++-- .../transformation/flink/config/TransformationFlinkConfig.java | 2 +- .../transformation/jvm/config/TransformationJvmConfig.java | 5 +++-- .../streampipes/sinks/brokers/jvm/config/BrokersJvmConfig.java | 5 +++-- .../sinks/databases/flink/config/DatabasesFlinkConfig.java | 2 +- .../sinks/databases/jvm/config/DatabasesJvmConfig.java | 5 +++-- .../sinks/internal/jvm/config/SinksInternalJvmConfig.java | 5 +++-- .../notifications/jvm/config/SinksNotificationsJvmConfig.java | 5 +++-- .../sinks/notifications/jvm/email/EmailPublisher.java | 2 +- .../sources/vehicle/simulator/config/VehicleSimulatorConfig.java | 5 +++-- .../watertank/simulator/config/WatertankSimulatorConfig.java | 5 +++-- 27 files changed, 61 insertions(+), 45 deletions(-) diff --git a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/config/ConnectWorkerConfig.java b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/config/ConnectWorkerConfig.java index 0ec5bab..58dd946 100644 --- a/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/config/ConnectWorkerConfig.java +++ b/streampipes-connect-adapters/src/main/java/org/apache/streampipes/connect/config/ConnectWorkerConfig.java @@ -19,7 +19,8 @@ package org.apache.streampipes.connect.config; -import org.apache.streampipes.config.SpConfig; +import org.apache.streampipes.svcdiscovery.SpServiceDiscovery; +import org.apache.streampipes.svcdiscovery.api.SpConfig; public enum ConnectWorkerConfig { INSTANCE; @@ -29,7 +30,7 @@ public enum ConnectWorkerConfig { ConnectWorkerConfig() { String name = "connect-worker-main"; - config = SpConfig.getSpConfig("connect-worker-main"); + config = SpServiceDiscovery.getSpConfig("connect-worker-main"); config.register(ConfigKeys.KAFKA_HOST, "kafka", "Hostname for backend service for kafka"); config.register(ConfigKeys.KAFKA_PORT, 9092, "Port for backend service for kafka"); diff --git a/streampipes-extensions-all-jvm/src/main/java/org/apache/streampipes/extensions/all/jvm/config/AllExtensionsConfig.java b/streampipes-extensions-all-jvm/src/main/java/org/apache/streampipes/extensions/all/jvm/config/AllExtensionsConfig.java index 631f2a2..db90c2e 100644 --- a/streampipes-extensions-all-jvm/src/main/java/org/apache/streampipes/extensions/all/jvm/config/AllExtensionsConfig.java +++ b/streampipes-extensions-all-jvm/src/main/java/org/apache/streampipes/extensions/all/jvm/config/AllExtensionsConfig.java @@ -17,7 +17,7 @@ */ package org.apache.streampipes.extensions.all.jvm.config; -import org.apache.streampipes.config.SpConfig; +import org.apache.streampipes.svcdiscovery.api.SpConfig; import org.apache.streampipes.container.model.ExtensionsConfig; public enum AllExtensionsConfig implements ExtensionsConfig { diff --git a/streampipes-pipeline-elements-all-flink/src/main/java/org/apache/streampipes/pe/flink/config/Config.java b/streampipes-pipeline-elements-all-flink/src/main/java/org/apache/streampipes/pe/flink/config/Config.java index c4618bb..b440204 100644 --- a/streampipes-pipeline-elements-all-flink/src/main/java/org/apache/streampipes/pe/flink/config/Config.java +++ b/streampipes-pipeline-elements-all-flink/src/main/java/org/apache/streampipes/pe/flink/config/Config.java @@ -17,7 +17,7 @@ */ package org.apache.streampipes.pe.flink.config; -import org.apache.streampipes.config.SpConfig; +import org.apache.streampipes.svcdiscovery.api.SpConfig; import org.apache.streampipes.container.model.PeConfig; public enum Config implements PeConfig { diff --git a/streampipes-pipeline-elements-all-jvm/src/main/java/org/apache/streampipes/pe/jvm/config/AllPipelineElementsConfig.java b/streampipes-pipeline-elements-all-jvm/src/main/java/org/apache/streampipes/pe/jvm/config/AllPipelineElementsConfig.java index f640bee..ef76203 100644 --- a/streampipes-pipeline-elements-all-jvm/src/main/java/org/apache/streampipes/pe/jvm/config/AllPipelineElementsConfig.java +++ b/streampipes-pipeline-elements-all-jvm/src/main/java/org/apache/streampipes/pe/jvm/config/AllPipelineElementsConfig.java @@ -17,7 +17,8 @@ */ package org.apache.streampipes.pe.jvm.config; -import org.apache.streampipes.config.SpConfig; +import org.apache.streampipes.svcdiscovery.SpServiceDiscovery; +import org.apache.streampipes.svcdiscovery.api.SpConfig; import org.apache.streampipes.container.model.PeConfig; public enum AllPipelineElementsConfig implements PeConfig { @@ -32,7 +33,7 @@ public enum AllPipelineElementsConfig implements PeConfig { private final static String service_container_name = "pipeline-elements-all-jvm"; AllPipelineElementsConfig() { - config = SpConfig.getSpConfig(service_id); + config = SpServiceDiscovery.getSpConfig(service_id); config.register(ConfigKeys.HOST, service_container_name, "Hostname for the pe esper"); config.register(ConfigKeys.PORT, 8090, "Port for the pe esper"); diff --git a/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/config/AggregationFlinkConfig.java b/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/config/AggregationFlinkConfig.java index f635c1d..134a6cf 100644 --- a/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/config/AggregationFlinkConfig.java +++ b/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/config/AggregationFlinkConfig.java @@ -18,7 +18,7 @@ package org.apache.streampipes.processors.aggregation.flink.config; -import org.apache.streampipes.config.SpConfig; +import org.apache.streampipes.svcdiscovery.api.SpConfig; import org.apache.streampipes.container.model.PeConfig; public enum AggregationFlinkConfig implements PeConfig { diff --git a/streampipes-processors-change-detection-jvm/src/main/java/org/apache/streampipes/processors/changedetection/jvm/config/ChangeDetectionJvmConfig.java b/streampipes-processors-change-detection-jvm/src/main/java/org/apache/streampipes/processors/changedetection/jvm/config/ChangeDetectionJvmConfig.java index 4ac3880..e59c1fd 100644 --- a/streampipes-processors-change-detection-jvm/src/main/java/org/apache/streampipes/processors/changedetection/jvm/config/ChangeDetectionJvmConfig.java +++ b/streampipes-processors-change-detection-jvm/src/main/java/org/apache/streampipes/processors/changedetection/jvm/config/ChangeDetectionJvmConfig.java @@ -19,7 +19,8 @@ package org.apache.streampipes.processors.changedetection.jvm.config; -import org.apache.streampipes.config.SpConfig; +import org.apache.streampipes.svcdiscovery.SpServiceDiscovery; +import org.apache.streampipes.svcdiscovery.api.SpConfig; import org.apache.streampipes.container.model.PeConfig; public enum ChangeDetectionJvmConfig implements PeConfig { @@ -34,7 +35,7 @@ public enum ChangeDetectionJvmConfig implements PeConfig { private final static String service_container_name = "processors-change-detection-jvm"; ChangeDetectionJvmConfig() { - config = SpConfig.getSpConfig(service_id); + config = SpServiceDiscovery.getSpConfig(service_id); config.register(ConfigKeys.HOST, service_container_name, "Hostname for the pe esper"); config.register(ConfigKeys.PORT, 8090, "Port for the pe esper"); diff --git a/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/config/EnricherFlinkConfig.java b/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/config/EnricherFlinkConfig.java index 6157eee..909c187 100644 --- a/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/config/EnricherFlinkConfig.java +++ b/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/config/EnricherFlinkConfig.java @@ -18,7 +18,7 @@ package org.apache.streampipes.processors.enricher.flink.config; -import org.apache.streampipes.config.SpConfig; +import org.apache.streampipes.svcdiscovery.api.SpConfig; import org.apache.streampipes.container.model.PeConfig; public enum EnricherFlinkConfig implements PeConfig { diff --git a/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/config/EnricherJvmConfig.java b/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/config/EnricherJvmConfig.java index 9fdf539..d007a34 100644 --- a/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/config/EnricherJvmConfig.java +++ b/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/config/EnricherJvmConfig.java @@ -19,7 +19,8 @@ package org.apache.streampipes.processors.enricher.jvm.config; -import org.apache.streampipes.config.SpConfig; +import org.apache.streampipes.svcdiscovery.SpServiceDiscovery; +import org.apache.streampipes.svcdiscovery.api.SpConfig; import org.apache.streampipes.container.model.PeConfig; public enum EnricherJvmConfig implements PeConfig { @@ -34,7 +35,7 @@ public enum EnricherJvmConfig implements PeConfig { private final static String service_container_name = "processors-enricher-jvm"; EnricherJvmConfig() { - config = SpConfig.getSpConfig(service_id); + config = SpServiceDiscovery.getSpConfig(service_id); config.register(ConfigKeys.HOST, service_container_name, "Hostname for the pe esper"); config.register(ConfigKeys.PORT, 8090, "Port for the pe esper"); diff --git a/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/config/FiltersJvmConfig.java b/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/config/FiltersJvmConfig.java index 721898b..ec6acee 100644 --- a/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/config/FiltersJvmConfig.java +++ b/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/config/FiltersJvmConfig.java @@ -19,7 +19,8 @@ package org.apache.streampipes.processors.filters.jvm.config; -import org.apache.streampipes.config.SpConfig; +import org.apache.streampipes.svcdiscovery.SpServiceDiscovery; +import org.apache.streampipes.svcdiscovery.api.SpConfig; import org.apache.streampipes.container.model.PeConfig; public enum FiltersJvmConfig implements PeConfig { @@ -34,7 +35,7 @@ public enum FiltersJvmConfig implements PeConfig { private final static String service_container_name = "processors-filters-jvm"; FiltersJvmConfig() { - config = SpConfig.getSpConfig(service_id); + config = SpServiceDiscovery.getSpConfig(service_id); config.register(ConfigKeys.HOST, service_container_name, "Hostname for the pe esper"); config.register(ConfigKeys.PORT, 8090, "Port for the pe esper"); diff --git a/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/config/FilterSiddhiConfig.java b/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/config/FilterSiddhiConfig.java index e7a7274..af379df 100644 --- a/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/config/FilterSiddhiConfig.java +++ b/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/config/FilterSiddhiConfig.java @@ -19,7 +19,8 @@ package org.apache.streampipes.processors.siddhi.config; -import org.apache.streampipes.config.SpConfig; +import org.apache.streampipes.svcdiscovery.SpServiceDiscovery; +import org.apache.streampipes.svcdiscovery.api.SpConfig; import org.apache.streampipes.container.model.PeConfig; public enum FilterSiddhiConfig implements PeConfig { @@ -34,7 +35,7 @@ public enum FilterSiddhiConfig implements PeConfig { private final static String service_container_name = "processors-filters-siddhi"; FilterSiddhiConfig() { - config = SpConfig.getSpConfig(service_id); + config = SpServiceDiscovery.getSpConfig(service_id); config.register(ConfigKeys.HOST, service_container_name, "Hostname for the pe esper"); config.register(ConfigKeys.PORT, 8090, "Port for the pe esper"); diff --git a/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/config/GeoFlinkConfig.java b/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/config/GeoFlinkConfig.java index a21ba65..0f704ca 100644 --- a/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/config/GeoFlinkConfig.java +++ b/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/config/GeoFlinkConfig.java @@ -18,7 +18,7 @@ package org.apache.streampipes.processor.geo.flink.config; -import org.apache.streampipes.config.SpConfig; +import org.apache.streampipes.svcdiscovery.api.SpConfig; import org.apache.streampipes.container.model.PeConfig; public enum GeoFlinkConfig implements PeConfig { diff --git a/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/config/GeoJvmConfig.java b/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/config/GeoJvmConfig.java index 06881af..790853b 100644 --- a/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/config/GeoJvmConfig.java +++ b/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/config/GeoJvmConfig.java @@ -19,7 +19,8 @@ package org.apache.streampipes.processors.geo.jvm.config; -import org.apache.streampipes.config.SpConfig; +import org.apache.streampipes.svcdiscovery.SpServiceDiscovery; +import org.apache.streampipes.svcdiscovery.api.SpConfig; import org.apache.streampipes.container.model.PeConfig; public enum GeoJvmConfig implements PeConfig { @@ -34,7 +35,7 @@ public enum GeoJvmConfig implements PeConfig { private final static String service_container_name = "processors-geo-jvm"; GeoJvmConfig() { - config = SpConfig.getSpConfig(service_id); + config = SpServiceDiscovery.getSpConfig(service_id); config.register(ConfigKeys.HOST, service_container_name, "Hostname for the geo container"); config.register(ConfigKeys.PORT, 8090, "Port for the pe esper"); diff --git a/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/config/ImageProcessingJvmConfig.java b/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/config/ImageProcessingJvmConfig.java index 2fc24ea..6246557 100644 --- a/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/config/ImageProcessingJvmConfig.java +++ b/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/config/ImageProcessingJvmConfig.java @@ -19,10 +19,11 @@ package org.apache.streampipes.processors.imageprocessing.jvm.config; -import static org.apache.streampipes.processors.imageprocessing.jvm.config.ConfigKeys.*; - -import org.apache.streampipes.config.SpConfig; import org.apache.streampipes.container.model.PeConfig; +import org.apache.streampipes.svcdiscovery.SpServiceDiscovery; +import org.apache.streampipes.svcdiscovery.api.SpConfig; + +import static org.apache.streampipes.processors.imageprocessing.jvm.config.ConfigKeys.SERVICE_NAME_KEY; public enum ImageProcessingJvmConfig implements PeConfig { INSTANCE; @@ -36,7 +37,7 @@ public enum ImageProcessingJvmConfig implements PeConfig { private final static String service_container_name = "processors-image-processing-jvm"; ImageProcessingJvmConfig() { - config = SpConfig.getSpConfig(service_id); + config = SpServiceDiscovery.getSpConfig(service_id); config.register(ConfigKeys.HOST, service_container_name, "Hostname for the pe image processing"); config.register(ConfigKeys.PORT, 8090, "Port for the pe image processing"); diff --git a/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/config/PatternDetectionFlinkConfig.java b/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/config/PatternDetectionFlinkConfig.java index 69f27d3..fd12d75 100644 --- a/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/config/PatternDetectionFlinkConfig.java +++ b/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/config/PatternDetectionFlinkConfig.java @@ -18,7 +18,7 @@ package org.apache.streampipes.processors.pattern.detection.flink.config; -import org.apache.streampipes.config.SpConfig; +import org.apache.streampipes.svcdiscovery.api.SpConfig; import org.apache.streampipes.container.model.PeConfig; public enum PatternDetectionFlinkConfig implements PeConfig { diff --git a/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/config/StatisticsFlinkConfig.java b/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/config/StatisticsFlinkConfig.java index 9a437ca..da31662 100644 --- a/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/config/StatisticsFlinkConfig.java +++ b/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/config/StatisticsFlinkConfig.java @@ -18,7 +18,7 @@ package org.apache.streampipes.processors.statistics.flink.config; -import org.apache.streampipes.config.SpConfig; +import org.apache.streampipes.svcdiscovery.api.SpConfig; import org.apache.streampipes.container.model.PeConfig; public enum StatisticsFlinkConfig implements PeConfig { diff --git a/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/config/TextMiningFlinkConfig.java b/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/config/TextMiningFlinkConfig.java index 6c78a1a..f2d586d 100644 --- a/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/config/TextMiningFlinkConfig.java +++ b/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/config/TextMiningFlinkConfig.java @@ -18,7 +18,7 @@ package org.apache.streampipes.processors.textmining.flink.config; -import org.apache.streampipes.config.SpConfig; +import org.apache.streampipes.svcdiscovery.api.SpConfig; import org.apache.streampipes.container.model.PeConfig; public enum TextMiningFlinkConfig implements PeConfig { diff --git a/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/config/TextMiningJvmConfig.java b/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/config/TextMiningJvmConfig.java index d27ecfa..3ce9d8d 100644 --- a/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/config/TextMiningJvmConfig.java +++ b/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/config/TextMiningJvmConfig.java @@ -19,7 +19,8 @@ package org.apache.streampipes.processors.textmining.jvm.config; -import org.apache.streampipes.config.SpConfig; +import org.apache.streampipes.svcdiscovery.SpServiceDiscovery; +import org.apache.streampipes.svcdiscovery.api.SpConfig; import org.apache.streampipes.container.model.PeConfig; public enum TextMiningJvmConfig implements PeConfig { @@ -34,7 +35,7 @@ public enum TextMiningJvmConfig implements PeConfig { private final static String service_container_name = "processors-text-mining-jvm"; TextMiningJvmConfig() { - config = SpConfig.getSpConfig(service_id); + config = SpServiceDiscovery.getSpConfig(service_id); config.register(ConfigKeys.HOST, service_container_name, "Hostname for the pe text mining"); config.register(ConfigKeys.PORT, 8090, "Port for the pe text mining"); diff --git a/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/config/TransformationFlinkConfig.java b/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/config/TransformationFlinkConfig.java index 477699b..6872ec8 100644 --- a/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/config/TransformationFlinkConfig.java +++ b/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/config/TransformationFlinkConfig.java @@ -18,7 +18,7 @@ package org.apache.streampipes.processors.transformation.flink.config; -import org.apache.streampipes.config.SpConfig; +import org.apache.streampipes.svcdiscovery.api.SpConfig; import org.apache.streampipes.container.model.PeConfig; public enum TransformationFlinkConfig implements PeConfig { diff --git a/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/config/TransformationJvmConfig.java b/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/config/TransformationJvmConfig.java index e6cce8b..0e0b723 100644 --- a/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/config/TransformationJvmConfig.java +++ b/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/config/TransformationJvmConfig.java @@ -19,7 +19,8 @@ package org.apache.streampipes.processors.transformation.jvm.config; -import org.apache.streampipes.config.SpConfig; +import org.apache.streampipes.svcdiscovery.SpServiceDiscovery; +import org.apache.streampipes.svcdiscovery.api.SpConfig; import org.apache.streampipes.container.model.PeConfig; public enum TransformationJvmConfig implements PeConfig { @@ -34,7 +35,7 @@ public enum TransformationJvmConfig implements PeConfig { private final static String service_container_name = "processors-transformation-jvm"; TransformationJvmConfig() { - config = SpConfig.getSpConfig(service_id); + config = SpServiceDiscovery.getSpConfig(service_id); config.register(ConfigKeys.HOST, service_container_name, "Hostname for the pe esper"); config.register(ConfigKeys.PORT, 8090, "Port for the pe esper"); diff --git a/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/config/BrokersJvmConfig.java b/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/config/BrokersJvmConfig.java index a52f7e9..92d23f4 100644 --- a/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/config/BrokersJvmConfig.java +++ b/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/config/BrokersJvmConfig.java @@ -19,7 +19,8 @@ package org.apache.streampipes.sinks.brokers.jvm.config; -import org.apache.streampipes.config.SpConfig; +import org.apache.streampipes.svcdiscovery.SpServiceDiscovery; +import org.apache.streampipes.svcdiscovery.api.SpConfig; import org.apache.streampipes.container.model.PeConfig; public enum BrokersJvmConfig implements PeConfig { @@ -34,7 +35,7 @@ public enum BrokersJvmConfig implements PeConfig { private final static String service_container_name = "sinks-brokers-jvm"; BrokersJvmConfig() { - config = SpConfig.getSpConfig(service_id); + config = SpServiceDiscovery.getSpConfig(service_id); config.register(ConfigKeys.HOST, service_container_name, "Hostname for the pe esper"); config.register(ConfigKeys.PORT, 8090, "Port for the pe esper"); diff --git a/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/config/DatabasesFlinkConfig.java b/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/config/DatabasesFlinkConfig.java index a5b20d3..ee94215 100644 --- a/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/config/DatabasesFlinkConfig.java +++ b/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/config/DatabasesFlinkConfig.java @@ -18,7 +18,7 @@ package org.apache.streampipes.sinks.databases.flink.config; -import org.apache.streampipes.config.SpConfig; +import org.apache.streampipes.svcdiscovery.api.SpConfig; import org.apache.streampipes.container.model.PeConfig; public enum DatabasesFlinkConfig implements PeConfig { diff --git a/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/config/DatabasesJvmConfig.java b/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/config/DatabasesJvmConfig.java index 98f4921..f395f8b 100644 --- a/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/config/DatabasesJvmConfig.java +++ b/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/config/DatabasesJvmConfig.java @@ -19,7 +19,8 @@ package org.apache.streampipes.sinks.databases.jvm.config; -import org.apache.streampipes.config.SpConfig; +import org.apache.streampipes.svcdiscovery.SpServiceDiscovery; +import org.apache.streampipes.svcdiscovery.api.SpConfig; import org.apache.streampipes.container.model.PeConfig; public enum DatabasesJvmConfig implements PeConfig { @@ -34,7 +35,7 @@ public enum DatabasesJvmConfig implements PeConfig { private final static String service_container_name = "sinks-databases-jvm"; DatabasesJvmConfig() { - config = SpConfig.getSpConfig(service_id); + config = SpServiceDiscovery.getSpConfig(service_id); config.register(ConfigKeys.HOST, service_container_name, "Hostname for the pe esper"); config.register(ConfigKeys.PORT, 8090, "Port for the pe esper"); diff --git a/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/config/SinksInternalJvmConfig.java b/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/config/SinksInternalJvmConfig.java index 760e9cd..faf1b1d 100644 --- a/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/config/SinksInternalJvmConfig.java +++ b/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/config/SinksInternalJvmConfig.java @@ -19,7 +19,8 @@ package org.apache.streampipes.sinks.internal.jvm.config; -import org.apache.streampipes.config.SpConfig; +import org.apache.streampipes.svcdiscovery.SpServiceDiscovery; +import org.apache.streampipes.svcdiscovery.api.SpConfig; import org.apache.streampipes.container.model.PeConfig; public enum SinksInternalJvmConfig implements PeConfig { @@ -35,7 +36,7 @@ public enum SinksInternalJvmConfig implements PeConfig { SinksInternalJvmConfig() { - config = SpConfig.getSpConfig(service_id); + config = SpServiceDiscovery.getSpConfig(service_id); config.register(ConfigKeys.HOST, service_container_name, "Hostname for the pe esper"); config.register(ConfigKeys.PORT, 8090, "Port for the pe esper"); diff --git a/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/config/SinksNotificationsJvmConfig.java b/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/config/SinksNotificationsJvmConfig.java index 38c475c..7c9016d 100644 --- a/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/config/SinksNotificationsJvmConfig.java +++ b/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/config/SinksNotificationsJvmConfig.java @@ -19,7 +19,8 @@ package org.apache.streampipes.sinks.notifications.jvm.config; -import org.apache.streampipes.config.SpConfig; +import org.apache.streampipes.svcdiscovery.SpServiceDiscovery; +import org.apache.streampipes.svcdiscovery.api.SpConfig; import org.apache.streampipes.container.model.PeConfig; public enum SinksNotificationsJvmConfig implements PeConfig { @@ -35,7 +36,7 @@ public enum SinksNotificationsJvmConfig implements PeConfig { SinksNotificationsJvmConfig() { - config = SpConfig.getSpConfig(service_id); + config = SpServiceDiscovery.getSpConfig(service_id); config.register(ConfigKeys.HOST, service_container_name, "Hostname for the notifications module"); config.register(ConfigKeys.PORT, 8090, "Port for the pe esper"); diff --git a/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/email/EmailPublisher.java b/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/email/EmailPublisher.java index 7310a43..8ee229e 100644 --- a/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/email/EmailPublisher.java +++ b/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/email/EmailPublisher.java @@ -19,7 +19,7 @@ package org.apache.streampipes.sinks.notifications.jvm.email; import org.apache.streampipes.commons.exceptions.SpRuntimeException; -import org.apache.streampipes.config.SpConfig; +import org.apache.streampipes.svcdiscovery.api.SpConfig; import org.apache.streampipes.logging.api.Logger; import org.apache.streampipes.model.runtime.Event; import org.apache.streampipes.model.runtime.EventConverter; diff --git a/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/config/VehicleSimulatorConfig.java b/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/config/VehicleSimulatorConfig.java index 7fd8b38..35e4786 100644 --- a/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/config/VehicleSimulatorConfig.java +++ b/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/config/VehicleSimulatorConfig.java @@ -18,7 +18,8 @@ package org.apache.streampipes.sources.vehicle.simulator.config; -import org.apache.streampipes.config.SpConfig; +import org.apache.streampipes.svcdiscovery.SpServiceDiscovery; +import org.apache.streampipes.svcdiscovery.api.SpConfig; import org.apache.streampipes.container.model.PeConfig; public enum VehicleSimulatorConfig implements PeConfig { @@ -33,7 +34,7 @@ public enum VehicleSimulatorConfig implements PeConfig { public static String serverUrl; VehicleSimulatorConfig() { - config = SpConfig.getSpConfig(service_id); + config = SpServiceDiscovery.getSpConfig(service_id); /* TUTORIAL: diff --git a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/config/WatertankSimulatorConfig.java b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/config/WatertankSimulatorConfig.java index 43682fb..5bfd6c8 100644 --- a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/config/WatertankSimulatorConfig.java +++ b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/config/WatertankSimulatorConfig.java @@ -18,7 +18,8 @@ package org.apache.streampipes.sources.watertank.simulator.config; -import org.apache.streampipes.config.SpConfig; +import org.apache.streampipes.svcdiscovery.SpServiceDiscovery; +import org.apache.streampipes.svcdiscovery.api.SpConfig; import org.apache.streampipes.container.model.PeConfig; public enum WatertankSimulatorConfig implements PeConfig { @@ -33,7 +34,7 @@ public enum WatertankSimulatorConfig implements PeConfig { public static String serverUrl; WatertankSimulatorConfig() { - config = SpConfig.getSpConfig(service_id); + config = SpServiceDiscovery.getSpConfig(service_id); /* TUTORIAL:
