Personal-Twin/hapi-fhir-jpaserver-starter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only override existing hapi properties with env ones

Browse Source
This commit is contained in:
Vladimir Nemergut
2020-05-15 11:44:38 +02:00
parent e2eee4e4e5
commit c74d45059d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/ca/uhn/fhir/jpa/starter/HapiProperties.java
View File

@@ -17,6 +17,7 @@ import java.util.Arrays;
import java.util.Locale; import java.util.Locale;
import java.util.Properties; import java.util.Properties;
import java.util.Set; import java.util.Set;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static org.apache.commons.lang3.StringUtils.defaultString; import static org.apache.commons.lang3.StringUtils.defaultString;
@@ -138,7 +139,10 @@ public class HapiProperties {
if (overrideProps != null) { if (overrideProps != null) {
properties.putAll(overrideProps); properties.putAll(overrideProps);
} }
properties.putAll(System.getenv()); properties.putAll(System.getenv().entrySet()
.stream()
.filter(e -> e.getValue() != null && properties.containsKey(e.getKey()))
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
return properties; return properties;
} }