From 16cfbfced18782aa358807d3ae5867913970da48 Mon Sep 17 00:00:00 2001
From: root <root@example.com>
Date: Tue, 15 Jun 2021 21:50:01 +0300
Subject: [PATCH 1/2] fix checkfornull

---
 .../library/configuration/ConfigurationReader.groovy        | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/ru/pulsar/jenkins/library/configuration/ConfigurationReader.groovy b/src/ru/pulsar/jenkins/library/configuration/ConfigurationReader.groovy
index 55b7ad2..7b44dc1 100644
--- 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,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
         }

From 8170ed17cc5fbbf1615ca1c593f65f019d59c092 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Wed, 16 Jun 2021 10:29:35 +0300
Subject: [PATCH 2/2] =?UTF-8?q?=D0=A2=D0=B8=D0=BF=D0=B8=D0=B7=D0=B0=D1=86?=
 =?UTF-8?q?=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vars/cmd.groovy        | 2 +-
 vars/pipeline1C.groovy | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/vars/cmd.groovy b/vars/cmd.groovy
index b5ad056..692b019 100644
--- a/vars/cmd.groovy
+++ b/vars/cmd.groovy
@@ -4,6 +4,6 @@ import ru.pulsar.jenkins.library.ioc.ContextRegistry
 int call(String script, boolean returnStatus = false) {
     ContextRegistry.registerDefaultContext(this)
 
-    def cmd = new Cmd(script, returnStatus)
+    Cmd cmd = new Cmd(script, returnStatus)
     return cmd.run()
 }
diff --git a/vars/pipeline1C.groovy b/vars/pipeline1C.groovy
index 04ee349..8da44df 100644
--- a/vars/pipeline1C.groovy
+++ b/vars/pipeline1C.groovy
@@ -1,3 +1,4 @@
+/* groovylint-disable NestedBlockDepth */
 import groovy.transform.Field
 import ru.pulsar.jenkins.library.configuration.JobConfiguration
 
@@ -7,7 +8,7 @@ import java.util.concurrent.TimeUnit
 JobConfiguration config
 
 @Field
-def agent1C
+String agent1C
 
 void call() {