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

firstBitMarksistskaya · Jun 16, 2021 · 3cb3691 · 3cb3691
2 parents 8170ed1 + 16cfbfc
commit 3cb3691
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/ru/pulsar/jenkins/library/configuration/ConfigurationReader.groovy b/src/ru/pulsar/jenkins/library/configuration/ConfigurationReader.groovy
@@ -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,15 +76,15 @@ 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
         }
         baseObject.additionalInitializationSteps = objectToMerge.additionalInitializationSteps.clone()
     }
 
     @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
         }