Merge pull request #505 from warunalakshitha/remove_duplicate_code

Refactor environment variable handling
ballerina-platform · Aug 18, 2023 · c9849ae · c9849ae
2 parents 96a4c58 + 608630b
commit c9849ae
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 61 deletions.
diff --git a/native/src/main/java/io/ballerina/stdlib/os/nativeimpl/GetEnv.java b/native/src/main/java/io/ballerina/stdlib/os/nativeimpl/GetEnv.java
@@ -18,17 +18,11 @@
 package io.ballerina.stdlib.os.nativeimpl;
 
 import io.ballerina.runtime.api.Environment;
-import io.ballerina.runtime.api.PredefinedTypes;
-import io.ballerina.runtime.api.creators.TypeCreator;
-import io.ballerina.runtime.api.creators.ValueCreator;
-import io.ballerina.runtime.api.types.MapType;
 import io.ballerina.runtime.api.utils.StringUtils;
 import io.ballerina.runtime.api.values.BMap;
 import io.ballerina.runtime.api.values.BString;
 
-import java.util.Map;
-
-import static io.ballerina.stdlib.os.utils.OSConstants.ENV_VAR_KEY;
+import static io.ballerina.stdlib.os.utils.OSUtils.getEnvVariablesMap;
 
 /**
  * Extern function of ballerina.os:getEnv.
@@ -42,19 +36,7 @@ private GetEnv() {
     }
 
     public static BString getEnv(Environment env, BString key) {
-        Object envVarMap = env.getStrandLocal(ENV_VAR_KEY);
-        BMap<BString, Object> envMap;
-        if (envVarMap == null) {
-            MapType mapType = TypeCreator.createMapType(PredefinedTypes.TYPE_STRING);
-            envMap = ValueCreator.createMapValue(mapType);
-            Map<String, String> jEnvMap = System.getenv();
-            for (Map.Entry<String, String> entry : jEnvMap.entrySet()) {
-                envMap.put(StringUtils.fromString(entry.getKey()), StringUtils.fromString(entry.getValue()));
-            }
-            env.setStrandLocal(ENV_VAR_KEY, envMap);
-        } else {
-            envMap = (BMap<BString, Object>) envVarMap;
-        }
+        BMap<BString, Object> envMap = getEnvVariablesMap(env);
         Object value = envMap.get(key);
         if (value == null) {
             return StringUtils.fromString("");

diff --git a/native/src/main/java/io/ballerina/stdlib/os/nativeimpl/ListEnv.java b/native/src/main/java/io/ballerina/stdlib/os/nativeimpl/ListEnv.java
@@ -18,17 +18,10 @@
 package io.ballerina.stdlib.os.nativeimpl;
 
 import io.ballerina.runtime.api.Environment;
-import io.ballerina.runtime.api.PredefinedTypes;
-import io.ballerina.runtime.api.creators.TypeCreator;
-import io.ballerina.runtime.api.creators.ValueCreator;
-import io.ballerina.runtime.api.types.MapType;
-import io.ballerina.runtime.api.utils.StringUtils;
 import io.ballerina.runtime.api.values.BMap;
 import io.ballerina.runtime.api.values.BString;
 
-import java.util.Map;
-
-import static io.ballerina.stdlib.os.utils.OSConstants.ENV_VAR_KEY;
+import static io.ballerina.stdlib.os.utils.OSUtils.getEnvVariablesMap;
 
 /**
  * Extern function of ballerina.os:listEnv.
@@ -42,17 +35,6 @@ private ListEnv() {
     }
 
     public static BMap<BString, Object> listEnv(Environment env) {
-        Object envVarMap = env.getStrandLocal(ENV_VAR_KEY);
-        if (envVarMap != null) {
-            return (BMap<BString, Object>) envVarMap;
-        }
-        MapType mapType = TypeCreator.createMapType(PredefinedTypes.TYPE_STRING);
-        BMap<BString, Object> envMap = ValueCreator.createMapValue(mapType);
-        Map<String, String> jEnvMap = System.getenv();
-        for (Map.Entry<String, String> entry : jEnvMap.entrySet()) {
-            envMap.put(StringUtils.fromString(entry.getKey()), StringUtils.fromString(entry.getValue()));
-        }
-        env.setStrandLocal(ENV_VAR_KEY, envMap);
-        return envMap;
+        return getEnvVariablesMap(env);
     }
 }
diff --git a/native/src/main/java/io/ballerina/stdlib/os/nativeimpl/SetEnv.java b/native/src/main/java/io/ballerina/stdlib/os/nativeimpl/SetEnv.java
@@ -18,17 +18,10 @@
 package io.ballerina.stdlib.os.nativeimpl;
 
 import io.ballerina.runtime.api.Environment;
-import io.ballerina.runtime.api.PredefinedTypes;
-import io.ballerina.runtime.api.creators.TypeCreator;
-import io.ballerina.runtime.api.creators.ValueCreator;
-import io.ballerina.runtime.api.types.MapType;
-import io.ballerina.runtime.api.utils.StringUtils;
 import io.ballerina.runtime.api.values.BMap;
 import io.ballerina.runtime.api.values.BString;
 
-import java.util.Map;
-
-import static io.ballerina.stdlib.os.utils.OSConstants.ENV_VAR_KEY;
+import static io.ballerina.stdlib.os.utils.OSUtils.getEnvVariablesMap;
 
 /**
  * Extern function of ballerina.os:setEnv.
@@ -42,19 +35,7 @@ private SetEnv() {
     }
 
     public static Object setEnv(Environment env, BString key, Object value) {
-        Object envVarMap = env.getStrandLocal(ENV_VAR_KEY);
-        BMap<BString, Object> envMap;
-        if (envVarMap == null) {
-            MapType mapType = TypeCreator.createMapType(PredefinedTypes.TYPE_STRING);
-            envMap = ValueCreator.createMapValue(mapType);
-            Map<String, String> jEnvMap = System.getenv();
-            for (Map.Entry<String, String> entry : jEnvMap.entrySet()) {
-                envMap.put(StringUtils.fromString(entry.getKey()), StringUtils.fromString(entry.getValue()));
-            }
-            env.setStrandLocal(ENV_VAR_KEY, envMap);
-        } else {
-            envMap = (BMap<BString, Object>) envVarMap;
-        }
+        BMap<BString, Object> envMap = getEnvVariablesMap(env);
         if (value == null) {
             envMap.remove(key);
         } else {

diff --git a/native/src/main/java/io/ballerina/stdlib/os/utils/OSUtils.java b/native/src/main/java/io/ballerina/stdlib/os/utils/OSUtils.java
@@ -17,14 +17,21 @@
  */
 package io.ballerina.stdlib.os.utils;
 
