don't use load step defaults as implicit factory method.

2025-09-16 09:26:22 +02:00 · 2018-09-07 10:08:16 +02:00
parent 5f66113c37
commit 8db2aaf5f0
21 changed files with 46 additions and 46 deletions
--- a/src/com/sap/piper/ConfigurationHelper.groovy
+++ b/src/com/sap/piper/ConfigurationHelper.groovy
@@ -1,10 +1,10 @@
 package com.sap.piper

 class ConfigurationHelper implements Serializable {
-    static ConfigurationHelper loadStepDefaults(Script step){
-        return new ConfigurationHelper(step)
-            .initDefaults(step)
-            .loadDefaults()
+
+    ConfigurationHelper loadStepDefaults() {
+            initDefaults()
+            loadDefaults()
    }

    private Map config
@@ -18,8 +18,8 @@ class ConfigurationHelper implements Serializable {
        if(!name) throw new IllegalArgumentException('Step has no public name property!')
    }

-    private final ConfigurationHelper initDefaults(Script step){
-        step.prepareDefaultValues()
+    private final ConfigurationHelper initDefaults(){
+        this.script.prepareDefaultValues()
        return this
    }

--- a/vars/artifactSetVersion.groovy
+++ b/vars/artifactSetVersion.groovy
@@ -41,8 +41,8 @@ def call(Map parameters = [:], Closure body = null) {
            script = this

        // load default & individual configuration
-        ConfigurationHelper configHelper = ConfigurationHelper
-            .loadStepDefaults(this)
+        ConfigurationHelper configHelper = new ConfigurationHelper(this)
+            .loadStepDefaults()
            .mixinGeneralConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS, CONFIG_KEY_COMPATIBILITY)
            .mixinStepConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS, CONFIG_KEY_COMPATIBILITY)
            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, STEP_CONFIG_KEYS, CONFIG_KEY_COMPATIBILITY)
--- a/vars/batsExecuteTests.groovy
+++ b/vars/batsExecuteTests.groovy
@@ -26,8 +26,8 @@ def call(Map parameters = [:]) {
        def utils = parameters.juStabUtils ?: new Utils()
        def script = parameters.script ?: [commonPipelineEnvironment: commonPipelineEnvironment]

-        Map config = ConfigurationHelper
-            .loadStepDefaults(this)
+        Map config = new ConfigurationHelper(this)
+            .loadStepDefaults()
            .mixinGeneralConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
            .mixinStepConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, STEP_CONFIG_KEYS)
--- a/vars/checkChangeInDevelopment.groovy
+++ b/vars/checkChangeInDevelopment.groovy
@@ -29,8 +29,8 @@ def call(parameters = [:]) {

        ChangeManagement cm = parameters?.cmUtils ?: new ChangeManagement(script, gitUtils)

-        ConfigurationHelper configHelper = ConfigurationHelper
-            .loadStepDefaults(this)
+        ConfigurationHelper configHelper = new ConfigurationHelper(this)
+            .loadStepDefaults()
            .mixinGeneralConfig(script.commonPipelineEnvironment, generalConfigurationKeys)
            .mixinStepConfig(script.commonPipelineEnvironment, stepConfigurationKeys)
            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, stepConfigurationKeys)
--- a/vars/checksPublishResults.groovy
+++ b/vars/checksPublishResults.groovy
@@ -30,8 +30,8 @@ def call(Map parameters = [:]) {
        prepare(parameters)

        // load default & individual configuration
-        Map configuration = ConfigurationHelper
-            .loadStepDefaults(this)
+        Map configuration = new ConfigurationHelper(this)
+            .loadStepDefaults()
            .mixinGeneralConfig(script.commonPipelineEnvironment, GENERAL_CONFIG_KEYS)
            .mixinStepConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, STEP_CONFIG_KEYS)
--- a/vars/cloudFoundryDeploy.groovy
+++ b/vars/cloudFoundryDeploy.groovy
@@ -33,8 +33,8 @@ def call(Map parameters = [:]) {
        if (script == null)
            script = [commonPipelineEnvironment: commonPipelineEnvironment]

-        Map config = ConfigurationHelper
-            .loadStepDefaults(this)
+        Map config = new ConfigurationHelper(this)
+            .loadStepDefaults()
            .mixinGeneralConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS, CONFIG_KEY_COMPATIBILITY)
            .mixinStepConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS, CONFIG_KEY_COMPATIBILITY)
            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, STEP_CONFIG_KEYS, CONFIG_KEY_COMPATIBILITY)
