jenkins/jenkins-lib
1
0
Fork 1
mirror of https://github.com/firstBitMarksistskaya/jenkins-lib.git synced 2025-08-25 20:09:25 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'github/fix/check-for-null' into develop

Browse Source
This commit is contained in:
Nikita Gryzlov
2021-06-16 10:31:22 +03:00
parent 8170ed17cc 16cfbfced1
commit 3cb369194b
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,8 +7,6 @@ import org.apache.commons.beanutils.BeanUtils
import ru.pulsar.jenkins.library.IStepExecutor
import ru.pulsar.jenkins.library.ioc.ContextRegistry
import javax.annotation.CheckForNull
class ConfigurationReader implements Serializable {
private static ObjectMapper mapper
@@ -78,7 +76,7 @@ class ConfigurationReader implements Serializable {
}
@NonCPS
private static void mergeInitInfobaseOptions(InitInfobaseOptions baseObject, @CheckForNull InitInfobaseOptions objectToMerge) {
private static void mergeInitInfobaseOptions(InitInfobaseOptions baseObject, InitInfobaseOptions objectToMerge) {
if (objectToMerge == null || objectToMerge.additionalInitializationSteps == null) {
return
}
@@ -86,7 +84,7 @@ class ConfigurationReader implements Serializable {
}
@NonCPS
private static void mergeBddOptions(BddOptions baseObject, @CheckForNull BddOptions objectToMerge) {
private static void mergeBddOptions(BddOptions baseObject, BddOptions objectToMerge) {
if (objectToMerge == null || objectToMerge.vrunnerSteps == null) {
return
}