Merge branch 'release/v0.3.1'

firstBitMarksistskaya · Jun 16, 2021 · 4202161 · 4202161
2 parents d39e9d1 + 3cb3691
commit 4202161
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 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
         }

diff --git 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
@@ -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() {