From f6d65b2fa382122badfeec737e785719383ad7c2 Mon Sep 17 00:00:00 2001
From: Daniel Heid <mail@daniel-heid.de>
Date: Sat, 12 Oct 2024 15:34:02 +0200
Subject: [PATCH] Upgraded to Jenkins 2.462.3

---
 .editorconfig                                 |   3 +
 .java-version                                 |   1 +
 README.md                                     |   6 +
 pom.xml                                       | 328 +++++++++---------
 .../ConfigurableMatrixAggregator.java         |  14 +-
 .../MatrixPostBuildScript.java                |  37 +-
 .../postbuildscript/PostBuildScript.java      |  60 ++--
 .../postbuildscript/logging/Logger.java       |  18 +-
 .../LoggerInitializationException.java        |   1 -
 .../postbuildscript/model/Configuration.java  |   5 +-
 .../postbuildscript/model/ExecuteOn.java      |   2 -
 .../postbuildscript/model/PostBuildItem.java  |   4 +-
 .../postbuildscript/model/PostBuildStep.java  |   8 +-
 .../plugins/postbuildscript/model/Role.java   |   4 +-
 .../plugins/postbuildscript/model/Script.java |   4 +-
 .../postbuildscript/model/ScriptFile.java     |   3 +-
 .../postbuildscript/processor/Processor.java  |  43 +--
 .../processor/ProcessorFactory.java           |  13 +-
 .../processor/rules/ExecutionRule.java        |   1 -
 .../processor/rules/MatrixRule.java           |   2 -
 .../processor/rules/ResultRule.java           |   3 +-
 .../processor/rules/RoleRule.java             |   4 +-
 .../postbuildscript/service/Command.java      |  11 +-
 .../service/CommandExecutor.java              |  21 +-
 .../postbuildscript/service/Content.java      |   4 +-
 .../service/GroovyScriptExecutor.java         |  17 +-
 .../service/GroovyScriptExecutorFactory.java  |   3 +-
 .../service/GroovyScriptPreparer.java         |  14 +-
 .../service/LoadFileCallable.java             |   3 +-
 .../service/LoadScriptContentCallable.java    |   4 +-
 .../service/ScriptFilePath.java               |  13 +-
 .../ConfigurableMatrixAggregatorTest.java     |  27 +-
 .../MatrixPostBuildScriptTest.java            |  37 +-
 .../PostBuildScriptExceptionTest.java         |  10 +-
 .../postbuildscript/PostBuildScriptIT.java    |  77 ++--
 .../postbuildscript/PostBuildScriptTest.java  |  28 +-
 .../postbuildscript/logging/LoggerTest.java   |  36 +-
 .../model/ConfigurationTest.java              |  23 +-
 .../postbuildscript/model/ExecuteOnTest.java  |   5 +-
 .../model/PostBuildItemTest.java              |  23 +-
 .../model/PostBuildStepTest.java              |  26 +-
 .../postbuildscript/model/ScriptFileTest.java |  12 +-
 .../postbuildscript/model/ScriptTest.java     |  15 +-
 .../processor/rules/MatrixRuleTest.java       |  19 +-
 .../processor/rules/ResultRuleTest.java       |  18 +-
 .../processor/rules/RoleRuleTest.java         |  20 +-
 .../service/CommandExecutorIT.java            |  13 +-
 .../postbuildscript/service/ContentTest.java  |  17 +-
 .../GroovyScriptExecutorFactoryTest.java      |  14 +-
 .../service/GroovyScriptExecutorIT.java       |  15 +-
 .../service/GroovyScriptPreparerTest.java     |  38 +-
 .../service/LoadFileCallableTest.java         |  21 +-
 .../LoadScriptContentCallableTest.java        |   8 +-
 53 files changed, 473 insertions(+), 683 deletions(-)
 create mode 100644 .java-version

diff --git a/.editorconfig b/.editorconfig
index d1f040a..25d30b5 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,5 +8,8 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 
+[*.xml]
+indent_size = 2
+
 [*.md]
 trim_trailing_whitespace = false
diff --git a/.java-version b/.java-version
new file mode 100644
index 0000000..98d9bcb
--- /dev/null
+++ b/.java-version
@@ -0,0 +1 @@
+17
diff --git a/README.md b/README.md
index 23263b7..adc5ded 100644
--- a/README.md
+++ b/README.md
@@ -53,6 +53,12 @@ the PR from the JIRA issue.
 
 ## Release Notes
 
+### Version 3.4.0
+
+* Upgraded to Jenkins Plugin POM 5.1
+* Upgraded to Jenkins 2.462.3
+* Reformatted source code with Spotless
+
 ### Version 3.3.0
 
 * Upgraded to Jenkins 2.452
diff --git a/pom.xml b/pom.xml
index 4f84967..c5bda27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,169 +1,169 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.jenkins-ci.plugins</groupId>
-        <artifactId>plugin</artifactId>
-        <version>5.1</version>
-    </parent>
-
-    <artifactId>postbuildscript</artifactId>
-    <packaging>hpi</packaging>
-    <name>Jenkins PostBuildScript Plugin</name>
-    <version>${revision}-${changelist}</version>
-    <url>https://plugins.jenkins.io/postbuildscript</url>
-    <inceptionYear>2011</inceptionYear>
-    <description>A plugin for the Jenkins CI to run several configurable actions after
-        a build, depending on the build result.
-    </description>
-
-    <properties>
-        <revision>3.3.0</revision>
-        <changelist>999999-SNAPSHOT</changelist>
-        <gitHubRepo>jenkinsci/postbuildscript-plugin</gitHubRepo>
-        <jenkins.version>2.452.2</jenkins.version>
-        <hpi.compatibleSinceVersion>3.0.0</hpi.compatibleSinceVersion>
-    </properties>
-
-    <issueManagement>
-        <system>jira</system>
-        <url>https://issues.jenkins-ci.org/browse</url>
-    </issueManagement>
-
-    <ciManagement>
-        <system>Jenkins</system>
-        <url>https://ci.jenkins.io/job/Plugins/job/postbuildscript-plugin/</url>
-        <notifiers>
-            <notifier>
-                <address>mail@daniel-heid.de</address>
-            </notifier>
-        </notifiers>
-    </ciManagement>
-
-    <distributionManagement>
-        <downloadUrl>https://updates.jenkins-ci.org/download/plugins/postbuildscript</downloadUrl>
-    </distributionManagement>
-
-    <licenses>
-        <license>
-            <name>MIT license</name>
-            <comments>All source code is under the MIT license.</comments>
-            <url>https://opensource.org/licenses/MIT</url>
-        </license>
-    </licenses>
-
-    <developers>
-        <developer>
-            <id>gbois</id>
-            <name>Gregory Boissinot</name>
-            <timezone>+1</timezone>
-            <roles>
-                <role>Initiator and previous maintainer (until 2015)</role>
-            </roles>
-        </developer>
-        <developer>
-            <id>dheid</id>
-            <name>Daniel Heid</name>
-            <email>mail@daniel-heid.de</email>
-            <url>https://www.daniel-heid.de/</url>
-            <roles>
-                <role>Maintainer (since 2017)</role>
-            </roles>
-        </developer>
-    </developers>
-
-    <contributors>
-        <contributor>
-            <name>Nicolas De loof</name>
-            <url>https://blog.loof.fr</url>
-            <organization>CloudBees</organization>
-            <organizationUrl>https://www.cloudbees.com/</organizationUrl>
-        </contributor>
-        <contributor>
-            <name>Simon Edwardsson</name>
-        </contributor>
-        <contributor>
-            <name>ChakaZulu</name>
-        </contributor>
-        <contributor>
-            <name>Rob Petti</name>
-            <url>http://robpetti.com</url>
-            <organization>OpenText</organization>
-            <organizationUrl>https://www.opentext.com/</organizationUrl>
-        </contributor>
-        <contributor>
-            <name>Markus Alexander Kuppe</name>
-            <url>https://www.lemmster.de/</url>
-        </contributor>
-        <contributor>
-            <name>Dan Clayton</name>
-        </contributor>
-    </contributors>
-
-    <scm>
-        <connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
-        <developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>
-        <url>https://github.com/${gitHubRepo}</url>
-        <tag>${scmTag}</tag>
-    </scm>
-
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.jenkins-ci.plugins</groupId>
+    <artifactId>plugin</artifactId>
+    <version>5.1</version>
+  </parent>
+
+  <artifactId>postbuildscript</artifactId>
+  <version>${revision}-${changelist}</version>
+  <packaging>hpi</packaging>
+  <name>Jenkins PostBuildScript Plugin</name>
+  <description>A plugin for the Jenkins CI to run several configurable actions after
+        a build, depending on the build result.</description>
+  <url>https://plugins.jenkins.io/postbuildscript</url>
+  <inceptionYear>2011</inceptionYear>
+
+  <licenses>
+    <license>
+      <name>MIT license</name>
+      <url>https://opensource.org/licenses/MIT</url>
+      <comments>All source code is under the MIT license.</comments>
+    </license>
+  </licenses>
+
+  <developers>
+    <developer>
+      <id>gbois</id>
+      <name>Gregory Boissinot</name>
+      <roles>
+        <role>Initiator and previous maintainer (until 2015)</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <id>dheid</id>
+      <name>Daniel Heid</name>
+      <email>mail@daniel-heid.de</email>
+      <url>https://www.daniel-heid.de/</url>
+      <roles>
+        <role>Maintainer (since 2017)</role>
+      </roles>
+    </developer>
+  </developers>
+
+  <contributors>
+    <contributor>
+      <name>Nicolas De loof</name>
+      <url>https://blog.loof.fr</url>
+      <organization>CloudBees</organization>
+      <organizationUrl>https://www.cloudbees.com/</organizationUrl>
+    </contributor>
+    <contributor>
+      <name>Simon Edwardsson</name>
+    </contributor>
+    <contributor>
+      <name>ChakaZulu</name>
+    </contributor>
+    <contributor>
+      <name>Rob Petti</name>
+      <url>http://robpetti.com</url>
+      <organization>OpenText</organization>
+      <organizationUrl>https://www.opentext.com/</organizationUrl>
+    </contributor>
+    <contributor>
+      <name>Markus Alexander Kuppe</name>
+      <url>https://www.lemmster.de/</url>
+    </contributor>
+    <contributor>
+      <name>Dan Clayton</name>
+    </contributor>
+  </contributors>
+
+  <scm>
+    <connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
+    <developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>
+    <tag>${scmTag}</tag>
+    <url>https://github.com/${gitHubRepo}</url>
+  </scm>
+
+  <issueManagement>
+    <system>jira</system>
+    <url>https://issues.jenkins-ci.org/browse</url>
+  </issueManagement>
+
+  <ciManagement>
+    <system>Jenkins</system>
+    <url>https://ci.jenkins.io/job/Plugins/job/postbuildscript-plugin/</url>
+    <notifiers>
+      <notifier>
+        <address>mail@daniel-heid.de</address>
+      </notifier>
+    </notifiers>
+  </ciManagement>
+
+  <distributionManagement>
+    <downloadUrl>https://updates.jenkins-ci.org/download/plugins/postbuildscript</downloadUrl>
+  </distributionManagement>
+
+  <properties>
+    <revision>3.4.0</revision>
+    <changelist>999999-SNAPSHOT</changelist>
+    <gitHubRepo>jenkinsci/postbuildscript-plugin</gitHubRepo>
+    <jenkins.version>2.462.3</jenkins.version>
+    <jenkins-test-harness.version>2228.v919b_5883c444</jenkins-test-harness.version>
+    <hpi.compatibleSinceVersion>3.0.0</hpi.compatibleSinceVersion>
+  </properties>
+
+  <dependencyManagement>
     <dependencies>
-
-        <dependency>
-            <groupId>org.jenkins-ci.plugins</groupId>
-            <artifactId>matrix-project</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-
+      <dependency>
+        <groupId>io.jenkins.tools.bom</groupId>
+        <artifactId>bom-2.462.x</artifactId>
+        <version>3387.v0f2773fa_3200</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
     </dependencies>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.452.x</artifactId>
-                <version>3435.v238d66a_043fb_</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <repositories>
-        <repository>
-            <id>repo.jenkins-ci.org</id>
-            <url>https://repo.jenkins-ci.org/public/</url>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>repo.jenkins-ci.org</id>
-            <url>https://repo.jenkins-ci.org/public/</url>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+  </dependencyManagement>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>org.jenkins-ci.plugins</groupId>
+      <artifactId>matrix-project</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+
+  <repositories>
+    <repository>
+      <id>repo.jenkins-ci.org</id>
+      <url>https://repo.jenkins-ci.org/public/</url>
+    </repository>
+  </repositories>
+
+  <pluginRepositories>
+    <pluginRepository>
+      <id>repo.jenkins-ci.org</id>
+      <url>https://repo.jenkins-ci.org/public/</url>
+    </pluginRepository>
+  </pluginRepositories>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>
-
diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/ConfigurableMatrixAggregator.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/ConfigurableMatrixAggregator.java
index 3f4eff9..ae862aa 100644
--- a/src/main/java/org/jenkinsci/plugins/postbuildscript/ConfigurableMatrixAggregator.java
+++ b/src/main/java/org/jenkinsci/plugins/postbuildscript/ConfigurableMatrixAggregator.java
@@ -5,12 +5,11 @@
 import hudson.matrix.MatrixBuild;
 import hudson.matrix.MatrixRun;
 import hudson.model.BuildListener;
