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 2021/07/13 09:18:27 UTC
[incubator-streampipes-extensions] branch STREAMPIPES-319 updated
(1b6daa0 -> 2647b97)
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a change to branch STREAMPIPES-319
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-extensions.git.
from 1b6daa0 Merge branch 'dev' into STREAMPIPES-319
new e3cf1be [STREAMPIPES-319] Refactor config management
new bb7a300 [STREAMPIPES-319] Refactor config of watertank simulator service
new 3559fb4 [STREAMPIPES-319] Refactor config of vehicle simulator service
new 2647b97 [STREAMPIPES-319] Remove config provider of notifications service
The 4 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.
Summary of changes:
.../connect/config/ConnectWorkerConfig.java | 5 +-
.../all/jvm/config/AllExtensionsConfig.java | 2 +-
.../apache/streampipes/pe/flink/config/Config.java | 2 +-
.../pe/jvm/config/AllPipelineElementsConfig.java | 5 +-
.../flink/config/AggregationFlinkConfig.java | 2 +-
.../jvm/config/ChangeDetectionJvmConfig.java | 5 +-
.../enricher/flink/config/EnricherFlinkConfig.java | 2 +-
.../enricher/jvm/config/EnricherJvmConfig.java | 5 +-
.../filters/jvm/config/FiltersJvmConfig.java | 5 +-
.../siddhi/config/FilterSiddhiConfig.java | 5 +-
.../processor/geo/flink/config/GeoFlinkConfig.java | 2 +-
.../processors/geo/jvm/config/GeoJvmConfig.java | 5 +-
.../jvm/config/ImageProcessingJvmConfig.java | 9 +-
.../flink/config/PatternDetectionFlinkConfig.java | 2 +-
.../flink/config/StatisticsFlinkConfig.java | 2 +-
.../flink/config/TextMiningFlinkConfig.java | 2 +-
.../textmining/jvm/config/TextMiningJvmConfig.java | 5 +-
.../flink/config/TransformationFlinkConfig.java | 2 +-
.../jvm/config/TransformationJvmConfig.java | 5 +-
.../sinks/brokers/jvm/config/BrokersJvmConfig.java | 5 +-
.../flink/config/DatabasesFlinkConfig.java | 2 +-
.../databases/jvm/config/DatabasesJvmConfig.java | 5 +-
.../jvm/config/SinksInternalJvmConfig.java | 5 +-
.../jvm/SinksNotificationsJvmInit.java | 2 +-
.../sinks/notifications/jvm/config/ConfigKeys.java | 8 --
.../jvm/config/SinksNotificationsJvmConfig.java | 108 ---------------------
.../notifications/jvm/email/EmailPublisher.java | 2 +-
.../vehicle/simulator/VehicleSimulatorInit.java | 19 +++-
.../vehicle/simulator/config/ConfigKeys.java | 8 +-
.../simulator/config/VehicleSimulatorConfig.java | 84 ----------------
.../simulator/simulator/VehicleDataSimulator.java | 9 +-
.../simulator/vehicle/streams/VehicleStream.java | 6 +-
.../simulator/WatertankSimulatorInit.java | 28 ++++--
.../watertank/simulator/config/ConfigKeys.java | 8 +-
.../simulator/config/WatertankSimulatorConfig.java | 84 ----------------
.../simulator/utils/WatertankDataSimulator.java | 9 +-
.../watertank/streams/FlowRate1Stream.java | 9 +-
.../watertank/streams/FlowRate2Stream.java | 6 +-
.../watertank/streams/PressureTankStream.java | 6 +-
.../watertank/streams/WaterLevel1Stream.java | 6 +-
.../watertank/streams/WaterLevel2Stream.java | 6 +-
41 files changed, 129 insertions(+), 368 deletions(-)
delete mode 100644 streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/config/SinksNotificationsJvmConfig.java
delete mode 100644 streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/config/VehicleSimulatorConfig.java
delete mode 100644 streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/config/WatertankSimulatorConfig.java
[incubator-streampipes-extensions] 03/04: [STREAMPIPES-319]
Refactor config of vehicle simulator service
Posted by ri...@apache.org.
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 3559fb4a0c802b3ebb37dd3567d18bd587ad3310
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Tue Jul 13 11:05:15 2021 +0200
[STREAMPIPES-319] Refactor config of vehicle simulator service
---
.../vehicle/simulator/VehicleSimulatorInit.java | 19 ++++-
.../vehicle/simulator/config/ConfigKeys.java | 8 +-
.../simulator/config/VehicleSimulatorConfig.java | 85 ----------------------
.../simulator/simulator/VehicleDataSimulator.java | 9 ++-
.../simulator/vehicle/streams/VehicleStream.java | 6 +-
5 files changed, 27 insertions(+), 100 deletions(-)
diff --git a/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/VehicleSimulatorInit.java b/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/VehicleSimulatorInit.java
index 6daff2b..3320e06 100644
--- a/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/VehicleSimulatorInit.java
+++ b/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/VehicleSimulatorInit.java
@@ -18,16 +18,27 @@
package org.apache.streampipes.sources.vehicle.simulator;
-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.sources.vehicle.simulator.config.VehicleSimulatorConfig;
+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 static void main(String[] args) {
- DeclarersSingleton.getInstance().add(new VehicleStream());
+ new VehicleSimulatorInit().init();
+ }
- new VehicleSimulatorInit().init(VehicleSimulatorConfig.INSTANCE);
+ @Override
+ public SpServiceDefinition provideServiceDefinition() {
+ return SpServiceDefinitionBuilder.create("org-apache-streampipes-sources-simulator-vehicle",
+ "Vehicle Simulator",
+ "",
+ 8090)
+ .registerPipelineElement(new VehicleStream())
+ .addConfig(ConfigKeys.KAFKA_HOST, "kafka", "Host for kafka of the vehicle simulator")
+ .addConfig(ConfigKeys.KAFKA_PORT, 9092, "Port for kafka of the vehicle simulator")
+ .build();
}
}
diff --git a/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/config/ConfigKeys.java b/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/config/ConfigKeys.java
index 606eb61..4f2d718 100644
--- a/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/config/ConfigKeys.java
+++ b/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/config/ConfigKeys.java
@@ -19,10 +19,6 @@
package org.apache.streampipes.sources.vehicle.simulator.config;
public class ConfigKeys {
-
- final static String HOST = "SP_HOST";
- final static String PORT = "SP_PORT";
- final static String KAFKA_HOST = "SP_KAFKA_HOST";
- final static String KAFKA_PORT = "SP_KAFKA_PORT";
- final static String SERVICE_NAME = "SP_SERVICE_NAME";
+ public final static String KAFKA_HOST = "SP_KAFKA_HOST";
+ public final static String KAFKA_PORT = "SP_KAFKA_PORT";
}
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
deleted file mode 100644
index 35e4786..0000000
--- a/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/config/VehicleSimulatorConfig.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.streampipes.sources.vehicle.simulator.config;
-
-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 {
- INSTANCE;
-
-
- private final static String service_id = "pe/org.apache.streampipes.sources.vehicle.simulator";
- private final static String service_name = "Sources Vehicle Simulator";
- private final static String service_container_name = "sources-vehicle-simulator";
-
- private SpConfig config;
- public static String serverUrl;
-
- VehicleSimulatorConfig() {
- config = SpServiceDiscovery.getSpConfig(service_id);
-
- /*
- TUTORIAL:
- The second parameter is the default value for the configuration property.
- This value is set in Consul when the parameter does not exist.
- Important. Changes here are not effective if the configuration parameter is already set in consul. In
- such cases the value has to be changed in consul directly.
- */
- config.register(ConfigKeys.HOST, service_container_name, "Hostname for the examples-sources project");
- config.register(ConfigKeys.PORT, 8090, "Port of the sources project");
- config.register(ConfigKeys.KAFKA_HOST, "kafka", "Host for kafka of the pe demonstrator project");
- config.register(ConfigKeys.KAFKA_PORT, 9092, "Port for kafka of the pe demonstrator project");
- config.register(ConfigKeys.SERVICE_NAME, service_name, "StreamPipes example sources");
- }
-
- static {
- serverUrl = VehicleSimulatorConfig.INSTANCE.getHost() + ":" + VehicleSimulatorConfig.INSTANCE.getPort();
- }
-
- @Override
- public String getHost() {
- return config.getString(ConfigKeys.HOST);
- }
-
- @Override
- public int getPort() {
- return config.getInteger(ConfigKeys.PORT);
- }
-
- public String getKafkaHost() {
- return config.getString(ConfigKeys.KAFKA_HOST);
- }
-
- public int getKafkaPort() {
- return config.getInteger(ConfigKeys.KAFKA_PORT);
- }
-
- @Override
- public String getId() {
- return service_id;
- }
-
- @Override
- public String getName() {
- return config.getString(ConfigKeys.SERVICE_NAME);
- }
-
-}
diff --git a/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/simulator/VehicleDataSimulator.java b/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/simulator/VehicleDataSimulator.java
index 99bbbe3..f36b0b4 100644
--- a/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/simulator/VehicleDataSimulator.java
+++ b/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/simulator/VehicleDataSimulator.java
@@ -21,9 +21,11 @@ package org.apache.streampipes.sources.vehicle.simulator.simulator;
import net.acesinc.data.json.generator.config.JSONConfigReader;
import net.acesinc.data.json.generator.config.SimulationConfig;
import net.acesinc.data.json.generator.config.WorkflowConfig;
+import org.apache.streampipes.container.config.ConfigExtractor;
+import org.apache.streampipes.container.init.DeclarersSingleton;
import org.apache.streampipes.pe.simulator.StreamPipesSimulationRunner;
import org.apache.streampipes.pe.simulator.TopicAwareWorkflow;
-import org.apache.streampipes.sources.vehicle.simulator.config.VehicleSimulatorConfig;
+import org.apache.streampipes.sources.vehicle.simulator.config.ConfigKeys;
import java.io.IOException;
import java.util.HashMap;
@@ -35,10 +37,11 @@ public class VehicleDataSimulator implements Runnable {
private void initSimulation() {
try {
+ ConfigExtractor configExtractor = ConfigExtractor.from(DeclarersSingleton.getInstance().getServiceDefinition().getServiceGroup());
SimulationConfig config = buildSimulationConfig();
Map<String, TopicAwareWorkflow> workflows = buildSimWorkflows(config);
- String kafkaHost = VehicleSimulatorConfig.INSTANCE.getKafkaHost();
- Integer kafkaPort = VehicleSimulatorConfig.INSTANCE.getKafkaPort();
+ String kafkaHost = configExtractor.getConfig().getString(ConfigKeys.KAFKA_HOST);
+ Integer kafkaPort = configExtractor.getConfig().getInteger(ConfigKeys.KAFKA_PORT);
new StreamPipesSimulationRunner(config, workflows, kafkaHost, kafkaPort).startSimulation();
} catch (IOException e) {
diff --git a/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/vehicle/streams/VehicleStream.java b/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/vehicle/streams/VehicleStream.java
index 30a93fd..63fc6d1 100644
--- a/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/vehicle/streams/VehicleStream.java
+++ b/streampipes-sources-vehicle-simulator/src/main/java/org/apache/streampipes/sources/vehicle/simulator/vehicle/streams/VehicleStream.java
@@ -26,7 +26,7 @@ import org.apache.streampipes.sdk.helpers.Formats;
import org.apache.streampipes.sdk.helpers.Labels;
import org.apache.streampipes.sdk.helpers.Protocols;
import org.apache.streampipes.sources.AbstractAdapterIncludedStream;
-import org.apache.streampipes.sources.vehicle.simulator.config.VehicleSimulatorConfig;
+import org.apache.streampipes.sources.vehicle.simulator.config.ConfigKeys;
import org.apache.streampipes.sources.vehicle.simulator.simulator.VehicleDataSimulator;
import org.apache.streampipes.vocabulary.Geo;
@@ -45,7 +45,9 @@ public class VehicleStream extends AbstractAdapterIncludedStream {
.property(EpProperties.doubleEp(Labels.from("longitude", "Longitude", "Denotes the longitude " +
"value of the vehicle's position"), "longitude", Geo.lng))
.format(Formats.jsonFormat())
- .protocol(Protocols.kafka(VehicleSimulatorConfig.INSTANCE.getKafkaHost(), VehicleSimulatorConfig.INSTANCE.getKafkaPort(),
+ .protocol(Protocols.kafka(
+ configExtractor().getConfig().getString(ConfigKeys.KAFKA_HOST),
+ configExtractor().getConfig().getInteger(ConfigKeys.KAFKA_PORT),
"org.apache.streampipes.examples.sources.vehicle"))
.build();
}
[incubator-streampipes-extensions] 04/04: [STREAMPIPES-319] Remove
config provider of notifications service
Posted by ri...@apache.org.
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 2647b975d318262c61ae33d7c7e126d1875c513f
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Tue Jul 13 11:07:25 2021 +0200
[STREAMPIPES-319] Remove config provider of notifications service
---
.../jvm/SinksNotificationsJvmInit.java | 2 +-
.../sinks/notifications/jvm/config/ConfigKeys.java | 8 --
.../jvm/config/SinksNotificationsJvmConfig.java | 109 ---------------------
3 files changed, 1 insertion(+), 118 deletions(-)
diff --git a/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/SinksNotificationsJvmInit.java b/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/SinksNotificationsJvmInit.java
index e5aa4a4..20c94ac 100644
--- a/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/SinksNotificationsJvmInit.java
+++ b/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/SinksNotificationsJvmInit.java
@@ -45,7 +45,7 @@ public class SinksNotificationsJvmInit extends StandaloneModelSubmitter {
return SpServiceDefinitionBuilder.create("org.apache.streampipes.sinks.notifications.jvm",
"Sinks Notifications JVM",
"",
- 8096)
+ 8090)
.registerPipelineElements(
new EmailController(),
new OneSignalController(),
diff --git a/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/config/ConfigKeys.java b/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/config/ConfigKeys.java
index 2726cfd..f69d0a7 100644
--- a/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/config/ConfigKeys.java
+++ b/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/config/ConfigKeys.java
@@ -19,14 +19,6 @@
package org.apache.streampipes.sinks.notifications.jvm.config;
public class ConfigKeys {
- public static final String SLACK_NOT_INITIALIZED = "SLACK_NOT_INITIALIZED";
-
- final static String HOST = "SP_HOST";
- final static String PORT = "SP_PORT";
- final static String ICON_HOST = "SP_ICON_HOST";
- final static String ICON_PORT = "SP_ICON_PORT";
- final static String SERVICE_NAME = "SP_SERVICE_NAME";
-
public final static String EMAIL_FROM = "SP_EMAIL_FROM";
public final static String EMAIL_USERNAME = "SP_EMAIL_USERNAME";
public final static String EMAIL_PASSWORD = "SP_EMAIL_PASSWORD";
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
deleted file mode 100644
index 7c9016d..0000000
--- a/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/config/SinksNotificationsJvmConfig.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.streampipes.sinks.notifications.jvm.config;
-
-
-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 {
- INSTANCE;
-
- private SpConfig config;
-
- public final static String serverUrl;
-
- private final static String service_id = "pe/org.apache.streampipes.sinks.notifications.jvm";
- private final static String service_name = "Sinks Notifications JVM";
- private final static String service_container_name = "sinks-notifications-jvm";
-
-
- SinksNotificationsJvmConfig() {
- 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");
-
- config.register(ConfigKeys.EMAIL_FROM, "", "The Email adress which send from");
- config.register(ConfigKeys.EMAIL_USERNAME, "", "The username of the email account");
- config.registerPassword(ConfigKeys.EMAIL_PASSWORD, "", "The password of the email account");
- config.register(ConfigKeys.EMAIL_SMTP_HOST, "", "The SMTP Host");
- config.register(ConfigKeys.EMAIL_SMTP_PORT, "", "The SMTP Port");
- config.register(ConfigKeys.EMAIL_STARTTLS, false, "Use startls?");
- config.register(ConfigKeys.EMAIL_SLL, false, "Use SLL?");
- config.register(ConfigKeys.WEBSOCKET_PROTOCOL, "ws", "");
-
- config.register(ConfigKeys.SERVICE_NAME, service_name, "The name of the service");
-
- }
-
- static {
- serverUrl = SinksNotificationsJvmConfig.INSTANCE.getHost() + ":" + SinksNotificationsJvmConfig.INSTANCE.getPort();
- }
-
- @Override
- public String getHost() {
- return config.getString(ConfigKeys.HOST);
- }
-
- @Override
- public int getPort() {
- return config.getInteger(ConfigKeys.PORT);
- }
-
- public String getEmailFrom() {
- return config.getString(ConfigKeys.EMAIL_FROM);
- }
-
- public String getEmailUsername() {
- return config.getString(ConfigKeys.EMAIL_USERNAME);
- }
-
- public String getEmailPassword() {
- return config.getString(ConfigKeys.EMAIL_PASSWORD);
- }
-
- public String getEmailSmtpHost() {
- return config.getString(ConfigKeys.EMAIL_SMTP_HOST);
- }
-
- public int getEmailSmtpPort() {
- return config.getInteger(ConfigKeys.EMAIL_SMTP_PORT);
- }
-
- public boolean useEmailStarttls() {
- return config.getBoolean(ConfigKeys.EMAIL_STARTTLS);
- }
-
- public boolean useEmailSll() {
- return config.getBoolean(ConfigKeys.EMAIL_SLL);
- }
-
- @Override
- public String getId() {
- return service_id;
- }
-
- @Override
- public String getName() {
- return config.getString(ConfigKeys.SERVICE_NAME);
- }
-
-
-}
[incubator-streampipes-extensions] 02/04: [STREAMPIPES-319]
Refactor config of watertank simulator service
Posted by ri...@apache.org.
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 bb7a3000ae7fa93cc6816c9614ba29ab837adbcc
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Tue Jul 13 11:00:14 2021 +0200
[STREAMPIPES-319] Refactor config of watertank simulator service
---
.../simulator/WatertankSimulatorInit.java | 28 ++++---
.../watertank/simulator/config/ConfigKeys.java | 8 +-
.../simulator/config/WatertankSimulatorConfig.java | 85 ----------------------
.../simulator/utils/WatertankDataSimulator.java | 9 ++-
.../watertank/streams/FlowRate1Stream.java | 9 ++-
.../watertank/streams/FlowRate2Stream.java | 6 +-
.../watertank/streams/PressureTankStream.java | 6 +-
.../watertank/streams/WaterLevel1Stream.java | 6 +-
.../watertank/streams/WaterLevel2Stream.java | 6 +-
9 files changed, 49 insertions(+), 114 deletions(-)
diff --git a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/WatertankSimulatorInit.java b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/WatertankSimulatorInit.java
index b241e1b..c5a051a 100644
--- a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/WatertankSimulatorInit.java
+++ b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/WatertankSimulatorInit.java
@@ -18,21 +18,31 @@
package org.apache.streampipes.sources.watertank.simulator;
-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.sources.watertank.simulator.config.WatertankSimulatorConfig;
+import org.apache.streampipes.sources.watertank.simulator.config.ConfigKeys;
import org.apache.streampipes.sources.watertank.simulator.watertank.streams.*;
public class WatertankSimulatorInit extends StandaloneModelSubmitter {
public static void main(String[] args) {
- DeclarersSingleton.getInstance()
- .add(new FlowRate1Stream())
- .add(new FlowRate2Stream())
- .add(new PressureTankStream())
- .add(new WaterLevel1Stream())
- .add(new WaterLevel2Stream());
+ new WatertankSimulatorInit().init();
+ }
- new WatertankSimulatorInit().init(WatertankSimulatorConfig.INSTANCE);
+ @Override
+ public SpServiceDefinition provideServiceDefinition() {
+ return SpServiceDefinitionBuilder.create("org-apache-streampipes-sources-simulator-watertank",
+ "Watertank Simulator",
+ "",
+ 8090)
+ .registerPipelineElement(new FlowRate1Stream())
+ .registerPipelineElement(new FlowRate2Stream())
+ .registerPipelineElement(new PressureTankStream())
+ .registerPipelineElement(new WaterLevel1Stream())
+ .registerPipelineElement(new WaterLevel2Stream())
+ .addConfig(ConfigKeys.KAFKA_HOST, "kafka", "Host for kafka of the watertank simulator")
+ .addConfig(ConfigKeys.KAFKA_PORT, 9092, "Port for kafka of the watertank simulator")
+ .build();
}
}
diff --git a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/config/ConfigKeys.java b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/config/ConfigKeys.java
index ffd72c8..99b053b 100644
--- a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/config/ConfigKeys.java
+++ b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/config/ConfigKeys.java
@@ -19,10 +19,6 @@
package org.apache.streampipes.sources.watertank.simulator.config;
public class ConfigKeys {
-
- final static String HOST = "SP_HOST";
- final static String PORT = "SP_PORT";
- final static String KAFKA_HOST = "SP_KAFKA_HOST";
- final static String KAFKA_PORT = "SP_KAFKA_PORT";
- final static String SERVICE_NAME = "SP_SERVICE_NAME";
+ public final static String KAFKA_HOST = "SP_KAFKA_HOST";
+ public final static String KAFKA_PORT = "SP_KAFKA_PORT";
}
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
deleted file mode 100644
index 5bfd6c8..0000000
--- a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/config/WatertankSimulatorConfig.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.streampipes.sources.watertank.simulator.config;
-
-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 {
- INSTANCE;
-
-
- private final static String service_id = "pe/org.apache.streampipes.sources.watertank.simulator";
- private final static String service_name = "Sources Watertank Simulator";
- private final static String service_container_name = "sources-watertank-simulator";
-
- private SpConfig config;
- public static String serverUrl;
-
- WatertankSimulatorConfig() {
- config = SpServiceDiscovery.getSpConfig(service_id);
-
- /*
- TUTORIAL:
- The second parameter is the default value for the configuration property.
- This value is set in Consul when the parameter does not exist.
- Important. Changes here are not effective if the configuration parameter is already set in consul. In
- such cases the value has to be changed in consul directly.
- */
- config.register(ConfigKeys.HOST, service_container_name, "Hostname for the examples-sources project");
- config.register(ConfigKeys.PORT, 8090, "Port of the sources project");
- config.register(ConfigKeys.KAFKA_HOST, "kafka", "Host for kafka of the pe demonstrator project");
- config.register(ConfigKeys.KAFKA_PORT, 9092, "Port for kafka of the pe demonstrator project");
- config.register(ConfigKeys.SERVICE_NAME, service_name, "StreamPipes example sources");
- }
-
- static {
- serverUrl = WatertankSimulatorConfig.INSTANCE.getHost() + ":" + WatertankSimulatorConfig.INSTANCE.getPort();
- }
-
- @Override
- public String getHost() {
- return config.getString(ConfigKeys.HOST);
- }
-
- @Override
- public int getPort() {
- return config.getInteger(ConfigKeys.PORT);
- }
-
- public String getKafkaHost() {
- return config.getString(ConfigKeys.KAFKA_HOST);
- }
-
- public int getKafkaPort() {
- return config.getInteger(ConfigKeys.KAFKA_PORT);
- }
-
- @Override
- public String getId() {
- return service_id;
- }
-
- @Override
- public String getName() {
- return config.getString(ConfigKeys.SERVICE_NAME);
- }
-
-}
diff --git a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/utils/WatertankDataSimulator.java b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/utils/WatertankDataSimulator.java
index d1713eb..ad0d0c6 100644
--- a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/utils/WatertankDataSimulator.java
+++ b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/utils/WatertankDataSimulator.java
@@ -21,9 +21,11 @@ package org.apache.streampipes.sources.watertank.simulator.utils;
import net.acesinc.data.json.generator.config.JSONConfigReader;
import net.acesinc.data.json.generator.config.SimulationConfig;
import net.acesinc.data.json.generator.config.WorkflowConfig;
+import org.apache.streampipes.container.config.ConfigExtractor;
+import org.apache.streampipes.container.init.DeclarersSingleton;
import org.apache.streampipes.pe.simulator.StreamPipesSimulationRunner;
import org.apache.streampipes.pe.simulator.TopicAwareWorkflow;
-import org.apache.streampipes.sources.watertank.simulator.config.WatertankSimulatorConfig;
+import org.apache.streampipes.sources.watertank.simulator.config.ConfigKeys;
import java.io.IOException;
import java.util.HashMap;
@@ -35,10 +37,11 @@ public class WatertankDataSimulator implements Runnable {
private void initSimulation() {
try {
+ ConfigExtractor configExtractor = ConfigExtractor.from(DeclarersSingleton.getInstance().getServiceDefinition().getServiceGroup());
SimulationConfig config = buildSimulationConfig();
Map<String, TopicAwareWorkflow> workflows = buildSimWorkflows(config);
- String kafkaHost = WatertankSimulatorConfig.INSTANCE.getKafkaHost();
- Integer kafkaPort = WatertankSimulatorConfig.INSTANCE.getKafkaPort();
+ String kafkaHost = configExtractor.getConfig().getString(ConfigKeys.KAFKA_HOST);
+ Integer kafkaPort = configExtractor.getConfig().getInteger(ConfigKeys.KAFKA_PORT);
new StreamPipesSimulationRunner(config, workflows, kafkaHost, kafkaPort).startSimulation();
} catch (IOException e) {
diff --git a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/FlowRate1Stream.java b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/FlowRate1Stream.java
index 781755d..65989ee 100644
--- a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/FlowRate1Stream.java
+++ b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/FlowRate1Stream.java
@@ -29,7 +29,7 @@ import org.apache.streampipes.sdk.helpers.Protocols;
import org.apache.streampipes.sdk.utils.Assets;
import org.apache.streampipes.sdk.utils.Datatypes;
import org.apache.streampipes.sources.AbstractAdapterIncludedStream;
-import org.apache.streampipes.sources.watertank.simulator.config.WatertankSimulatorConfig;
+import org.apache.streampipes.sources.watertank.simulator.config.ConfigKeys;
import org.apache.streampipes.sources.watertank.simulator.utils.WatertankDataSimulator;
import org.apache.streampipes.sources.watertank.simulator.vocabulary.WaterTankVocabulary;
@@ -67,8 +67,11 @@ public class FlowRate1Stream extends AbstractAdapterIncludedStream {
.valueSpecification(0.0f, 100.0f, 0.1f)
.build())
.format(Formats.jsonFormat())
- .protocol(Protocols.kafka(WatertankSimulatorConfig.INSTANCE.getKafkaHost(), WatertankSimulatorConfig.INSTANCE.getKafkaPort(),
- "org.apache.streampipes.examples.flowrate-1"))
+ .protocol(Protocols.kafka(
+ configExtractor().getConfig().getString(ConfigKeys.KAFKA_HOST),
+ configExtractor().getConfig().getInteger(ConfigKeys.KAFKA_PORT),
+ "org.apache.streampipes.examples.flowrate-1")
+ )
.build();
}
diff --git a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/FlowRate2Stream.java b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/FlowRate2Stream.java
index efb281b..a8d0284 100644
--- a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/FlowRate2Stream.java
+++ b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/FlowRate2Stream.java
@@ -29,7 +29,7 @@ import org.apache.streampipes.sdk.helpers.Protocols;
import org.apache.streampipes.sdk.utils.Assets;
import org.apache.streampipes.sdk.utils.Datatypes;
import org.apache.streampipes.sources.AbstractAlreadyExistingStream;
-import org.apache.streampipes.sources.watertank.simulator.config.WatertankSimulatorConfig;
+import org.apache.streampipes.sources.watertank.simulator.config.ConfigKeys;
import org.apache.streampipes.sources.watertank.simulator.vocabulary.WaterTankVocabulary;
public class FlowRate2Stream extends AbstractAlreadyExistingStream {
@@ -84,7 +84,9 @@ public class FlowRate2Stream extends AbstractAlreadyExistingStream {
.scope(PropertyScope.MEASUREMENT_PROPERTY)
.build())
.format(Formats.jsonFormat())
- .protocol(Protocols.kafka(WatertankSimulatorConfig.INSTANCE.getKafkaHost(), WatertankSimulatorConfig.INSTANCE.getKafkaPort(),
+ .protocol(Protocols.kafka(
+ configExtractor().getConfig().getString(ConfigKeys.KAFKA_HOST),
+ configExtractor().getConfig().getInteger(ConfigKeys.KAFKA_PORT),
"org.apache.streampipes.examples.flowrate2"))
.build();
}
diff --git a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/PressureTankStream.java b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/PressureTankStream.java
index 436dce0..8d98187 100644
--- a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/PressureTankStream.java
+++ b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/PressureTankStream.java
@@ -29,7 +29,7 @@ import org.apache.streampipes.sdk.helpers.Protocols;
import org.apache.streampipes.sdk.utils.Assets;
import org.apache.streampipes.sdk.utils.Datatypes;
import org.apache.streampipes.sources.AbstractAlreadyExistingStream;
-import org.apache.streampipes.sources.watertank.simulator.config.WatertankSimulatorConfig;
+import org.apache.streampipes.sources.watertank.simulator.config.ConfigKeys;
import org.apache.streampipes.sources.watertank.simulator.vocabulary.WaterTankVocabulary;
public class PressureTankStream extends AbstractAlreadyExistingStream {
@@ -56,7 +56,9 @@ public class PressureTankStream extends AbstractAlreadyExistingStream {
.scope(PropertyScope.MEASUREMENT_PROPERTY)
.build())
.format(Formats.jsonFormat())
- .protocol(Protocols.kafka(WatertankSimulatorConfig.INSTANCE.getKafkaHost(), WatertankSimulatorConfig.INSTANCE.getKafkaPort(),
+ .protocol(Protocols.kafka(
+ configExtractor().getConfig().getString(ConfigKeys.KAFKA_HOST),
+ configExtractor().getConfig().getInteger(ConfigKeys.KAFKA_PORT),
"org.apache.streampipes.examples.pressuretank"))
.build();
}
diff --git a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/WaterLevel1Stream.java b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/WaterLevel1Stream.java
index cdea01b..25225b3 100644
--- a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/WaterLevel1Stream.java
+++ b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/WaterLevel1Stream.java
@@ -29,7 +29,7 @@ import org.apache.streampipes.sdk.helpers.Protocols;
import org.apache.streampipes.sdk.utils.Assets;
import org.apache.streampipes.sdk.utils.Datatypes;
import org.apache.streampipes.sources.AbstractAlreadyExistingStream;
-import org.apache.streampipes.sources.watertank.simulator.config.WatertankSimulatorConfig;
+import org.apache.streampipes.sources.watertank.simulator.config.ConfigKeys;
import org.apache.streampipes.sources.watertank.simulator.utils.WatertankDataSimulator;
import org.apache.streampipes.sources.watertank.simulator.vocabulary.WaterTankVocabulary;
@@ -70,7 +70,9 @@ public class WaterLevel1Stream extends AbstractAlreadyExistingStream {
.scope(PropertyScope.MEASUREMENT_PROPERTY)
.build())
.format(Formats.jsonFormat())
- .protocol(Protocols.kafka(WatertankSimulatorConfig.INSTANCE.getKafkaHost(), WatertankSimulatorConfig.INSTANCE.getKafkaPort(),
+ .protocol(Protocols.kafka(
+ configExtractor().getConfig().getString(ConfigKeys.KAFKA_HOST),
+ configExtractor().getConfig().getInteger(ConfigKeys.KAFKA_PORT),
"org.apache.streampipes.examples.waterlevel"))
.build();
}
diff --git a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/WaterLevel2Stream.java b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/WaterLevel2Stream.java
index c1a33e4..f45aa54 100644
--- a/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/WaterLevel2Stream.java
+++ b/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/WaterLevel2Stream.java
@@ -29,7 +29,7 @@ import org.apache.streampipes.sdk.helpers.Protocols;
import org.apache.streampipes.sdk.utils.Assets;
import org.apache.streampipes.sdk.utils.Datatypes;
import org.apache.streampipes.sources.AbstractAlreadyExistingStream;
-import org.apache.streampipes.sources.watertank.simulator.config.WatertankSimulatorConfig;
+import org.apache.streampipes.sources.watertank.simulator.config.ConfigKeys;
import org.apache.streampipes.sources.watertank.simulator.vocabulary.WaterTankVocabulary;
public class WaterLevel2Stream extends AbstractAlreadyExistingStream {
@@ -62,7 +62,9 @@ public class WaterLevel2Stream extends AbstractAlreadyExistingStream {
.scope(PropertyScope.MEASUREMENT_PROPERTY)
.build())
.format(Formats.jsonFormat())
- .protocol(Protocols.kafka(WatertankSimulatorConfig.INSTANCE.getKafkaHost(), WatertankSimulatorConfig.INSTANCE.getKafkaPort(),
+ .protocol(Protocols.kafka(
+ configExtractor().getConfig().getString(ConfigKeys.KAFKA_HOST),
+ configExtractor().getConfig().getInteger(ConfigKeys.KAFKA_PORT),
"org.apache.streampipes.examples.waterlevel2"))
.build();
}
[incubator-streampipes-extensions] 01/04: [STREAMPIPES-319]
Refactor config management
Posted by ri...@apache.org.
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 <ri...@fzi.de>
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: