refactor integer logic to getInteger

Consensys · Feb 24, 2020 · e691f7c · e691f7c
1 parent c9cde27
commit e691f7c
Showing 1 changed file with 14 additions and 18 deletions.
diff --git a/src/main/java/net/consensys/orion/config/Config.java b/src/main/java/net/consensys/orion/config/Config.java
@@ -119,15 +119,7 @@ public Optional<URL> nodeUrl() {
    * @return Port to listen on for the Orion API
    */
   public int nodePort() {
-    String port = env.get(envKey("nodeport"));
-    if (port != null) {
-      try {
-        return Integer.parseInt(port);
-      } catch (NumberFormatException e) {
-        log.warn(e.getMessage(), e);
-      }
-    }
-    return configuration.getInteger("nodeport");
+    return getInteger("nodeport");
   }
 
   /**
@@ -157,15 +149,7 @@ public Optional<URL> clientUrl() {
    * @return Port to listen on for the client API
    */
   public int clientPort() {
-    String port = env.get(envKey("clientport"));
-    if (port != null) {
-      try {
-        return Integer.parseInt(port);
-      } catch (NumberFormatException e) {
-        log.warn(e.getMessage(), e);
-      }
-    }
-    return configuration.getInteger("clientport");
+    return getInteger("clientport");
   }
 
   /**
@@ -537,6 +521,18 @@ private boolean contains(final String key) {
     return env.containsKey(envKey(key)) || configuration.contains(key);
   }
 
+  private Integer getInteger(final String key) {
+    String valueStr = env.get(envKey(key));
+    if (valueStr != null) {
+      try {
+        return Integer.parseInt(valueStr);
+      } catch (NumberFormatException e) {
+        log.warn(e.getMessage(), e);
+      }
+    }
+    return configuration.getInteger(key);
+  }
+
   private String getString(final String key) {
     return env.getOrDefault(envKey(key), configuration.getString(key));
   }