jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-01-30 05:59:39 +02:00
Code Issues Releases Activity

Cleanup (#844)

Browse Source
This commit is contained in:
Florian Wilhelm 2019-08-13 11:54:58 +02:00 committed by GitHub
parent f3f4c741be
commit 3af8062c9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/sap/piper/ConfigurationHelper.groovy
View File

@ -1,7 +1,5 @@
package com.sap.piper package com.sap.piper
import com.cloudbees.groovy.cps.NonCPS
@API @API
class ConfigurationHelper implements Serializable { class ConfigurationHelper implements Serializable {
@ -51,7 +49,7 @@ class ConfigurationHelper implements Serializable {
return mixin(stepConfiguration, filter, compatibleParameters) return mixin(stepConfiguration, filter, compatibleParameters)
} }
final ConfigurationHelper mixin(Map parameters, Set filter = null, Map compatibleParameters = [:]){ ConfigurationHelper mixin(Map parameters, Set filter = null, Map compatibleParameters = [:]){
if (parameters.size() > 0 && compatibleParameters.size() > 0) { if (parameters.size() > 0 && compatibleParameters.size() > 0) {
parameters = ConfigurationMerger.merge(handleCompatibility(compatibleParameters, parameters), null, parameters) parameters = ConfigurationMerger.merge(handleCompatibility(compatibleParameters, parameters), null, parameters)
} }