jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-02-21 19:48:53 +02:00
Code Issues Releases Activity

filter by keyset and null

Browse Source
This commit is contained in:
Christopher Fenner 2018-02-05 19:39:13 +01:00
parent eab6716797
commit 20cbbfc26c
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/sap/piper/ConfigurationMerger.groovy
View File

@ -18,12 +18,13 @@ class ConfigurationMerger {
def static merge(Map configs, Map configKeys, Map defaults = [:]) {
Map merged = [:]
merged.putAll(defaults)
if(configs != null)
if(configs != null && configKeys)
for(String key : defaults.keySet())
if(MapUtils.isMap(defaults[key]))
merged[key] = merge(configs[key], configKeys[key], defaults[key])
else
merged[key] = configs[key]
if(configKeys.keySet().contains(key))
if(MapUtils.isMap(defaults[key]))
merged[key] = merge(configs[key], configKeys[key], defaults[key])
else if(configs[key] != null)
merged[key] = configs[key]
return merged
}