1 files changed, 9 insertions, 2 deletions
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvProvider.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvProvider.java
index beccd383..25a152bf 100644
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvProvider.java
+++ b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/EnvProvider.java
@@ -19,8 +19,15 @@
  */
 package org.onap.aaf.certservice.client.configuration;
 
+import java.util.Optional;
+
 public class EnvProvider {
-    public String readEnvVariable(String envVariable) {
-        return System.getProperty(envVariable);
+    public Optional<String> readEnvVariable(String envVariableName) {
+        return Optional.ofNullable(System.getenv(envVariableName))
+                .filter(EnvProvider::isEnvPresent);
+    }
+
+    private static Boolean isEnvPresent(String envValue) {
+        return !"".equals(envValue);
     }
 }