From 680b264251a139940339cd2804bf5c7387e149d1 Mon Sep 17 00:00:00 2001
From: Timon Borter <timon.borter@gmx.ch>
Date: Wed, 9 Oct 2024 10:04:07 +0200
Subject: [PATCH] chore: remove superfluous newlines

---
 .../docker/command/ContainerCreate.java                |  2 --
 .../citrusframework/knative/actions/KnativeAction.java |  1 -
 .../kubernetes/actions/CreateConfigMapAction.java      |  1 -
 .../kubernetes/actions/CreateSecretAction.java         |  1 -
 .../kubernetes/command/DeleteResult.java               |  1 -
 .../citrusframework/kubernetes/command/ListResult.java |  1 -
 .../config/xml/KubernetesBadClientParserTest.java      |  1 -
 .../functions/ServiceClusterIpFunctionTest.java        |  1 -
 .../OpenApiClientRequestMessageBuilderTest.java        |  1 -
 .../selenium/endpoint/SeleniumHeaders.java             |  1 -
 .../selenium/actions/DropDownSelectActionTest.java     |  1 -
 .../actions/ExecutePLSQLActionTest.java                |  1 -
 .../citrusframework/actions/ExecuteSQLActionTest.java  |  1 -
 .../src/main/java/org/citrusframework/TestActor.java   |  1 -
 .../org/citrusframework/message/MessageProcessor.java  |  1 -
 .../java/org/citrusframework/report/TestReporter.java  |  1 -
 .../main/java/org/citrusframework/server/Server.java   |  1 -
 .../citrusframework/spi/ClasspathResourceResolver.java |  1 -
 .../validation/context/ValidationContext.java          |  1 -
 .../java/org/citrusframework/spi/ResourcesTest.java    |  1 -
 .../citrusframework/AbstractSuiteContainerBuilder.java |  1 -
 .../AbstractTestBoundaryContainerBuilder.java          |  1 -
 .../main/java/org/citrusframework/CitrusContext.java   |  2 --
 .../org/citrusframework/CitrusInstanceManager.java     |  1 -
 .../java/org/citrusframework/actions/InputAction.java  |  1 -
 .../org/citrusframework/actions/SendMessageAction.java |  1 -
 .../java/org/citrusframework/actions/SleepAction.java  |  1 -
 .../org/citrusframework/actions/TransformAction.java   |  1 -
 .../org/citrusframework/common/DefaultTestLoader.java  |  1 -
 .../org/citrusframework/condition/HttpCondition.java   |  1 -
 .../container/AbstractTestBoundaryActionContainer.java |  1 -
 .../org/citrusframework/container/Conditional.java     |  1 -
 .../java/org/citrusframework/message/ZipMessage.java   |  1 -
 .../main/java/org/citrusframework/sharding/Shard.java  |  1 -
 .../java/org/citrusframework/util/SocketUtils.java     |  2 --
 .../validation/DelegatingPayloadVariableExtractor.java |  1 -
 .../java/org/citrusframework/DefaultTestCaseTest.java  |  1 -
 .../org/citrusframework/actions/AntRunActionTest.java  |  1 -
 .../org/citrusframework/actions/InputActionTest.java   |  1 -
 .../actions/ReceiveMessageActionTest.java              |  1 -
 .../actions/ReceiveMessageBuilderTest.java             |  2 --
 .../actions/dsl/SendMessageActionBuilderTest.java      |  1 -
 .../citrusframework/condition/HttpConditionTest.java   |  1 -
 .../condition/MessageConditionTest.java                |  1 -
 .../org/citrusframework/container/ParallelTest.java    |  1 -
 .../citrusframework/container/RepeatUntilTrueTest.java |  1 -
 .../org/citrusframework/container/SequenceTest.java    |  1 -
 .../org/citrusframework/container/TemplateTest.java    |  1 -
 .../endpoint/AbstractEndpointAdapterTest.java          |  1 -
 .../endpoint/direct/DirectEndpointComponentTest.java   |  1 -
 .../direct/DirectEndpointSyncConsumerTest.java         |  1 -
 .../correlation/PollingCorrelationManagerTest.java     |  1 -
 .../dictionary/AbstractDataDictionaryTest.java         |  1 -
 .../common/BeanDefinitionParserConfiguration.java      |  1 -
 .../citrusframework/config/xml/BaseTestCaseParser.java |  1 -
 .../config/xml/ReceiveMessageActionParser.java         |  1 -
 .../config/xml/TestCaseMetaInfoParser.java             |  1 -
 .../org/citrusframework/config/xml/TestCaseParser.java |  1 -
 .../org/citrusframework/io/CitrusResourceEditor.java   |  1 -
 .../config/xml/CustomTestCaseParserTest.java           |  2 --
 .../reporter/ReporterConfigDisabledTest.java           |  1 -
 .../camel/actions/CreateCamelRouteActionTest.java      |  1 -
 .../camel/actions/RemoveCamelRouteActionTest.java      |  1 -
 .../camel/actions/StartCamelRouteActionTest.java       |  1 -
 .../camel/endpoint/CamelEndpointComponentTest.java     |  1 -
 .../camel/endpoint/CamelSyncEndpointTest.java          |  1 -
 .../ftp/client/FtpEndpointComponentTest.java           |  1 -
 .../ftp/client/SftpEndpointComponentTest.java          |  1 -
 .../org/citrusframework/http/message/HttpMessage.java  |  2 --
 .../http/message/HttpMessageConverter.java             |  2 --
 .../http/client/HttpEndpointComponentTest.java         |  1 -
 .../http/client/HttpsEndpointComponentTest.java        |  1 -
 .../http/integration/HttpServerJmsIT.java              |  1 -
 .../citrusframework/http/integration/WaitJavaIT.java   |  1 -
 .../http/message/CookieConverterTest.java              |  1 -
 .../http/message/HttpMessageBuilderTest.java           |  1 -
 .../http/message/HttpMessageConverterTest.java         |  2 --
 .../citrusframework/http/server/HttpServerTest.java    |  1 -
 .../servlet/CachingHttpServletRequestWrapperTest.java  |  1 -
 .../http/servlet/CitrusDispatcherServletTest.java      |  1 -
 .../jms/endpoint/JmsEndpointAdapterTest.java           |  2 --
 .../jms/endpoint/JmsEndpointComponentTest.java         |  1 -
 .../jms/endpoint/JmsEndpointSyncProducerTest.java      |  2 --
 .../jms/integration/service/model/FaultDetail.java     |  1 -
 .../jms/integration/service/model/FaultType.java       |  1 -
 .../jms/integration/service/model/HelloRequest.java    |  1 -
 .../jms/integration/service/model/HelloResponse.java   |  1 -
 .../jms/integration/service/model/ObjectFactory.java   |  2 --
 .../jms/integration/service/model/RequestHeader.java   |  1 -
 .../jms/integration/service/model/ResponseHeader.java  |  1 -
 .../jmx/message/JmxMessageConverter.java               |  1 -
 .../org/citrusframework/jmx/model/ObjectFactory.java   |  1 -
 .../org/citrusframework/mail/model/ObjectFactory.java  |  1 -
 .../mail/client/MailEndpointComponentTest.java         |  1 -
 .../java/org/citrusframework/rmi/model/MethodArg.java  |  2 --
 .../org/citrusframework/rmi/model/ObjectFactory.java   |  1 -
 .../channel/ChannelEndpointComponentTest.java          |  1 -
 .../channel/ChannelEndpointSyncConsumerTest.java       |  1 -
 .../selector/DispatchingMessageSelectorTest.java       |  1 -
 .../config/xml/ChannelSyncEndpointParserTest.java      |  1 -
 .../integration/common/SpringXmlTestLoaderIT.java      |  1 -
 .../integration/service/model/FaultDetail.java         |  1 -
 .../integration/service/model/FaultType.java           |  1 -
 .../integration/service/model/HelloRequest.java        |  1 -
 .../integration/service/model/HelloResponse.java       |  1 -
 .../integration/service/model/ObjectFactory.java       |  2 --
 .../org/citrusframework/ssh/model/ObjectFactory.java   |  1 -
 .../org/citrusframework/ssh/client/SshClientTest.java  |  1 -
 .../vertx/endpoint/VertxEndpointComponentTest.java     |  1 -
 .../vertx/message/VertxMessageConverterTest.java       |  1 -
 .../servlet/CitrusWebSocketDispatcherServletTest.java  |  1 -
 .../ws/config/annotation/WebServiceClientConfig.java   |  1 -
 .../ws/config/xml/WebServiceServerParser.java          |  1 -
 .../ws/endpoint/builder/WebServiceEndpoints.java       |  1 -
 .../org/citrusframework/ws/message/SoapMessage.java    |  1 -
 .../ws/validation/SimpleSoapFaultValidator.java        |  1 -
 .../ws/validation/SoapAttachmentValidator.java         |  1 -
 .../ws/validation/SoapFaultValidationContext.java      |  1 -
 .../main/java/org/citrusframework/ws/yaml/Soap.java    |  2 --
 .../org/citrusframework/ws/WebServiceEndpointTest.java | 10 ----------
 .../ws/actions/AssertSoapFaultTest.java                |  2 --
 .../ws/client/WebServiceClientTest.java                |  1 -
 .../ws/client/WebServiceEndpointComponentTest.java     |  1 -
 .../interceptor/DelegatingEndpointInterceptorTest.java |  1 -
 .../citrusframework/ws/message/SoapAttachmentTest.java |  1 -
 .../callback/SoapRequestMessageCallbackTest.java       |  3 ---
 .../callback/SoapResponseMessageCallbackTest.java      |  5 -----
 .../ws/servlet/CitrusMessageDispatcherServletTest.java |  1 -
 .../org/citrusframework/zookeeper/command/Info.java    |  1 -
 .../zookeeper/config/xml/ZooExecuteActionParser.java   |  1 -
 .../actions/dsl/ZooExecuteTestActionBuilderTest.java   |  1 -
 .../org/citrusframework/quarkus/CitrusSupport.java     |  1 -
 .../actions/dsl/ApplyTestBehaviorTest.java             |  1 -
 .../dsl/CatchExceptionTestActionBuilderTest.java       |  1 -
 .../integration/actions/TransformActionJavaIT.java     |  1 -
 .../org/citrusframework/xml/actions/ObjectFactory.java |  1 -
 .../citrusframework/docs/HtmlTestDocsGenerator.java    |  1 -
 .../docs/AbstractTestDocsGeneratorTest.java            |  1 -
 .../citrusframework/mvn/plugin/GenerateTestMojo.java   |  1 -
 .../generate/javadsl/XsdJavaTestGenerator.java         |  1 -
 .../generate/provider/ReceiveCodeProvider.java         |  1 -
 .../provider/http/SendHttpResponseCodeProvider.java    |  1 -
 .../generate/xml/XsdXmlTestGenerator.java              |  1 -
 .../generate/javadsl/JavaDslTestGeneratorTest.java     |  3 ---
 .../generate/provider/ReceiveCodeProviderTest.java     |  1 -
 .../generate/provider/http/HttpCodeProviderTest.java   |  1 -
 .../citrusframework/container/RepeatUntilTrueTest.java |  1 -
 .../main/java/org/citrusframework/dsl/JsonSupport.java |  1 -
 .../builder/ObjectMappingHeaderDataBuilder.java        |  1 -
 .../message/builder/ObjectMappingPayloadBuilder.java   |  1 -
 .../validation/json/schema/JsonSchemaValidation.java   |  1 -
 .../validation/json/JsonElementValidatorItemTest.java  |  1 -
 .../validation/json/JsonElementValidatorTest.java      |  1 -
 .../validation/json/schema/JsonSchemaFilterTest.java   |  1 -
 .../json/schema/JsonSchemaValidationTest.java          |  1 -
 .../message/builder/MarshallingHeaderDataBuilder.java  |  1 -
 .../dictionary/xml/AbstractXmlDataDictionary.java      |  1 -
 .../java/org/citrusframework/xml/XmlConfigurer.java    |  1 -
 .../schema/TargetNamespaceSchemaMappingStrategy.java   |  1 -
 .../org/citrusframework/IgnoreElementsLegacyTest.java  |  1 -
 .../java/org/citrusframework/util/XMLUtilsTest.java    |  1 -
 .../citrusframework/validation/DTDValidationTest.java  |  2 --
 .../validation/xml/DomXmlMessageValidatorTest.java     |  1 -
 .../xml/schema/RootQNameSchemaMappingStrategyTest.java |  5 -----
 .../xml/schema/SchemaMappingStrategyChainTest.java     |  2 --
 .../TargetNamespaceSchemaMappingStrategyTest.java      |  1 -
 166 files changed, 204 deletions(-)

diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerCreate.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerCreate.java
index 47e3bdbec0..3b5ee1260f 100644
--- a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerCreate.java
+++ b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerCreate.java
@@ -412,7 +412,6 @@ public ContainerCreate portBindings(PortBinding ... portBindings) {
         return this;
     }
 
-
     /**
      * Adds volumes variables as command parameter.
      * @param volumes
@@ -602,7 +601,6 @@ public Builder portBindings(PortBinding ... portBindings) {
             return this;
         }
 
-
         /**
          * Adds volumes variables as command parameter.
          * @param volumes
diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/KnativeAction.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/KnativeAction.java
index 17ec75fa35..a51117bbdc 100644
--- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/KnativeAction.java
+++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/KnativeAction.java
@@ -45,7 +45,6 @@ public interface KnativeAction extends TestAction {
      */
     KnativeClient getKnativeClient();
 
-
     /**
      * Gets the current namespace.
      */
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/CreateConfigMapAction.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/CreateConfigMapAction.java
index e8d4d2ebb9..4ca353584c 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/CreateConfigMapAction.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/CreateConfigMapAction.java
@@ -55,7 +55,6 @@ public void doExecute(TestContext context) {
                 Resource file = FileUtils.getFileResource(filePath, context);
                 String resolvedFileContent = context.replaceDynamicContentInString(FileUtils.readToString(file, StandardCharsets.UTF_8));
 
-
                 data.put(FileUtils.getFileName(file.getLocation()),
                         Base64.getEncoder().encodeToString(resolvedFileContent.getBytes(StandardCharsets.UTF_8)));
             } catch (IOException e) {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/CreateSecretAction.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/CreateSecretAction.java
index f174b21bd8..e26b3c59a1 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/CreateSecretAction.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/CreateSecretAction.java
@@ -55,7 +55,6 @@ public void doExecute(TestContext context) {
                 Resource file = FileUtils.getFileResource(filePath, context);
                 String resolvedFileContent = context.replaceDynamicContentInString(FileUtils.readToString(file, StandardCharsets.UTF_8));
 
-
                 data.put(FileUtils.getFileName(file.getLocation()),
                         Base64.getEncoder().encodeToString(resolvedFileContent.getBytes(StandardCharsets.UTF_8)));
             } catch (IOException e) {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/DeleteResult.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/DeleteResult.java
index 4a2a4426cb..5fea13886e 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/DeleteResult.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/DeleteResult.java
@@ -21,7 +21,6 @@
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import jakarta.validation.constraints.NotNull;
 
-
 /**
  * @since 2.7
  */
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListResult.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListResult.java
index 373a247582..28d32328b9 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListResult.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListResult.java
@@ -25,7 +25,6 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import jakarta.validation.constraints.NotNull;
 
-
 /**
  * @since 2.7
  */
diff --git a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/config/xml/KubernetesBadClientParserTest.java b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/config/xml/KubernetesBadClientParserTest.java
index 245d753c37..d263363224 100644
--- a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/config/xml/KubernetesBadClientParserTest.java
+++ b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/config/xml/KubernetesBadClientParserTest.java
@@ -43,4 +43,3 @@ public void testBadConfiguredKubernetesClient() {
     }
 }
 
-
diff --git a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/functions/ServiceClusterIpFunctionTest.java b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/functions/ServiceClusterIpFunctionTest.java
index f9de582a10..eebf70c117 100644
--- a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/functions/ServiceClusterIpFunctionTest.java
+++ b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/functions/ServiceClusterIpFunctionTest.java
@@ -41,7 +41,6 @@
 
 public class ServiceClusterIpFunctionTest extends UnitTestSupport {
 
-
     @Mock
     private KubernetesClient k8sClient;
     @Mock
diff --git a/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/actions/OpenApiClientRequestMessageBuilderTest.java b/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/actions/OpenApiClientRequestMessageBuilderTest.java
index 17b2159a60..1de662ca01 100644
--- a/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/actions/OpenApiClientRequestMessageBuilderTest.java
+++ b/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/actions/OpenApiClientRequestMessageBuilderTest.java
@@ -15,7 +15,6 @@ public class OpenApiClientRequestMessageBuilderTest {
     private final OpenApiSpecification petstoreSpec = OpenApiSpecification.from(
             Resources.create("classpath:org/citrusframework/openapi/petstore/petstore-derivation-for-message-builder-test.json"));
 
-
     @Test
     public void shouldAddRandomDataForOperation() {
         Message message = openapi()
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/SeleniumHeaders.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/SeleniumHeaders.java
index 6543214ac1..e92bc74708 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/SeleniumHeaders.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/SeleniumHeaders.java
@@ -21,7 +21,6 @@
  */
 public class SeleniumHeaders {
 
-
     /**
      * Prevent instantiation.
      */
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/DropDownSelectActionTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/DropDownSelectActionTest.java
index 046e40b3ab..6c9b41684f 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/DropDownSelectActionTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/DropDownSelectActionTest.java
@@ -94,5 +94,4 @@ public void testExecuteMultiSelect() throws Exception {
     }
 
 
-
 }
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/actions/ExecutePLSQLActionTest.java b/connectors/citrus-sql/src/test/java/org/citrusframework/actions/ExecutePLSQLActionTest.java
index 08fea8230a..bbfa68eb06 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/actions/ExecutePLSQLActionTest.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/actions/ExecutePLSQLActionTest.java
@@ -31,7 +31,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-
 public class ExecutePLSQLActionTest extends AbstractTestNGUnitTest {
 
     private ExecutePLSQLAction.Builder executePLSQLActionBuilder;
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/actions/ExecuteSQLActionTest.java b/connectors/citrus-sql/src/test/java/org/citrusframework/actions/ExecuteSQLActionTest.java
index fd237b4f1e..15231d1270 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/actions/ExecuteSQLActionTest.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/actions/ExecuteSQLActionTest.java
@@ -34,7 +34,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.verify;
 
-
 public class ExecuteSQLActionTest extends AbstractTestNGUnitTest {
 
     private static final String DB_STMT_1 = "DELETE * FROM ERRORS WHERE STATUS='resolved'";
diff --git a/core/citrus-api/src/main/java/org/citrusframework/TestActor.java b/core/citrus-api/src/main/java/org/citrusframework/TestActor.java
index ddea0bc250..56e6429edf 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/TestActor.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/TestActor.java
@@ -62,5 +62,4 @@ public void setDisabled(boolean disabled) {
         this.disabled = disabled;
     }
 
-
 }
diff --git a/core/citrus-api/src/main/java/org/citrusframework/message/MessageProcessor.java b/core/citrus-api/src/main/java/org/citrusframework/message/MessageProcessor.java
index 59d9e2430c..5b84a59161 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/message/MessageProcessor.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/message/MessageProcessor.java
@@ -58,7 +58,6 @@ static <T extends MessageProcessor, B extends Builder<T, B>> Optional<Builder<T,
         return Optional.empty();
     }
 
-
     /**
      * Process message with given test context. Processors can change the message payload and headers.
      * @param message the message to process.
diff --git a/core/citrus-api/src/main/java/org/citrusframework/report/TestReporter.java b/core/citrus-api/src/main/java/org/citrusframework/report/TestReporter.java
index 9feca760a8..46024d5413 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/report/TestReporter.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/report/TestReporter.java
@@ -16,7 +16,6 @@
 
 package org.citrusframework.report;
 
-
 /**
  * Interface for test reporters.
  *
diff --git a/core/citrus-api/src/main/java/org/citrusframework/server/Server.java b/core/citrus-api/src/main/java/org/citrusframework/server/Server.java
index d0a7180f00..9e4d3be1a0 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/server/Server.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/server/Server.java
@@ -16,7 +16,6 @@
 
 package org.citrusframework.server;
 
-
 import org.citrusframework.endpoint.Endpoint;
 
 /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/spi/ClasspathResourceResolver.java b/core/citrus-api/src/main/java/org/citrusframework/spi/ClasspathResourceResolver.java
index 7e9bbf2978..7c6c9e5c4b 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/spi/ClasspathResourceResolver.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/spi/ClasspathResourceResolver.java
@@ -179,7 +179,6 @@ private static void readFromJarStream(ClassLoader classLoader, String path, Stri
         }
     }
 
-
     private void loadResourcesInDirectory(String path, File location, Set<Path> result,
         Predicate<String> filter) {
         File[] files = location.listFiles();
diff --git a/core/citrus-api/src/main/java/org/citrusframework/validation/context/ValidationContext.java b/core/citrus-api/src/main/java/org/citrusframework/validation/context/ValidationContext.java
index 1772a8c4b6..41f85fad0f 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/validation/context/ValidationContext.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/validation/context/ValidationContext.java
@@ -16,7 +16,6 @@
 
 package org.citrusframework.validation.context;
 
-
 /**
  * Basic validation context holding validation specific information.
  *
diff --git a/core/citrus-api/src/test/java/org/citrusframework/spi/ResourcesTest.java b/core/citrus-api/src/test/java/org/citrusframework/spi/ResourcesTest.java
index 6a72de3f69..e84a842d37 100644
--- a/core/citrus-api/src/test/java/org/citrusframework/spi/ResourcesTest.java
+++ b/core/citrus-api/src/test/java/org/citrusframework/spi/ResourcesTest.java
@@ -177,7 +177,6 @@ public void urlResourceExistsOnConnectionTest() throws IOException {
         assertTrue(new UrlResource(withContentUrlMock).exists());
     }
 
-
     @Test
     public void urlResourceNotExistsOnConnectionFailureTest() throws IOException {
         URL withContentUrlMock = spy(new URL(Resources.HTTP_RESOURCE_PREFIX + "//host/context"));
diff --git a/core/citrus-base/src/main/java/org/citrusframework/AbstractSuiteContainerBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/AbstractSuiteContainerBuilder.java
index 71e1da812d..66c52857f2 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/AbstractSuiteContainerBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/AbstractSuiteContainerBuilder.java
@@ -87,7 +87,6 @@ public S whenSystemProperties(Map<String, String> systemProperties) {
         return self;
     }
 
-
     /**
      * Condition on environment variable with value. The before test logic will only run when this condition matches.
      * @param name
diff --git a/core/citrus-base/src/main/java/org/citrusframework/AbstractTestBoundaryContainerBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/AbstractTestBoundaryContainerBuilder.java
index 47c8a169b2..8dfd7bc8af 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/AbstractTestBoundaryContainerBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/AbstractTestBoundaryContainerBuilder.java
@@ -89,7 +89,6 @@ public S whenSystemProperties(Map<String, String> systemProperties) {
         return self;
     }
 
-
     /**
      * Condition on environment variable with value. The before test logic will only run when this condition matches.
      * @param name
diff --git a/core/citrus-base/src/main/java/org/citrusframework/CitrusContext.java b/core/citrus-base/src/main/java/org/citrusframework/CitrusContext.java
index a12d93f031..8eca48635d 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/CitrusContext.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/CitrusContext.java
@@ -181,7 +181,6 @@ public void addTestListener(TestListener testListener) {
         this.testListeners.addTestListener(testListener);
     }
 
-
     @Override
     public void addTestActionListener(TestActionListener testActionListener) {
         this.testActionListeners.addTestActionListener(testActionListener);
@@ -227,7 +226,6 @@ public TestListeners getTestListeners() {
         return testListeners;
     }
 
-
     /**
      * Gets the test action listeners in this context.
      * @return
diff --git a/core/citrus-base/src/main/java/org/citrusframework/CitrusInstanceManager.java b/core/citrus-base/src/main/java/org/citrusframework/CitrusInstanceManager.java
index 0453a121b3..b65e635aa0 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/CitrusInstanceManager.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/CitrusInstanceManager.java
@@ -81,7 +81,6 @@ public static Optional<Citrus> get() {
         return Optional.ofNullable(citrus);
     }
 
-
     /**
      * Provide access to the current Citrus instance.
      * Create new instance if it has not been initialized yet.
diff --git a/core/citrus-base/src/main/java/org/citrusframework/actions/InputAction.java b/core/citrus-base/src/main/java/org/citrusframework/actions/InputAction.java
index 268b2b64fd..24e85d8661 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/actions/InputAction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/actions/InputAction.java
@@ -89,7 +89,6 @@ public void doExecute(TestContext context) {
             display = message;
         }
 
-
         try (BufferedReader stdin = getInputReader()) {
             do {
                 logger.info(display);
diff --git a/core/citrus-base/src/main/java/org/citrusframework/actions/SendMessageAction.java b/core/citrus-base/src/main/java/org/citrusframework/actions/SendMessageAction.java
index db9a117edb..c4dbb3ec10 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/actions/SendMessageAction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/actions/SendMessageAction.java
@@ -46,7 +46,6 @@
 import org.slf4j.LoggerFactory;
 import org.citrusframework.util.StringUtils;
 
-
 /**
  * This action sends a messages to a specified message endpoint. The action holds a reference to
  * a {@link org.citrusframework.endpoint.Endpoint}, which is capable of the message transport implementation. So action is
diff --git a/core/citrus-base/src/main/java/org/citrusframework/actions/SleepAction.java b/core/citrus-base/src/main/java/org/citrusframework/actions/SleepAction.java
index 148bbfb9b3..4be7addf79 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/actions/SleepAction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/actions/SleepAction.java
@@ -140,7 +140,6 @@ public Builder seconds(Long seconds) {
             return time(String.valueOf(seconds  * 1000L), TimeUnit.MILLISECONDS);
         }
 
-
         public Builder time(Duration duration) {
             milliseconds(duration.toMillis());
             return this;
diff --git a/core/citrus-base/src/main/java/org/citrusframework/actions/TransformAction.java b/core/citrus-base/src/main/java/org/citrusframework/actions/TransformAction.java
index acc54c6578..359fa05f5a 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/actions/TransformAction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/actions/TransformAction.java
@@ -34,7 +34,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 /**
  * Action transforms a XML document(specified inline or from external file resource)
  * with a XSLT document(specified inline or from external file resource)
diff --git a/core/citrus-base/src/main/java/org/citrusframework/common/DefaultTestLoader.java b/core/citrus-base/src/main/java/org/citrusframework/common/DefaultTestLoader.java
index 0701f4e2bc..fab4e795e2 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/common/DefaultTestLoader.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/common/DefaultTestLoader.java
@@ -229,7 +229,6 @@ public DefaultTestLoader testName(String testName) {
         return this;
     }
 
-
     @Override
     public void setPackageName(String packageName) {
         this.packageName = packageName;
diff --git a/core/citrus-base/src/main/java/org/citrusframework/condition/HttpCondition.java b/core/citrus-base/src/main/java/org/citrusframework/condition/HttpCondition.java
index fb45cb9799..95be6db182 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/condition/HttpCondition.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/condition/HttpCondition.java
@@ -109,7 +109,6 @@ protected HttpURLConnection openConnection(URL url) throws IOException {
         return (HttpURLConnection) url.openConnection();
     }
 
-
     /**
      * Gets the request url with test variable support.
      * @param context The test context to get the url from
diff --git a/core/citrus-base/src/main/java/org/citrusframework/container/AbstractTestBoundaryActionContainer.java b/core/citrus-base/src/main/java/org/citrusframework/container/AbstractTestBoundaryActionContainer.java
index 461c8fed14..b955a04f40 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/container/AbstractTestBoundaryActionContainer.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/container/AbstractTestBoundaryActionContainer.java
@@ -117,7 +117,6 @@ private String sanitizePatten(String pattern) {
         return pattern;
     }
 
-
     /**
      * Checks on included test groups if we should execute sequence. Included group list should have
      * at least one entry matching the sequence test groups restriction.
diff --git a/core/citrus-base/src/main/java/org/citrusframework/container/Conditional.java b/core/citrus-base/src/main/java/org/citrusframework/container/Conditional.java
index 089da376bf..7cfca45b46 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/container/Conditional.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/container/Conditional.java
@@ -109,7 +109,6 @@ public ConditionExpression getConditionExpression() {
         return conditionExpression;
     }
 
-
     /**
      * Action builder.
      */
diff --git a/core/citrus-base/src/main/java/org/citrusframework/message/ZipMessage.java b/core/citrus-base/src/main/java/org/citrusframework/message/ZipMessage.java
index 200f840c0f..f2a1ac6f31 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/message/ZipMessage.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/message/ZipMessage.java
@@ -233,7 +233,6 @@ public Entry addEntry(Entry entry) {
             return this;
         }
 
-
         /**
          * Gets the content.
          *
diff --git a/core/citrus-base/src/main/java/org/citrusframework/sharding/Shard.java b/core/citrus-base/src/main/java/org/citrusframework/sharding/Shard.java
index 438c2bb8ed..08a3a1061a 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/sharding/Shard.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/sharding/Shard.java
@@ -91,7 +91,6 @@ public static <T> Stream<T> createShard(Stream<T> testCases, ShardingConfigurati
         return createShard(testCases, shardingConfiguration, false);
     }
 
-
     /**
      * Creates a sharded stream from the input stream using the provided sharding configuration and a flag to determine
      * whether the stream should be parallel.
diff --git a/core/citrus-base/src/main/java/org/citrusframework/util/SocketUtils.java b/core/citrus-base/src/main/java/org/citrusframework/util/SocketUtils.java
index 4b81504272..d4b7f7eecb 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/util/SocketUtils.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/util/SocketUtils.java
@@ -42,7 +42,6 @@ public class SocketUtils {
 
     private static final Random random = new Random(System.nanoTime());
 
-
     public static int findAvailableTcpPort() {
         return findAvailableTcpPort(PORT_RANGE_MIN);
     }
@@ -65,7 +64,6 @@ public static int findAvailableTcpPort(int min) {
         return candidatePort;
     }
 
-
     /**
      * Check if the specified TCP port is currently available on localhost.
      */
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/DelegatingPayloadVariableExtractor.java b/core/citrus-base/src/main/java/org/citrusframework/validation/DelegatingPayloadVariableExtractor.java
index 3e2c2d3ade..a7d59ab176 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/DelegatingPayloadVariableExtractor.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/DelegatingPayloadVariableExtractor.java
@@ -54,7 +54,6 @@ public DelegatingPayloadVariableExtractor(Builder builder) {
         this.namespaces = builder.namespaces;
     }
 
-
     @Override
     public void extractVariables(Message message, TestContext context) {
         if (pathExpressions.isEmpty()) {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/DefaultTestCaseTest.java b/core/citrus-base/src/test/java/org/citrusframework/DefaultTestCaseTest.java
index 197c2f2873..1a530ddfbf 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/DefaultTestCaseTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/DefaultTestCaseTest.java
@@ -1,6 +1,5 @@
 package org.citrusframework;
 
-
 import org.citrusframework.actions.AbstractAsyncTestAction;
 import org.citrusframework.actions.EchoAction;
 import org.citrusframework.actions.SleepAction;
diff --git a/core/citrus-base/src/test/java/org/citrusframework/actions/AntRunActionTest.java b/core/citrus-base/src/test/java/org/citrusframework/actions/AntRunActionTest.java
index be3b663b87..a8156d343b 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/actions/AntRunActionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/actions/AntRunActionTest.java
@@ -50,7 +50,6 @@ public void messageLogged(BuildEvent event) {
                 })
                 .build();
 
-
 		ant.execute(context);
 	}
 
diff --git a/core/citrus-base/src/test/java/org/citrusframework/actions/InputActionTest.java b/core/citrus-base/src/test/java/org/citrusframework/actions/InputActionTest.java
index e563faf0e0..52b8f14d79 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/actions/InputActionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/actions/InputActionTest.java
@@ -27,7 +27,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-
 public class InputActionTest extends UnitTestSupport {
 
     private BufferedReader inputReader = Mockito.mock(BufferedReader.class);
diff --git a/core/citrus-base/src/test/java/org/citrusframework/actions/ReceiveMessageActionTest.java b/core/citrus-base/src/test/java/org/citrusframework/actions/ReceiveMessageActionTest.java
index cacfb4465d..769a67203f 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/actions/ReceiveMessageActionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/actions/ReceiveMessageActionTest.java
@@ -166,7 +166,6 @@ public void testReceiveMessageWithMessagePayloadData() {
 		TestActor testActor = new TestActor();
         testActor.setName("TESTACTOR");
 
-
         DefaultMessageBuilder controlMessageBuilder = new DefaultMessageBuilder();
         controlMessageBuilder.setPayloadBuilder(new DefaultPayloadBuilder("<TestRequest><Message>Hello World!</Message></TestRequest>"));
 
diff --git a/core/citrus-base/src/test/java/org/citrusframework/actions/ReceiveMessageBuilderTest.java b/core/citrus-base/src/test/java/org/citrusframework/actions/ReceiveMessageBuilderTest.java
index c00e959a44..9b19eeba19 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/actions/ReceiveMessageBuilderTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/actions/ReceiveMessageBuilderTest.java
@@ -258,7 +258,6 @@ void header_withString() {
 		final ReceiveMessageAction.Builder builder = new ReceiveMessageAction.Builder();
 		final String data = "hello";
 
-
 		//WHEN
 		builder.message().header(data);
 
@@ -557,7 +556,6 @@ void validate_xmlMap() {
 		assertEquals(value3, xmlMessageValidationContext.getXpathExpressions().get(key3));
 	}
 
-
 	@Test
 	void validate_jsonMap() {
 
diff --git a/core/citrus-base/src/test/java/org/citrusframework/actions/dsl/SendMessageActionBuilderTest.java b/core/citrus-base/src/test/java/org/citrusframework/actions/dsl/SendMessageActionBuilderTest.java
index 97308267f3..7bfe51471f 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/actions/dsl/SendMessageActionBuilderTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/actions/dsl/SendMessageActionBuilderTest.java
@@ -290,7 +290,6 @@ public void testSendBuilderWithPayloadResource() throws IOException {
                         .message()
                         .body(resource));
 
-
         final TestCase test = runner.getTestCase();
         Assert.assertEquals(test.getActionCount(), 1);
         Assert.assertEquals(test.getActions().get(0).getClass(), SendMessageAction.class);
diff --git a/core/citrus-base/src/test/java/org/citrusframework/condition/HttpConditionTest.java b/core/citrus-base/src/test/java/org/citrusframework/condition/HttpConditionTest.java
index 8010cccebe..39e5aaf818 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/condition/HttpConditionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/condition/HttpConditionTest.java
@@ -28,7 +28,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-
 /**
  * @since 2.4
  */
diff --git a/core/citrus-base/src/test/java/org/citrusframework/condition/MessageConditionTest.java b/core/citrus-base/src/test/java/org/citrusframework/condition/MessageConditionTest.java
index 2d505dee8c..b943c2ee3d 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/condition/MessageConditionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/condition/MessageConditionTest.java
@@ -26,7 +26,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-
 /**
  * @since 2.6.2
  */
diff --git a/core/citrus-base/src/test/java/org/citrusframework/container/ParallelTest.java b/core/citrus-base/src/test/java/org/citrusframework/container/ParallelTest.java
index 6aa3d45c52..828f170464 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/container/ParallelTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/container/ParallelTest.java
@@ -31,7 +31,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.verify;
 
-
 public class ParallelTest extends UnitTestSupport {
 
     private TestAction action = Mockito.mock(TestAction.class);
diff --git a/core/citrus-base/src/test/java/org/citrusframework/container/RepeatUntilTrueTest.java b/core/citrus-base/src/test/java/org/citrusframework/container/RepeatUntilTrueTest.java
index c69e858e91..053192e279 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/container/RepeatUntilTrueTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/container/RepeatUntilTrueTest.java
@@ -27,7 +27,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-
 public class RepeatUntilTrueTest extends UnitTestSupport {
 
     private TestAction action = Mockito.mock(TestAction.class);
diff --git a/core/citrus-base/src/test/java/org/citrusframework/container/SequenceTest.java b/core/citrus-base/src/test/java/org/citrusframework/container/SequenceTest.java
index 9d13a4a512..2ee52e7fdf 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/container/SequenceTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/container/SequenceTest.java
@@ -26,7 +26,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.verify;
 
-
 public class SequenceTest extends UnitTestSupport {
 
     private TestAction action = Mockito.mock(TestAction.class);
diff --git a/core/citrus-base/src/test/java/org/citrusframework/container/TemplateTest.java b/core/citrus-base/src/test/java/org/citrusframework/container/TemplateTest.java
index 9f6fa0babc..448802901d 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/container/TemplateTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/container/TemplateTest.java
@@ -30,7 +30,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.verify;
 
-
 public class TemplateTest extends UnitTestSupport {
 
     private final TestAction action = Mockito.mock(TestAction.class);
diff --git a/core/citrus-base/src/test/java/org/citrusframework/endpoint/AbstractEndpointAdapterTest.java b/core/citrus-base/src/test/java/org/citrusframework/endpoint/AbstractEndpointAdapterTest.java
index 22e0927b97..3c3804eda2 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/endpoint/AbstractEndpointAdapterTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/endpoint/AbstractEndpointAdapterTest.java
@@ -24,7 +24,6 @@
 
 import static org.mockito.Mockito.*;
 
-
 public class AbstractEndpointAdapterTest {
 
     /** Endpoint adapter mock */
diff --git a/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointComponentTest.java b/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointComponentTest.java
index f627e16c2d..04a94c6091 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointComponentTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointComponentTest.java
@@ -26,7 +26,6 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-
 public class DirectEndpointComponentTest {
 
     private TestContext context;
diff --git a/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointSyncConsumerTest.java b/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointSyncConsumerTest.java
index c967cf41b6..85acc96725 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointSyncConsumerTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointSyncConsumerTest.java
@@ -214,7 +214,6 @@ public void testReceiveNoMessage() {
 
         when(queue.receive(5000L)).thenReturn(null);
 
-
         try {
             DirectSyncConsumer channelSyncConsumer = (DirectSyncConsumer) endpoint.createConsumer();
             channelSyncConsumer.receive(context);
diff --git a/core/citrus-base/src/test/java/org/citrusframework/message/correlation/PollingCorrelationManagerTest.java b/core/citrus-base/src/test/java/org/citrusframework/message/correlation/PollingCorrelationManagerTest.java
index 6bb6f7a912..f816e321e6 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/message/correlation/PollingCorrelationManagerTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/message/correlation/PollingCorrelationManagerTest.java
@@ -24,7 +24,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-
 public class PollingCorrelationManagerTest {
 
     private ObjectStore objectStore = Mockito.mock(ObjectStore.class);
diff --git a/core/citrus-base/src/test/java/org/citrusframework/variable/dictionary/AbstractDataDictionaryTest.java b/core/citrus-base/src/test/java/org/citrusframework/variable/dictionary/AbstractDataDictionaryTest.java
index 316526bc4e..74562e1708 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/variable/dictionary/AbstractDataDictionaryTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/variable/dictionary/AbstractDataDictionaryTest.java
@@ -35,7 +35,6 @@
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertTrue;
 
-
 public class AbstractDataDictionaryTest {
 
     private static final String KEY = "a";
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/common/BeanDefinitionParserConfiguration.java b/core/citrus-spring/src/main/java/org/citrusframework/common/BeanDefinitionParserConfiguration.java
index a9aa239d63..1150d7d8cd 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/common/BeanDefinitionParserConfiguration.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/common/BeanDefinitionParserConfiguration.java
@@ -16,7 +16,6 @@
 
 package org.citrusframework.common;
 
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/BaseTestCaseParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/BaseTestCaseParser.java
index a58b86dfb2..8c100bd343 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/BaseTestCaseParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/BaseTestCaseParser.java
@@ -87,7 +87,6 @@ public final BeanDefinition parse(Element element, ParserContext parserContext)
         return parserContext.getRegistry().getBeanDefinition(testName);
     }
 
-
     /**
      * Parses action elements and adds them to a managed list.
      *
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ReceiveMessageActionParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ReceiveMessageActionParser.java
index 7959f2a9d9..dd9c5f9f6c 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ReceiveMessageActionParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ReceiveMessageActionParser.java
@@ -472,7 +472,6 @@ private void extractJsonPathValidateExpressions(
         ValidateMessageParserUtil.parseJsonPathElements(validateElement, validateJsonPathExpressions);
     }
 
-
     /**
      * Parse component returning generic bean definition.
      *
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TestCaseMetaInfoParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TestCaseMetaInfoParser.java
index 25ce12c015..19f20abc20 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TestCaseMetaInfoParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TestCaseMetaInfoParser.java
@@ -18,7 +18,6 @@
 
 import org.citrusframework.TestCaseMetaInfo;
 
-
 /**
  * Default implementation that provides {@link TestCaseMetaInfo}
  */
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TestCaseParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TestCaseParser.java
index 4a87570e1d..a4f1151ee9 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TestCaseParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TestCaseParser.java
@@ -29,5 +29,4 @@ public TestCaseParser() {
         super(DefaultTestCase.class);
     }
 
-
 }
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/io/CitrusResourceEditor.java b/core/citrus-spring/src/main/java/org/citrusframework/io/CitrusResourceEditor.java
index baf7da0a26..2b33d30b97 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/io/CitrusResourceEditor.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/io/CitrusResourceEditor.java
@@ -24,7 +24,6 @@
 import org.springframework.lang.Nullable;
 import org.springframework.util.StringUtils;
 
-
 /**
  * Editor for {@link Resource} descriptors, to automatically convert String locations e.g. file:C:/myfile.txt
  * or classpath:myfile.txt to {@link Resource} properties instead of using a String location property.
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/CustomTestCaseParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/CustomTestCaseParserTest.java
index f2afae6854..2e5d967763 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/CustomTestCaseParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/CustomTestCaseParserTest.java
@@ -53,14 +53,12 @@ public void testCustomTestCaseParser() throws IOException {
         Assert.assertEquals(((CustomTestCaseMetaInfo)getTestCase().getMetaInfo()).getDescription(), "Foo bar: F#!$§ed up beyond all repair");
     }
 
-
     public static class CustomTestCase extends DefaultTestCase {
     }
 
     public static class CustomTestCaseMetaInfo extends TestCaseMetaInfo {
         private String description;
 
-
         public String getDescription() {
             return description;
         }
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/reporter/ReporterConfigDisabledTest.java b/core/citrus-spring/src/test/java/org/citrusframework/reporter/ReporterConfigDisabledTest.java
index 1bff5af940..bfb16b581b 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/reporter/ReporterConfigDisabledTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/reporter/ReporterConfigDisabledTest.java
@@ -26,7 +26,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-
 @TestPropertySource(value = "classpath:org/citrusframework/reporter/default-logger-disabled.properties")
 public class ReporterConfigDisabledTest extends UnitTestSupport {
 
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/actions/CreateCamelRouteActionTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/actions/CreateCamelRouteActionTest.java
index 7f60007928..99c22d8a1d 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/actions/CreateCamelRouteActionTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/actions/CreateCamelRouteActionTest.java
@@ -35,7 +35,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-
 public class CreateCamelRouteActionTest extends AbstractTestNGUnitTest {
 
     private final AbstractCamelContext camelContext = Mockito.mock(AbstractCamelContext.class);
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/actions/RemoveCamelRouteActionTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/actions/RemoveCamelRouteActionTest.java
index 9c5bee74bc..e98767ccbb 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/actions/RemoveCamelRouteActionTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/actions/RemoveCamelRouteActionTest.java
@@ -30,7 +30,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-
 public class RemoveCamelRouteActionTest extends AbstractTestNGUnitTest {
 
     private AbstractCamelContext camelContext = Mockito.mock(AbstractCamelContext.class);
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/actions/StartCamelRouteActionTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/actions/StartCamelRouteActionTest.java
index 2a742b4681..2125788143 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/actions/StartCamelRouteActionTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/actions/StartCamelRouteActionTest.java
@@ -30,7 +30,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-
 public class StartCamelRouteActionTest extends AbstractTestNGUnitTest {
 
     private AbstractCamelContext camelContext = Mockito.mock(AbstractCamelContext.class);
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/endpoint/CamelEndpointComponentTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/endpoint/CamelEndpointComponentTest.java
index 35c15cef85..dc57ca3df8 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/endpoint/CamelEndpointComponentTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/endpoint/CamelEndpointComponentTest.java
@@ -34,7 +34,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-
 /**
  * @since 1.4.1
  */
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/endpoint/CamelSyncEndpointTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/endpoint/CamelSyncEndpointTest.java
index 980ac181dd..f5876b06f4 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/endpoint/CamelSyncEndpointTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/endpoint/CamelSyncEndpointTest.java
@@ -93,7 +93,6 @@ public void testCamelSyncEndpointConsumer() {
 
         CamelSyncEndpoint camelEndpoint = new CamelSyncEndpoint(endpointConfiguration);
 
-
         Message replyMessage = new org.citrusframework.message.DefaultMessage("Hello from Citrus!")
                                                 .setHeader("operation", "hello");
 
diff --git a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/client/FtpEndpointComponentTest.java b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/client/FtpEndpointComponentTest.java
index 16a0d6d651..654e799d72 100644
--- a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/client/FtpEndpointComponentTest.java
+++ b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/client/FtpEndpointComponentTest.java
@@ -28,7 +28,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-
 public class FtpEndpointComponentTest {
 
     private TestContext context = new TestContext();
diff --git a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/client/SftpEndpointComponentTest.java b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/client/SftpEndpointComponentTest.java
index 70f30a8334..5cff085473 100644
--- a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/client/SftpEndpointComponentTest.java
+++ b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/client/SftpEndpointComponentTest.java
@@ -28,7 +28,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-
 public class SftpEndpointComponentTest {
 
     private TestContext context = new TestContext();
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/message/HttpMessage.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/message/HttpMessage.java
index 972758fd74..345d9ee2d8 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/message/HttpMessage.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/message/HttpMessage.java
@@ -269,8 +269,6 @@ public HttpMessage queryParam(final String name, final String value) {
         return this;
     }
 
-
-
     /**
      * Sets request path that is dynamically added to base uri.
      *
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/message/HttpMessageConverter.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/message/HttpMessageConverter.java
index 1e9765c8a2..ab14965aea 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/message/HttpMessageConverter.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/message/HttpMessageConverter.java
@@ -119,8 +119,6 @@ public void convertOutbound(HttpEntity externalMessage,
         throw new UnsupportedOperationException("HttpMessageConverter does not support predefined HttpEntity objects");
     }
 
-
-
     /**
      * Message headers consist of standard HTTP message headers and custom headers.
      * This method assumes that all header entries that were not initially mapped
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/client/HttpEndpointComponentTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/client/HttpEndpointComponentTest.java
index e51c6099a3..7964aa5786 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/client/HttpEndpointComponentTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/client/HttpEndpointComponentTest.java
@@ -36,7 +36,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-
 public class HttpEndpointComponentTest {
 
     private ReferenceResolver referenceResolver = Mockito.mock(ReferenceResolver.class);
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/client/HttpsEndpointComponentTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/client/HttpsEndpointComponentTest.java
index aeec6f52c1..10080dbe00 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/client/HttpsEndpointComponentTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/client/HttpsEndpointComponentTest.java
@@ -36,7 +36,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-
 public class HttpsEndpointComponentTest {
 
     private ReferenceResolver referenceResolver = Mockito.mock(ReferenceResolver.class);
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerJmsIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerJmsIT.java
index 60266d6553..4a356b12c0 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerJmsIT.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerJmsIT.java
@@ -29,5 +29,4 @@ public class HttpServerJmsIT extends TestNGCitrusSpringSupport {
     @CitrusTestSource(type = TestLoader.SPRING, name = "HttpServerJmsIT")
     public void serverJmsIT() {}
 
-
 }
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/WaitJavaIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/WaitJavaIT.java
index 50d02cdfdc..ccc24b8b83 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/WaitJavaIT.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/WaitJavaIT.java
@@ -33,7 +33,6 @@
 import static org.citrusframework.container.FinallySequence.Builder.doFinally;
 import static org.citrusframework.container.Wait.Builder.waitFor;
 
-
 @Test
 public class WaitJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/message/CookieConverterTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/message/CookieConverterTest.java
index d3ca177476..4505731470 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/message/CookieConverterTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/message/CookieConverterTest.java
@@ -122,7 +122,6 @@ public void testCookiePathIsPreserved() {
         assertEquals("foobar", cookies[0].getPath());
     }
 
-
     @Test
     public void testCookieSecureIsPreserved() {
         // GIVEN
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/message/HttpMessageBuilderTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/message/HttpMessageBuilderTest.java
index 96f94f8179..b7cd2c8cfd 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/message/HttpMessageBuilderTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/message/HttpMessageBuilderTest.java
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 package org.citrusframework.http.message;
 
 import jakarta.servlet.http.Cookie;
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/message/HttpMessageConverterTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/message/HttpMessageConverterTest.java
index 8f3b2418fe..3d708565ca 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/message/HttpMessageConverterTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/message/HttpMessageConverterTest.java
@@ -284,7 +284,6 @@ public void testHttpMethodBodyIsNotSetForTraceOnOutbound() {
         assertNull(httpEntity.getBody());
     }
 
-
     @Test
     public void testHttpMessageWithStatusCodeContainsCookiesOnOutbound() {
         // GIVEN
@@ -476,7 +475,6 @@ public void testCookiesPreservedOnConfigurationOnInbound() {
         assertEquals(cookieMock, httpMessage.getCookies().get(0));
     }
 
-
     @Test
     public void testSpringIntegrationHeaderMapperListResultIsConvertedOnInbound() {
         // GIVEN
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/server/HttpServerTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/server/HttpServerTest.java
index 3ae80d3754..2edf9b11f2 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/server/HttpServerTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/server/HttpServerTest.java
@@ -224,5 +224,4 @@ public void testCustomContentType() {
         verify(mockResponseEndpointAdapter).handleMessage(any(Message.class));
     }
 
-
 }
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/servlet/CachingHttpServletRequestWrapperTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/servlet/CachingHttpServletRequestWrapperTest.java
index c03b0119af..00884f56e8 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/servlet/CachingHttpServletRequestWrapperTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/servlet/CachingHttpServletRequestWrapperTest.java
@@ -220,7 +220,6 @@ class DelegatingServletInputStream extends ServletInputStream {
             this.sourceStream = sourceStream;
         }
 
-
         public int read() throws IOException {
             return this.sourceStream.read();
         }
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/servlet/CitrusDispatcherServletTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/servlet/CitrusDispatcherServletTest.java
index 849f597a64..fa1a89c17b 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/servlet/CitrusDispatcherServletTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/servlet/CitrusDispatcherServletTest.java
@@ -37,7 +37,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-
 /**
  * @since 1.4
  */
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointAdapterTest.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointAdapterTest.java
index 681819faed..092e703fe6 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointAdapterTest.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointAdapterTest.java
@@ -86,7 +86,6 @@ public void testEndpointAdapter() throws JMSException {
         when(session.createTextMessage("<TestMessage><text>Hi!</text></TestMessage>")).thenReturn(
                 new TextMessageImpl("<TestMessage><text>Hi!</text></TestMessage>", new HashMap<>()));
 
-
         Message response = endpointAdapter.handleMessage(new DefaultMessage("<TestMessage><text>Hi!</text></TestMessage>"));
         Assert.assertNotNull(response);
         Assert.assertEquals(response.getPayload(String.class), "<TestResponse>Hello World!</TestResponse>");
@@ -114,7 +113,6 @@ public void testNoResponse() throws JMSException {
         when(session.createTextMessage("<TestMessage><text>Hi!</text></TestMessage>")).thenReturn(
                 new TextMessageImpl("<TestMessage><text>Hi!</text></TestMessage>", new HashMap<>()));
 
-
         Assert.assertNull(endpointAdapter.handleMessage(new DefaultMessage("<TestMessage><text>Hi!</text></TestMessage>")));
 
         verify(messageProducer).send(any());
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointComponentTest.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointComponentTest.java
index b55d3f3029..ea90903fe0 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointComponentTest.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointComponentTest.java
@@ -37,7 +37,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-
 public class JmsEndpointComponentTest {
 
     private ReferenceResolver referenceResolver = Mockito.mock(ReferenceResolver.class);
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointSyncProducerTest.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointSyncProducerTest.java
index 41ebe5e09c..24a0fa8d3b 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointSyncProducerTest.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointSyncProducerTest.java
@@ -317,7 +317,6 @@ public Message remove(String correlationKey) {
             }
         });
 
-
         JmsSyncProducer jmsSyncProducer = (JmsSyncProducer)endpoint.createConsumer();
         jmsSyncProducer.getCorrelationManager().saveCorrelationKey(
                 endpoint.getEndpointConfiguration().getCorrelator().getCorrelationKeyName(jmsSyncProducer.getName()),
@@ -384,7 +383,6 @@ public Message remove(String correlationKey) {
             }
         });
 
-
         JmsSyncProducer jmsSyncProducer = (JmsSyncProducer)endpoint.createConsumer();
         jmsSyncProducer.getCorrelationManager().saveCorrelationKey(
                 endpoint.getEndpointConfiguration().getCorrelator().getCorrelationKeyName(jmsSyncProducer.getName()),
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/model/FaultDetail.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/model/FaultDetail.java
index 6098b098dc..dbae42d66a 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/model/FaultDetail.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/model/FaultDetail.java
@@ -18,7 +18,6 @@
 
 import jakarta.xml.bind.annotation.*;
 
-
 /**
  * <p>Java-Klasse für anonymous complex type.
  *
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/model/FaultType.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/model/FaultType.java
index 3d74431a12..478d99023c 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/model/FaultType.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/model/FaultType.java
@@ -18,7 +18,6 @@
 
 import jakarta.xml.bind.annotation.*;
 
-
 /**
  * <p>Java-Klasse für FaultType complex type.
  *
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/model/HelloRequest.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/model/HelloRequest.java
index 1c31b134de..f05e6fc245 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/model/HelloRequest.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/model/HelloRequest.java
@@ -18,7 +18,6 @@
 
 import jakarta.xml.bind.annotation.*;
 
-
 /**
  * <p>Java-Klasse für anonymous complex type.
  *
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/model/HelloResponse.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/model/HelloResponse.java
index db152a5e1a..e2397393ab 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/model/HelloResponse.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/model/HelloResponse.java
@@ -18,7 +18,6 @@
 
 import jakarta.xml.bind.annotation.*;
 
-
 /**
  * <p>Java-Klasse für anonymous complex type.
  *
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/model/ObjectFactory.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/model/ObjectFactory.java
index 1b892cf10c..c8d2f153fc 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/model/ObjectFactory.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/model/ObjectFactory.java
@@ -18,7 +18,6 @@
 
 import jakarta.xml.bind.annotation.XmlRegistry;
 
-
 /**
  * This object contains factory methods for each
  * Java content interface and Java element interface
@@ -36,7 +35,6 @@
 @XmlRegistry
 public class ObjectFactory {
 
-
     /**
      * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.citrusframework.demo.model
      *
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/model/RequestHeader.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/model/RequestHeader.java
index 145e3ea677..d92160ff2b 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/model/RequestHeader.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/model/RequestHeader.java
@@ -18,7 +18,6 @@
 
 import jakarta.xml.bind.annotation.*;
 
-
 /**
  * <p>Java-Klasse für anonymous complex type.
  *
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/model/ResponseHeader.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/model/ResponseHeader.java
index a1f087f3c0..4ec975ac96 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/model/ResponseHeader.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/model/ResponseHeader.java
@@ -18,7 +18,6 @@
 
 import jakarta.xml.bind.annotation.*;
 
-
 /**
  * <p>Java-Klasse für anonymous complex type.
  *
diff --git a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/message/JmxMessageConverter.java b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/message/JmxMessageConverter.java
index 14d7148d48..4b5690b646 100644
--- a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/message/JmxMessageConverter.java
+++ b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/message/JmxMessageConverter.java
@@ -77,7 +77,6 @@ public void convertOutbound(ManagedBeanInvocation mBeanInvocation, Message inter
             mBeanInvocation.setAttribute(attribute);
         }
 
-
         if (internalMessage.getHeader(JmxMessageHeaders.JMX_OBJECT_DOMAIN) != null) {
             mBeanInvocation.setObjectDomain(internalMessage.getHeader(JmxMessageHeaders.JMX_OBJECT_DOMAIN).toString());
         }
diff --git a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/model/ObjectFactory.java b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/model/ObjectFactory.java
index c316b4df05..7c1bfca042 100644
--- a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/model/ObjectFactory.java
+++ b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/model/ObjectFactory.java
@@ -21,7 +21,6 @@
 @XmlRegistry
 public class ObjectFactory {
 
-
     /**
      * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.citrusframework.jmx.model
      */
diff --git a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/ObjectFactory.java b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/ObjectFactory.java
index 7585268df7..56459b6cf1 100644
--- a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/ObjectFactory.java
+++ b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/ObjectFactory.java
@@ -21,7 +21,6 @@
 @XmlRegistry
 public class ObjectFactory {
 
-
     /**
      * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.citrusframework.mail.model
      */
diff --git a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/client/MailEndpointComponentTest.java b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/client/MailEndpointComponentTest.java
index d8fc44a1ef..35f3d9387d 100644
--- a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/client/MailEndpointComponentTest.java
+++ b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/client/MailEndpointComponentTest.java
@@ -32,7 +32,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-
 public class MailEndpointComponentTest {
 
     private ReferenceResolver referenceResolver = Mockito.mock(ReferenceResolver.class);
diff --git a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/model/MethodArg.java b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/model/MethodArg.java
index fd105e1fca..83b6ec4359 100644
--- a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/model/MethodArg.java
+++ b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/model/MethodArg.java
@@ -21,12 +21,10 @@
 // Generated on: 2015.12.10 at 10:05:34 AM MEZ
 //
 
-
 package org.citrusframework.rmi.model;
 
 import jakarta.xml.bind.annotation.*;
 
-
 /**
  * <p>Java class for MethodArg complex type.
  *
diff --git a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/model/ObjectFactory.java b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/model/ObjectFactory.java
index 7ef24ea7db..a675d52351 100644
--- a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/model/ObjectFactory.java
+++ b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/model/ObjectFactory.java
@@ -21,7 +21,6 @@
 @XmlRegistry
 public class ObjectFactory {
 
-
     /**
      * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.citrusframework.rmi.model
      */
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointComponentTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointComponentTest.java
index 818ce749eb..f2e2763242 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointComponentTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointComponentTest.java
@@ -33,7 +33,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-
 public class ChannelEndpointComponentTest {
 
     @Mock
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointSyncConsumerTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointSyncConsumerTest.java
index ba1c121295..680a947613 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointSyncConsumerTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointSyncConsumerTest.java
@@ -247,7 +247,6 @@ public void testReceiveNoMessage() {
 
         when(messagingTemplate.receive(channel)).thenReturn(null);
 
-
         try {
             ChannelSyncConsumer channelSyncConsumer = (ChannelSyncConsumer) endpoint.createConsumer();
             channelSyncConsumer.receive(context);
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/selector/DispatchingMessageSelectorTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/selector/DispatchingMessageSelectorTest.java
index 835ec32eb0..b6b98568e7 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/selector/DispatchingMessageSelectorTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/selector/DispatchingMessageSelectorTest.java
@@ -36,7 +36,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-
 public class DispatchingMessageSelectorTest extends UnitTestSupport {
 
     private BeanFactory beanFactory = Mockito.mock(BeanFactory.class);
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/xml/ChannelSyncEndpointParserTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/xml/ChannelSyncEndpointParserTest.java
index 22d43d2dc0..3970b07daa 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/xml/ChannelSyncEndpointParserTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/xml/ChannelSyncEndpointParserTest.java
@@ -67,5 +67,4 @@ public void testChannelSyncEndpointAsConsumerParser() {
         Assert.assertEquals(channelSyncEndpoint.getActor(), beanDefinitionContext.getBean("testActor", TestActor.class));
     }
 
-
 }
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/common/SpringXmlTestLoaderIT.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/common/SpringXmlTestLoaderIT.java
index 21ad578743..0f9eabbd17 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/common/SpringXmlTestLoaderIT.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/common/SpringXmlTestLoaderIT.java
@@ -104,5 +104,4 @@ protected void parseAdditionalProperties(Element metaInfoElement, BeanDefinition
         }
     }
 
-
 }
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/model/FaultDetail.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/model/FaultDetail.java
index d1cc36ef56..f850ed2be8 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/model/FaultDetail.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/model/FaultDetail.java
@@ -18,7 +18,6 @@
 
 import jakarta.xml.bind.annotation.*;
 
-
 /**
  * <p>Java-Klasse für anonymous complex type.
  *
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/model/FaultType.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/model/FaultType.java
index 9b957e7eaa..cb33d2e550 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/model/FaultType.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/model/FaultType.java
@@ -18,7 +18,6 @@
 
 import jakarta.xml.bind.annotation.*;
 
-
 /**
  * <p>Java-Klasse für FaultType complex type.
  *
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/model/HelloRequest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/model/HelloRequest.java
index eaf529b9c2..941af4da2f 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/model/HelloRequest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/model/HelloRequest.java
@@ -18,7 +18,6 @@
 
 import jakarta.xml.bind.annotation.*;
 
-
 /**
  * <p>Java-Klasse für anonymous complex type.
  *
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/model/HelloResponse.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/model/HelloResponse.java
index b19f193acd..014587834d 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/model/HelloResponse.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/model/HelloResponse.java
@@ -18,7 +18,6 @@
 
 import jakarta.xml.bind.annotation.*;
 
-
 /**
  * <p>Java-Klasse für anonymous complex type.
  *
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/model/ObjectFactory.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/model/ObjectFactory.java
index 7596502e6b..e2382f4faa 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/model/ObjectFactory.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/model/ObjectFactory.java
@@ -18,7 +18,6 @@
 
 import jakarta.xml.bind.annotation.XmlRegistry;
 
-
 /**
  * This object contains factory methods for each
  * Java content interface and Java element interface
@@ -36,7 +35,6 @@
 @XmlRegistry
 public class ObjectFactory {
 
-
     /**
      * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.citrusframework.demo.model
      *
diff --git a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/model/ObjectFactory.java b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/model/ObjectFactory.java
index 9b4f0b4fc8..7cd0ab6ce9 100644
--- a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/model/ObjectFactory.java
+++ b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/model/ObjectFactory.java
@@ -20,7 +20,6 @@
 @XmlRegistry
 public class ObjectFactory {
 
-
     /**
      * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.citrusframework.ssh.model
      *
diff --git a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/client/SshClientTest.java b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/client/SshClientTest.java
index 61127217f5..90e3540164 100644
--- a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/client/SshClientTest.java
+++ b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/client/SshClientTest.java
@@ -229,5 +229,4 @@ public void appendTo(StringBuffer buffer) {
         return null;
     }
 
-
 }
diff --git a/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/endpoint/VertxEndpointComponentTest.java b/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/endpoint/VertxEndpointComponentTest.java
index a13d3d1960..d76a5dc391 100644
--- a/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/endpoint/VertxEndpointComponentTest.java
+++ b/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/endpoint/VertxEndpointComponentTest.java
@@ -33,7 +33,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-
 /**
  * @since 1.4.1
  */
diff --git a/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/message/VertxMessageConverterTest.java b/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/message/VertxMessageConverterTest.java
index 01be4f982f..404680141f 100644
--- a/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/message/VertxMessageConverterTest.java
+++ b/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/message/VertxMessageConverterTest.java
@@ -26,7 +26,6 @@
 
 import static org.mockito.Mockito.*;
 
-
 /**
  * @since 2.0
  */
diff --git a/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/servlet/CitrusWebSocketDispatcherServletTest.java b/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/servlet/CitrusWebSocketDispatcherServletTest.java
index 6b7c6bd168..7ce098e401 100644
--- a/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/servlet/CitrusWebSocketDispatcherServletTest.java
+++ b/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/servlet/CitrusWebSocketDispatcherServletTest.java
@@ -122,7 +122,6 @@ public void testConfigureMessageController() {
         assertEquals(httpMessageController.getEndpointAdapter().getClass(), TimeoutProducingEndpointAdapter.class);
         assertNotNull(httpMessageController.getEndpointConfiguration().getMessageConverter());
 
-
     }
 
     @Test
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/annotation/WebServiceClientConfig.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/annotation/WebServiceClientConfig.java
index 62b6dc59f7..721fe108f7 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/annotation/WebServiceClientConfig.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/annotation/WebServiceClientConfig.java
@@ -79,7 +79,6 @@
      */
     int pollingInterval() default 500;
 
-
     /**
      * Fault handling strategy.
      * @return
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/WebServiceServerParser.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/WebServiceServerParser.java
index 6a1a7a8e42..703638a0c0 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/WebServiceServerParser.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/WebServiceServerParser.java
@@ -66,5 +66,4 @@ protected Class<? extends AbstractServer> getServerClass() {
         return WebServiceServer.class;
     }
 
-
 }
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/endpoint/builder/WebServiceEndpoints.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/endpoint/builder/WebServiceEndpoints.java
index 237ec4a47a..469698b242 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/endpoint/builder/WebServiceEndpoints.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/endpoint/builder/WebServiceEndpoints.java
@@ -22,7 +22,6 @@
 
 public final class WebServiceEndpoints extends ClientServerEndpointBuilder<WebServiceClientBuilder, WebServiceServerBuilder>  {
 
-
     /**
      * Private constructor setting the client and server builder implementation.
      */
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/SoapMessage.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/SoapMessage.java
index 4b26e0c5ff..e7fbad132f 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/SoapMessage.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/SoapMessage.java
@@ -120,7 +120,6 @@ public SoapMessage accept(final String accept) {
     }
 
 
-
     /**
      * Sets the Http response status code.
      *
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SimpleSoapFaultValidator.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SimpleSoapFaultValidator.java
index 6c1c174397..2c56de79dd 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SimpleSoapFaultValidator.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SimpleSoapFaultValidator.java
@@ -16,7 +16,6 @@
 
 package org.citrusframework.ws.validation;
 
-
 import org.citrusframework.context.TestContext;
 import org.citrusframework.exceptions.ValidationException;
 import org.slf4j.Logger;
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SoapAttachmentValidator.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SoapAttachmentValidator.java
index 18d43c4055..44f894d619 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SoapAttachmentValidator.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SoapAttachmentValidator.java
@@ -21,7 +21,6 @@
 
 import java.util.List;
 
-
 /**
  * Interface for SOAP attachment validators.
  *
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SoapFaultValidationContext.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SoapFaultValidationContext.java
index 343d706910..fd52ca22f5 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SoapFaultValidationContext.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SoapFaultValidationContext.java
@@ -83,7 +83,6 @@ public Builder details(List<SoapFaultDetailValidationContext> detailValidationCo
             return this;
         }
 
-
         /**
          * Add fault detail validation context.
          * @param detailValidationContexts
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/yaml/Soap.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/yaml/Soap.java
index de09fc6759..87a4c2c1eb 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/yaml/Soap.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/yaml/Soap.java
@@ -549,7 +549,6 @@ public void setMessage(SoapRequest message) {
             this.message = message;
         }
 
-
         public String getAttachmentValidator() {
             return attachmentValidator;
         }
@@ -674,7 +673,6 @@ public void setMessage(SoapResponse message) {
             this.message = message;
         }
 
-
         public String getAttachmentValidator() {
             return attachmentValidator;
         }
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/WebServiceEndpointTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/WebServiceEndpointTest.java
index 352f0ae835..dbbabfba74 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/WebServiceEndpointTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/WebServiceEndpointTest.java
@@ -122,7 +122,6 @@ public Message handleMessageInternal(Message message) {
 
         when(soapResponse.getPayloadResult()).thenReturn(soapResponsePayload);
 
-
         endpoint.invoke(messageContext);
 
         Assert.assertEquals(soapResponsePayload.toString(), responseMessage.getPayload());
@@ -179,7 +178,6 @@ public Message handleMessageInternal(Message message) {
 
         when(soapResponse.getPayloadResult()).thenReturn(soapResponsePayload);
 
-
         endpoint.invoke(messageContext);
 
         Assert.assertEquals(soapResponsePayload.toString(), responseMessage.getPayload());
@@ -648,7 +646,6 @@ public Message handleMessageInternal(Message message) {
             }
         });
 
-
         StringResult soapResponsePayload = new StringResult();
 
         Set<Attachment> attachments = new HashSet<>();
@@ -807,7 +804,6 @@ public Message handleMessageInternal(Message message) {
             return soapFault;
         }).when(soapBody).addServerOrReceiverFault((String)any(), (Locale)any());
 
-
         endpoint.invoke(messageContext);
 
         Assert.assertEquals(soapResponsePayload.toString(), responseMessage.getPayload());
@@ -873,7 +869,6 @@ public Message handleMessageInternal(Message message) {
             return soapFault;
         }).when(soapBody).addClientOrSenderFault((String)any(), (Locale)any());
 
-
         endpoint.invoke(messageContext);
 
         Assert.assertEquals(soapResponsePayload.toString(), responseMessage.getPayload());
@@ -946,7 +941,6 @@ public Message handleMessageInternal(Message message) {
 
         when(soapFaultDetail.getResult()).thenReturn(soapFaultResult);
 
-
         endpoint.invoke(messageContext);
 
         Assert.assertEquals(soapFaultResult.toString(), "<DetailMessage><text>This request was not OK!</text></DetailMessage>");
@@ -1020,7 +1014,6 @@ public Message handleMessageInternal(Message message) {
 
         when(soapFaultDetail.getResult()).thenReturn(soapFaultResult);
 
-
         endpoint.invoke(messageContext);
 
         Assert.assertEquals(soapFaultResult.toString(), "<DetailMessage><text>This request was not OK!</text></DetailMessage><Error><text>This request was not OK!</text></Error>");
@@ -1052,7 +1045,6 @@ public Message handleMessageInternal(Message message) {
             }
         });
 
-
         StringResult soapResponsePayload = new StringResult();
 
         reset(messageContext, soapEnvelope, soapRequest, soapRequestHeader, soapResponse);
@@ -1155,7 +1147,6 @@ public Message handleMessageInternal(Message message) {
             return soapFault;
         }).when(soapResponseBody).addFault((QName)any(), (String)any(), (Locale)any());
 
-
         endpoint.invoke(messageContext);
 
         Assert.assertEquals(soapResponsePayload.toString(), responseMessage.getPayload());
@@ -1255,7 +1246,6 @@ public Message handleMessageInternal(Message message) {
             }
         });
 
-
         StringResult soapResponsePayload = new StringResult();
 
         reset(messageContext, soapEnvelope, soapRequest, soapRequestHeader, soapResponse);
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/AssertSoapFaultTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/AssertSoapFaultTest.java
index b713d91423..7dab0e9b25 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/AssertSoapFaultTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/AssertSoapFaultTest.java
@@ -254,7 +254,6 @@ public void testAssertSoapFaultDetail() throws Exception {
             throw new SoapFaultClientException(faultMessage);
         }).build();
 
-
         AssertSoapFault assertAction = new AssertSoapFault.Builder()
                 .validator(soapFaultValidator)
                 .when(action)
@@ -393,7 +392,6 @@ public void testAssertMultipleSoapFaultDetails() throws Exception {
             throw new SoapFaultClientException(faultMessage);
         }).build();
 
-
         AssertSoapFault assertAction = new AssertSoapFault.Builder()
                 .validator(soapFaultValidator)
                 .when(action)
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/client/WebServiceClientTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/client/WebServiceClientTest.java
index 1853cec78e..1034dccd65 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/client/WebServiceClientTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/client/WebServiceClientTest.java
@@ -118,7 +118,6 @@ public void testErrorResponseExceptionStrategy() {
 
         reset(webServiceTemplate, soapFaultMessage, soapBody, soapFault);
 
-
         when(soapFaultMessage.getSoapBody()).thenReturn(soapBody);
         when(soapFaultMessage.getFaultReason()).thenReturn("Internal server error");
         when(soapBody.getFault()).thenReturn(soapFault);
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/client/WebServiceEndpointComponentTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/client/WebServiceEndpointComponentTest.java
index 049eb95c3a..82e47aec4d 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/client/WebServiceEndpointComponentTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/client/WebServiceEndpointComponentTest.java
@@ -36,7 +36,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-
 public class WebServiceEndpointComponentTest {
 
     private ReferenceResolver referenceResolver = Mockito.mock(ReferenceResolver.class);
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/interceptor/DelegatingEndpointInterceptorTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/interceptor/DelegatingEndpointInterceptorTest.java
index 9bc0ca902a..b7e20d3d10 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/interceptor/DelegatingEndpointInterceptorTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/interceptor/DelegatingEndpointInterceptorTest.java
@@ -35,7 +35,6 @@
 
 import static org.mockito.Mockito.*;
 
-
 /**
  * @since 1.4.1
  */
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/SoapAttachmentTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/SoapAttachmentTest.java
index 5bd9d624a4..4a66d51b93 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/SoapAttachmentTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/SoapAttachmentTest.java
@@ -37,7 +37,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-
 public class SoapAttachmentTest {
 
     private final Attachment attachment = Mockito.mock(Attachment.class);
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/callback/SoapRequestMessageCallbackTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/callback/SoapRequestMessageCallbackTest.java
index 889d149935..678cbc7afc 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/callback/SoapRequestMessageCallbackTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/callback/SoapRequestMessageCallbackTest.java
@@ -67,7 +67,6 @@ public void testSoapBody() throws TransformerException, IOException {
         when(soapRequest.getSoapBody()).thenReturn(soapBody);
         when(soapBody.getPayloadResult()).thenReturn(soapBodyResult);
 
-
         callback.doWithMessage(soapRequest);
 
         Assert.assertEquals(soapBodyResult.toString(), "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + requestPayload);
@@ -113,7 +112,6 @@ public void testSoapHeaderContent() throws TransformerException, IOException {
         when(soapRequest.getSoapHeader()).thenReturn(soapHeader);
         when(soapHeader.getResult()).thenReturn(soapHeaderResult);
 
-
         callback.doWithMessage(soapRequest);
 
         Assert.assertEquals(soapHeaderResult.toString(), soapHeaderContent);
@@ -208,7 +206,6 @@ public void testSoapMimeHeader() throws TransformerException, IOException {
 
         SoapRequestMessageCallback callback = new SoapRequestMessageCallback(testMessage, new WebServiceEndpointConfiguration(), context);
 
-
         SaajSoapMessage saajSoapRequest = Mockito.mock(SaajSoapMessage.class);
         SoapEnvelope soapEnvelope = Mockito.mock(SoapEnvelope.class);
         SOAPMessage saajMessage = Mockito.mock(SOAPMessage.class);
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/callback/SoapResponseMessageCallbackTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/callback/SoapResponseMessageCallbackTest.java
index 817b6afeda..1d1dd3e0c7 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/callback/SoapResponseMessageCallbackTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/callback/SoapResponseMessageCallbackTest.java
@@ -79,7 +79,6 @@ public void testSoapBody() throws TransformerException, IOException {
 
         when(soapResponse.getSoapAction()).thenReturn("");
 
-
         callback.doWithMessage(soapResponse);
 
         Message responseMessage = callback.getResponse();
@@ -110,7 +109,6 @@ public void testSoapAction() throws TransformerException, IOException {
 
         when(soapResponse.getAttachments()).thenReturn(soapAttachments.iterator());
 
-
         callback.doWithMessage(soapResponse);
 
         Message responseMessage = callback.getResponse();
@@ -146,7 +144,6 @@ public void testSoapHeaderContent() throws TransformerException, IOException {
 
         when(soapResponse.getAttachments()).thenReturn(soapAttachments.iterator());
 
-
         callback.doWithMessage(soapResponse);
 
         Message responseMessage = callback.getResponse();
@@ -185,7 +182,6 @@ public void testSoapHeader() throws TransformerException, IOException {
 
         when(soapResponse.getAttachments()).thenReturn(soapAttachments.iterator());
 
-
         callback.doWithMessage(soapResponse);
 
         Message responseMessage = callback.getResponse();
@@ -223,7 +219,6 @@ public void testSoapAttachment() throws TransformerException, IOException {
 
         when(soapResponse.getAttachments()).thenReturn(soapAttachments.iterator());
 
-
         callback.doWithMessage(soapResponse);
 
         Message responseMessage = callback.getResponse();
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/servlet/CitrusMessageDispatcherServletTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/servlet/CitrusMessageDispatcherServletTest.java
index e056245dca..c83169dc76 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/servlet/CitrusMessageDispatcherServletTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/servlet/CitrusMessageDispatcherServletTest.java
@@ -38,7 +38,6 @@
 
 import static org.mockito.Mockito.*;
 
-
 /**
  * @since 1.4.1
  */
diff --git a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/Info.java b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/Info.java
index e02b606819..e3457ba0d3 100644
--- a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/Info.java
+++ b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/Info.java
@@ -52,5 +52,4 @@ public void execute(ZooClient zookeeperClient, TestContext context) {
         logger.debug(getCommandResult().toString());
     }
 
-
 }
diff --git a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/config/xml/ZooExecuteActionParser.java b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/config/xml/ZooExecuteActionParser.java
index 468e1c0c36..8c32fe55c9 100644
--- a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/config/xml/ZooExecuteActionParser.java
+++ b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/config/xml/ZooExecuteActionParser.java
@@ -226,7 +226,6 @@ public ZooExecuteAction getObject() throws Exception {
             }
 
 
-
             return builder.build();
         }
 
diff --git a/endpoints/citrus-zookeeper/src/test/java/org/citrusframework/zookeeper/actions/dsl/ZooExecuteTestActionBuilderTest.java b/endpoints/citrus-zookeeper/src/test/java/org/citrusframework/zookeeper/actions/dsl/ZooExecuteTestActionBuilderTest.java
index 4c99b9bb3d..70f9134346 100644
--- a/endpoints/citrus-zookeeper/src/test/java/org/citrusframework/zookeeper/actions/dsl/ZooExecuteTestActionBuilderTest.java
+++ b/endpoints/citrus-zookeeper/src/test/java/org/citrusframework/zookeeper/actions/dsl/ZooExecuteTestActionBuilderTest.java
@@ -172,7 +172,6 @@ public void testZookeeperBuilder() throws KeeperException, InterruptedException
         Assert.assertEquals(action.getCommand().getClass(), org.citrusframework.zookeeper.command.SetData.class);
     }
 
-
     private Stat prepareStatMock() {
         Stat stat = Mockito.mock(Stat.class);
         when(stat.getAversion()).thenReturn(1);
diff --git a/runtime/citrus-quarkus/citrus-quarkus-runtime/src/main/java/org/citrusframework/quarkus/CitrusSupport.java b/runtime/citrus-quarkus/citrus-quarkus-runtime/src/main/java/org/citrusframework/quarkus/CitrusSupport.java
index bc9f8c3753..6ac4212703 100644
--- a/runtime/citrus-quarkus/citrus-quarkus-runtime/src/main/java/org/citrusframework/quarkus/CitrusSupport.java
+++ b/runtime/citrus-quarkus/citrus-quarkus-runtime/src/main/java/org/citrusframework/quarkus/CitrusSupport.java
@@ -32,5 +32,4 @@
 @Target(ElementType.TYPE)
 public @interface CitrusSupport {
 
-
 }
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/ApplyTestBehaviorTest.java b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/ApplyTestBehaviorTest.java
index 0b1103434c..60592d43e4 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/ApplyTestBehaviorTest.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/ApplyTestBehaviorTest.java
@@ -118,7 +118,6 @@ public void testBehaviorInContainer() {
         Sequence sequence = (Sequence) test.getActions().get(0);
         Assert.assertEquals(sequence.getActionCount(), 3);
 
-
         Assert.assertEquals(sequence.getActions().get(0).getClass(), EchoAction.class);
         Assert.assertEquals(((EchoAction)sequence.getActions().get(0)).getMessage(), "before");
 
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/CatchExceptionTestActionBuilderTest.java b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/CatchExceptionTestActionBuilderTest.java
index b8e88bd421..2793e0b66b 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/CatchExceptionTestActionBuilderTest.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/CatchExceptionTestActionBuilderTest.java
@@ -55,7 +55,6 @@ public void testCatchBuilder() {
         builder.$(catchException().exception(CitrusRuntimeException.class.getName())
                 .when(echo("${var}")));
 
-
         builder.$(catchException().exception(CitrusRuntimeException.class)
                 .when(echo("${var}"), sleep().milliseconds(100L)));
 
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/TransformActionJavaIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/TransformActionJavaIT.java
index 5f19e0e465..2336be979d 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/TransformActionJavaIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/TransformActionJavaIT.java
@@ -53,7 +53,6 @@ public void transformAction() {
             .xslt(Resources.fromClasspath("org/citrusframework/integration/actions/transform.xslt"))
             .result("result"));
 
-
         run(echo("${result}"));
     }
 }
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/ObjectFactory.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/ObjectFactory.java
index 008d94dc69..8bfe10f2fe 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/ObjectFactory.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/ObjectFactory.java
@@ -154,7 +154,6 @@ public TraceVariables createTraceVariables() {
         return new TraceVariables();
     }
 
-
     /**
      * Create an instance of {@link Trace }
      *
diff --git a/tools/docs-generator/src/main/java/org/citrusframework/docs/HtmlTestDocsGenerator.java b/tools/docs-generator/src/main/java/org/citrusframework/docs/HtmlTestDocsGenerator.java
index 8a7d57ca76..88b5884828 100644
--- a/tools/docs-generator/src/main/java/org/citrusframework/docs/HtmlTestDocsGenerator.java
+++ b/tools/docs-generator/src/main/java/org/citrusframework/docs/HtmlTestDocsGenerator.java
@@ -179,7 +179,6 @@ public static void main(String[] args) {
                 .withOverviewTitle(args.length == 5 ? args[4] : generator.overviewTitle)
                 .withColumns(args.length == 6 ? args[5] : generator.overviewColumns);
 
-
             generator.generateDoc();
         } catch (ArrayIndexOutOfBoundsException e) {
             throw new CitrusRuntimeException("Wrong usage exception! " +
diff --git a/tools/docs-generator/src/test/java/org/citrusframework/docs/AbstractTestDocsGeneratorTest.java b/tools/docs-generator/src/test/java/org/citrusframework/docs/AbstractTestDocsGeneratorTest.java
index aac4a68e3c..adfeebd1ef 100644
--- a/tools/docs-generator/src/test/java/org/citrusframework/docs/AbstractTestDocsGeneratorTest.java
+++ b/tools/docs-generator/src/test/java/org/citrusframework/docs/AbstractTestDocsGeneratorTest.java
@@ -49,7 +49,6 @@ protected Properties getTestDocProperties() {
         }
     };
 
-
     @Test
     public void testGetTestFiles() throws IOException {
 
diff --git a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/GenerateTestMojo.java b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/GenerateTestMojo.java
index d7a360f63b..9d62d463c2 100644
--- a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/GenerateTestMojo.java
+++ b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/GenerateTestMojo.java
@@ -180,7 +180,6 @@ public void doExecute() throws MojoExecutionException, MojoFailureException {
                 generator.withSpec(test.getSwagger().getFile());
                 generator.withOperation(test.getSwagger().getOperation());
 
-
                 if (test.getSwagger().getMappings() != null) {
                     generator.withInboundMappings(test.getSwagger().getMappings().getInbound());
                     generator.withOutboundMappings(test.getSwagger().getMappings().getOutbound());
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/javadsl/XsdJavaTestGenerator.java b/tools/test-generator/src/main/java/org/citrusframework/generate/javadsl/XsdJavaTestGenerator.java
index 6b21e7d9e1..1956c709ba 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/javadsl/XsdJavaTestGenerator.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/javadsl/XsdJavaTestGenerator.java
@@ -262,7 +262,6 @@ public XsdJavaTestGenerator withOutboundMappingFile(String mappingFile) {
     }
 
 
-
     /**
      * Sets the xsd.
      *
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/ReceiveCodeProvider.java b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/ReceiveCodeProvider.java
index 46e0b54029..482b01fcf6 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/ReceiveCodeProvider.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/ReceiveCodeProvider.java
@@ -39,5 +39,4 @@ public CodeBlock getCode(final String endpoint, final Message message) {
         return code.build();
     }
 
-
 }
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/http/SendHttpResponseCodeProvider.java b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/http/SendHttpResponseCodeProvider.java
index da959262b9..93c852fb18 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/http/SendHttpResponseCodeProvider.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/http/SendHttpResponseCodeProvider.java
@@ -41,5 +41,4 @@ public CodeBlock getCode(final String endpoint, final HttpMessage message) {
         return code.build();
     }
 
-
 }
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/xml/XsdXmlTestGenerator.java b/tools/test-generator/src/main/java/org/citrusframework/generate/xml/XsdXmlTestGenerator.java
index b06ef48f48..c026aa6d4f 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/xml/XsdXmlTestGenerator.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/xml/XsdXmlTestGenerator.java
@@ -262,7 +262,6 @@ public XsdXmlTestGenerator withOutboundMappingFile(String mappingFile) {
     }
 
 
-
     /**
      * Sets the xsd.
      *
diff --git a/tools/test-generator/src/test/java/org/citrusframework/generate/javadsl/JavaDslTestGeneratorTest.java b/tools/test-generator/src/test/java/org/citrusframework/generate/javadsl/JavaDslTestGeneratorTest.java
index e8b0d09202..9358600be9 100644
--- a/tools/test-generator/src/test/java/org/citrusframework/generate/javadsl/JavaDslTestGeneratorTest.java
+++ b/tools/test-generator/src/test/java/org/citrusframework/generate/javadsl/JavaDslTestGeneratorTest.java
@@ -43,14 +43,12 @@ public void cleanUp(){
     @Test
     public void create_should_pass_with_junit5() throws IOException {
 
-
         //GIVEN
         generatorUnderTest.withName("FooTest")
                 .withDisabled(false)
                 .withFramework(UnitFramework.JUNIT5)
                 .usePackage("org.citrusframework");
 
-
         //WHEN
         generatorUnderTest.create();
 
@@ -82,7 +80,6 @@ public void create_should_pass_with_junit4() throws IOException {
     }
 
 
-
     @Test
     public void create_should_pass_with_testng() throws IOException {
 
diff --git a/tools/test-generator/src/test/java/org/citrusframework/generate/provider/ReceiveCodeProviderTest.java b/tools/test-generator/src/test/java/org/citrusframework/generate/provider/ReceiveCodeProviderTest.java
index 4112e383e9..c19d7a10ea 100644
--- a/tools/test-generator/src/test/java/org/citrusframework/generate/provider/ReceiveCodeProviderTest.java
+++ b/tools/test-generator/src/test/java/org/citrusframework/generate/provider/ReceiveCodeProviderTest.java
@@ -22,7 +22,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-
 class ReceiveCodeProviderTest {
 
     private final ReceiveCodeProvider receiveCodeProvider = new ReceiveCodeProvider();
diff --git a/tools/test-generator/src/test/java/org/citrusframework/generate/provider/http/HttpCodeProviderTest.java b/tools/test-generator/src/test/java/org/citrusframework/generate/provider/http/HttpCodeProviderTest.java
index b1b5e44660..38488f7912 100644
--- a/tools/test-generator/src/test/java/org/citrusframework/generate/provider/http/HttpCodeProviderTest.java
+++ b/tools/test-generator/src/test/java/org/citrusframework/generate/provider/http/HttpCodeProviderTest.java
@@ -16,7 +16,6 @@
 
 package org.citrusframework.generate.provider.http;
 
-
 import org.citrusframework.http.message.HttpMessage;
 import com.squareup.javapoet.CodeBlock;
 import org.apache.hc.core5.http.HttpStatus;
diff --git a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/container/RepeatUntilTrueTest.java b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/container/RepeatUntilTrueTest.java
index 0519b7a513..2cc7503e59 100644
--- a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/container/RepeatUntilTrueTest.java
+++ b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/container/RepeatUntilTrueTest.java
@@ -28,7 +28,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-
 public class RepeatUntilTrueTest extends AbstractTestNGUnitTest {
 
     private TestAction action = Mockito.mock(TestAction.class);
diff --git a/validation/citrus-validation-json/src/main/java/org/citrusframework/dsl/JsonSupport.java b/validation/citrus-validation-json/src/main/java/org/citrusframework/dsl/JsonSupport.java
index c5ad73294a..6886a2c8d0 100644
--- a/validation/citrus-validation-json/src/main/java/org/citrusframework/dsl/JsonSupport.java
+++ b/validation/citrus-validation-json/src/main/java/org/citrusframework/dsl/JsonSupport.java
@@ -50,7 +50,6 @@ public static ObjectMappingPayloadBuilder marshal(Object payload) {
         return new ObjectMappingPayloadBuilder(payload);
     }
 
-
     /**
      * Static builder method constructing a mapping payload builder.
      * @param payload
diff --git a/validation/citrus-validation-json/src/main/java/org/citrusframework/message/builder/ObjectMappingHeaderDataBuilder.java b/validation/citrus-validation-json/src/main/java/org/citrusframework/message/builder/ObjectMappingHeaderDataBuilder.java
index 01bff3fbdb..9eccf594fc 100644
--- a/validation/citrus-validation-json/src/main/java/org/citrusframework/message/builder/ObjectMappingHeaderDataBuilder.java
+++ b/validation/citrus-validation-json/src/main/java/org/citrusframework/message/builder/ObjectMappingHeaderDataBuilder.java
@@ -99,5 +99,4 @@ private String buildHeaderData(ObjectMapper mapper, Object model, TestContext co
         }
     }
 
-
 }
diff --git a/validation/citrus-validation-json/src/main/java/org/citrusframework/message/builder/ObjectMappingPayloadBuilder.java b/validation/citrus-validation-json/src/main/java/org/citrusframework/message/builder/ObjectMappingPayloadBuilder.java
index 27d9273d61..f352499954 100644
--- a/validation/citrus-validation-json/src/main/java/org/citrusframework/message/builder/ObjectMappingPayloadBuilder.java
+++ b/validation/citrus-validation-json/src/main/java/org/citrusframework/message/builder/ObjectMappingPayloadBuilder.java
@@ -99,5 +99,4 @@ private Object buildPayload(ObjectMapper mapper, Object model, TestContext conte
         }
     }
 
-
 }
diff --git a/validation/citrus-validation-json/src/main/java/org/citrusframework/validation/json/schema/JsonSchemaValidation.java b/validation/citrus-validation-json/src/main/java/org/citrusframework/validation/json/schema/JsonSchemaValidation.java
index 75cf64af1b..fff261a2e7 100644
--- a/validation/citrus-validation-json/src/main/java/org/citrusframework/validation/json/schema/JsonSchemaValidation.java
+++ b/validation/citrus-validation-json/src/main/java/org/citrusframework/validation/json/schema/JsonSchemaValidation.java
@@ -156,7 +156,6 @@ private Set<ValidationMessage> validate(Message message, SimpleJsonSchema simple
         }
     }
 
-
     /**
      * Checks whether the supplied message type is supported by the message.
      *
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/JsonElementValidatorItemTest.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/JsonElementValidatorItemTest.java
index e7532b5d58..ddc77c994d 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/JsonElementValidatorItemTest.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/JsonElementValidatorItemTest.java
@@ -51,7 +51,6 @@ void shouldGetJsonPath(String expectedPath, JsonElementValidatorItem<?> fixture)
         assertThat(fixture.getJsonPath()).isEqualTo(expectedPath);
     }
 
-
     @DataProvider
     public static Object[][] getNamePairs() {
         return new Object[][]{
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/JsonElementValidatorTest.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/JsonElementValidatorTest.java
index 9db9b360f1..d0cf2b210e 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/JsonElementValidatorTest.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/JsonElementValidatorTest.java
@@ -144,7 +144,6 @@ public static JsonAssertion[] validIfStrict() {
         ).toArray(new JsonAssertion[0]);
     }
 
-
     @Test(dataProvider = "invalidJsonPairsOnStrictAndNonStrict")
     public void shouldBeInvalid(JsonAssertion jsonAssertion) {
         var validationItem = toValidationItem(jsonAssertion);
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/schema/JsonSchemaFilterTest.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/schema/JsonSchemaFilterTest.java
index 927e6141f2..f6b7b90363 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/schema/JsonSchemaFilterTest.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/schema/JsonSchemaFilterTest.java
@@ -189,7 +189,6 @@ public void testNoSchemaFoundThrowsException() {
                 .schema("foo")
                 .build();
 
-
         //Setup application validationContext
         when(referenceResolverMock.resolve(validationContext.getSchema(), SimpleJsonSchema.class))
                 .thenThrow(CitrusRuntimeException.class);
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/schema/JsonSchemaValidationTest.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/schema/JsonSchemaValidationTest.java
index 6a7ae17db9..9ca46b5290 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/schema/JsonSchemaValidationTest.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/schema/JsonSchemaValidationTest.java
@@ -97,7 +97,6 @@ public void testValidJsonMessageSuccessfullyValidated() {
                   }
                 ]""");
 
-
         GraciousProcessingReport report = fixture.validate(
                 receivedMessage,
                 schemaRepositories,
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/message/builder/MarshallingHeaderDataBuilder.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/message/builder/MarshallingHeaderDataBuilder.java
index 04475e9179..093444eb9b 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/message/builder/MarshallingHeaderDataBuilder.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/message/builder/MarshallingHeaderDataBuilder.java
@@ -103,5 +103,4 @@ private String buildHeaderData(Marshaller marshaller, Object model, TestContext
         return context.replaceDynamicContentInString(result.toString());
     }
 
-
 }
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/variable/dictionary/xml/AbstractXmlDataDictionary.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/variable/dictionary/xml/AbstractXmlDataDictionary.java
index 18bbdd3ea7..f7e12a4a6e 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/variable/dictionary/xml/AbstractXmlDataDictionary.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/variable/dictionary/xml/AbstractXmlDataDictionary.java
@@ -116,5 +116,4 @@ public boolean supportsMessageType(String messageType) {
         return MessageType.XML.toString().equalsIgnoreCase(messageType) || MessageType.XHTML.toString().equalsIgnoreCase(messageType);
     }
 
-
 }
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/XmlConfigurer.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/XmlConfigurer.java
index 34ddd57ff3..faeaaa44d9 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/XmlConfigurer.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/XmlConfigurer.java
@@ -144,7 +144,6 @@ public LSOutput createLSOutput() {
         return domImpl.createLSOutput();
     }
 
-
     /**
      * Creates LSResourceResolver from dom implementation.
      * @return
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/TargetNamespaceSchemaMappingStrategy.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/TargetNamespaceSchemaMappingStrategy.java
index 80db87772f..cf227685ed 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/TargetNamespaceSchemaMappingStrategy.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/TargetNamespaceSchemaMappingStrategy.java
@@ -21,7 +21,6 @@
 import org.citrusframework.util.StringUtils;
 import org.springframework.xml.xsd.XsdSchema;
 
-
 /**
  * Mapping strategy checks on target namespaces in schemas to find matching schema
  * instance.
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/IgnoreElementsLegacyTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/IgnoreElementsLegacyTest.java
index 83fc588e11..8d448085e1 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/IgnoreElementsLegacyTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/IgnoreElementsLegacyTest.java
@@ -170,7 +170,6 @@ public void testIgnoreElementsAndValidate() {
         ignoreMessageElements.add("root.element.sub-elementA");
         ignoreMessageElements.add("sub-elementB");
 
-
         Map<String, Object> validateElements = new HashMap<>();
         validateElements.put("root.element.sub-elementA", "wrong value");
         validateElements.put("sub-elementB", "wrong value");
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/util/XMLUtilsTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/util/XMLUtilsTest.java
index 9a91890168..afbea6f6bf 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/util/XMLUtilsTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/util/XMLUtilsTest.java
@@ -16,7 +16,6 @@
 
 package org.citrusframework.util;
 
-
 import org.citrusframework.xml.namespace.NamespaceContextBuilder;
 import org.mockito.Mockito;
 import org.testng.Assert;
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/DTDValidationTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/DTDValidationTest.java
index 7fbef53e1e..75d0a3aa88 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/DTDValidationTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/DTDValidationTest.java
@@ -174,7 +174,6 @@ public void testPublicIdError() {
                             + "</message>"
                         + "</root>"));
 
-
         try {
             ReceiveMessageAction receiveAction = new ReceiveMessageAction.Builder()
                     .endpoint(endpoint)
@@ -213,7 +212,6 @@ public void testSystemIdError() {
                             + "</message>"
                         + "</root>"));
 
-
         try {
             ReceiveMessageAction receiveAction = new ReceiveMessageAction.Builder()
                     .endpoint(endpoint)
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xml/DomXmlMessageValidatorTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xml/DomXmlMessageValidatorTest.java
index d230745591..8b52957a63 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xml/DomXmlMessageValidatorTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xml/DomXmlMessageValidatorTest.java
@@ -754,7 +754,6 @@ public void testValidateMessagePayloadWithIgnoresSuccess() {
                         + "</element>"
                     + "</root>");
 
-
         Set<String> ignoreExpressions = new HashSet<>();
         ignoreExpressions.add("//root/element/sub-element1");
 
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/schema/RootQNameSchemaMappingStrategyTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/schema/RootQNameSchemaMappingStrategyTest.java
index b67a1f44eb..6db972d3ee 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/schema/RootQNameSchemaMappingStrategyTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/schema/RootQNameSchemaMappingStrategyTest.java
@@ -29,7 +29,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-
 public class RootQNameSchemaMappingStrategyTest {
 
     private XsdSchema schemaMock = Mockito.mock(XsdSchema.class);
@@ -51,7 +50,6 @@ public void testPositiveMapping() {
 
         when(schemaMock.getTargetNamespace()).thenReturn("http://citrusframework.org/schema");
 
-
         Assert.assertEquals(strategy.getSchema(schemas, "http://citrusframework.org/schema", "foo"), schemaMock);
 
     }
@@ -74,7 +72,6 @@ public void testPositiveMappingWithNamespaces() {
 
         when(schemaMock.getTargetNamespace()).thenReturn("http://citrusframework.org/schema");
 
-
         Assert.assertEquals(strategy.getSchema(schemas, "http://citrusframework.org/schema", "foo"), schemaMock);
 
     }
@@ -96,7 +93,6 @@ public void testNoMappingFound() {
 
         when(schemaMock.getTargetNamespace()).thenReturn("http://citrusframework.org/schema");
 
-
         Assert.assertNull(strategy.getSchema(schemas, "http://citrusframework.org/schema", "foo"));
 
     }
@@ -119,7 +115,6 @@ public void testMappingErrorWithNamespaceInconstistency() {
 
         when(schemaMock.getTargetNamespace()).thenReturn("http://citrusframework.org/schema/unknown");
 
-
         try {
             strategy.getSchema(schemas, "http://citrusframework.org/schema", "foo");
             Assert.fail("Missing exception due to schema target namespace inconsistency");
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/schema/SchemaMappingStrategyChainTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/schema/SchemaMappingStrategyChainTest.java
index 2d52438630..de54415b92 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/schema/SchemaMappingStrategyChainTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/schema/SchemaMappingStrategyChainTest.java
@@ -60,7 +60,6 @@ public void testStrategyChain() {
 
         when(schemaMock.getTargetNamespace()).thenReturn("http://citrusframework.org/schema");
 
-
         Assert.assertEquals(strategy.getSchema(schemas, doc), schemaMock);
 
     }
@@ -95,7 +94,6 @@ public void testStrategyChainFallback() {
 
         when(schemaMock.getTargetNamespace()).thenReturn("http://citrusframework.org/schema");
 
-
         Assert.assertEquals(strategy.getSchema(schemas, doc), schemaMock);
 
     }
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/schema/TargetNamespaceSchemaMappingStrategyTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/schema/TargetNamespaceSchemaMappingStrategyTest.java
index 240f3ef7c1..847746d10b 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/schema/TargetNamespaceSchemaMappingStrategyTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/schema/TargetNamespaceSchemaMappingStrategyTest.java
@@ -25,7 +25,6 @@
 
 import static org.mockito.Mockito.*;
 
-
 public class TargetNamespaceSchemaMappingStrategyTest {
     
     private XsdSchema schemaMock = Mockito.mock(XsdSchema.class);