--- a/vars/dockerExecute.groovy
+++ b/vars/dockerExecute.groovy
@@ -21,8 +21,8 @@ void call(Map parameters = [:], body) {
        final script = parameters.script
        if (script == null)
            script = [commonPipelineEnvironment: commonPipelineEnvironment]
-        Map config = ConfigurationHelper
-            .loadStepDefaults(this)
+        Map config = new ConfigurationHelper(this)
+            .loadStepDefaults()
            .mixinGeneralConfig(script.commonPipelineEnvironment, GENERAL_CONFIG_KEYS)
            .mixinStepConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, STEP_CONFIG_KEYS)
--- a/vars/dockerExecuteOnKubernetes.groovy
+++ b/vars/dockerExecuteOnKubernetes.groovy
@@ -22,8 +22,8 @@ void call(Map parameters = [:], body) {
        if (script == null)
            script = [commonPipelineEnvironment: commonPipelineEnvironment]

-        ConfigurationHelper configHelper = ConfigurationHelper
-            .loadStepDefaults(this)
+        ConfigurationHelper configHelper = new ConfigurationHelper(this)
+            .loadStepDefaults()
            .mixinGeneralConfig(script.commonPipelineEnvironment, GENERAL_CONFIG_KEYS)
            .mixinStepConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName ?: env.STAGE_NAME, STEP_CONFIG_KEYS)
--- a/vars/influxWriteData.groovy
+++ b/vars/influxWriteData.groovy
@@ -24,8 +24,8 @@ def call(Map parameters = [:]) {
             script = [commonPipelineEnvironment: commonPipelineEnvironment]

        // load default & individual configuration
-        Map configuration = ConfigurationHelper
-            .loadStepDefaults(this)
+        Map configuration = new ConfigurationHelper(this)
+            .loadStepDefaults()
            .mixinGeneralConfig(script.commonPipelineEnvironment, GENERAL_CONFIG_KEYS)
            .mixinStepConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, STEP_CONFIG_KEYS)
--- a/vars/mavenExecute.groovy
+++ b/vars/mavenExecute.groovy
@@ -26,8 +26,8 @@ def call(Map parameters = [:]) {
        final script = parameters.script

        // load default & individual configuration
-        Map configuration = ConfigurationHelper
-            .loadStepDefaults(this)
+        Map configuration = new ConfigurationHelper(this)
+            .loadStepDefaults()
            .mixinGeneralConfig(script.commonPipelineEnvironment, GENERAL_CONFIG_KEYS)
            .mixinStepConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, STEP_CONFIG_KEYS)
--- a/vars/mtaBuild.groovy
+++ b/vars/mtaBuild.groovy
@@ -25,8 +25,8 @@ def call(Map parameters = [:]) {
        final script = parameters?.script ?: [commonPipelineEnvironment: commonPipelineEnvironment]

        // load default & individual configuration
-        Map configuration = ConfigurationHelper
-            .loadStepDefaults(this)
+        Map configuration = new ConfigurationHelper(this)
+            .loadStepDefaults()
            .mixinGeneralConfig(script.commonPipelineEnvironment, GENERAL_CONFIG_KEYS)
            .mixinStepConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName ?: env.STAGE_NAME, STEP_CONFIG_KEYS)
