fixed env variables not working

fixed regex for env property values

Issue-ID: SDNC-1196
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
Change-Id: Ia8a96110f000438bec84d235dde484d313f45a8e

diff --git a/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/configuration/subtypes/Section.java b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/configuration/subtypes/Section.java
index b6d277f..39c00da 100644 (file)
--- a/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/configuration/subtypes/Section.java
+++ b/sdnr/wt/common/src/main/java/org/onap/ccsdk/features/sdnr/wt/common/configuration/subtypes/Section.java
@@ -98,7 +98,7 @@ public class Section {
                if (value != null && value.contains("${")) {
                        
                        LOG.debug("try to find env var(s) for {}",value);
-                       final String regex = "(\\$\\{[A-Z]+\\})";
+                       final String regex = "(\\$\\{[A-Z0-9_-]+\\})";
                        final Pattern pattern = Pattern.compile(regex);
                        final Matcher matcher = pattern.matcher(value);
                        String tmp=new String(value);