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:29 UTC

[incubator-streampipes-extensions] 02/04: [STREAMPIPES-319] Refactor config of watertank simulator service

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();
   }