jenkins/jenkins-lib
1
0
Fork 1
mirror of https://github.com/firstBitMarksistskaya/jenkins-lib.git synced 2025-02-14 15:00:06 +02:00
Code Issues Releases Activity

Рефакторинг мержа конфигураций

Browse Source
This commit is contained in:
Nikita Gryzlov 2020-04-15 18:21:57 +03:00
parent 8d9ed2ff08
commit 7b786d85d9
No known key found for this signature in database
GPG Key ID: C1EAE411FEF0BF2F
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ru/pulsar/jenkins/library/configuration/ConfigurationReader.groovy
View File

@ -32,10 +32,12 @@ class ConfigurationReader implements Serializable {
JobConfiguration baseConfiguration,
JobConfiguration configurationToMerge
) {
def nonMergeableSettings = Arrays.asList("secrets").toSet()
def nonMergeableSettings = Arrays.asList(
"secrets",
"sonarQubeOptions"
).toSet()
mergeObjects(baseConfiguration, configurationToMerge, nonMergeableSettings);
mergeObjects(baseConfiguration.secrets, configurationToMerge.secrets, Collections.emptySet())
mergeObjects(baseConfiguration, configurationToMerge, nonMergeableSettings)
return baseConfiguration;
}
@ -47,8 +49,16 @@ class ConfigurationReader implements Serializable {
.filter({ e -> e.getKey() != "class" })
.filter({ e -> e.getKey() != "metaClass" })
.filter({ e -> !nonMergeableSettings.contains(e.getKey()) })
.forEach {e ->
.forEach { e ->
BeanUtils.setProperty(baseObject, e.getKey(), e.getValue());
}
nonMergeableSettings.forEach({ key ->
mergeObjects(
baseObject[key],
objectToMerge[key],
Collections.emptySet()
)
})
}
}