Revert "Removed unnecessary util"

simasch · simasch · commit 67f580faffc0 · 2023-07-07T16:57:30.000+02:00
This reverts commit 9ece9af.
diff --git a/src/main/java/org/utplsql/api/EnvironmentVariableUtil.java b/src/main/java/org/utplsql/api/EnvironmentVariableUtil.java
@@ -0,0 +1,53 @@
+package org.utplsql.api;
+
+import javax.annotation.Nullable;
+
+/**
+ * This class provides an easy way to get environmental variables.
+ * This is mainly to improve testability but also to standardize the way how utPLSQL API and CLI read from
+ * environment.
+ * <p>
+ * Variables are obtained from the following scopes in that order (chain breaks as soon as a value is obtained):
+ * <ul>
+ * <li>Properties (System.getProperty())</li>
+ * <li>Environment (System.getEnv())</li>
+ * <li>Default value</li>
+ * </ul>
+ * <p>
+ * An empty string is treated the same as null.
+ *
+ * @author pesse
+ */
+public class EnvironmentVariableUtil {
+
+    private EnvironmentVariableUtil() {
+    }
+
+    /**
+     * Returns the value for a given key from environment (see class description)
+     *
+     * @param key Key of environment or property value
+     * @return Environment value or null
+     */
+    public static String getEnvValue(String key) {
+        return getEnvValue(key, null);
+    }
+
+    /**
+     * Returns the value for a given key from environment or a default value (see class description)
+     *
+     * @param key          Key of environment or property value
+     * @param defaultValue Default value if nothing found
+     * @return Environment value or defaultValue
+     */
+    public static String getEnvValue(String key, @Nullable String defaultValue) {
+
+        String val = System.getProperty(key);
+        if (val == null || val.isEmpty()) val = System.getenv(key);
+        if (val == null || val.isEmpty()) val = defaultValue;
+
+        return val;
+    }
+
+
+}
diff --git a/src/test/java/org/utplsql/api/AbstractDatabaseTest.java b/src/test/java/org/utplsql/api/AbstractDatabaseTest.java
@@ -11,12 +11,18 @@
 
 public abstract class AbstractDatabaseTest {
 
-    private static final String sUrl = "localhost:1521:XE";
-    private static final String sUser = "APP";
-    private static final String sPass = "pass";
+    private static String sUrl;
+    private static String sUser;
+    private static String sPass;
+
+    static {
+        sUrl = EnvironmentVariableUtil.getEnvValue("DB_URL", "localhost:1521:XE");
+        sUser = EnvironmentVariableUtil.getEnvValue("DB_USER", "app");
+        sPass = EnvironmentVariableUtil.getEnvValue("DB_PASS", "pass");
+    }
 
     private Connection conn;
-    private final List<Connection> connectionList = new ArrayList<>();
+    private List<Connection> connectionList = new ArrayList<>();
 
     public static String getUser() {
         return sUser;
diff --git a/src/test/java/org/utplsql/api/EnvironmentVariableUtilTest.java b/src/test/java/org/utplsql/api/EnvironmentVariableUtilTest.java
@@ -0,0 +1,43 @@
+package org.utplsql.api;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
+
+class EnvironmentVariableUtilTest {
+
+    @Test
+    void testGetVariableFromEnvironment() {
+        // Let's find an environment variable which is not in Properties list and not empty
+        Set<Object> props = System.getProperties().keySet();
+        Optional<Map.Entry<String, String>> envVariable = System.getenv().entrySet().stream()
+                .filter((e) -> !props.contains(e.getKey()) && e.getValue() != null && !e.getValue().isEmpty())
+                .findFirst();
+
+        if (!envVariable.isPresent()) {
+            fail("Can't test for there is no environment variable not overridden by property");
+        }
+
+        assertEquals(envVariable.get().getValue(), EnvironmentVariableUtil.getEnvValue(envVariable.get().getKey()));
+    }
+
+    @Test
+    void testGetVariableFromProperty() {
+        System.setProperty("PATH", "MyPath");
+
+        assertEquals("MyPath", EnvironmentVariableUtil.getEnvValue("PATH"));
+    }
+
+    @Test
+    void testGetVariableFromDefault() {
+
+        assertEquals("defaultValue", EnvironmentVariableUtil.getEnvValue("RANDOM" + System.currentTimeMillis(), "defaultValue"));
+    }
+
+}
