ternaries for properties object - all tests pass

CDCgov · Dec 8, 2023 · 2f3136d · 2f3136d
1 parent b1d46f6
commit 2f3136d
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/database/PostgresDao.java b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/external/database/PostgresDao.java
@@ -31,12 +31,27 @@ protected Connection connect() throws SQLException {
                         + "/"
                         + ApplicationContext.getProperty("DB_NAME");
 
+        // Ternaries prevent NullPointerException during testing since we decided not to mock env
+        // vars.
+        var user =
+                ApplicationContext.getProperty("DB_USER") == null
+                        ? ""
+                        : ApplicationContext.getProperty("DB_USER");
+        var pass =
+                ApplicationContext.getProperty("DB_PASS") == null
+                        ? ""
+                        : ApplicationContext.getProperty("DB_PASS");
+        var ssl =
+                ApplicationContext.getProperty("DB_SSL") == null
+                        ? ""
+                        : ApplicationContext.getProperty("DB_SSL");
+
         Properties props = new Properties();
-        props.setProperty("user", ApplicationContext.getProperty("DB_USER"));
-        props.setProperty("password", ApplicationContext.getProperty("DB_PASS"));
+        props.setProperty("user", user);
+        props.setProperty("password", pass);
 
         // TODO: Change this based on env
-        props.setProperty("ssl", ApplicationContext.getProperty("DB_SSL"));
+        props.setProperty("ssl", ssl);
         conn = driverManager.getConnection(url, props);
         logger.logInfo("DB Connected Successfully");
         return conn;