jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2024-12-14 11:03:09 +02:00
Code Issues Releases Activity

consolidate marge methods

Browse Source
This commit is contained in:
Christopher Fenner 2018-02-06 08:41:28 +01:00
parent 0566cab5db
commit 6e3bfac5c8
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,11 +7,7 @@ import com.sap.piper.MapUtils
class ConfigurationMerger {
@NonCPS
def static merge(Map configs, List configKeys, Map defaults=[:]) {
Map merged = [:]
merged.putAll(defaults)
merged.putAll(filterByKeyAndNull(configs, configKeys))
return merged
return merge(configs, MapUtils.fromList(configKeys), defaults)
}
@NonCPS
@ -31,11 +27,15 @@ class ConfigurationMerger {
}
@NonCPS
def static merge(Map parameters, List parameterKeys, Map configurationMap, List configurationKeys, Map defaults=[:]){
Map merged = merge(configurationMap, configurationKeys, defaults)
merged.putAll(filterByKeyAndNull(parameters, parameterKeys))
return merged
def static merge(
Map parameters, List parameterKeys,
Map configuration, List configurationKeys,
Map defaults=[:]
){
return merge(
parameters, MapUtils.fromList(parameterKeys),
configuration, MapUtils.fromList(configurationKeys),
defaults)
}
@NonCPS