Fix spotbug findings

Jenkinsfile.internal

@@ -34,6 +34,8 @@ pipeline {
             failFast false
             parallel {
                 stage('System Tests') {
+                    // The needed artifact is only built for main and pull requests -> skip this job otherwise
+                    when { branch pattern: "PR-\\d+|main", comparator: "REGEXP"}
                     steps {
                         build job: '../systemTests', parameters: [string(name: 'artifactName', value: "${JOB_BASE_NAME}"), string(name: 'commitHash', value: "${GIT_COMMIT}")]
                     }

config/spotbugs/spotbugs-exclude.xml

@@ -6,4 +6,21 @@
     <Match>
         <Source name="~.*\.java" />
     </Match>
+    <Match>
+        <Class name="~.*_closure\d+" />
+        <Bug pattern="SE_NO_SERIALVERSIONID" />
+    </Match>
+    <Match>
+        <Field name="metaClass" />
+        <Bug code="EI,EI2"/>
+    </Match>
+    <Match>
+        <Class name="~.*_closure\d+" />
+        <Bug code="EI2" />
+    </Match>
+    <Match>
+        <Class name="~.*AbstractTestBuilder" />
+        <Field name="context" />
+        <Bug pattern="EI_EXPOSE_REP" />
+    </Match>
 </FindBugsFilter>

gradle.properties

@@ -4,7 +4,7 @@ jpiVersion=0.43.0
 jenkinsVersion=2.332.3
 gradleVersion=7.3
 openapiVersion=6.1.0
-spotBugsPlugin=5.0.13
+spotBugsPlugin=5.1.3
 spotBugsVersion=4.7.3
 cyclonedxVersion=1.7.2
 depCheckVersion=7.4.1

src/main/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/ETInstallation.groovy

@@ -47,7 +47,7 @@ class ETInstallation extends ToolInstallation implements
      * @param home path to the tool executable
      * @param properties properties of the tool installation
      */
-    ETInstallation(String name, String home, List<? extends ToolProperty<?>> properties) {
+    ETInstallation(String name, String home, List<? extends ToolProperty<? extends ToolInstallation>> properties) {
         super(Util.fixEmptyAndTrim(name), Util.fixEmptyAndTrim(home), properties)
     }
 

src/main/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/actions/RunPackageAction.groovy

@@ -23,10 +23,10 @@ class RunPackageAction extends RunTestAction {
     }
 
     PackageConfig getPackageConfig() {
-        return packageConfig
+        return new PackageConfig(packageConfig)
     }
 
     AnalysisConfig getAnalysisConfig() {
-        return analysisConfig
+        return new AnalysisConfig(analysisConfig)
     }
 }

src/main/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/actions/RunTestAction.groovy

@@ -26,10 +26,10 @@ abstract class RunTestAction extends InvisibleAction {
     }
 
     TestConfig getTestConfig() {
-        return testConfig
+        return new TestConfig(testConfig)
     }
 
     TestResult getTestResult() {
-        return testResult
+        return new TestResult(testResult)
     }
 }

src/main/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/builder/AbstractTestBuilder.groovy

@@ -25,10 +25,10 @@ import java.util.concurrent.TimeoutException
  * Common base class for all test related steps implemented in this plugin.
  */
 abstract class AbstractTestBuilder implements Serializable {
-    static String testCasePath
-    static TestConfig testConfig
-    static ExecutionConfig executionConfig
-    static StepContext context
+    final String testCasePath
+    final TestConfig testConfig
+    final ExecutionConfig executionConfig
+    final StepContext context
 
     protected abstract String getTestArtifactName()
     protected abstract LogConfigUtil getLogConfig()
@@ -43,6 +43,14 @@ abstract class AbstractTestBuilder implements Serializable {
         this.context = context
     }
 
+    ExecutionConfig getExecutionConfig() {
+        return executionConfig ? new ExecutionConfig(executionConfig) : null
+    }
+
+    TestConfig getTestConfig() {
+        return testConfig ? new TestConfig(testConfig) : null
+    }
+
     TestResult runTest() {
 
         def toolInstallations = getToolInstallationsOnNode()
@@ -52,7 +60,7 @@ abstract class AbstractTestBuilder implements Serializable {
                 getTestArtifactName(), getLogConfig(), getExecutionOrderBuilder(), toolInstallations))
     }
 
-    private static ArrayList<String> getToolInstallationsOnNode() {
+    private ArrayList<String> getToolInstallationsOnNode() {
         /**
          * This method gets the executable names of the tool installations on the node given by the context. Context is
          * not reasonably available in the MasterToSlaveCallable, so all info which needs a context must be fetched
@@ -73,6 +81,9 @@ abstract class AbstractTestBuilder implements Serializable {
     }
 
     private static final class RunTestCallable extends MasterToSlaveCallable<TestResult, IOException> {
+
+        private static final long serialVersionUID = 1L 
+
         private final String testCasePath
         private final EnvVars envVars
         private final TaskListener listener

src/main/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/builder/ExecutionOrderBuilder.groovy

@@ -14,6 +14,8 @@ import de.tracetronic.jenkins.plugins.ecutestexecution.util.ConverterUtil
  * thus avoid serialization errors.
  */
 class ExecutionOrderBuilder implements Serializable {
+
+    private static final long serialVersionUID = 1L
 
     private final String testCasePath
     private final TestConfig testConfig

src/main/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/builder/TestPackageBuilder.groovy

@@ -12,12 +12,14 @@ import org.jenkinsci.plugins.workflow.steps.StepContext
  * builder providing test package configuration.
  */
 class TestPackageBuilder extends AbstractTestBuilder {
+    private static final long serialVersionUID = 1L
+
     /**
      * Defines the test artifact name.
      */
     private final static String TEST_ARTIFACT_NAME = 'package'
-    private static PackageConfig packageConfig
-    private static AnalysisConfig analysisConfig
+    private final PackageConfig packageConfig
+    private final AnalysisConfig analysisConfig
 
     TestPackageBuilder(String testCasePath, TestConfig testConfig, ExecutionConfig executionConfig,
                        StepContext context, PackageConfig packageConfig, AnalysisConfig analysisConfig){

src/main/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/builder/TestProjectBuilder.groovy

@@ -10,6 +10,9 @@ import org.jenkinsci.plugins.workflow.steps.StepContext
  * builder providing test project configuration.
  */
 class TestProjectBuilder extends AbstractTestBuilder {
+
+    private static final long serialVersionUID = 1L
+
     /**
      * Defines the test artifact name.
      */

src/main/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/configs/AnalysisConfig.groovy

@@ -33,6 +33,12 @@ class AnalysisConfig extends AbstractDescribableImpl<AnalysisConfig> implements
         this.recordings = []
     }
 
+    AnalysisConfig(AnalysisConfig config) {
+        this.analysisName = config.getAnalysisName()
+        this.mapping = config.getMapping()
+        this.recordings = config.getRecordings()
+    }
+
     String getAnalysisName() {
         return analysisName
     }
@@ -52,7 +58,7 @@ class AnalysisConfig extends AbstractDescribableImpl<AnalysisConfig> implements
     }
 
     List<RecordingAsSetting> getRecordings() {
-        return recordings
+        return recordings.collect({new RecordingAsSetting(it)})
     }
 
     @DataBoundSetter

src/main/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/configs/ExecutionConfig.groovy

@@ -32,6 +32,12 @@ class ExecutionConfig extends AbstractDescribableImpl<ExecutionConfig> implement
         this.stopUndefinedTools = true
     }
 
+    ExecutionConfig(ExecutionConfig config) {
+        this.timeout = config.getTimeout()
+        this.stopOnError = config.isStopOnError()
+        this.stopUndefinedTools = config.getStopUndefinedTools()
+    }
+
     int getTimeout() {
         return timeout
     }

src/main/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/configs/PackageConfig.groovy

@@ -13,7 +13,7 @@ import hudson.model.Descriptor
 import org.apache.commons.lang.StringUtils
 import org.kohsuke.stapler.DataBoundConstructor
 
-class PackageConfig extends AbstractDescribableImpl<PackageConfig> implements ExpandableConfig, Serializable {
+class PackageConfig extends AbstractDescribableImpl<PackageConfig> implements ExpandableConfig, Serializable{
 
     private static final long serialVersionUID = 1L
 
@@ -24,8 +24,12 @@ class PackageConfig extends AbstractDescribableImpl<PackageConfig> implements Ex
         this.packageParameters = packageParameters ? removeEmptyParameters(packageParameters) : []
     }
 
+    PackageConfig(PackageConfig config) {
+        this.packageParameters = config.getPackageParameters()
+    }
+
     List<PackageParameter> getPackageParameters() {
-        return packageParameters
+        return packageParameters.collect({new PackageParameter(it)})
     }
 
     @Override

src/main/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/configs/TestConfig.groovy

@@ -34,6 +34,13 @@ class TestConfig extends AbstractDescribableImpl<TestConfig> implements Expandab
         this.constants = []
     }
 
+    TestConfig(TestConfig config) {
+        this.tbcPath = config.getTbcPath()
+        this.tcfPath = config.getTcfPath()
+        this.constants = config.getConstants()
+        this.forceConfigurationReload = config.forceConfigurationReload
+    }
+
     String getTbcPath() {
         return tbcPath
     }
@@ -62,7 +69,7 @@ class TestConfig extends AbstractDescribableImpl<TestConfig> implements Expandab
     }
 
     List<Constant> getConstants() {
-        return constants
+        return constants.collect({new Constant(it)})
     }
 
     @DataBoundSetter

src/main/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/model/AdditionalSetting.groovy

@@ -29,6 +29,11 @@ class AdditionalSetting extends AbstractDescribableImpl<AdditionalSetting> imple
         this.value = StringUtils.trimToEmpty(value)
     }
 
+    AdditionalSetting(AdditionalSetting setting) {
+        this.name = setting.getName()
+        this.value = setting.getValue()
+    }
+
     String getName() {
         return name
     }

src/main/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/model/Constant.groovy

@@ -29,6 +29,11 @@ class Constant extends AbstractDescribableImpl<Constant> implements ExpandableCo
         this.value = StringUtils.trimToEmpty(value)
     }
 
+    Constant(Constant constant) {
+        this.label = constant.getLabel()
+        this.value = constant.getValue()
+    }
+
     String getLabel() {
         return label
     }

src/main/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/model/PackageParameter.groovy

@@ -29,6 +29,11 @@ class PackageParameter extends AbstractDescribableImpl<PackageParameter> impleme
         this.value = StringUtils.trimToEmpty(value)
     }
 
+    PackageParameter(PackageParameter param) {
+        this.label = param.getLabel()
+        this.value = param.getValue()
+    }
+
     String getLabel() {
         return label
     }

src/main/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/model/RecordingAsSetting.groovy

@@ -37,6 +37,14 @@ class RecordingAsSetting extends AbstractDescribableImpl<RecordingAsSetting> imp
         this.formatDetails = ''
     }
 