+import java.io.IOException;
 import org.jenkinsci.plugins.postbuildscript.logging.Logger;
 import org.jenkinsci.plugins.postbuildscript.processor.Processor;
 import org.jenkinsci.plugins.postbuildscript.processor.ProcessorFactory;
 
-import java.io.IOException;
-
 public class ConfigurableMatrixAggregator extends MatrixAggregator {
 
     private final Processor processor;
@@ -19,12 +18,11 @@ public class ConfigurableMatrixAggregator extends MatrixAggregator {
     private final Logger logger;
 
     public ConfigurableMatrixAggregator(
-        MatrixBuild build,
-        Launcher launcher,
-        BuildListener listener,
-        ProcessorFactory processorFactory,
-        Class<? extends PostBuildScript> initiator
-    ) {
+            MatrixBuild build,
+            Launcher launcher,
+            BuildListener listener,
+            ProcessorFactory processorFactory,
+            Class<? extends PostBuildScript> initiator) {
         super(build, launcher, listener);
         this.initiator = initiator;
         processor = processorFactory.createMatrixProcessor(build, launcher, listener);
diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/MatrixPostBuildScript.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/MatrixPostBuildScript.java
index 476268e..e5ff0e9 100644
--- a/src/main/java/org/jenkinsci/plugins/postbuildscript/MatrixPostBuildScript.java
+++ b/src/main/java/org/jenkinsci/plugins/postbuildscript/MatrixPostBuildScript.java
@@ -11,6 +11,7 @@
 import hudson.model.BuildListener;
 import hudson.tasks.BuildStepDescriptor;
 import hudson.tasks.Publisher;
+import java.util.Collection;
 import org.jenkinsci.plugins.postbuildscript.model.PostBuildStep;
 import org.jenkinsci.plugins.postbuildscript.model.Script;
 import org.jenkinsci.plugins.postbuildscript.model.ScriptFile;
@@ -18,43 +19,26 @@
 import org.jenkinsci.plugins.postbuildscript.processor.ProcessorFactory;
 import org.kohsuke.stapler.DataBoundConstructor;
 
-import java.util.Collection;
-
 public class MatrixPostBuildScript extends PostBuildScript {
 
     @DataBoundConstructor
     public MatrixPostBuildScript(
-        Collection<ScriptFile> genericScriptFiles,
-        Collection<ScriptFile> groovyScriptFiles,
-        Collection<Script> groovyScripts,
-        Collection<PostBuildStep> buildSteps,
-        boolean markBuildUnstable
-    ) {
+            Collection<ScriptFile> genericScriptFiles,
+            Collection<ScriptFile> groovyScriptFiles,
+            Collection<Script> groovyScripts,
+            Collection<PostBuildStep> buildSteps,
+            boolean markBuildUnstable) {
         super(genericScriptFiles, groovyScriptFiles, groovyScripts, buildSteps, markBuildUnstable);
     }
 
     @Override
-    public MatrixAggregator createAggregator(
-        MatrixBuild build,
-        Launcher launcher,
-        BuildListener listener
-    ) {
+    public MatrixAggregator createAggregator(MatrixBuild build, Launcher launcher, BuildListener listener) {
         ProcessorFactory processorFactory = createProcessorFactory();
-        return new ConfigurableMatrixAggregator(
-            build,
-            launcher,
-            listener,
-            processorFactory,
-            getClass()
-        );
+        return new ConfigurableMatrixAggregator(build, launcher, listener, processorFactory, getClass());
     }
 
     @Override
-    public boolean perform(
-        AbstractBuild<?, ?> build,
-        Launcher launcher,
-        BuildListener listener
-    ) {
+    public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListener listener) {
         ProcessorFactory processorFactory = createProcessorFactory();
         Processor processor = processorFactory.createMatrixProcessor(build, launcher, listener);
         return processor.process();
@@ -71,7 +55,7 @@ public String getDisplayName() {
 
         @Override
         public String getHelpFile() {
-            return "/plugin/postbuildscript/help/postbuildscript.html"; //NON-NLS
+            return "/plugin/postbuildscript/help/postbuildscript.html"; // NON-NLS
         }
 
         @Override
@@ -79,5 +63,4 @@ public boolean isApplicable(Class<? extends AbstractProject> jobType) {
             return MatrixProject.class.isAssignableFrom(jobType);
         }
     }
-
 }
diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/PostBuildScript.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/PostBuildScript.java
index 51979ba..d1355e8 100644
--- a/src/main/java/org/jenkinsci/plugins/postbuildscript/PostBuildScript.java
+++ b/src/main/java/org/jenkinsci/plugins/postbuildscript/PostBuildScript.java
@@ -9,34 +9,38 @@
 import hudson.model.AbstractBuild;
 import hudson.model.AbstractProject;
 import hudson.model.BuildListener;
-import hudson.model.Result;
-import hudson.tasks.*;
-import org.jenkinsci.plugins.postbuildscript.model.*;
+import hudson.tasks.BuildStepDescriptor;
+import hudson.tasks.BuildStepMonitor;
+import hudson.tasks.Notifier;
+import hudson.tasks.Publisher;
+import java.util.Collection;
+import java.util.List;
+import org.jenkinsci.plugins.postbuildscript.model.Configuration;
+import org.jenkinsci.plugins.postbuildscript.model.PostBuildStep;
+import org.jenkinsci.plugins.postbuildscript.model.Script;
+import org.jenkinsci.plugins.postbuildscript.model.ScriptFile;
+import org.jenkinsci.plugins.postbuildscript.model.ScriptType;
 import org.jenkinsci.plugins.postbuildscript.processor.Processor;
 import org.jenkinsci.plugins.postbuildscript.processor.ProcessorFactory;
 import org.kohsuke.stapler.DataBoundConstructor;
 
-import java.util.*;
-
-
 /**
  * @author Gregory Boissinot
  */
 public class PostBuildScript extends Notifier
-    // MatrixAggregatable is needed for migration of old plugin version configurations (< 1.0.0), see JENKINS-53691
-    // TODO Remove, if there are no 0.18.x installations left
-    implements MatrixAggregatable {
+        // MatrixAggregatable is needed for migration of old plugin version configurations (< 1.0.0), see JENKINS-53691
+        // TODO Remove, if there are no 0.18.x installations left
+        implements MatrixAggregatable {
 
     private Configuration config = new Configuration();
 
     @DataBoundConstructor
     public PostBuildScript(
-        Collection<ScriptFile> genericScriptFiles,
-        Collection<ScriptFile> groovyScriptFiles,
-        Collection<Script> groovyScripts,
-        Collection<PostBuildStep> buildSteps,
-        boolean markBuildUnstable
-    ) {
+            Collection<ScriptFile> genericScriptFiles,
+            Collection<ScriptFile> groovyScriptFiles,
+            Collection<Script> groovyScripts,
+            Collection<PostBuildStep> buildSteps,
+            boolean markBuildUnstable) {
 
         addScriptFiles(genericScriptFiles, ScriptType.GENERIC);
         addScriptFiles(groovyScriptFiles, ScriptType.GROOVY);
@@ -50,7 +54,6 @@ public PostBuildScript(
         }
 
         config.setMarkBuildUnstable(markBuildUnstable);
-
     }
 
     void addScriptFiles(Collection<? extends ScriptFile> scriptFiles, ScriptType scriptType) {
@@ -68,11 +71,7 @@ public BuildStepMonitor getRequiredMonitorService() {
     }
 
     @Override
-    public boolean perform(
-        AbstractBuild<?, ?> build,
-        Launcher launcher,
-        BuildListener listener
-    ) {
+    public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListener listener) {
         Processor processor = createProcessor(build, launcher, listener);
         return processor.process();
     }
@@ -109,19 +108,9 @@ public boolean isMarkBuildUnstable() {
     }
 
     @Override
-    public MatrixAggregator createAggregator(
-        MatrixBuild build,
-        Launcher launcher,
-        BuildListener listener
-    ) {
+    public MatrixAggregator createAggregator(MatrixBuild build, Launcher launcher, BuildListener listener) {
         ProcessorFactory processorFactory = createProcessorFactory();
-        return new ConfigurableMatrixAggregator(
-            build,
-            launcher,
-            listener,
-            processorFactory,
-            getClass()
-        );
+        return new ConfigurableMatrixAggregator(build, launcher, listener, processorFactory, getClass());
     }
 
     @Extension
@@ -135,15 +124,12 @@ public String getDisplayName() {
 
         @Override
         public String getHelpFile() {
-            return "/plugin/postbuildscript/help/postbuildscript.html"; //NON-NLS
+            return "/plugin/postbuildscript/help/postbuildscript.html"; // NON-NLS
         }
 
         @Override
         public boolean isApplicable(Class<? extends AbstractProject> jobType) {
             return true;
         }
-
     }
-
 }
-
diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/logging/Logger.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/logging/Logger.java
index c626605..d28641f 100644
--- a/src/main/java/org/jenkinsci/plugins/postbuildscript/logging/Logger.java
+++ b/src/main/java/org/jenkinsci/plugins/postbuildscript/logging/Logger.java
@@ -1,15 +1,13 @@
 package org.jenkinsci.plugins.postbuildscript.logging;
 
+import hudson.model.AbstractBuild;
+import hudson.model.TaskListener;
+import java.io.PrintStream;
 import org.slf4j.Marker;
 import org.slf4j.event.Level;
 import org.slf4j.helpers.LegacyAbstractLogger;
 import org.slf4j.helpers.MessageFormatter;
 
-import java.io.PrintStream;
-
-import hudson.model.AbstractBuild;
-import hudson.model.TaskListener;
-
 /**
  * @author Daniel Heid
  */
@@ -26,8 +24,8 @@ public Logger(TaskListener listener, AbstractBuild<?, ?> build) {
         this.listener = listener;
         try {
             verbose = Boolean.parseBoolean(
-                build.getEnvironment(listener).get("POSTBUILDSCRIPT_VERBOSE", "false") //NON-NLS
-            );
+                    build.getEnvironment(listener).get("POSTBUILDSCRIPT_VERBOSE", "false") // NON-NLS
+                    );
         } catch (Exception e) {
             throw new LoggerInitializationException(e);
         }
@@ -43,9 +41,10 @@ protected String getFullyQualifiedCallerName() {
     }
 
     @Override
-    protected void handleNormalizedLoggingCall(Level level, Marker marker, String messagePattern, Object[] arguments, Throwable throwable) {
+    protected void handleNormalizedLoggingCall(
+            Level level, Marker marker, String messagePattern, Object[] arguments, Throwable throwable) {
         PrintStream logger = listener.getLogger();
-        logger.print("[PostBuildScript] - "); //NON-NLS
+        logger.print("[PostBuildScript] - "); // NON-NLS
         logger.print('[');
         logger.print(level.name());
         logger.print("] ");
@@ -79,5 +78,4 @@ public boolean isInfoEnabled() {
     public boolean isWarnEnabled() {
         return true;
     }
-
 }
diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/logging/LoggerInitializationException.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/logging/LoggerInitializationException.java
index decdd03..c3d4f0c 100644
--- a/src/main/java/org/jenkinsci/plugins/postbuildscript/logging/LoggerInitializationException.java
+++ b/src/main/java/org/jenkinsci/plugins/postbuildscript/logging/LoggerInitializationException.java
@@ -5,5 +5,4 @@ public class LoggerInitializationException extends RuntimeException {
     public LoggerInitializationException(Throwable cause) {
         super(cause);
     }
-
 }
diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/model/Configuration.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/model/Configuration.java
index bab89cb..9b29989 100644
--- a/src/main/java/org/jenkinsci/plugins/postbuildscript/model/Configuration.java
+++ b/src/main/java/org/jenkinsci/plugins/postbuildscript/model/Configuration.java
@@ -35,8 +35,8 @@ public List<ScriptFile> getScriptFiles() {
 
     public List<ScriptFile> getScriptFiles(ScriptType scriptType) {
         return scriptFiles.stream()
-            .filter(scriptFile -> scriptFile.getScriptType() == scriptType)
-            .collect(Collectors.toList());
+                .filter(scriptFile -> scriptFile.getScriptType() == scriptType)
+                .collect(Collectors.toList());
     }
 
     public int scriptFileIndexOf(ScriptFile scriptFile) {
@@ -66,5 +66,4 @@ public void addBuildSteps(Collection<? extends PostBuildStep> buildSteps) {
     public void addBuildStep(PostBuildStep postBuildStep) {
         buildSteps.add(postBuildStep);
     }
-
 }
diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/model/ExecuteOn.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/model/ExecuteOn.java
index d80416e..09d7ff3 100644
--- a/src/main/java/org/jenkinsci/plugins/postbuildscript/model/ExecuteOn.java
+++ b/src/main/java/org/jenkinsci/plugins/postbuildscript/model/ExecuteOn.java
@@ -4,7 +4,6 @@
  * @author <a href="mailto:nicolas.deloof@gmail.com">Nicolas De Loof</a>
  */
 public enum ExecuteOn {
-
     BOTH,
     MATRIX,
     AXES;
@@ -16,5 +15,4 @@ public boolean matrix() {
     public boolean axes() {
         return this == AXES || this == BOTH;
     }
-
 }
diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/model/PostBuildItem.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/model/PostBuildItem.java
index 00ae090..04d5d19 100644
--- a/src/main/java/org/jenkinsci/plugins/postbuildscript/model/PostBuildItem.java
+++ b/src/main/java/org/jenkinsci/plugins/postbuildscript/model/PostBuildItem.java
@@ -2,12 +2,11 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
-import org.kohsuke.stapler.DataBoundSetter;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
+import org.kohsuke.stapler.DataBoundSetter;
 
 public class PostBuildItem {
 
@@ -77,5 +76,4 @@ public Object readResolve() {
         }
         return this;
     }
-
 }
diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/model/PostBuildStep.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/model/PostBuildStep.java
index bd78dce..75b693b 100644
--- a/src/main/java/org/jenkinsci/plugins/postbuildscript/model/PostBuildStep.java
+++ b/src/main/java/org/jenkinsci/plugins/postbuildscript/model/PostBuildStep.java
@@ -2,13 +2,11 @@
 
 import edu.umd.cs.findbugs.annotations.Nullable;
 import hudson.tasks.BuildStep;
-import org.kohsuke.stapler.DataBoundConstructor;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-
+import org.kohsuke.stapler.DataBoundConstructor;
 
 public class PostBuildStep extends PostBuildItem {
 
@@ -17,7 +15,8 @@ public class PostBuildStep extends PostBuildItem {
     private boolean stopOnFailure;
 
     @DataBoundConstructor
-    public PostBuildStep(@Nullable Collection<String> results, @Nullable Collection<BuildStep> buildSteps, boolean stopOnFailure) {
+    public PostBuildStep(
+            @Nullable Collection<String> results, @Nullable Collection<BuildStep> buildSteps, boolean stopOnFailure) {
         super(results);
         this.stopOnFailure = stopOnFailure;
         if (buildSteps != null) {
@@ -45,5 +44,4 @@ public Object readResolve() {
         }
         return this;
     }
-
 }
diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/model/Role.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/model/Role.java
index 0cbced3..7e61619 100644
--- a/src/main/java/org/jenkinsci/plugins/postbuildscript/model/Role.java
+++ b/src/main/java/org/jenkinsci/plugins/postbuildscript/model/Role.java
@@ -1,5 +1,7 @@
 package org.jenkinsci.plugins.postbuildscript.model;
 
 public enum Role {
-    MASTER, SLAVE, BOTH
+    MASTER,
+    SLAVE,
+    BOTH
 }
diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/model/Script.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/model/Script.java
index 3b3d343..c6b79b1 100644
--- a/src/main/java/org/jenkinsci/plugins/postbuildscript/model/Script.java
+++ b/src/main/java/org/jenkinsci/plugins/postbuildscript/model/Script.java
@@ -1,11 +1,10 @@
 package org.jenkinsci.plugins.postbuildscript.model;
 
 import hudson.Util;
+import java.util.Collection;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 
-import java.util.Collection;
-
 public class Script extends PostBuildItem {
 
     private final String content;
@@ -30,5 +29,4 @@ public void setSandboxed(boolean sandboxed) {
     public boolean isSandboxed() {
         return sandboxed;
     }
-
 }
diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/model/ScriptFile.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/model/ScriptFile.java
index f3759a8..da08bbe 100644
--- a/src/main/java/org/jenkinsci/plugins/postbuildscript/model/ScriptFile.java
+++ b/src/main/java/org/jenkinsci/plugins/postbuildscript/model/ScriptFile.java
@@ -1,10 +1,9 @@
 package org.jenkinsci.plugins.postbuildscript.model;
 
+import java.util.Collection;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 
-import java.util.Collection;
-
 public class ScriptFile extends PostBuildItem {
 
     private final String filePath;
diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/processor/Processor.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/processor/Processor.java
index f341bb4..1754567 100644
--- a/src/main/java/org/jenkinsci/plugins/postbuildscript/processor/Processor.java
+++ b/src/main/java/org/jenkinsci/plugins/postbuildscript/processor/Processor.java
@@ -9,20 +9,24 @@
 import hudson.model.BuildListener;
 import hudson.model.Result;
 import hudson.tasks.BuildStep;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
 import org.jenkinsci.plugins.postbuildscript.Messages;
 import org.jenkinsci.plugins.postbuildscript.PostBuildScriptException;
 import org.jenkinsci.plugins.postbuildscript.logging.Logger;
-import org.jenkinsci.plugins.postbuildscript.model.*;
+import org.jenkinsci.plugins.postbuildscript.model.Configuration;
+import org.jenkinsci.plugins.postbuildscript.model.PostBuildItem;
+import org.jenkinsci.plugins.postbuildscript.model.PostBuildStep;
+import org.jenkinsci.plugins.postbuildscript.model.Script;
+import org.jenkinsci.plugins.postbuildscript.model.ScriptFile;
+import org.jenkinsci.plugins.postbuildscript.model.ScriptType;
 import org.jenkinsci.plugins.postbuildscript.processor.rules.ExecutionRule;
 import org.jenkinsci.plugins.postbuildscript.service.Command;
 import org.jenkinsci.plugins.postbuildscript.service.CommandExecutor;
 import org.jenkinsci.plugins.postbuildscript.service.GroovyScriptExecutorFactory;
 import org.jenkinsci.plugins.postbuildscript.service.GroovyScriptPreparer;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-
 public class Processor {
 
     private final AbstractBuild<?, ?> build;
@@ -32,19 +36,13 @@ public class Processor {
     private final Logger logger;
     private final Collection<ExecutionRule> rules = new ArrayList<>();
 
-    public Processor(
-        AbstractBuild<?, ?> build,
-        Launcher launcher,
-        BuildListener listener,
-        Configuration config
-    ) {
+    public Processor(AbstractBuild<?, ?> build, Launcher launcher, BuildListener listener, Configuration config) {
         this.build = build;
         Result result = build.getResult();
         if (result == null) {
             this.launcher = launcher;
         } else {
-            this.launcher = launcher.decorateByEnv(
-                new EnvVars("BUILD_RESULT", result.toString())); //NON-NLS
+            this.launcher = launcher.decorateByEnv(new EnvVars("BUILD_RESULT", result.toString())); // NON-NLS
         }
         this.listener = listener;
         this.config = config;
@@ -87,8 +85,8 @@ public boolean process(boolean endOfMatrixBuild) {
     private boolean processScripts(boolean endOfMatrixBuild) throws PostBuildScriptException {
         @SuppressWarnings("NonShortCircuitBooleanExpression")
         boolean everyScriptSuccessful = processScriptFiles(endOfMatrixBuild)
-            & processGroovyScripts(endOfMatrixBuild)
-            & processBuildSteps(endOfMatrixBuild);
+                & processGroovyScripts(endOfMatrixBuild)
+                & processBuildSteps(endOfMatrixBuild);
         return everyScriptSuccessful || failOrUnstable();
     }
 
@@ -153,15 +151,13 @@ private boolean processGroovyScripts(boolean endOfMatrixBuild) {
                     everyStepSuccessful = false;
                 }
             }
-
         }
         return everyStepSuccessful;
     }
 
     private GroovyScriptPreparer createGroovyScriptPreparer() {
         FilePath workspace = build.getWorkspace();
-        GroovyScriptExecutorFactory executorFactory =
-            new GroovyScriptExecutorFactory(build, logger);
+        GroovyScriptExecutorFactory executorFactory = new GroovyScriptExecutorFactory(build, logger);
         return new GroovyScriptPreparer(logger, workspace, executorFactory);
     }
 
@@ -170,8 +166,7 @@ private boolean processBuildSteps(boolean endOfMatrixBuild) throws PostBuildScri
         try {
             boolean everyStepSuccessful = true;
             for (PostBuildStep postBuildStep : config.getBuildSteps()) {
-                String scriptName = Messages.PostBuildScript_BuildStep(
-                    config.buildStepIndexOf(postBuildStep));
+                String scriptName = Messages.PostBuildScript_BuildStep(config.buildStepIndexOf(postBuildStep));
                 if (violatesAnyRule(postBuildStep, scriptName, endOfMatrixBuild)) {
                     continue;
                 }
@@ -194,16 +189,10 @@ private boolean processBuildSteps(boolean endOfMatrixBuild) throws PostBuildScri
     private boolean violatesAnyRule(PostBuildItem item, String scriptName, boolean endOfMatrixBuild) {
         for (ExecutionRule rule : rules) {
             if (!rule.allows(item, endOfMatrixBuild)) {
-                logger.info(
-                    rule.formatViolationMessage(
-                        item,
-                        scriptName
-                    )
-                );
+                logger.info(rule.formatViolationMessage(item, scriptName));
                 return true;
             }
         }
         return false;
     }
-
 }
diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/processor/ProcessorFactory.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/processor/ProcessorFactory.java
index 7aca792..6b60616 100644
--- a/src/main/java/org/jenkinsci/plugins/postbuildscript/processor/ProcessorFactory.java
+++ b/src/main/java/org/jenkinsci/plugins/postbuildscript/processor/ProcessorFactory.java
@@ -16,25 +16,16 @@ public ProcessorFactory(Configuration config) {
         this.config = config;
     }
 
-    public Processor createDefaultProcessor(
-        AbstractBuild<?, ?> build,
-        Launcher launcher,
-        BuildListener listener
-    ) {
+    public Processor createDefaultProcessor(AbstractBuild<?, ?> build, Launcher launcher, BuildListener listener) {
         Processor processor = new Processor(build, launcher, listener, config);
         processor.addRule(new RoleRule(build));
         processor.addRule(new ResultRule(build));
         return processor;
     }
 
-    public Processor createMatrixProcessor(
-        AbstractBuild<?, ?> build,
-        Launcher launcher,
-        BuildListener listener
-    ) {
+    public Processor createMatrixProcessor(AbstractBuild<?, ?> build, Launcher launcher, BuildListener listener) {
         Processor processor = createDefaultProcessor(build, launcher, listener);
         processor.addRule(new MatrixRule());
         return processor;
     }
-
 }
diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/processor/rules/ExecutionRule.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/processor/rules/ExecutionRule.java
index 2e4f62f..b19240d 100644
--- a/src/main/java/org/jenkinsci/plugins/postbuildscript/processor/rules/ExecutionRule.java
+++ b/src/main/java/org/jenkinsci/plugins/postbuildscript/processor/rules/ExecutionRule.java
@@ -7,5 +7,4 @@ public interface ExecutionRule {
     boolean allows(PostBuildItem item, boolean endOfMatrixBuild);
 
     String formatViolationMessage(PostBuildItem item, String scriptName);
-
 }
diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/processor/rules/MatrixRule.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/processor/rules/MatrixRule.java
index 2f6a5bf..1d7996a 100644
--- a/src/main/java/org/jenkinsci/plugins/postbuildscript/processor/rules/MatrixRule.java
+++ b/src/main/java/org/jenkinsci/plugins/postbuildscript/processor/rules/MatrixRule.java
@@ -22,12 +22,10 @@ public boolean allows(PostBuildItem item, boolean endOfMatrixBuild) {
         }
 
         return executeOn.axes();
-
     }
 
     @Override
     public String formatViolationMessage(PostBuildItem item, String scriptName) {
         return Messages.PostBuildScript_OnlyExecuteOn(scriptName, item.getExecuteOn());
     }
-
 }
diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/processor/rules/ResultRule.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/processor/rules/ResultRule.java
index c5b6881..71fb080 100644
--- a/src/main/java/org/jenkinsci/plugins/postbuildscript/processor/rules/ResultRule.java
+++ b/src/main/java/org/jenkinsci/plugins/postbuildscript/processor/rules/ResultRule.java
@@ -2,11 +2,10 @@
 
 import hudson.model.AbstractBuild;
 import hudson.model.Result;
+import java.util.Optional;
 import org.jenkinsci.plugins.postbuildscript.Messages;
 import org.jenkinsci.plugins.postbuildscript.model.PostBuildItem;
 
-import java.util.Optional;
-
 public class ResultRule implements ExecutionRule {
 
     private final AbstractBuild<?, ?> build;
diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/processor/rules/RoleRule.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/processor/rules/RoleRule.java
index f26613d..ab776d6 100644
--- a/src/main/java/org/jenkinsci/plugins/postbuildscript/processor/rules/RoleRule.java
+++ b/src/main/java/org/jenkinsci/plugins/postbuildscript/processor/rules/RoleRule.java
@@ -14,7 +14,8 @@ public RoleRule(AbstractBuild<?, ?> build) {
 
     @Override
     public boolean allows(PostBuildItem item, boolean endOfMatrixBuild) {
-        boolean runsOnMaster = build.getBuiltOnStr() == null || build.getBuiltOnStr().isEmpty();
+        boolean runsOnMaster =
+                build.getBuiltOnStr() == null || build.getBuiltOnStr().isEmpty();
         if (runsOnMaster) {
             return item.shouldRunOnMaster();
         }
@@ -25,5 +26,4 @@ public boolean allows(PostBuildItem item, boolean endOfMatrixBuild) {
     public String formatViolationMessage(PostBuildItem item, String scriptName) {
         return Messages.PostBuildScript_NodeDoesNotHaveRole(item.getRole(), scriptName);
     }
-
 }
diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/service/Command.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/service/Command.java
index a6a00fe..feec92c 100644
--- a/src/main/java/org/jenkinsci/plugins/postbuildscript/service/Command.java
+++ b/src/main/java/org/jenkinsci/plugins/postbuildscript/service/Command.java
@@ -1,10 +1,13 @@
 package org.jenkinsci.plugins.postbuildscript.service;
 
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Deque;
+import java.util.List;
 import org.apache.commons.lang.StringUtils;
 
-import java.util.*;
-import java.util.regex.Pattern;
-
 public class Command {
 
     private final String scriptPath;
@@ -65,7 +68,7 @@ private static Deque<String> parseLine(String command) {
             throw new IllegalArgumentException("Missing closing \" in " + command + " -- " + tokens);
         }
         if (index == command.length() && singleHyphenOpen) {
-            throw new IllegalArgumentException("Missing closing ' in " + command  + " -- " + tokens);
+            throw new IllegalArgumentException("Missing closing ' in " + command + " -- " + tokens);
         }
         if (currentToken.length() > 0) {
             tokens.add(currentToken.toString());
diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/service/CommandExecutor.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/service/CommandExecutor.java
index 7f85ae3..1bff914 100644
--- a/src/main/java/org/jenkinsci/plugins/postbuildscript/service/CommandExecutor.java
+++ b/src/main/java/org/jenkinsci/plugins/postbuildscript/service/CommandExecutor.java
@@ -6,15 +6,14 @@
 import hudson.tasks.BatchFile;
 import hudson.tasks.CommandInterpreter;
 import hudson.tasks.Shell;
-import org.jenkinsci.plugins.postbuildscript.Messages;
-import org.jenkinsci.plugins.postbuildscript.PostBuildScriptException;
-import org.jenkinsci.plugins.postbuildscript.logging.Logger;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Pattern;
+import org.jenkinsci.plugins.postbuildscript.Messages;
+import org.jenkinsci.plugins.postbuildscript.PostBuildScriptException;
+import org.jenkinsci.plugins.postbuildscript.logging.Logger;
 
 public class CommandExecutor {
 
@@ -39,11 +38,14 @@ public int executeCommand(Command command) throws PostBuildScriptException {
         String scriptContent = removeSpaceInFrontOfInterpreter(resolveScriptContent(command));
         try {
             List<String> arguments = buildArguments(command, scriptContent);
-            return launcher.launch().cmds(arguments).stdout(listener).pwd(workspace).join();
+            return launcher.launch()
+                    .cmds(arguments)
+                    .stdout(listener)
+                    .pwd(workspace)
+                    .join();
         } catch (InterruptedException | IOException exception) {
             throw new PostBuildScriptException("Error while executing script", exception);
         }
-
     }
 
     private static String removeSpaceInFrontOfInterpreter(String scriptContent) {
@@ -54,7 +56,7 @@ private static String removeSpaceInFrontOfInterpreter(String scriptContent) {
     }
 
     private List<String> buildArguments(Command command, String scriptContent)
-        throws IOException, InterruptedException {
+            throws IOException, InterruptedException {
         CommandInterpreter interpreter = createInterpreter(scriptContent);
         FilePath scriptFile = interpreter.createScriptFile(workspace);
         List<String> args = new ArrayList<>(Arrays.asList(interpreter.buildCommandLine(scriptFile)));
@@ -69,8 +71,7 @@ private CommandInterpreter createInterpreter(String scriptContent) {
         return new BatchFile(scriptContent);
     }
 
-    private String resolveScriptContent(Command command)
-        throws PostBuildScriptException {
+    private String resolveScriptContent(Command command) throws PostBuildScriptException {
 
         FilePath script = new ScriptFilePath(workspace).resolve(command.getScriptPath());
         logger.info(Messages.PostBuildScript_ExecutingScript(script, command.getParameters()));
@@ -78,7 +79,5 @@ private String resolveScriptContent(Command command)
         Content content = new Content(callable);
         String resolvedContent = content.resolve(script);
         return resolvedContent.trim();
-
     }
-
 }
diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/service/Content.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/service/Content.java
index 3e2b11f..316f27a 100644
--- a/src/main/java/org/jenkinsci/plugins/postbuildscript/service/Content.java
+++ b/src/main/java/org/jenkinsci/plugins/postbuildscript/service/Content.java
@@ -2,9 +2,8 @@
 
 import hudson.FilePath;
 import hudson.FilePath.FileCallable;
-import org.jenkinsci.plugins.postbuildscript.PostBuildScriptException;
-
 import java.io.IOException;
+import org.jenkinsci.plugins.postbuildscript.PostBuildScriptException;
 
 public class Content {
 
@@ -21,5 +20,4 @@ public String resolve(FilePath filePath) throws PostBuildScriptException {
             throw new PostBuildScriptException("Error calling file", ioe);
         }
     }
-
 }
diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/service/GroovyScriptExecutor.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/service/GroovyScriptExecutor.java
index f49baed..4ae82b4 100644
--- a/src/main/java/org/jenkinsci/plugins/postbuildscript/service/GroovyScriptExecutor.java
+++ b/src/main/java/org/jenkinsci/plugins/postbuildscript/service/GroovyScriptExecutor.java
@@ -5,13 +5,12 @@
 import hudson.FilePath;
 import hudson.Util;
 import hudson.model.AbstractBuild;
-import org.jenkinsci.plugins.postbuildscript.logging.Logger;
-import org.jenkinsci.plugins.postbuildscript.model.Script;
-import org.jenkinsci.plugins.scriptsecurity.sandbox.groovy.SecureGroovyScript;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import org.jenkinsci.plugins.postbuildscript.logging.Logger;
+import org.jenkinsci.plugins.postbuildscript.model.Script;
+import org.jenkinsci.plugins.scriptsecurity.sandbox.groovy.SecureGroovyScript;
 
 public class GroovyScriptExecutor {
 
@@ -36,14 +35,14 @@ public void execute() throws Exception {
         if (build != null) {
             FilePath workspace = build.getWorkspace();
             if (workspace != null && workspace.getRemote() != null) {
-                binding.setVariable("workspace", new File(workspace.getRemote())); //NON-NLS
+                binding.setVariable("workspace", new File(workspace.getRemote())); // NON-NLS
             }
-            binding.setVariable("build", build); //NON-NLS
+            binding.setVariable("build", build); // NON-NLS
         }
 
-        binding.setVariable("log", log); //NON-NLS
-        binding.setVariable("out", log.getListener().getLogger()); //NON-NLS
-        binding.setVariable("args", arguments); //NON-NLS
+        binding.setVariable("log", log); // NON-NLS
+        binding.setVariable("out", log.getListener().getLogger()); // NON-NLS
+        binding.setVariable("args", arguments); // NON-NLS
 
         ClassLoader classLoader = getClass().getClassLoader();
         secureGroovyScript.evaluate(classLoader, binding, log.getListener());
diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/service/GroovyScriptExecutorFactory.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/service/GroovyScriptExecutorFactory.java
index 205ecf4..4a1db2a 100644
--- a/src/main/java/org/jenkinsci/plugins/postbuildscript/service/GroovyScriptExecutorFactory.java
+++ b/src/main/java/org/jenkinsci/plugins/postbuildscript/service/GroovyScriptExecutorFactory.java
@@ -1,11 +1,10 @@
 package org.jenkinsci.plugins.postbuildscript.service;
 
 import hudson.model.AbstractBuild;
+import java.util.List;
 import org.jenkinsci.plugins.postbuildscript.logging.Logger;
 import org.jenkinsci.plugins.postbuildscript.model.Script;
 
-import java.util.List;
-
 public class GroovyScriptExecutorFactory {
 
     private final AbstractBuild<?, ?> build;
diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/service/GroovyScriptPreparer.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/service/GroovyScriptPreparer.java
index b2ea608..4fa9c39 100644
--- a/src/main/java/org/jenkinsci/plugins/postbuildscript/service/GroovyScriptPreparer.java
+++ b/src/main/java/org/jenkinsci/plugins/postbuildscript/service/GroovyScriptPreparer.java
@@ -1,16 +1,15 @@
 package org.jenkinsci.plugins.postbuildscript.service;
 
 import hudson.FilePath;
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
 import org.jenkinsci.plugins.postbuildscript.Messages;
 import org.jenkinsci.plugins.postbuildscript.PostBuildScriptException;
 import org.jenkinsci.plugins.postbuildscript.logging.Logger;
 import org.jenkinsci.plugins.postbuildscript.model.Script;
 import org.jenkinsci.plugins.postbuildscript.model.ScriptFile;
 
-import java.io.Serializable;
-import java.util.Collections;
-import java.util.List;
-
 /**
  * @author Gregory Boissinot
  */
@@ -25,10 +24,7 @@ public class GroovyScriptPreparer implements Serializable {
     private final FilePath workspace;
 
     public GroovyScriptPreparer(
-        Logger logger,
-        FilePath workspace,
-        GroovyScriptExecutorFactory groovyScriptExecutorFactory
-    ) {
+            Logger logger, FilePath workspace, GroovyScriptExecutorFactory groovyScriptExecutorFactory) {
         this.logger = logger;
         this.workspace = workspace;
         this.groovyScriptExecutorFactory = groovyScriptExecutorFactory;
@@ -79,7 +75,5 @@ public boolean evaluateCommand(ScriptFile scriptFile, Command command) throws Po
         Script script = new Script(scriptFile.getResults(), scriptContent);
         script.setSandboxed(scriptFile.isSandboxed());
         return evaluateScript(script, command.getParameters());
-
     }
-
 }
diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/service/LoadFileCallable.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/service/LoadFileCallable.java
index f1f55a9..6387353 100644
--- a/src/main/java/org/jenkinsci/plugins/postbuildscript/service/LoadFileCallable.java
+++ b/src/main/java/org/jenkinsci/plugins/postbuildscript/service/LoadFileCallable.java
@@ -2,10 +2,9 @@
 
 import hudson.FilePath;
 import hudson.remoting.VirtualChannel;
-import jenkins.MasterToSlaveFileCallable;
-
 import java.io.File;
 import java.io.IOException;
+import jenkins.MasterToSlaveFileCallable;
 
 public class LoadFileCallable extends MasterToSlaveFileCallable<FilePath> {
     private static final long serialVersionUID = -7079515863020025724L;
diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/service/LoadScriptContentCallable.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/service/LoadScriptContentCallable.java
index a98ce9e..ab818fa 100644
--- a/src/main/java/org/jenkinsci/plugins/postbuildscript/service/LoadScriptContentCallable.java
+++ b/src/main/java/org/jenkinsci/plugins/postbuildscript/service/LoadScriptContentCallable.java
@@ -2,11 +2,10 @@
 
 import hudson.Util;
 import hudson.remoting.VirtualChannel;
-import jenkins.MasterToSlaveFileCallable;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.Charset;
+import jenkins.MasterToSlaveFileCallable;
 
 public class LoadScriptContentCallable extends MasterToSlaveFileCallable<String> {
     private static final long serialVersionUID = -8106062333861360484L;
@@ -15,5 +14,4 @@ public class LoadScriptContentCallable extends MasterToSlaveFileCallable<String>
     public String invoke(File f, VirtualChannel channel) throws IOException {
         return Util.loadFile(f, Charset.defaultCharset());
     }
-
 }
diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/service/ScriptFilePath.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/service/ScriptFilePath.java
index a856122..782ba3b 100644
--- a/src/main/java/org/jenkinsci/plugins/postbuildscript/service/ScriptFilePath.java
+++ b/src/main/java/org/jenkinsci/plugins/postbuildscript/service/ScriptFilePath.java
@@ -1,14 +1,10 @@
 package org.jenkinsci.plugins.postbuildscript.service;
 
 import hudson.FilePath;
+import java.io.IOException;
 import org.jenkinsci.plugins.postbuildscript.Messages;
 import org.jenkinsci.plugins.postbuildscript.PostBuildScriptException;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.regex.Pattern;
-
 public class ScriptFilePath {
 
     private final FilePath workspace;
@@ -21,12 +17,10 @@ public FilePath resolve(String command) throws PostBuildScriptException {
 
         FilePath filePath = getFilePath(command);
         if (filePath == null) {
-            throw new PostBuildScriptException(
-                Messages.PostBuildScript_ScriptFilePathDoesNotExist(command));
+            throw new PostBuildScriptException(Messages.PostBuildScript_ScriptFilePathDoesNotExist(command));
         }
 
         return filePath;
-
     }
 
     private FilePath getFilePath(String givenPath) throws PostBuildScriptException {
@@ -36,8 +30,5 @@ private FilePath getFilePath(String givenPath) throws PostBuildScriptException {
         } catch (IOException | InterruptedException ioe) {
             throw new PostBuildScriptException("Error to resolve script path", ioe);
         }
-
     }
-
-
 }
diff --git a/src/test/java/org/jenkinsci/plugins/postbuildscript/ConfigurableMatrixAggregatorTest.java b/src/test/java/org/jenkinsci/plugins/postbuildscript/ConfigurableMatrixAggregatorTest.java
index 1a356a8..cda4565 100644
--- a/src/test/java/org/jenkinsci/plugins/postbuildscript/ConfigurableMatrixAggregatorTest.java
+++ b/src/test/java/org/jenkinsci/plugins/postbuildscript/ConfigurableMatrixAggregatorTest.java
@@ -1,10 +1,18 @@
 package org.jenkinsci.plugins.postbuildscript;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
 import hudson.EnvVars;
 import hudson.Launcher;
 import hudson.matrix.MatrixBuild;
 import hudson.matrix.MatrixRun;
 import hudson.model.BuildListener;
+import java.io.IOException;
+import java.io.PrintStream;
 import org.jenkinsci.plugins.postbuildscript.processor.Processor;
 import org.jenkinsci.plugins.postbuildscript.processor.ProcessorFactory;
 import org.junit.jupiter.api.Test;
@@ -12,15 +20,6 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import java.io.IOException;
-import java.io.PrintStream;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-
 @ExtendWith(MockitoExtension.class)
 public class ConfigurableMatrixAggregatorTest {
 
@@ -62,7 +61,6 @@ public void runsProcessorWithEndOfMatrixBuildEnabled() throws IOException, Inter
 
         thenProcesses();
         thenContinuesBuild();
-
     }
 
     @Test
@@ -75,7 +73,6 @@ public void addsNewLineToLoggerAfterRun() throws Exception {
         assertThat(canContinue, is(true));
         verify(logger).println();
         verifyNoMoreInteractions(run);
-
     }
 
     private void thenProcesses() {
@@ -91,12 +88,7 @@ private void givenAggregator() throws IOException, InterruptedException {
         given(envVars.get("POSTBUILDSCRIPT_VERBOSE", "false")).willReturn("true");
         given(listener.getLogger()).willReturn(logger);
         aggregator = new ConfigurableMatrixAggregator(
-            build,
-            launcher,
-            listener,
-            processorFactory,
-            MatrixPostBuildScript.class
-        );
+                build, launcher, listener, processorFactory, MatrixPostBuildScript.class);
     }
 
     private void givenWillProcess() {
@@ -110,5 +102,4 @@ private void givenProcessor() {
     private void thenContinuesBuild() {
         assertThat(processed, is(true));
     }
-
 }
diff --git a/src/test/java/org/jenkinsci/plugins/postbuildscript/MatrixPostBuildScriptTest.java b/src/test/java/org/jenkinsci/plugins/postbuildscript/MatrixPostBuildScriptTest.java
index 4a32fe6..261fd50 100644
--- a/src/test/java/org/jenkinsci/plugins/postbuildscript/MatrixPostBuildScriptTest.java
+++ b/src/test/java/org/jenkinsci/plugins/postbuildscript/MatrixPostBuildScriptTest.java
@@ -1,5 +1,12 @@
 package org.jenkinsci.plugins.postbuildscript;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.verify;
+
 import hudson.EnvVars;
 import hudson.Launcher;
 import hudson.matrix.MatrixAggregator;
@@ -7,6 +14,9 @@
 import hudson.matrix.MatrixProject;
 import hudson.model.AbstractProject;
 import hudson.model.BuildListener;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.util.Collections;
 import org.jenkinsci.plugins.postbuildscript.MatrixPostBuildScript.DescriptorImpl;
 import org.jenkinsci.plugins.postbuildscript.model.PostBuildStep;
 import org.jenkinsci.plugins.postbuildscript.model.Script;
@@ -17,17 +27,6 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.Collections;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.verify;
-
 @ExtendWith(MockitoExtension.class)
 public class MatrixPostBuildScriptTest {
 
@@ -78,7 +77,6 @@ public void keepsPostBuildItems() {
 
         verify(genericScriptFile).setScriptType(ScriptType.GENERIC);
         verify(groovyScriptFile).setScriptType(ScriptType.GROOVY);
-
     }
 
     @Test
@@ -91,7 +89,6 @@ public void createsAggregator() throws IOException, InterruptedException {
         MatrixAggregator aggregator = matrixPostBuildScript.createAggregator(matrixBuild, launcher, listener);
 
         assertThat(aggregator, is(notNullValue()));
-
     }
 
     @Test
@@ -100,7 +97,6 @@ public void containsHelpFile() {
         givenDescriptor();
 
         assertThat(descriptor.getHelpFile(), is("/plugin/postbuildscript/help/postbuildscript.html"));
-
     }
 
     @Test
@@ -110,21 +106,18 @@ public void appliesToMatrixJob() {
 
         Class<? extends AbstractProject> jobType = MatrixProject.class;
         assertThat(descriptor.isApplicable(jobType), is(true));
-
     }
 
     private void givenMatrixPostBuildScript() {
         matrixPostBuildScript = new MatrixPostBuildScript(
-            Collections.singleton(genericScriptFile),
-            Collections.singleton(groovyScriptFile),
-            Collections.singleton(script),
-            Collections.singleton(postBuildStep),
-            true
-        );
+                Collections.singleton(genericScriptFile),
+                Collections.singleton(groovyScriptFile),
+                Collections.singleton(script),
+                Collections.singleton(postBuildStep),
+                true);
     }
 
     private void givenDescriptor() {
         descriptor = new DescriptorImpl();
     }
-
 }
diff --git a/src/test/java/org/jenkinsci/plugins/postbuildscript/PostBuildScriptExceptionTest.java b/src/test/java/org/jenkinsci/plugins/postbuildscript/PostBuildScriptExceptionTest.java
index 6bbe607..79a6598 100644
--- a/src/test/java/org/jenkinsci/plugins/postbuildscript/PostBuildScriptExceptionTest.java
+++ b/src/test/java/org/jenkinsci/plugins/postbuildscript/PostBuildScriptExceptionTest.java
@@ -1,13 +1,13 @@
 package org.jenkinsci.plugins.postbuildscript;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
 @ExtendWith(MockitoExtension.class)
 public class PostBuildScriptExceptionTest {
 
@@ -22,7 +22,6 @@ public void containsMessage() {
         PostBuildScriptException exception = new PostBuildScriptException(MESSAGE);
 
         assertThat(exception.getMessage(), is(MESSAGE));
-
     }
 
     @Test
@@ -32,7 +31,6 @@ public void containsMessageAndCause() {
 
         assertThat(exception.getMessage(), is(MESSAGE));
         assertThat(exception.getCause(), is(cause));
-
     }
 
     @Test
@@ -41,7 +39,5 @@ public void containsCause() {
         PostBuildScriptException exception = new PostBuildScriptException(cause);
 
         assertThat(exception.getCause(), is(cause));
-
     }
-
 }
diff --git a/src/test/java/org/jenkinsci/plugins/postbuildscript/PostBuildScriptIT.java b/src/test/java/org/jenkinsci/plugins/postbuildscript/PostBuildScriptIT.java
index e961999..334f239 100644
--- a/src/test/java/org/jenkinsci/plugins/postbuildscript/PostBuildScriptIT.java
+++ b/src/test/java/org/jenkinsci/plugins/postbuildscript/PostBuildScriptIT.java
@@ -1,19 +1,17 @@
 package org.jenkinsci.plugins.postbuildscript;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.startsWith;
+import static org.hamcrest.MatcherAssert.assertThat;
+
 import hudson.Functions;
 import hudson.Launcher;
-import hudson.model.*;
+import hudson.model.AbstractBuild;
+import hudson.model.BuildListener;
+import hudson.model.FreeStyleBuild;
+import hudson.model.FreeStyleProject;
+import hudson.model.Result;
 import hudson.tasks.BuildStep;
-import org.jenkinsci.plugins.postbuildscript.model.PostBuildStep;
-import org.jenkinsci.plugins.postbuildscript.model.Script;
-import org.jenkinsci.plugins.postbuildscript.model.ScriptFile;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Assumptions;
-import org.junit.jupiter.api.Test;
-import org.jvnet.hudson.test.JenkinsRule;
-import org.jvnet.hudson.test.TestBuilder;
-import org.jvnet.hudson.test.junit.jupiter.WithJenkins;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -26,10 +24,15 @@
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.startsWith;
-import static org.hamcrest.MatcherAssert.assertThat;
+import org.jenkinsci.plugins.postbuildscript.model.PostBuildStep;
+import org.jenkinsci.plugins.postbuildscript.model.Script;
+import org.jenkinsci.plugins.postbuildscript.model.ScriptFile;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Test;
+import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.TestBuilder;
+import org.jvnet.hudson.test.junit.jupiter.WithJenkins;
 
 @WithJenkins
 public class PostBuildScriptIT {
@@ -49,14 +52,9 @@ public void executesShellScriptFile(JenkinsRule jenkinsRule) throws Exception {
         Assumptions.assumeFalse(Functions.isWindows());
 
         givenOutfile();
-        givenScriptFiles("/script.sh"); //NON-NLS
+        givenScriptFiles("/script.sh"); // NON-NLS
         postBuildScript = new PostBuildScript(
-            scriptFiles,
-            Collections.emptyList(),
-            Collections.emptyList(),
-            Collections.emptyList(),
-            false
-        );
+                scriptFiles, Collections.emptyList(), Collections.emptyList(), Collections.emptyList(), false);
 
         whenBuilt(jenkinsRule);
 
@@ -70,14 +68,9 @@ public void executesGroovyScriptFile(JenkinsRule jenkinsRule) throws Exception {
         Assumptions.assumeFalse(Functions.isWindows());
 
         givenOutfile();
-        givenScriptFiles("/script.groovy"); //NON-NLS
+        givenScriptFiles("/script.groovy"); // NON-NLS
         postBuildScript = new PostBuildScript(
-            Collections.emptyList(),
-            scriptFiles,
-            Collections.emptyList(),
-            Collections.emptyList(),
-            false
-        );
+                Collections.emptyList(), scriptFiles, Collections.emptyList(), Collections.emptyList(), false);
 
         whenBuilt(jenkinsRule);
 
@@ -89,16 +82,13 @@ public void executesGroovyScriptFile(JenkinsRule jenkinsRule) throws Exception {
     public void executesGroovyScript(JenkinsRule jenkinsRule) throws Exception {
 
         givenOutfile();
-        String scriptContent = String.format("def out = new File(\"%s\")%nout << \"Hello world\"", outFile.getPath().replace("\\", "\\\\")); //NON-NLS
+        String scriptContent = String.format(
+                "def out = new File(\"%s\")%nout << \"Hello world\"",
+                outFile.getPath().replace("\\", "\\\\")); // NON-NLS
         Script script = new Script(SUCCESS_RESULTS, scriptContent);
         Collection<Script> scripts = Collections.singleton(script);
         postBuildScript = new PostBuildScript(
-            Collections.emptyList(),
-            Collections.emptyList(),
-            scripts,
-            Collections.emptyList(),
-            false
-        );
+                Collections.emptyList(), Collections.emptyList(), scripts, Collections.emptyList(), false);
 
         whenBuilt(jenkinsRule);
 
@@ -116,7 +106,6 @@ public void executesPostBuildStep(JenkinsRule jenkinsRule) throws Exception {
 
         thenSuccessfulBuild();
         Assertions.assertEquals(1, firstBuildStep.getInvocations());
-
     }
 
     @Test
@@ -131,7 +120,6 @@ public void executesPostBuildStepRegardlessOfFailures(JenkinsRule jenkinsRule) t
         thenFailedBuild();
         Assertions.assertEquals(1, firstBuildStep.getInvocations());
         Assertions.assertEquals(1, secondBuildStep.getInvocations());
-
     }
 
     @Test
@@ -146,7 +134,6 @@ public void stopOnBuildStepFailure(JenkinsRule jenkinsRule) throws Exception {
         thenFailedBuild();
         Assertions.assertEquals(1, firstBuildStep.getInvocations());
         Assertions.assertEquals(0, secondBuildStep.getInvocations());
-
     }
 
     private void givenSuccessfulFirstBuildStep() {
@@ -168,12 +155,7 @@ private void givenPostBuildStep(boolean stopOnFailure) {
         PostBuildStep step = new PostBuildStep(SUCCESS_RESULTS, buildSteps, stopOnFailure);
         Collection<PostBuildStep> steps = Collections.singleton(step);
         postBuildScript = new PostBuildScript(
-            Collections.emptyList(),
-            Collections.emptyList(),
-            Collections.emptyList(),
-            steps,
-            false
-        );
+                Collections.emptyList(), Collections.emptyList(), Collections.emptyList(), steps, false);
     }
 
     private void givenOutfile() throws Exception {
@@ -183,7 +165,10 @@ private void givenOutfile() throws Exception {
 
     private void givenScriptFiles(String scriptFileLocation) throws Exception {
         Path scriptFilePath = Files.createTempFile("script", ".groovy");
-        Files.copy(getClass().getResourceAsStream(scriptFileLocation), scriptFilePath, StandardCopyOption.REPLACE_EXISTING);
+        Files.copy(
+                getClass().getResourceAsStream(scriptFileLocation),
+                scriptFilePath,
+                StandardCopyOption.REPLACE_EXISTING);
         String command = '"' + scriptFilePath.toString() + "\" " + outFile.getPath();
         ScriptFile scriptFile = new ScriptFile(SUCCESS_RESULTS, command);
         scriptFiles = Collections.singleton(scriptFile);
diff --git a/src/test/java/org/jenkinsci/plugins/postbuildscript/PostBuildScriptTest.java b/src/test/java/org/jenkinsci/plugins/postbuildscript/PostBuildScriptTest.java
index 634e43f..8329d23 100644
--- a/src/test/java/org/jenkinsci/plugins/postbuildscript/PostBuildScriptTest.java
+++ b/src/test/java/org/jenkinsci/plugins/postbuildscript/PostBuildScriptTest.java
@@ -1,5 +1,12 @@
 package org.jenkinsci.plugins.postbuildscript;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.verify;
+
+import java.util.Collections;
 import org.jenkinsci.plugins.postbuildscript.model.PostBuildStep;
 import org.jenkinsci.plugins.postbuildscript.model.Script;
 import org.jenkinsci.plugins.postbuildscript.model.ScriptFile;
@@ -9,14 +16,6 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import java.util.Collections;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.verify;
-
 @ExtendWith(MockitoExtension.class)
 public class PostBuildScriptTest {
 
@@ -41,12 +40,11 @@ public void keepsPostBuildItems() {
         given(groovyScriptFile.getScriptType()).willReturn(ScriptType.GROOVY);
 
         postBuildScript = new PostBuildScript(
-            Collections.singleton(genericScriptFile),
-            Collections.singleton(groovyScriptFile),
-            Collections.singleton(script),
-            Collections.singleton(postBuildStep),
-            true
-        );
+                Collections.singleton(genericScriptFile),
+                Collections.singleton(groovyScriptFile),
+                Collections.singleton(script),
+                Collections.singleton(postBuildStep),
+                true);
 
         assertThat(postBuildScript.getGenericScriptFiles(), contains(genericScriptFile));
         assertThat(postBuildScript.getGroovyScriptFiles(), contains(groovyScriptFile));
@@ -56,7 +54,5 @@ public void keepsPostBuildItems() {
 
         verify(genericScriptFile).setScriptType(ScriptType.GENERIC);
         verify(groovyScriptFile).setScriptType(ScriptType.GROOVY);
-
     }
-
 }
diff --git a/src/test/java/org/jenkinsci/plugins/postbuildscript/logging/LoggerTest.java b/src/test/java/org/jenkinsci/plugins/postbuildscript/logging/LoggerTest.java
index a4e284e..d8db04f 100644
--- a/src/test/java/org/jenkinsci/plugins/postbuildscript/logging/LoggerTest.java
+++ b/src/test/java/org/jenkinsci/plugins/postbuildscript/logging/LoggerTest.java
@@ -1,24 +1,23 @@
 package org.jenkinsci.plugins.postbuildscript.logging;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.startsWith;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.BDDMockito.given;
+
 import hudson.EnvVars;
 import hudson.model.AbstractBuild;
 import hudson.model.TaskListener;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.nio.charset.StandardCharsets;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.startsWith;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.BDDMockito.given;
-
 @ExtendWith(MockitoExtension.class)
 public class LoggerTest {
 
@@ -28,11 +27,14 @@ public class LoggerTest {
 
     @Mock
     private TaskListener taskListener;
+
     private final ByteArrayOutputStream out = new ByteArrayOutputStream();
+
     @Mock
     private AbstractBuild<?, ?> build;
 
     private Logger logger;
+
     @Mock
     private EnvVars envVars;
 
@@ -44,8 +46,6 @@ public void letTaskListenerReturnStream() throws IOException, InterruptedExcepti
         logger = new Logger(taskListener, build);
     }
 
-
-
     @Test
     public void prefixesInfoMessages() throws IOException {
 
@@ -55,7 +55,6 @@ public void prefixesInfoMessages() throws IOException {
 
         out.flush();
         assertThat(out.toString(), is("[PostBuildScript] - [INFO] message" + NEW_LINE));
-
     }
 
     @Test
@@ -67,7 +66,6 @@ public void prefixesErrorMessages() throws IOException {
 
         out.flush();
         assertThat(out.toString(), is("[PostBuildScript] - [ERROR] message" + NEW_LINE));
-
     }
 
     @Test
@@ -78,8 +76,10 @@ public void addsThrowable() throws IOException {
         logger.error(MESSAGE, new RuntimeException("Test exception message"));
 
         out.flush();
-        assertThat(out.toString(), startsWith("[PostBuildScript] - [ERROR] message" + NEW_LINE + "java.lang.RuntimeException: Test exception message"));
-
+        assertThat(
+                out.toString(),
+                startsWith("[PostBuildScript] - [ERROR] message" + NEW_LINE
+                        + "java.lang.RuntimeException: Test exception message"));
     }
 
     @Test
@@ -88,11 +88,9 @@ public void fullyQualifiedCallerNameIsClassName() {
         String fullyQualifiedCallerName = logger.getFullyQualifiedCallerName();
 
         assertThat(fullyQualifiedCallerName, is("org.jenkinsci.plugins.postbuildscript.logging.Logger"));
-
     }
 
-    private void givenPrintStream()  {
+    private void givenPrintStream() {
         given(taskListener.getLogger()).willReturn(new PrintStream(out, false, StandardCharsets.UTF_8));
     }
-
 }
diff --git a/src/test/java/org/jenkinsci/plugins/postbuildscript/model/ConfigurationTest.java b/src/test/java/org/jenkinsci/plugins/postbuildscript/model/ConfigurationTest.java
index de1e0fa..2bc5018 100644
--- a/src/test/java/org/jenkinsci/plugins/postbuildscript/model/ConfigurationTest.java
+++ b/src/test/java/org/jenkinsci/plugins/postbuildscript/model/ConfigurationTest.java
@@ -1,17 +1,16 @@
 package org.jenkinsci.plugins.postbuildscript.model;
 
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.util.Collections;
-
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.mockito.BDDMockito.given;
 
+import java.util.Collections;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
 @ExtendWith(MockitoExtension.class)
 public class ConfigurationTest {
 
@@ -33,10 +32,8 @@ public void addsBuildStep() {
 
         assertThat(configuration.getBuildSteps(), contains(postBuildStep));
         assertThat(configuration.buildStepIndexOf(postBuildStep), is(0));
-
     }
 
-
     @Test
     public void addsBuildSteps() {
 
@@ -44,7 +41,6 @@ public void addsBuildSteps() {
 
         assertThat(configuration.getBuildSteps(), contains(postBuildStep));
         assertThat(configuration.buildStepIndexOf(postBuildStep), is(0));
-
     }
 
     @Test
@@ -53,7 +49,6 @@ public void storesMarkBuildUnstable() {
         configuration.setMarkBuildUnstable(true);
 
         assertThat(configuration.isMarkBuildUnstable(), is(true));
-
     }
 
     @Test
@@ -65,10 +60,8 @@ public void addsGenericScriptFiles() {
 
         assertThat(configuration.getScriptFiles(ScriptType.GENERIC), contains(scriptFile));
         assertThat(configuration.scriptFileIndexOf(scriptFile), is(0));
-
     }
 
-
     @Test
     public void addsGroovyScripts() {
 
@@ -76,7 +69,6 @@ public void addsGroovyScripts() {
 
         assertThat(configuration.getGroovyScripts(), contains(script));
         assertThat(configuration.groovyScriptIndexOf(script), is(0));
-
     }
 
     @Test
@@ -88,8 +80,5 @@ public void addsGroovyScriptFiles() {
 
         assertThat(configuration.getScriptFiles(ScriptType.GROOVY), contains(scriptFile));
         assertThat(configuration.scriptFileIndexOf(scriptFile), is(0));
-
     }
-
-
 }
diff --git a/src/test/java/org/jenkinsci/plugins/postbuildscript/model/ExecuteOnTest.java b/src/test/java/org/jenkinsci/plugins/postbuildscript/model/ExecuteOnTest.java
index 8761d04..82aa9ca 100644
--- a/src/test/java/org/jenkinsci/plugins/postbuildscript/model/ExecuteOnTest.java
+++ b/src/test/java/org/jenkinsci/plugins/postbuildscript/model/ExecuteOnTest.java
@@ -1,10 +1,10 @@
 package org.jenkinsci.plugins.postbuildscript.model;
 
-import org.junit.jupiter.api.Test;
-
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
+import org.junit.jupiter.api.Test;
+
 public class ExecuteOnTest {
 
     @Test
@@ -36,5 +36,4 @@ public void axesMatrixIsFalse() {
     public void axesAxesIsTrue() {
         assertThat(ExecuteOn.AXES.axes(), is(true));
     }
-
 }
diff --git a/src/test/java/org/jenkinsci/plugins/postbuildscript/model/PostBuildItemTest.java b/src/test/java/org/jenkinsci/plugins/postbuildscript/model/PostBuildItemTest.java
index 1dcdb5b..c78f43b 100644
--- a/src/test/java/org/jenkinsci/plugins/postbuildscript/model/PostBuildItemTest.java
+++ b/src/test/java/org/jenkinsci/plugins/postbuildscript/model/PostBuildItemTest.java
@@ -1,18 +1,17 @@
 package org.jenkinsci.plugins.postbuildscript.model;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.util.Collections;
-
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 
+import java.util.Collections;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 public class PostBuildItemTest {
 
-    private static final String SUCCESS = "SUCCESS"; //NON-NLS
-    private static final String FAILURE = "FAILURE"; //NON-NLS
+    private static final String SUCCESS = "SUCCESS"; // NON-NLS
+    private static final String FAILURE = "FAILURE"; // NON-NLS
 
     private PostBuildItem postBuildItem;
 
@@ -26,7 +25,6 @@ public void doesNotHaveResultOnNullResult() {
 
         PostBuildItem postBuildItem = new PostBuildItem(null);
         assertThat(postBuildItem.hasResult(), is(false));
-
     }
 
     @Test
@@ -34,29 +32,24 @@ public void doesNotHaveResultOnEmptyResults() {
 
         PostBuildItem postBuildItem = new PostBuildItem(Collections.emptySet());
         assertThat(postBuildItem.hasResult(), is(false));
-
     }
 
-
     @Test
     public void allowsExecutionWhenContainsResults() {
 
         assertThat(postBuildItem.shouldBeExecuted(SUCCESS), is(true));
-
     }
 
     @Test
     public void deniesExecutionWhenDoesNotContainResults() {
 
         assertThat(postBuildItem.shouldBeExecuted(FAILURE), is(false));
-
     }
 
     @Test
     public void deniesExecutionOnNull() {
 
         assertThat(postBuildItem.shouldBeExecuted(null), is(false));
-
     }
 
     @Test
@@ -65,7 +58,6 @@ public void addsResultsWhenInitialized() {
         postBuildItem.addResults(Collections.singleton(FAILURE));
 
         assertThat(postBuildItem.getResults(), contains(SUCCESS, FAILURE));
-
     }
 
     @Test
@@ -73,7 +65,6 @@ public void runsOnBothRolesPerDefault() {
 
         assertThat(postBuildItem.shouldRunOnMaster(), is(true));
         assertThat(postBuildItem.shouldRunOnSlave(), is(true));
-
     }
 
     @Test
@@ -82,7 +73,5 @@ public void setsRole() {
         postBuildItem.setRole(Role.MASTER);
         assertThat(postBuildItem.shouldRunOnMaster(), is(true));
         assertThat(postBuildItem.shouldRunOnSlave(), is(false));
-
     }
-
 }
diff --git a/src/test/java/org/jenkinsci/plugins/postbuildscript/model/PostBuildStepTest.java b/src/test/java/org/jenkinsci/plugins/postbuildscript/model/PostBuildStepTest.java
index 2f56bef..90319bf 100644
--- a/src/test/java/org/jenkinsci/plugins/postbuildscript/model/PostBuildStepTest.java
+++ b/src/test/java/org/jenkinsci/plugins/postbuildscript/model/PostBuildStepTest.java
@@ -1,18 +1,17 @@
 package org.jenkinsci.plugins.postbuildscript.model;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+
 import hudson.tasks.BuildStep;
+import java.util.Collections;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import java.util.Collections;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
-
 @ExtendWith(MockitoExtension.class)
 public class PostBuildStepTest {
 
@@ -24,11 +23,8 @@ public class PostBuildStepTest {
     @Test
     public void containsBuildSteps() {
 
-        PostBuildStep postBuildStep = new PostBuildStep(
-            Collections.singleton(RESULT),
-            Collections.singleton(buildStep),
-            false
-        );
+        PostBuildStep postBuildStep =
+                new PostBuildStep(Collections.singleton(RESULT), Collections.singleton(buildStep), false);
 
         assertThat(postBuildStep.getBuildSteps(), contains(buildStep));
     }
@@ -37,14 +33,8 @@ public void containsBuildSteps() {
     @Test
     public void allowsEmptyBuildSteps() {
 
-        PostBuildStep postBuildStep = new PostBuildStep(
-            Collections.singleton(RESULT),
-            null,
-            false
-        );
+        PostBuildStep postBuildStep = new PostBuildStep(Collections.singleton(RESULT), null, false);
 
         assertThat(postBuildStep.getBuildSteps(), is(Matchers.emptyIterable()));
-
     }
-
 }
diff --git a/src/test/java/org/jenkinsci/plugins/postbuildscript/model/ScriptFileTest.java b/src/test/java/org/jenkinsci/plugins/postbuildscript/model/ScriptFileTest.java
index 8c74278..8c6ef1b 100644
--- a/src/test/java/org/jenkinsci/plugins/postbuildscript/model/ScriptFileTest.java
+++ b/src/test/java/org/jenkinsci/plugins/postbuildscript/model/ScriptFileTest.java
@@ -1,12 +1,11 @@
 package org.jenkinsci.plugins.postbuildscript.model;
 
-import org.junit.jupiter.api.Test;
-
-import java.util.Collections;
-
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
+import java.util.Collections;
+import org.junit.jupiter.api.Test;
+
 public class ScriptFileTest {
 
     private static final String RESULT = "SUCCESS";
@@ -15,11 +14,8 @@ public class ScriptFileTest {
     @Test
     public void containsFilePath() {
 
-        ScriptFile scriptFile = new ScriptFile(
-            Collections.singleton(RESULT), FILE_PATH);
+        ScriptFile scriptFile = new ScriptFile(Collections.singleton(RESULT), FILE_PATH);
 
         assertThat(scriptFile.getFilePath(), is(FILE_PATH));
-
     }
-
 }
diff --git a/src/test/java/org/jenkinsci/plugins/postbuildscript/model/ScriptTest.java b/src/test/java/org/jenkinsci/plugins/postbuildscript/model/ScriptTest.java
index 35b24f3..dd899ec 100644
--- a/src/test/java/org/jenkinsci/plugins/postbuildscript/model/ScriptTest.java
+++ b/src/test/java/org/jenkinsci/plugins/postbuildscript/model/ScriptTest.java
@@ -1,13 +1,12 @@
 package org.jenkinsci.plugins.postbuildscript.model;
 
-import org.junit.jupiter.api.Test;
-
-import java.util.Collections;
-
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 
+import java.util.Collections;
+import org.junit.jupiter.api.Test;
+
 public class ScriptTest {
 
     private static final String RESULT = "SUCCESS";
@@ -16,20 +15,16 @@ public class ScriptTest {
     @Test
     public void containsScript() {
 
-        Script script = new Script(
-            Collections.singleton(RESULT), CONTENT);
+        Script script = new Script(Collections.singleton(RESULT), CONTENT);
 
         assertThat(script.getContent(), is(CONTENT));
-
     }
 
     @Test
     public void containsNullOnEmptyScript() {
 
-        Script script = new Script(
-            Collections.singleton(RESULT), "");
+        Script script = new Script(Collections.singleton(RESULT), "");
 
         assertThat(script.getContent(), is(nullValue()));
-
     }
 }
diff --git a/src/test/java/org/jenkinsci/plugins/postbuildscript/processor/rules/MatrixRuleTest.java b/src/test/java/org/jenkinsci/plugins/postbuildscript/processor/rules/MatrixRuleTest.java
index 46980b5..8e265a0 100644
--- a/src/test/java/org/jenkinsci/plugins/postbuildscript/processor/rules/MatrixRuleTest.java
+++ b/src/test/java/org/jenkinsci/plugins/postbuildscript/processor/rules/MatrixRuleTest.java
@@ -1,5 +1,10 @@
 package org.jenkinsci.plugins.postbuildscript.processor.rules;
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.BDDMockito.given;
+
 import org.jenkinsci.plugins.postbuildscript.model.ExecuteOn;
 import org.jenkinsci.plugins.postbuildscript.model.PostBuildItem;
 import org.junit.jupiter.api.Test;
@@ -7,11 +12,6 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.BDDMockito.given;
-
 @ExtendWith(MockitoExtension.class)
 public class MatrixRuleTest {
 
@@ -28,7 +28,6 @@ public void allowsAxesExecutionIfNotEndOfMatrixBuild() {
         boolean actual = matrixRule.allows(item, false);
 
         assertThat(actual, is(true));
-
     }
 
     @Test
@@ -39,7 +38,6 @@ public void allowsMatrixExecutionIfEndOfMatrixBuild() {
         boolean actual = matrixRule.allows(item, true);
 
         assertThat(actual, is(true));
-
     }
 
     @Test
@@ -50,7 +48,6 @@ public void allowsExecutionIfBothAndNotEndOfMatrixBuild() {
         boolean actual = matrixRule.allows(item, false);
 
         assertThat(actual, is(true));
-
     }
 
     @Test
@@ -61,7 +58,6 @@ public void allowsExecutionIfBothAndEndOfMatrixBuild() {
         boolean actual = matrixRule.allows(item, true);
 
         assertThat(actual, is(true));
-
     }
 
     @Test
@@ -72,7 +68,6 @@ public void deniesAxesExecutionIfEndOfMatrixBuild() {
         boolean actual = matrixRule.allows(item, true);
 
         assertThat(actual, is(false));
-
     }
 
     @Test
@@ -83,7 +78,6 @@ public void deniesMatrixExecutionIfNotEndOfMatrixBuild() {
         boolean actual = matrixRule.allows(item, false);
 
         assertThat(actual, is(false));
-
     }
 
     @Test
@@ -95,7 +89,6 @@ public void formatsViolationMessageForMatrix() {
 
         assertThat(violationMessage, containsString("scriptName"));
         assertThat(violationMessage, containsString("MATRIX"));
-
     }
 
     @Test
@@ -107,7 +100,5 @@ public void formatsViolationMessageForAxes() {
 
         assertThat(violationMessage, containsString("scriptName"));
         assertThat(violationMessage, containsString("AXES"));
-
     }
-
 }
diff --git a/src/test/java/org/jenkinsci/plugins/postbuildscript/processor/rules/ResultRuleTest.java b/src/test/java/org/jenkinsci/plugins/postbuildscript/processor/rules/ResultRuleTest.java
index 603b2ae..60b9506 100644
--- a/src/test/java/org/jenkinsci/plugins/postbuildscript/processor/rules/ResultRuleTest.java
+++ b/src/test/java/org/jenkinsci/plugins/postbuildscript/processor/rules/ResultRuleTest.java
@@ -1,7 +1,13 @@
 package org.jenkinsci.plugins.postbuildscript.processor.rules;
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.BDDMockito.given;
+
 import hudson.model.AbstractBuild;
 import hudson.model.Result;
+import java.util.Collections;
 import org.jenkinsci.plugins.postbuildscript.model.PostBuildItem;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -9,13 +15,6 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import java.util.Collections;
-
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.BDDMockito.given;
-
 @ExtendWith(MockitoExtension.class)
 public class ResultRuleTest {
 
@@ -37,7 +36,6 @@ public void allowsRunningWhenBuildHasSameResultThanItem() {
         boolean actual = resultRule.allows(item, true);
 
         assertThat(actual, is(true));
-
     }
 
     @Test
@@ -48,7 +46,6 @@ public void deniesRunningWhenBuildHasDifferentResultThanItem() {
         boolean actual = resultRule.allows(item, true);
 
         assertThat(actual, is(false));
-
     }
 
     @Test
@@ -57,7 +54,6 @@ public void deniesRunningWhenBuildHasNoResult() {
         boolean actual = resultRule.allows(item, true);
 
         assertThat(actual, is(false));
-
     }
 
     @Test
@@ -69,7 +65,5 @@ public void formatsViolationMessage() {
 
         assertThat(violationMessage, containsString("scriptName"));
         assertThat(violationMessage, containsString("RESULT"));
-
     }
-
 }
diff --git a/src/test/java/org/jenkinsci/plugins/postbuildscript/processor/rules/RoleRuleTest.java b/src/test/java/org/jenkinsci/plugins/postbuildscript/processor/rules/RoleRuleTest.java
index 0afe335..7a1bc96 100644
--- a/src/test/java/org/jenkinsci/plugins/postbuildscript/processor/rules/RoleRuleTest.java
+++ b/src/test/java/org/jenkinsci/plugins/postbuildscript/processor/rules/RoleRuleTest.java
@@ -1,5 +1,12 @@
 package org.jenkinsci.plugins.postbuildscript.processor.rules;
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
 import hudson.model.AbstractBuild;
 import org.jenkinsci.plugins.postbuildscript.model.PostBuildItem;
 import org.jenkinsci.plugins.postbuildscript.model.Role;
@@ -9,13 +16,6 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-
 @ExtendWith(MockitoExtension.class)
 public class RoleRuleTest {
 
@@ -38,7 +38,6 @@ public void allowsRunningOnSlaveWhenBuiltStrIsDefined() {
 
         assertThat(actual, is(true));
         verify(item, never()).shouldRunOnMaster();
-
     }
 
     @Test
@@ -51,7 +50,6 @@ public void deniesRunningOnMasterWhenBuiltStrIsDefined() {
 
         assertThat(actual, is(false));
         verify(item, never()).shouldRunOnMaster();
-
     }
 
     @Test
@@ -63,7 +61,6 @@ public void allowsRunningOnMasterWhenBuiltStrIsUndefined() {
 
         assertThat(actual, is(true));
         verify(item, never()).shouldRunOnSlave();
-
     }
 
     @Test
@@ -75,7 +72,6 @@ public void deniesRunningOnSlaveWhenBuiltStrIsUndefined() {
 
         assertThat(actual, is(false));
         verify(item, never()).shouldRunOnSlave();
-
     }
 
     @Test
@@ -87,7 +83,5 @@ public void formatsViolationMessage() {
 
         assertThat(violationMessage, containsString("scriptName"));
         assertThat(violationMessage, containsString("MASTER"));
-
     }
-
 }
diff --git a/src/test/java/org/jenkinsci/plugins/postbuildscript/service/CommandExecutorIT.java b/src/test/java/org/jenkinsci/plugins/postbuildscript/service/CommandExecutorIT.java
index b3511da..5de0696 100644
--- a/src/test/java/org/jenkinsci/plugins/postbuildscript/service/CommandExecutorIT.java
+++ b/src/test/java/org/jenkinsci/plugins/postbuildscript/service/CommandExecutorIT.java
@@ -1,9 +1,13 @@
 package org.jenkinsci.plugins.postbuildscript.service;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
 import hudson.FilePath;
 import hudson.Functions;
 import hudson.Launcher.LocalLauncher;
 import hudson.model.TaskListener;
+import java.io.File;
 import org.jenkinsci.plugins.postbuildscript.logging.Logger;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
@@ -13,17 +17,13 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import java.io.File;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
 @ExtendWith(MockitoExtension.class)
 @WithJenkins
 public class CommandExecutorIT {
 
     @Mock
     private Logger logger;
+
     private File scriptFile;
     private CommandExecutor executor;
 
@@ -37,7 +37,6 @@ public void executesCommand(JenkinsRule jenkinsRule) throws Exception {
         int command = executor.executeCommand(new Command(scriptFile.getName() + " param1 param2"));
 
         assertThat(command, is(0));
-
     }
 
     @Test
@@ -50,7 +49,6 @@ public void supportsShebangWithSpacesInFrontOfInterpreter(JenkinsRule jenkinsRul
         int command = executor.executeCommand(new Command(scriptFile.getName() + " param1 param2"));
 
         assertThat(command, is(0));
-
     }
 
     private void givenExecutor(JenkinsRule jenkinsRule) {
@@ -59,5 +57,4 @@ private void givenExecutor(JenkinsRule jenkinsRule) {
         TaskListener listener = jenkinsRule.createTaskListener();
         executor = new CommandExecutor(logger, listener, workspace, launcher);
     }
-
 }
diff --git a/src/test/java/org/jenkinsci/plugins/postbuildscript/service/ContentTest.java b/src/test/java/org/jenkinsci/plugins/postbuildscript/service/ContentTest.java
index 1446aa3..1181af5 100644
--- a/src/test/java/org/jenkinsci/plugins/postbuildscript/service/ContentTest.java
+++ b/src/test/java/org/jenkinsci/plugins/postbuildscript/service/ContentTest.java
@@ -1,9 +1,16 @@
 package org.jenkinsci.plugins.postbuildscript.service;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.ArgumentMatchers.isA;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.verify;
+
 import hudson.FilePath;
 import hudson.FilePath.FileCallable;
 import hudson.remoting.LocalChannel;
 import hudson.remoting.VirtualChannel;
+import java.io.File;
 import org.jenkinsci.plugins.postbuildscript.logging.Logger;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -13,14 +20,6 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import java.io.File;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.verify;
-
 @ExtendWith(MockitoExtension.class)
 public class ContentTest {
 
@@ -48,7 +47,5 @@ public void resolvesByCallingCallable() throws Exception {
         File file = fileArgumentCaptor.getValue();
         assertThat(file.getPath(), is("remote"));
         assertThat(resolvedContent, is("resolvedContent"));
-
-
     }
 }
diff --git a/src/test/java/org/jenkinsci/plugins/postbuildscript/service/GroovyScriptExecutorFactoryTest.java b/src/test/java/org/jenkinsci/plugins/postbuildscript/service/GroovyScriptExecutorFactoryTest.java
index 5cc1d74..f06437b 100644
--- a/src/test/java/org/jenkinsci/plugins/postbuildscript/service/GroovyScriptExecutorFactoryTest.java
+++ b/src/test/java/org/jenkinsci/plugins/postbuildscript/service/GroovyScriptExecutorFactoryTest.java
@@ -1,6 +1,12 @@
 package org.jenkinsci.plugins.postbuildscript.service;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.BDDMockito.given;
+
 import hudson.model.AbstractBuild;
+import java.util.Collections;
 import org.jenkinsci.plugins.postbuildscript.logging.Logger;
 import org.jenkinsci.plugins.postbuildscript.model.Script;
 import org.junit.jupiter.api.Test;
@@ -9,13 +15,6 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import java.util.Collections;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.BDDMockito.given;
-
 @ExtendWith(MockitoExtension.class)
 public class GroovyScriptExecutorFactoryTest {
 
@@ -40,6 +39,5 @@ public void createsExecutor() {
         GroovyScriptExecutor executor = executorFactory.create(script, Collections.emptyList());
 
         assertThat(executor, is(notNullValue()));
-
     }
 }
diff --git a/src/test/java/org/jenkinsci/plugins/postbuildscript/service/GroovyScriptExecutorIT.java b/src/test/java/org/jenkinsci/plugins/postbuildscript/service/GroovyScriptExecutorIT.java
index 62ed86a..4710aa8 100644
--- a/src/test/java/org/jenkinsci/plugins/postbuildscript/service/GroovyScriptExecutorIT.java
+++ b/src/test/java/org/jenkinsci/plugins/postbuildscript/service/GroovyScriptExecutorIT.java
@@ -1,9 +1,14 @@
 package org.jenkinsci.plugins.postbuildscript.service;
 
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.verify;
+
 import hudson.EnvVars;
 import hudson.model.FreeStyleBuild;
 import hudson.model.FreeStyleProject;
 import hudson.model.TaskListener;
+import java.io.PrintStream;
+import java.util.Collections;
 import org.jenkinsci.plugins.postbuildscript.logging.Logger;
 import org.jenkinsci.plugins.postbuildscript.model.Script;
 import org.junit.jupiter.api.Test;
@@ -13,12 +18,6 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import java.io.PrintStream;
-import java.util.Collections;
-
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.verify;
-
 @ExtendWith(MockitoExtension.class)
 @WithJenkins
 public class GroovyScriptExecutorIT {
@@ -46,12 +45,10 @@ public void runsGroovyScriptWithVariablesAndBindings(JenkinsRule jenkinsRule) th
         EnvVars.masterEnvVars.put("envVar1", "world");
         EnvVars.masterEnvVars.put("envVar2", "jenkins");
 
-        GroovyScriptExecutor callable = new GroovyScriptExecutor(
-            script, Collections.emptyList(), executable, log);
+        GroovyScriptExecutor callable = new GroovyScriptExecutor(script, Collections.emptyList(), executable, log);
         callable.execute();
 
         verify(log).info("hello world");
         verify(printStream).println(executable.getId());
-
     }
 }
diff --git a/src/test/java/org/jenkinsci/plugins/postbuildscript/service/GroovyScriptPreparerTest.java b/src/test/java/org/jenkinsci/plugins/postbuildscript/service/GroovyScriptPreparerTest.java
index 2959ec6..8e91e11 100644
--- a/src/test/java/org/jenkinsci/plugins/postbuildscript/service/GroovyScriptPreparerTest.java
+++ b/src/test/java/org/jenkinsci/plugins/postbuildscript/service/GroovyScriptPreparerTest.java
@@ -1,6 +1,18 @@
 package org.jenkinsci.plugins.postbuildscript.service;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.willThrow;
+import static org.mockito.Mockito.verify;
+
 import hudson.FilePath;
+import java.io.File;
+import java.net.URISyntaxException;
+import java.util.Collections;
 import org.jenkinsci.plugins.postbuildscript.Messages;
 import org.jenkinsci.plugins.postbuildscript.logging.Logger;
 import org.jenkinsci.plugins.postbuildscript.model.Script;
@@ -11,19 +23,6 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import java.io.File;
-import java.net.URISyntaxException;
-import java.util.Collections;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.BDDMockito.willThrow;
-import static org.mockito.Mockito.verify;
-
 @ExtendWith(MockitoExtension.class)
 public class GroovyScriptPreparerTest {
 
@@ -49,8 +48,7 @@ public class GroovyScriptPreparerTest {
 
     private File file;
 
-    public GroovyScriptPreparerTest() {
-    }
+    public GroovyScriptPreparerTest() {}
 
     @BeforeEach
     public void initPreparer() throws URISyntaxException {
@@ -63,7 +61,6 @@ public void initPreparer() throws URISyntaxException {
     public void failsIfNoScriptContent() {
 
         assertThrows(IllegalArgumentException.class, () -> groovyScriptPreparer.evaluateScript(null));
-
     }
 
     @Test
@@ -74,7 +71,6 @@ public void doesNotExecuteScriptIfWorkspaceIsNull() {
         boolean evaluated = groovyScriptPreparer.evaluateScript(script);
 
         assertThat(evaluated, is(false));
-
     }
 
     @Test
@@ -86,7 +82,6 @@ public void createsExecutorAndActsOnWorkspace() throws Exception {
 
         assertThat(evaluated, is(true));
         verify(executor).execute();
-
     }
 
     @Test
@@ -100,20 +95,19 @@ public void logsExecutionFailAndReturnsFalse() throws Exception {
 
         assertThat(evaluated, is(false));
         verify(logger).info(Messages.PostBuildScript_ProblemOccured(), exception);
-
     }
 
     @Test
     public void evaluatesFile() throws Exception {
 
-        given(executorFactory.create(any(Script.class), eq(Collections.emptyList()))).willReturn(executor);
+        given(executorFactory.create(any(Script.class), eq(Collections.emptyList())))
+                .willReturn(executor);
 
         boolean evaluated = groovyScriptPreparer.evaluateCommand(scriptFile, new Command(file.getName()));
 
         verify(executorFactory).create(any(Script.class), eq(Collections.emptyList()));
         verify(executor).execute();
         assertThat(evaluated, is(true));
-
     }
 
     @Test
@@ -124,7 +118,5 @@ public void doesNotExecuteScriptFileIfWorkspaceIsNull() throws Exception {
         boolean evaluated = groovyScriptPreparer.evaluateCommand(scriptFile, new Command(file.getName()));
 
         assertThat(evaluated, is(false));
-
     }
-
 }
diff --git a/src/test/java/org/jenkinsci/plugins/postbuildscript/service/LoadFileCallableTest.java b/src/test/java/org/jenkinsci/plugins/postbuildscript/service/LoadFileCallableTest.java
index e857d4e..4bde8c1 100644
--- a/src/test/java/org/jenkinsci/plugins/postbuildscript/service/LoadFileCallableTest.java
+++ b/src/test/java/org/jenkinsci/plugins/postbuildscript/service/LoadFileCallableTest.java
@@ -1,18 +1,17 @@
 package org.jenkinsci.plugins.postbuildscript.service;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+
 import hudson.FilePath;
 import hudson.remoting.VirtualChannel;
+import java.io.File;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import java.io.File;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-
 @ExtendWith(MockitoExtension.class)
 public class LoadFileCallableTest {
 
@@ -22,22 +21,19 @@ public class LoadFileCallableTest {
     @Test
     public void fileExists() throws Exception {
 
-        File tempFile = File.createTempFile(LoadFileCallableTest.class.getName(),
-            ".txt");
+        File tempFile = File.createTempFile(LoadFileCallableTest.class.getName(), ".txt");
         tempFile.deleteOnExit();
 
         LoadFileCallable callable = new LoadFileCallable(tempFile.getPath(), null);
         FilePath filePath = callable.invoke(null, virtualChannel);
 
         assertThat(filePath.getRemote(), is(tempFile.getPath()));
-
     }
 
     @Test
     public void fileExistsInWorkspace() throws Exception {
 
-        File tempFile = File.createTempFile(LoadFileCallableTest.class.getName(),
-            ".txt");
+        File tempFile = File.createTempFile(LoadFileCallableTest.class.getName(), ".txt");
         tempFile.deleteOnExit();
 
         FilePath workspace = new FilePath(tempFile.getParentFile());
@@ -46,7 +42,6 @@ public void fileExistsInWorkspace() throws Exception {
         FilePath filePath = callable.invoke(null, virtualChannel);
 
         assertThat(filePath.getRemote(), is(tempFile.getPath()));
-
     }
 
     @Test
@@ -58,7 +53,5 @@ public void fileDoesNotExist() throws Exception {
         FilePath filePath = callable.invoke(null, virtualChannel);
 
         assertThat(filePath, is(nullValue()));
-
     }
-
 }
diff --git a/src/test/java/org/jenkinsci/plugins/postbuildscript/service/LoadScriptContentCallableTest.java b/src/test/java/org/jenkinsci/plugins/postbuildscript/service/LoadScriptContentCallableTest.java
index 4e5766e..96a66b3 100644
--- a/src/test/java/org/jenkinsci/plugins/postbuildscript/service/LoadScriptContentCallableTest.java
+++ b/src/test/java/org/jenkinsci/plugins/postbuildscript/service/LoadScriptContentCallableTest.java
@@ -1,12 +1,11 @@
 package org.jenkinsci.plugins.postbuildscript.service;
 
-import org.junit.jupiter.api.Test;
+import static org.hamcrest.CoreMatchers.startsWith;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.File;
 import java.net.URL;
-
-import static org.hamcrest.CoreMatchers.startsWith;
-import static org.hamcrest.MatcherAssert.assertThat;
+import org.junit.jupiter.api.Test;
 
 public class LoadScriptContentCallableTest {
 
@@ -19,6 +18,5 @@ public void loadsScript() throws Exception {
         String script = callable.invoke(new File(url.toURI()), null);
 
         assertThat(script, startsWith("Hello world"));
-
     }
 }