--- a/vars/neoDeploy.groovy
+++ b/vars/neoDeploy.groovy
@@ -72,8 +72,8 @@ def call(parameters = [:]) {
        // Backward compatibility end
        
        // load default & individual configuration
-        Map configuration = ConfigurationHelper
-            .loadStepDefaults(this)
+        Map configuration = new ConfigurationHelper(this)
+            .loadStepDefaults()
            .mixinGeneralConfig(script.commonPipelineEnvironment, GENERAL_CONFIG_KEYS)
            .mixin(stepCompatibilityConfiguration)
            .mixinStepConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
--- a/vars/newmanExecute.groovy
+++ b/vars/newmanExecute.groovy
@@ -25,8 +25,8 @@ def call(Map parameters = [:]) {
        def utils = parameters?.juStabUtils ?: new Utils()

        // load default & individual configuration
-        Map config = ConfigurationHelper
-            .loadStepDefaults(this)
+        Map config = new ConfigurationHelper(this)
+            .loadStepDefaults()
            .mixinGeneralConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
            .mixinStepConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, STEP_CONFIG_KEYS)
--- a/vars/pipelineStashFilesAfterBuild.groovy
+++ b/vars/pipelineStashFilesAfterBuild.groovy
@@ -20,8 +20,8 @@ def call(Map parameters = [:]) {
        //additional includes via passing e.g. stashIncludes: [opa5: '**/*.include']
        //additional excludes via passing e.g. stashExcludes: [opa5: '**/*.exclude']

-        Map config = ConfigurationHelper
-            .loadStepDefaults(this)
+        Map config = new ConfigurationHelper(this)
+            .loadStepDefaults()
            .mixinGeneralConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
            .mixinStepConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, STEP_CONFIG_KEYS)
--- a/vars/pipelineStashFilesBeforeBuild.groovy
+++ b/vars/pipelineStashFilesBeforeBuild.groovy
@@ -22,8 +22,8 @@ def call(Map parameters = [:]) {
        //additional includes via passing e.g. stashIncludes: [opa5: '**/*.include']
        //additional excludes via passing e.g. stashExcludes: [opa5: '**/*.exclude']

-        Map config = ConfigurationHelper
-            .loadStepDefaults(this)
+        Map config = new ConfigurationHelper(this)
+            .loadStepDefaults()
            .mixinGeneralConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
            .mixinStepConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, STEP_CONFIG_KEYS)
--- a/vars/setupCommonPipelineEnvironment.groovy
+++ b/vars/setupCommonPipelineEnvironment.groovy
@@ -17,8 +17,8 @@ def call(Map parameters = [:]) {

        loadConfigurationFromFile(script, configFile)

-        Map config = ConfigurationHelper
-            .loadStepDefaults(this)
+        Map config = new ConfigurationHelper(this)
+            .loadStepDefaults()
            .mixinGeneralConfig(script.commonPipelineEnvironment, GENERAL_CONFIG_KEYS)
            .use()

--- a/vars/snykExecute.groovy
+++ b/vars/snykExecute.groovy
@@ -24,8 +24,8 @@ def call(Map parameters = [:]) {
        def utils = parameters.juStabUtils ?: new Utils()
        def script = parameters.script ?: [commonPipelineEnvironment: commonPipelineEnvironment]

-        Map config = ConfigurationHelper
-            .loadStepDefaults(this)
+        Map config = new ConfigurationHelper(this)
+            .loadStepDefaults()
            .mixinGeneralConfig(script.commonPipelineEnvironment, GENERAL_CONFIG_KEYS)
            .mixinStepConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, STEP_CONFIG_KEYS)
--- a/vars/testsPublishResults.groovy
+++ b/vars/testsPublishResults.groovy
@@ -28,8 +28,8 @@ def call(Map parameters = [:]) {
        prepare(parameters)

        // load default & individual configuration
-        Map configuration = ConfigurationHelper
-            .loadStepDefaults(this)
+        Map configuration = new ConfigurationHelper(this)
+            .loadStepDefaults()
            .mixinGeneralConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
            .mixinStepConfig(script.commonPipelineEnvironment, STEP_CONFIG_KEYS)
            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName ?: env.STAGE_NAME, STEP_CONFIG_KEYS)
--- a/vars/transportRequestCreate.groovy
+++ b/vars/transportRequestCreate.groovy
@@ -29,8 +29,8 @@ def call(parameters = [:]) {

        ChangeManagement cm = parameters.cmUtils ?: new ChangeManagement(script)

-        ConfigurationHelper configHelper = ConfigurationHelper
-            .loadStepDefaults(this)
+        ConfigurationHelper configHelper = new ConfigurationHelper(this)
+            .loadStepDefaults()
            .mixinGeneralConfig(script.commonPipelineEnvironment, generalConfigurationKeys)
            .mixinStepConfig(script.commonPipelineEnvironment, stepConfigurationKeys)
            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, stepConfigurationKeys)
--- a/vars/transportRequestRelease.groovy
+++ b/vars/transportRequestRelease.groovy
@@ -31,8 +31,8 @@ def call(parameters = [:]) {

        ChangeManagement cm = parameters.cmUtils ?: new ChangeManagement(script)

-        ConfigurationHelper configHelper = ConfigurationHelper
-            .loadStepDefaults(this)
+        ConfigurationHelper configHelper = new ConfigurationHelper(this)
+            .loadStepDefaults()
            .mixinGeneralConfig(script.commonPipelineEnvironment, generalConfigurationKeys)
            .mixinStepConfig(script.commonPipelineEnvironment, stepConfigurationKeys)
            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, stepConfigurationKeys)
--- a/vars/transportRequestUploadFile.groovy
+++ b/vars/transportRequestUploadFile.groovy
@@ -33,8 +33,8 @@ def call(parameters = [:]) {

        ChangeManagement cm = parameters.cmUtils ?: new ChangeManagement(script)

-        ConfigurationHelper configHelper = ConfigurationHelper
-            .loadStepDefaults(this)
+        ConfigurationHelper configHelper = new ConfigurationHelper(this)
+            .loadStepDefaults()
            .mixinGeneralConfig(script.commonPipelineEnvironment, generalConfigurationKeys)
            .mixinStepConfig(script.commonPipelineEnvironment, stepConfigurationKeys)
            .mixinStageConfig(script.commonPipelineEnvironment, parameters.stageName?:env.STAGE_NAME, stepConfigurationKeys)