+    RecordingAsSetting(RecordingAsSetting setting) {
+        this.path = setting.getPath()
+        this.recordingGroup = setting.getRecordingGroup()
+        this.mappingNames = setting.getMappingNames()
+        this.deviceName = setting.getDeviceName()
+        this.formatDetails = setting.getFormatDetails()
+    }
+
     String getPath() {
         return path
     }
@@ -51,7 +59,7 @@ class RecordingAsSetting extends AbstractDescribableImpl<RecordingAsSetting> imp
     }
 
     List<String> getMappingNames() {
-        return mappingNames
+        return mappingNames.collect()
     }
 
     @DataBoundSetter

src/main/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/model/TestResult.groovy

@@ -21,6 +21,12 @@ class TestResult implements Serializable {
         this.reportDir = reportDir
     }
 
+    TestResult(TestResult result) {
+        this.reportId = result.getReportId()
+        this.reportDir = result.getReportDir()
+        this.testResult = result.getTestResult()
+    }
+
     @Whitelisted
     String getReportId() {
         return reportId

src/main/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/scan/AbstractTestScanner.groovy

@@ -56,6 +56,9 @@ abstract class AbstractTestScanner {
      * {@link hudson.remoting.Callable} providing remote access to scan a directory with a include file pattern.
      */
     private static final class ScanTestCallable extends MasterToSlaveCallable<List<String>, IOException> {
+
+        private static final long serialVersionUID = 1L
+
         private final String inputDir
         private final filePattern
 

src/main/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/steps/GenerateReportsStep.groovy

@@ -45,7 +45,7 @@ class GenerateReportsStep extends Step {
     }
 
     List<AdditionalSetting> getAdditionalSettings() {
-        return additionalSettings
+        return additionalSettings.collect({new AdditionalSetting(it)})
     }
 
     @DataBoundSetter
@@ -54,7 +54,7 @@ class GenerateReportsStep extends Step {
     }
 
     List<String> getReportIds() {
-        return reportIds
+        return reportIds.collect()
     }
 
     @DataBoundSetter
@@ -85,6 +85,8 @@ class GenerateReportsStep extends Step {
 
     static class Execution extends SynchronousNonBlockingStepExecution<GenerationResult> {
 
+        private static final long serialVersionUID = 1L
+
         private final transient GenerateReportsStep step
 
         Execution(GenerateReportsStep step, StepContext context) {
@@ -104,6 +106,8 @@ class GenerateReportsStep extends Step {
     }
 
     private static final class ExecutionCallable extends MasterToSlaveCallable<GenerationResult, IOException> {
+
+        private static final long serialVersionUID = 1L
 
         private final String generatorName
         private final Map<String, String> additionalSettings

src/main/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/steps/RunPackageStep.groovy

@@ -51,7 +51,7 @@ class RunPackageStep extends RunTestStep {
 
     @Nonnull
     PackageConfig getPackageConfig() {
-        return packageConfig
+        return new PackageConfig(packageConfig)
     }
 
     @DataBoundSetter
@@ -61,7 +61,7 @@ class RunPackageStep extends RunTestStep {
 
     @Nonnull
     AnalysisConfig getAnalysisConfig() {
-        return analysisConfig
+        return new AnalysisConfig(analysisConfig)
     }
 
     @DataBoundSetter
@@ -75,6 +75,8 @@ class RunPackageStep extends RunTestStep {
     }
 
     static class Execution extends SynchronousNonBlockingStepExecution<TestResult> {
+
+        private static final long serialVersionUID = 1L
 
         private final transient RunPackageStep step
 

src/main/groovy/de/tracetronic/jenkins/plugins/ecutestexecution/steps/RunProjectStep.groovy

@@ -43,6 +43,8 @@ class RunProjectStep extends RunTestStep {
 
     static class Execution extends SynchronousNonBlockingStepExecution<TestResult> {
 
+        private static final long serialVersionUID = 1L
+
         private final transient RunProjectStep step
 
         Execution(RunProjectStep step, StepContext context) {