[incubator-streampipes] branch STREAMPIPES-319 updated: [STREAMPIPES-319] Refactor environment variable provider

[riemer]

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.git


The following commit(s) were added to refs/heads/STREAMPIPES-319 by this push:
     new c121c68  [STREAMPIPES-319] Refactor environment variable provider
c121c68 is described below

commit c121c68df7b3f75e1bd0a964be071e6d470efab4
Author: Dominik Riemer <rie...@fzi.de>
AuthorDate: Mon Apr 12 08:50:31 2021 +0200

    [STREAMPIPES-319] Refactor environment variable provider
---
 .../apache/streampipes/commons/constants/Envs.java | 24 ++++++++++++++--------
 .../streampipes/commons/networking/Networking.java |  8 ++++----
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git 
a/streampipes-commons/src/main/java/org/apache/streampipes/commons/constants/Envs.java
 
b/streampipes-commons/src/main/java/org/apache/streampipes/commons/constants/Envs.java
index 656c50a..1e06871 100644
--- 
a/streampipes-commons/src/main/java/org/apache/streampipes/commons/constants/Envs.java
+++ 
b/streampipes-commons/src/main/java/org/apache/streampipes/commons/constants/Envs.java
@@ -17,21 +17,27 @@
  */
 package org.apache.streampipes.commons.constants;
 
-public class Envs {
+public enum Envs {
 
-  public static String SP_HOST = "SP_HOST";
-  public static String SP_PORT = "SP_PORT";
+  SP_HOST("SP_HOST"),
+  SP_PORT("SP_PORT");
 
-  public static boolean existsEnv(String envVariable) {
-    return System.getenv().containsKey(envVariable);
+  private String envVariableName;
+
+  Envs(String envVariableName) {
+    this.envVariableName = envVariableName;
+  }
+
+  public boolean exists() {
+    return System.getenv().containsKey(this.envVariableName);
   }
 
-  public static String getEnv(String key) {
-    return System.getenv(key);
+  public String getValue() {
+    return System.getenv(this.envVariableName);
   }
 
-  public static Integer getEnvAsInt(String key) {
-    return Integer.parseInt(getEnv(key));
+  public Integer getValueAsInt() {
+    return Integer.parseInt(getValue());
   }
 
 }
diff --git 
a/streampipes-commons/src/main/java/org/apache/streampipes/commons/networking/Networking.java
 
b/streampipes-commons/src/main/java/org/apache/streampipes/commons/networking/Networking.java
index c142cbd..8c04dca 100644
--- 
a/streampipes-commons/src/main/java/org/apache/streampipes/commons/networking/Networking.java
+++ 
b/streampipes-commons/src/main/java/org/apache/streampipes/commons/networking/Networking.java
@@ -25,16 +25,16 @@ import java.net.UnknownHostException;
 public class Networking {
 
   public static String getHostname() throws UnknownHostException {
-    if (Envs.existsEnv(Envs.SP_HOST)) {
-      return Envs.getEnv(Envs.SP_HOST);
+    if (Envs.SP_HOST.exists()) {
+      return Envs.SP_HOST.getValue();
     } else {
         return InetAddress.getLocalHost().getHostAddress();
     }
   }
 
   public static Integer getPort(Integer defaultPort) {
-    if (Envs.existsEnv(Envs.SP_PORT)) {
-      return Envs.getEnvAsInt(Envs.SP_PORT);
+    if (Envs.SP_PORT.exists()) {
+      return Envs.SP_PORT.getValueAsInt();
     } else {
       return defaultPort;
     }