+import io.ballerina.runtime.api.Environment;
+import io.ballerina.runtime.api.PredefinedTypes;
+import io.ballerina.runtime.api.creators.TypeCreator;
 import io.ballerina.runtime.api.creators.ValueCreator;
+import io.ballerina.runtime.api.types.MapType;
 import io.ballerina.runtime.api.utils.StringUtils;
+import io.ballerina.runtime.api.values.BMap;
 import io.ballerina.runtime.api.values.BObject;
 import io.ballerina.runtime.api.values.BString;
 
 import java.io.IOException;
+import java.util.Map;
 
 import static io.ballerina.stdlib.os.nativeimpl.ModuleUtils.getModule;
+import static io.ballerina.stdlib.os.utils.OSConstants.ENV_VAR_KEY;
 import static io.ballerina.stdlib.os.utils.OSConstants.PROCESS_FIELD;
 import static io.ballerina.stdlib.os.utils.OSConstants.PROCESS_TYPE;
 
@@ -58,4 +65,20 @@ public static BString getSystemProperty(BString key) {
         }
         return StringUtils.fromString(value);
     }
+
+    public static BMap<BString, Object> getEnvVariablesMap(Environment env) {
+        Object envVarMap = env.getStrandLocal(ENV_VAR_KEY);
+        BMap<BString, Object> envMap;
+        if (envVarMap != null) {
+            return (BMap<BString, Object>) envVarMap;
+        }
+        MapType mapType = TypeCreator.createMapType(PredefinedTypes.TYPE_STRING);
+        envMap = ValueCreator.createMapValue(mapType);
+        Map<String, String> jEnvMap = System.getenv();
+        for (Map.Entry<String, String> entry : jEnvMap.entrySet()) {
+            envMap.put(StringUtils.fromString(entry.getKey()), StringUtils.fromString(entry.getValue()));
+        }
+        env.setStrandLocal(ENV_VAR_KEY, envMap);
+        return envMap;
+    }
 }