This is an automated email from the ASF dual-hosted git repository.

orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit ba99a55330d4103f1198945c7f95c5afad478419
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Tue Apr 16 15:12:46 2024 +0200

    (chores) camel-core: use final fields in tests when possible
---
 .../camel/core/xml/AbstractCamelContextFactoryBeanTest.java       | 8 ++++----
 core/camel-core/src/test/java/org/apache/camel/TestSupport.java   | 2 +-
 .../test/java/org/apache/camel/builder/ExpressionBuilderTest.java | 4 ++--
 .../org/apache/camel/builder/PredicateBinaryCoerceTypeTest.java   | 2 +-
 .../test/java/org/apache/camel/builder/PredicateBuilderTest.java  | 2 +-
 .../test/java/org/apache/camel/component/bean/BeanInfoTest.java   | 2 +-
 .../camel/component/bean/BeanInfoWithBridgedMethodTest.java       | 2 +-
 .../java/org/apache/camel/component/bean/BeanReturnNullTest.java  | 2 +-
 .../component/bean/BeanWithExpressionInjectionPredicateTest.java  | 2 +-
 .../camel/component/bean/BeanWithExpressionInjectionTest.java     | 2 +-
 .../camel/component/bean/BeanWithHeadersAndBodyInject2Test.java   | 4 ++--
 .../camel/component/bean/BeanWithHeadersAndBodyInjectionTest.java | 2 +-
 .../bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java    | 2 +-
 .../component/bean/BeanWithPropertiesAndHeadersInjectionTest.java | 2 +-
 .../bean/BeanWithPropertiesAndVariablesInjectionTest.java         | 2 +-
 .../component/bean/BeanWithVariablesAndBodyInjectionTest.java     | 2 +-
 .../bean/BeanWithXPathInjectionUsingHeaderValueTest.java          | 2 +-
 .../component/bean/BeanWithXPathInjectionUsingResultTypeTest.java | 2 +-
 .../component/bean/BodyAnnotationToDisambiguateMethodsTest.java   | 2 +-
 .../bean/ExpressionAnnotationToDisambiguateMethodsTest.java       | 4 ++--
 .../java/org/apache/camel/component/bean/PredicateAsBeanTest.java | 2 +-
 .../test/java/org/apache/camel/component/browse/BrowseTest.java   | 4 ++--
 .../org/apache/camel/component/dataset/BigDataSetManualTest.java  | 2 +-
 .../org/apache/camel/component/dataset/CustomDataSetTest.java     | 2 +-
 .../org/apache/camel/component/dataset/DataSetConsumerTest.java   | 2 +-
 .../org/apache/camel/component/dataset/DataSetProducerTest.java   | 2 +-
 .../test/java/org/apache/camel/component/dataset/DataSetTest.java | 2 +-
 .../file/strategy/FileIdempotentReadLockDelayedAsyncTest.java     | 2 +-
 .../file/strategy/FileIdempotentReadLockDelayedTest.java          | 2 +-
 .../camel/component/file/strategy/FileIdempotentReadLockTest.java | 2 +-
 .../java/org/apache/camel/component/rest/RestEndpointTest.java    | 4 ++--
 .../org/apache/camel/component/scheduler/SchedulerRouteTest.java  | 2 +-
 .../java/org/apache/camel/component/timer/TimerRouteTest.java     | 2 +-
 .../camel/component/validator/ValidatorDtdAccessAbstractTest.java | 7 ++++---
 .../src/test/java/org/apache/camel/converter/ConverterTest.java   | 2 +-
 .../src/test/java/org/apache/camel/converter/JaxpTest.java        | 2 +-
 .../test/java/org/apache/camel/converter/StringSourceTest.java    | 4 ++--
 .../test/java/org/apache/camel/impl/StartAndStopRoutesTest.java   | 2 +-
 .../org/apache/camel/impl/verifier/ResultErrorHelperTest.java     | 2 +-
 .../test/java/org/apache/camel/issues/Camel4857UriIssueTest.java  | 4 ++--
 .../test/java/org/apache/camel/issues/ComponentUseRawUriTest.java | 2 +-
 .../src/test/java/org/apache/camel/issues/DavidSiefertTest.java   | 2 +-
 .../src/test/java/org/apache/camel/issues/Issue170Test.java       | 6 +++---
 .../src/test/java/org/apache/camel/issues/Issue3Test.java         | 2 +-
 .../camel/processor/BeanOgnMethodWithXPathInjectionTest.java      | 4 ++--
 .../java/org/apache/camel/processor/BeanRecipientListTest.java    | 2 +-
 .../src/test/java/org/apache/camel/processor/BeanRouteTest.java   | 2 +-
 .../camel/processor/BeanWithXPathInjectionPreCompileTest.java     | 2 +-
 .../org/apache/camel/processor/BeanWithXPathInjectionTest.java    | 2 +-
 .../org/apache/camel/processor/Camel715ThreadProcessorTest.java   | 2 +-
 .../src/test/java/org/apache/camel/processor/ClaimCheckTest.java  | 2 +-
 .../org/apache/camel/processor/ComposedMessageProcessorTest.java  | 4 ++--
 .../processor/DeadLetterChannelExceptionCausePropagatedTest.java  | 2 +-
 .../java/org/apache/camel/processor/DeadLetterChannelTest.java    | 2 +-
 .../processor/IdempotentConsumerUsingCustomRepositoryTest.java    | 2 +-
 .../src/test/java/org/apache/camel/processor/RegExRouteTest.java  | 4 ++--
 .../apache/camel/processor/SetHeaderUsingDslExpressionsTest.java  | 2 +-
 .../java/org/apache/camel/processor/SetHeadersProcessorTest.java  | 4 ++--
 .../org/apache/camel/processor/SplitTimeoutCancelTaskTest.java    | 4 ++--
 .../java/org/apache/camel/processor/SplitterStreamCacheTest.java  | 2 +-
 .../camel/processor/SplitterWithCustomThreadPoolExecutorTest.java | 2 +-
 .../java/org/apache/camel/processor/ThreadsInvalidConfigTest.java | 2 +-
 .../src/test/java/org/apache/camel/processor/UnitOfWorkTest.java  | 2 +-
 .../apache/camel/processor/ValidationFinallyBlockNoCatchTest.java | 2 +-
 .../org/apache/camel/processor/ValidationFinallyBlockTest.java    | 2 +-
 .../src/test/java/org/apache/camel/processor/ValidationTest.java  | 2 +-
 .../src/test/java/org/apache/camel/processor/XPathFilterTest.java | 2 +-
 .../org/apache/camel/processor/aggregator/AggregatorTest.java     | 2 +-
 .../apache/camel/processor/enricher/EnricherSendEventTest.java    | 4 ++--
 .../processor/routingslip/RoutingSlipDataModificationTest.java    | 2 +-
 .../camel/processor/routingslip/RoutingSlipWithExceptionTest.java | 2 +-
 .../processor/throttle/concurrent/ThrottlerAsyncDelayedTest.java  | 2 +-
 .../processor/throttle/concurrent/ThrottlerMethodCallTest.java    | 2 +-
 .../processor/throttle/requests/ThrottlerAsyncDelayedTest.java    | 2 +-
 .../camel/processor/throttle/requests/ThrottlerDslTest.java       | 2 +-
 .../java/org/apache/camel/support/cache/SimpleSoftCacheTest.java  | 2 +-
 .../src/test/java/org/apache/camel/util/EventHelperTest.java      | 6 +++---
 .../JmxInstrumentationOnlyRegisterProcessorWithCustomIdTest.java  | 2 +-
 .../src/test/java/org/apache/camel/management/LoadTimerTest.java  | 2 +-
 79 files changed, 102 insertions(+), 101 deletions(-)

diff --git 
a/core/camel-core-xml/src/test/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBeanTest.java
 
b/core/camel-core-xml/src/test/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBeanTest.java
index d5ea5f4e382..9f71ea4a4f6 100644
--- 
a/core/camel-core-xml/src/test/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBeanTest.java
+++ 
b/core/camel-core-xml/src/test/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBeanTest.java
@@ -56,9 +56,9 @@ public class AbstractCamelContextFactoryBeanTest {
     // any properties (abstract methods in AbstractCamelContextFactoryBean that
     // return String and receive no arguments) that do not support property
     // placeholders
-    Set<String> propertiesThatAreNotPlaceholdered = 
Collections.singleton("{{getErrorHandlerRef}}");
+    final Set<String> propertiesThatAreNotPlaceholdered = 
Collections.singleton("{{getErrorHandlerRef}}");
 
-    TypeConverter typeConverter = new DefaultTypeConverter(
+    final TypeConverter typeConverter = new DefaultTypeConverter(
             new DefaultPackageScanClassResolver(),
             new Injector() {
                 @Override
@@ -88,7 +88,7 @@ public class AbstractCamelContextFactoryBeanTest {
             }, false);
 
     // properties that should return value that can be converted to boolean
-    Set<String> valuesThatReturnBoolean = new HashSet<>(
+    final Set<String> valuesThatReturnBoolean = new HashSet<>(
             asList("{{getStreamCache}}", "{{getDebug}}", "{{getTrace}}", 
"{{getBacklogTrace}}",
                     "{{getMessageHistory}}", "{{getLogMask}}", 
"{{getLogExhaustedMessageBody}}",
                     "{{getCaseInsensitiveHeaders}}",
@@ -99,7 +99,7 @@ public class AbstractCamelContextFactoryBeanTest {
                     "{{getInflightRepositoryBrowseEnabled}}"));
 
     // properties that should return value that can be converted to long
-    Set<String> valuesThatReturnLong = new 
HashSet<>(List.of("{{getDelayer}}"));
+    final Set<String> valuesThatReturnLong = new 
HashSet<>(List.of("{{getDelayer}}"));
 
     public AbstractCamelContextFactoryBeanTest() throws Exception {
         ((Service) typeConverter).start();
diff --git a/core/camel-core/src/test/java/org/apache/camel/TestSupport.java 
b/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
index c32844cb96c..3aa960c1e56 100644
--- a/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
+++ b/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
@@ -65,7 +65,7 @@ public abstract class TestSupport {
 
     protected TestInfo info;
 
-    protected Logger log = LoggerFactory.getLogger(getClass());
+    protected final Logger log = LoggerFactory.getLogger(getClass());
 
     @TempDir
     private Path tempDirectory;
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java
index e68bf307161..87cc50b9046 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java
@@ -38,8 +38,8 @@ import static 
org.apache.camel.builder.PredicateBuilder.contains;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ExpressionBuilderTest extends TestSupport {
-    protected CamelContext camelContext = new DefaultCamelContext();
-    protected Exchange exchange = new DefaultExchange(camelContext);
+    protected final CamelContext camelContext = new DefaultCamelContext();
+    protected final Exchange exchange = new DefaultExchange(camelContext);
 
     @Test
     public void testRegexTokenize() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/builder/PredicateBinaryCoerceTypeTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/builder/PredicateBinaryCoerceTypeTest.java
index 529c6225bed..02ad115bcce 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/builder/PredicateBinaryCoerceTypeTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/builder/PredicateBinaryCoerceTypeTest.java
@@ -27,7 +27,7 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class PredicateBinaryCoerceTypeTest extends TestSupport {
-    protected Exchange exchange = new DefaultExchange(new 
DefaultCamelContext());
+    protected final Exchange exchange = new DefaultExchange(new 
DefaultCamelContext());
 
     @Test
     public void testIsNull() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderTest.java
index badf6d4484d..2c10de943e0 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderTest.java
@@ -34,7 +34,7 @@ import static org.apache.camel.builder.PredicateBuilder.not;
 
 public class PredicateBuilderTest extends TestSupport {
 
-    protected Exchange exchange = new DefaultExchange(new 
DefaultCamelContext());
+    protected final Exchange exchange = new DefaultExchange(new 
DefaultCamelContext());
 
     @Test
     public void testRegexPredicates() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoTest.java
index 0e9b1134ecf..102d776a1b3 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoTest.java
@@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.*;
 public class BeanInfoTest {
     private static final Logger LOG = 
LoggerFactory.getLogger(BeanInfoTest.class);
 
-    protected CamelContext camelContext = new DefaultCamelContext();
+    protected final CamelContext camelContext = new DefaultCamelContext();
 
     @Test
     public void testObjectOperations() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoWithBridgedMethodTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoWithBridgedMethodTest.java
index 9f630da42dc..2ea8a7517f7 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoWithBridgedMethodTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoWithBridgedMethodTest.java
@@ -59,7 +59,7 @@ public class BeanInfoWithBridgedMethodTest extends 
ContextTestSupport {
     }
 
     public static class Request {
-        int x;
+        final int x;
 
         public Request(int x) {
             this.x = x;
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanReturnNullTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanReturnNullTest.java
index cce49ee8e6b..5304d50a58c 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanReturnNullTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanReturnNullTest.java
@@ -66,7 +66,7 @@ public class BeanReturnNullTest extends ContextTestSupport {
 
     public static final class MyBean {
 
-        public String name;
+        public final String name;
 
         public MyBean(String name) {
             this.name = name;
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionPredicateTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionPredicateTest.java
index 96cd8709bc6..8fac2c01e89 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionPredicateTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionPredicateTest.java
@@ -27,7 +27,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class BeanWithExpressionInjectionPredicateTest extends 
ContextTestSupport {
-    protected MyBean myBean = new MyBean();
+    protected final MyBean myBean = new MyBean();
 
     @Test
     public void testSendMessage() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java
index b91231eed1b..d3004518e86 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java
@@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class BeanWithExpressionInjectionTest extends ContextTestSupport {
     private static final Logger LOG = 
LoggerFactory.getLogger(BeanRouteTest.class);
-    protected MyBean myBean = new MyBean();
+    protected final MyBean myBean = new MyBean();
 
     @Test
     public void testSendMessage() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInject2Test.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInject2Test.java
index 1cc29bdd772..0ae81f957a5 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInject2Test.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInject2Test.java
@@ -123,8 +123,8 @@ public class BeanWithHeadersAndBodyInject2Test extends 
ContextTestSupport {
     }
 
     public static class User {
-        public String name;
-        public String age;
+        public final String name;
+        public final String age;
 
         public User(String name, String age) {
             this.name = name;
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInjectionTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInjectionTest.java
index 7275f62c92f..ce0e1b0b618 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInjectionTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInjectionTest.java
@@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.*;
 
 public class BeanWithHeadersAndBodyInjectionTest extends ContextTestSupport {
     private static final Logger LOG = 
LoggerFactory.getLogger(BeanRouteTest.class);
-    protected MyBean myBean = new MyBean();
+    protected final MyBean myBean = new MyBean();
 
     @Test
     public void testSendMessage() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java
index c2b3dd81327..d9af9414d8d 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java
@@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class BeanWithPropertiesAndHeadersAndBodyInjectionTest extends 
ContextTestSupport {
-    protected MyBean myBean = new MyBean();
+    protected final MyBean myBean = new MyBean();
 
     @Test
     public void testSendMessage() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersInjectionTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersInjectionTest.java
index 7e407979824..5bdacdd7cc9 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersInjectionTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersInjectionTest.java
@@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class BeanWithPropertiesAndHeadersInjectionTest extends 
ContextTestSupport {
     private static final Logger LOG = 
LoggerFactory.getLogger(BeanRouteTest.class);
-    protected MyBean myBean = new MyBean();
+    protected final MyBean myBean = new MyBean();
 
     @Test
     public void testSendMessage() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndVariablesInjectionTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndVariablesInjectionTest.java
index 216c1fe3d17..92bdf50466c 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndVariablesInjectionTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndVariablesInjectionTest.java
@@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class BeanWithPropertiesAndVariablesInjectionTest extends 
ContextTestSupport {
     private static final Logger LOG = 
LoggerFactory.getLogger(BeanRouteTest.class);
-    protected MyBean myBean = new MyBean();
+    protected final MyBean myBean = new MyBean();
 
     @Test
     public void testSendMessage() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithVariablesAndBodyInjectionTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithVariablesAndBodyInjectionTest.java
index 4b42eb2f1d6..d377d75c746 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithVariablesAndBodyInjectionTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithVariablesAndBodyInjectionTest.java
@@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.fail;
 
 public class BeanWithVariablesAndBodyInjectionTest extends ContextTestSupport {
     private static final Logger LOG = 
LoggerFactory.getLogger(BeanRouteTest.class);
-    protected MyBean myBean = new MyBean();
+    protected final MyBean myBean = new MyBean();
 
     @Test
     public void testSendMessage() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithXPathInjectionUsingHeaderValueTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithXPathInjectionUsingHeaderValueTest.java
index 7633337187b..26f9de2e7b1 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithXPathInjectionUsingHeaderValueTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithXPathInjectionUsingHeaderValueTest.java
@@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
  * otherwise it will be applied to the body
  */
 public class BeanWithXPathInjectionUsingHeaderValueTest extends 
ContextTestSupport {
-    protected MyBean myBean = new MyBean();
+    protected final MyBean myBean = new MyBean();
 
     @Test
     public void testConstantXPathHeaders() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithXPathInjectionUsingResultTypeTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithXPathInjectionUsingResultTypeTest.java
index 3b2d383431a..6acd6b63c73 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithXPathInjectionUsingResultTypeTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithXPathInjectionUsingResultTypeTest.java
@@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class BeanWithXPathInjectionUsingResultTypeTest extends 
ContextTestSupport {
 
-    protected MyBean myBean = new MyBean();
+    protected final MyBean myBean = new MyBean();
 
     @Test
     public void testSendMessage() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BodyAnnotationToDisambiguateMethodsTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BodyAnnotationToDisambiguateMethodsTest.java
index 499b60db7f5..7489216d8c7 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BodyAnnotationToDisambiguateMethodsTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BodyAnnotationToDisambiguateMethodsTest.java
@@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.fail;
 
 public class BodyAnnotationToDisambiguateMethodsTest extends 
ContextTestSupport {
     private static final Logger LOG = 
LoggerFactory.getLogger(BeanRouteTest.class);
-    protected MyBean myBean = new MyBean();
+    protected final MyBean myBean = new MyBean();
 
     @Test
     public void testSendMessage() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java
index abafbb9e1b4..eebe90a164a 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java
@@ -31,8 +31,8 @@ import static org.junit.jupiter.api.Assertions.fail;
 
 public class ExpressionAnnotationToDisambiguateMethodsTest extends 
ContextTestSupport {
     private static final Logger LOG = 
LoggerFactory.getLogger(BeanRouteTest.class);
-    protected MyBean myBean = new MyBean();
-    protected MyOtherBean myOtherBean = new MyOtherBean();
+    protected final MyBean myBean = new MyBean();
+    protected final MyOtherBean myOtherBean = new MyOtherBean();
 
     @Test
     public void testSendMessage() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/PredicateAsBeanTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/PredicateAsBeanTest.java
index e4d7b1dd076..2324201c26f 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/PredicateAsBeanTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/PredicateAsBeanTest.java
@@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class PredicateAsBeanTest extends ContextTestSupport {
     private static final Logger LOG = 
LoggerFactory.getLogger(BeanRouteTest.class);
-    protected MyPredicate myPredicate = new MyPredicate();
+    protected final MyPredicate myPredicate = new MyPredicate();
 
     @Test
     public void testSendMessage() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/browse/BrowseTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/browse/BrowseTest.java
index eb372989eb4..dc65aedd36a 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/component/browse/BrowseTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/browse/BrowseTest.java
@@ -32,8 +32,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 public class BrowseTest extends ContextTestSupport {
     private static final Logger LOG = 
LoggerFactory.getLogger(BrowseTest.class);
 
-    protected Object body1 = "one";
-    protected Object body2 = "two";
+    protected final Object body1 = "one";
+    protected final Object body2 = "two";
 
     @Test
     public void testListEndpoints() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/BigDataSetManualTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/BigDataSetManualTest.java
index 6bdc407f62a..6615c091769 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/BigDataSetManualTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/BigDataSetManualTest.java
@@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test;
 
 @Disabled("Manual test")
 public class BigDataSetManualTest extends ContextTestSupport {
-    protected SimpleDataSet dataSet = new SimpleDataSet(20000);
+    protected final SimpleDataSet dataSet = new SimpleDataSet(20000);
 
     @Test
     public void testDataSet() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java
index aea59b9193c..d2ad2eee6f0 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java
@@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test;
 
 public class CustomDataSetTest extends ContextTestSupport {
 
-    protected DataSet dataSet = new DataSetSupport() {
+    protected final DataSet dataSet = new DataSetSupport() {
         final Expression expression = new 
XPathBuilder("/message/@index").resultType(Long.class);
 
         @Override
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumerTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumerTest.java
index 358b73fc7b6..2e43a03a6ea 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumerTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumerTest.java
@@ -27,7 +27,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class DataSetConsumerTest extends ContextTestSupport {
 
-    protected SimpleDataSet dataSet = new SimpleDataSet(5);
+    protected final SimpleDataSet dataSet = new SimpleDataSet(5);
 
     final String dataSetName = "foo";
     final String dataSetUri = "dataset://" + dataSetName + "?initialDelay=0";
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetProducerTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetProducerTest.java
index 813b39afede..673d9443ab9 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetProducerTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetProducerTest.java
@@ -27,7 +27,7 @@ import static org.junit.jupiter.api.Assertions.fail;
 
 public class DataSetProducerTest extends ContextTestSupport {
 
-    protected SimpleDataSet dataSet = new SimpleDataSet(20);
+    protected final SimpleDataSet dataSet = new SimpleDataSet(20);
 
     final String dataSetName = "foo";
     final String dataSetUri = "dataset://" + dataSetName;
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTest.java
index 2fae450d51a..b23d286ab2e 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
 
 public class DataSetTest extends ContextTestSupport {
 
-    protected SimpleDataSet dataSet = new SimpleDataSet(20);
+    protected final SimpleDataSet dataSet = new SimpleDataSet(20);
 
     @Override
     protected Registry createCamelRegistry() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileIdempotentReadLockDelayedAsyncTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileIdempotentReadLockDelayedAsyncTest.java
index 12f61eab279..0d3a10326bb 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileIdempotentReadLockDelayedAsyncTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileIdempotentReadLockDelayedAsyncTest.java
@@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class FileIdempotentReadLockDelayedAsyncTest extends ContextTestSupport 
{
 
-    MemoryIdempotentRepository myRepo = new MemoryIdempotentRepository();
+    final MemoryIdempotentRepository myRepo = new MemoryIdempotentRepository();
 
     @Override
     protected Registry createCamelRegistry() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileIdempotentReadLockDelayedTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileIdempotentReadLockDelayedTest.java
index f6e6940c62c..29d3dffc2f0 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileIdempotentReadLockDelayedTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileIdempotentReadLockDelayedTest.java
@@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class FileIdempotentReadLockDelayedTest extends ContextTestSupport {
 
-    MemoryIdempotentRepository myRepo = new MemoryIdempotentRepository();
+    final MemoryIdempotentRepository myRepo = new MemoryIdempotentRepository();
 
     @Override
     protected Registry createCamelRegistry() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileIdempotentReadLockTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileIdempotentReadLockTest.java
index 33bcb88f28f..20f0092acac 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileIdempotentReadLockTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/file/strategy/FileIdempotentReadLockTest.java
@@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class FileIdempotentReadLockTest extends ContextTestSupport {
 
-    MemoryIdempotentRepository myRepo = new MemoryIdempotentRepository();
+    final MemoryIdempotentRepository myRepo = new MemoryIdempotentRepository();
 
     @Override
     protected Registry createCamelRegistry() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/rest/RestEndpointTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/rest/RestEndpointTest.java
index 0ba1fd9c1f1..f3c65d16c7c 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/component/rest/RestEndpointTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/rest/RestEndpointTest.java
@@ -50,9 +50,9 @@ public class RestEndpointTest {
         }
     }
 
-    RestComponent restComponent;
+    final RestComponent restComponent;
 
-    CamelContext context;
+    final CamelContext context;
 
     public RestEndpointTest() {
         context = new DefaultCamelContext();
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/scheduler/SchedulerRouteTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/scheduler/SchedulerRouteTest.java
index 208cf43c6f6..1a8d1abfc97 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/component/scheduler/SchedulerRouteTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/scheduler/SchedulerRouteTest.java
@@ -59,7 +59,7 @@ public class SchedulerRouteTest extends ContextTestSupport {
     }
 
     public static class MyBean {
-        public AtomicInteger counter = new AtomicInteger();
+        public final AtomicInteger counter = new AtomicInteger();
 
         public void someMethod() {
             LOG.debug("Invoked someMethod()");
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/timer/TimerRouteTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/timer/TimerRouteTest.java
index e20531aec95..e4487f5dc5d 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/component/timer/TimerRouteTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/timer/TimerRouteTest.java
@@ -59,7 +59,7 @@ public class TimerRouteTest extends ContextTestSupport {
     }
 
     public static class MyBean {
-        public AtomicInteger counter = new AtomicInteger();
+        public final AtomicInteger counter = new AtomicInteger();
 
         public void someMethod() {
             LOG.debug("Invoked someMethod()");
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorDtdAccessAbstractTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorDtdAccessAbstractTest.java
index 1f908de2b6b..f15c365f32f 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorDtdAccessAbstractTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorDtdAccessAbstractTest.java
@@ -32,11 +32,12 @@ public abstract class ValidatorDtdAccessAbstractTest 
extends ContextTestSupport
     protected MockEndpoint unknownHostExceptionEndpoint;
     protected MockEndpoint validEndpoint;
 
-    protected String payloud = getPayloudPart("Hello world!");
+    protected final String payloud = getPayloudPart("Hello world!");
 
-    protected String ssrfPayloud = "<!DOCTYPE roottag PUBLIC 
\"-//VSR//PENTEST//EN\" \"http://notex.isting/test\";>\n" + payloud;
+    protected final String ssrfPayloud
+            = "<!DOCTYPE roottag PUBLIC \"-//VSR//PENTEST//EN\" 
\"http://notex.isting/test\";>\n" + payloud;
 
-    protected String xxePayloud
+    protected final String xxePayloud
             = "<!DOCTYPE updateProfile [<!ENTITY file SYSTEM 
\"http://notex.istinghost/test\";>]>\n" + getPayloudPart("&file;");
 
     private final boolean accessExternalDTD;
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java 
b/core/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java
index 78cebc90fec..d2e4a927004 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java
@@ -57,7 +57,7 @@ public class ConverterTest extends TestSupport {
 
     private static final Logger LOG = 
LoggerFactory.getLogger(ConverterTest.class);
 
-    protected TypeConverter converter = new DefaultTypeConverter(
+    protected final TypeConverter converter = new DefaultTypeConverter(
             new DefaultPackageScanClassResolver(), new ReflectionInjector(), 
true);
 
     @BeforeEach
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/converter/JaxpTest.java 
b/core/camel-core/src/test/java/org/apache/camel/converter/JaxpTest.java
index 4e8dfd77628..4bd22e14b86 100644
--- a/core/camel-core/src/test/java/org/apache/camel/converter/JaxpTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/converter/JaxpTest.java
@@ -40,7 +40,7 @@ import static org.junit.jupiter.api.Assertions.*;
 
 public class JaxpTest {
     private static final Logger LOG = LoggerFactory.getLogger(JaxpTest.class);
-    protected TypeConverter converter = new DefaultTypeConverter(
+    protected final TypeConverter converter = new DefaultTypeConverter(
             new DefaultPackageScanClassResolver(), new ReflectionInjector(), 
false);
 
     @BeforeEach
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/converter/StringSourceTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/converter/StringSourceTest.java
index bf261869e57..4a80ecd1eff 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/converter/StringSourceTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/converter/StringSourceTest.java
@@ -34,9 +34,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class StringSourceTest {
-    protected TypeConverter converter = new DefaultTypeConverter(
+    protected final TypeConverter converter = new DefaultTypeConverter(
             new DefaultPackageScanClassResolver(), new ReflectionInjector(), 
false);
-    protected String expectedBody = "<hello>world!</hello>";
+    protected final String expectedBody = "<hello>world!</hello>";
 
     @BeforeEach
     public void setUp() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/impl/StartAndStopRoutesTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/impl/StartAndStopRoutesTest.java
index 6703cb39236..869e6dd897c 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/impl/StartAndStopRoutesTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/impl/StartAndStopRoutesTest.java
@@ -34,7 +34,7 @@ public class StartAndStopRoutesTest extends 
ContextTestSupport {
     protected Endpoint endpointA;
     protected Endpoint endpointB;
     protected Endpoint endpointC;
-    protected Object expectedBody = "<hello>world!</hello>";
+    protected final Object expectedBody = "<hello>world!</hello>";
 
     @Test
     public void testStartRouteThenStopMutateAndStartRouteAgain() throws 
Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/impl/verifier/ResultErrorHelperTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/impl/verifier/ResultErrorHelperTest.java
index d25c1b9b006..301fd0d3b62 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/impl/verifier/ResultErrorHelperTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/impl/verifier/ResultErrorHelperTest.java
@@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ResultErrorHelperTest {
 
-    OptionsGroup[] groups = new OptionsGroup[] {
+    final OptionsGroup[] groups = new OptionsGroup[] {
             OptionsGroup.withName("optionA").options("param1", "param2", 
"!param3"),
             OptionsGroup.withName("optionB").options("param1", "!param2", 
"param3"),
             OptionsGroup.withName("optionC").options("!param1", "!param2", 
"param4") };
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/issues/Camel4857UriIssueTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/issues/Camel4857UriIssueTest.java
index 8a939157ca1..c66320a6640 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/issues/Camel4857UriIssueTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/issues/Camel4857UriIssueTest.java
@@ -42,8 +42,8 @@ public class Camel4857UriIssueTest extends ContextTestSupport 
{
      * contain URI special characters like ? or +
      */
     static class MyEndpoint extends DefaultEndpoint {
-        String uri;
-        String remaining;
+        final String uri;
+        final String remaining;
 
         MyEndpoint(final String uri, final String remaining) {
             this.uri = uri;
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/issues/ComponentUseRawUriTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/issues/ComponentUseRawUriTest.java
index 9c580aed8e4..b4d24aaf985 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/issues/ComponentUseRawUriTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/issues/ComponentUseRawUriTest.java
@@ -38,7 +38,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 public class ComponentUseRawUriTest extends ContextTestSupport {
 
     public static class MyEndpoint extends DefaultEndpoint {
-        String remaining;
+        final String remaining;
         String foo;
         String bar;
 
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/issues/DavidSiefertTest.java 
b/core/camel-core/src/test/java/org/apache/camel/issues/DavidSiefertTest.java
index 5e31d9d3f2f..e00ebf3475a 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/issues/DavidSiefertTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/issues/DavidSiefertTest.java
@@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.fail;
 
 public class DavidSiefertTest extends ContextTestSupport {
-    protected static Object expectedBody = "Some Output";
+    protected static final Object expectedBody = "Some Output";
 
     @Test
     public void testWorks() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/issues/Issue170Test.java 
b/core/camel-core/src/test/java/org/apache/camel/issues/Issue170Test.java
index 1642a52e1fe..aeb5d5053f2 100644
--- a/core/camel-core/src/test/java/org/apache/camel/issues/Issue170Test.java
+++ b/core/camel-core/src/test/java/org/apache/camel/issues/Issue170Test.java
@@ -22,9 +22,9 @@ import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.jupiter.api.Test;
 
 public class Issue170Test extends ContextTestSupport {
-    protected String qOne = "seda:Q1";
-    protected String qTwo = "mock:Q2";
-    protected String qThree = "mock:Q3";
+    protected final String qOne = "seda:Q1";
+    protected final String qTwo = "mock:Q2";
+    protected final String qThree = "mock:Q3";
 
     @Test
     public void testSendMessagesGetCorrectCounts() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/issues/Issue3Test.java 
b/core/camel-core/src/test/java/org/apache/camel/issues/Issue3Test.java
index d5089d10f17..2327c096236 100644
--- a/core/camel-core/src/test/java/org/apache/camel/issues/Issue3Test.java
+++ b/core/camel-core/src/test/java/org/apache/camel/issues/Issue3Test.java
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class Issue3Test extends ContextTestSupport {
-    protected String fromQueue = "direct:A";
+    protected final String fromQueue = "direct:A";
 
     @Test
     public void testIssue() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/BeanOgnMethodWithXPathInjectionTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/BeanOgnMethodWithXPathInjectionTest.java
index f2787053fd2..5070ab5bdf9 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/BeanOgnMethodWithXPathInjectionTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/BeanOgnMethodWithXPathInjectionTest.java
@@ -28,8 +28,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class BeanOgnMethodWithXPathInjectionTest extends ContextTestSupport {
     private static final Logger LOG = 
LoggerFactory.getLogger(BeanRouteTest.class);
-    protected MyBean myBean = new MyBean();
-    protected MyOtherBean myOtherBean = new MyOtherBean(myBean);
+    protected final MyBean myBean = new MyBean();
+    protected final MyOtherBean myOtherBean = new MyOtherBean(myBean);
 
     @Test
     public void testSendMessage() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java
index 0dc33d00907..1d084dbbaee 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java
@@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertSame;
 
 public class BeanRecipientListTest extends ContextTestSupport {
     private static final Logger LOG = 
LoggerFactory.getLogger(BeanRecipientListTest.class);
-    protected MyBean myBean = new MyBean();
+    protected final MyBean myBean = new MyBean();
 
     @Test
     public void testSendMessage() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/BeanRouteTest.java 
b/core/camel-core/src/test/java/org/apache/camel/processor/BeanRouteTest.java
index 37cfac04567..59128a3f288 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/BeanRouteTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/BeanRouteTest.java
@@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.*;
 
 public class BeanRouteTest extends ContextTestSupport {
     private static final Logger LOG = 
LoggerFactory.getLogger(BeanRouteTest.class);
-    protected MyBean myBean = new MyBean();
+    protected final MyBean myBean = new MyBean();
 
     @Test
     public void testSendingMessageWithMethodNameHeader() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/BeanWithXPathInjectionPreCompileTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/BeanWithXPathInjectionPreCompileTest.java
index 88269d153a1..04d7a81da47 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/BeanWithXPathInjectionPreCompileTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/BeanWithXPathInjectionPreCompileTest.java
@@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class BeanWithXPathInjectionPreCompileTest extends ContextTestSupport {
     private static final Logger LOG = 
LoggerFactory.getLogger(BeanRouteTest.class);
-    protected MyBean myBean = new MyBean();
+    protected final MyBean myBean = new MyBean();
 
     @Test
     public void testSendMessage() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/BeanWithXPathInjectionTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/BeanWithXPathInjectionTest.java
index f1a67655331..5e345f51b00 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/BeanWithXPathInjectionTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/BeanWithXPathInjectionTest.java
@@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class BeanWithXPathInjectionTest extends ContextTestSupport {
     private static final Logger LOG = 
LoggerFactory.getLogger(BeanRouteTest.class);
-    protected MyBean myBean = new MyBean();
+    protected final MyBean myBean = new MyBean();
 
     @Test
     public void testSendMessage() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/Camel715ThreadProcessorTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/Camel715ThreadProcessorTest.java
index ec921a6ba8f..be29c96a020 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/Camel715ThreadProcessorTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/Camel715ThreadProcessorTest.java
@@ -41,7 +41,7 @@ public class Camel715ThreadProcessorTest {
     private static final int ITERS = 50000;
 
     static class SendingProcessor implements Processor {
-        int iterationNumber;
+        final int iterationNumber;
 
         public SendingProcessor(int iter) {
             iterationNumber = iter;
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/ClaimCheckTest.java 
b/core/camel-core/src/test/java/org/apache/camel/processor/ClaimCheckTest.java
index 5f498f57cfb..c7e5443d4be 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/ClaimCheckTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/ClaimCheckTest.java
@@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test;
 public class ClaimCheckTest extends ContextTestSupport {
 
     // in memory data store for testing only!
-    public static Map<String, Object> dataStore = new HashMap<>();
+    public static final Map<String, Object> dataStore = new HashMap<>();
 
     @Test
     public void testClaimCheck() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/ComposedMessageProcessorTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/ComposedMessageProcessorTest.java
index a342b317e6f..aa5606f8fcc 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/ComposedMessageProcessorTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/ComposedMessageProcessorTest.java
@@ -102,8 +102,8 @@ public class ComposedMessageProcessorTest extends 
ContextTestSupport {
 
     // START SNIPPET: e3
     public static final class OrderItem {
-        String type; // type of the item
-        int quantity; // how many we want
+        final String type; // type of the item
+        final int quantity; // how many we want
         boolean valid; // whether that many items can be ordered
 
         public OrderItem(String type, int quantity) {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelExceptionCausePropagatedTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelExceptionCausePropagatedTest.java
index 86fd3dd87e8..6eda45e0663 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelExceptionCausePropagatedTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelExceptionCausePropagatedTest.java
@@ -26,7 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class DeadLetterChannelExceptionCausePropagatedTest extends 
ContextTestSupport {
     protected static final RuntimeException RUNTIME_EXCEPTION = new 
RuntimeException("Expected exception.");
-    protected String body = "<hello>world!</hello>";
+    protected final String body = "<hello>world!</hello>";
 
     @Test
     public void testFirstFewAttemptsFail() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java
index 84995a9961f..eec5a694b6e 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java
@@ -34,7 +34,7 @@ public class DeadLetterChannelTest extends ContextTestSupport 
{
     protected MockEndpoint deadEndpoint;
     protected MockEndpoint successEndpoint;
     protected int failUntilAttempt = 2;
-    protected String body = "<hello>world!</hello>";
+    protected final String body = "<hello>world!</hello>";
 
     @Test
     public void testFirstFewAttemptsFail() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerUsingCustomRepositoryTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerUsingCustomRepositoryTest.java
index 5af81422de8..da23cb7e817 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerUsingCustomRepositoryTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerUsingCustomRepositoryTest.java
@@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 public class IdempotentConsumerUsingCustomRepositoryTest extends 
ContextTestSupport {
     protected Endpoint startEndpoint;
     protected MockEndpoint resultEndpoint;
-    protected IdempotentRepository customRepo = new MyRepo();
+    protected final IdempotentRepository customRepo = new MyRepo();
 
     @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/RegExRouteTest.java 
b/core/camel-core/src/test/java/org/apache/camel/processor/RegExRouteTest.java
index 8073ce8df80..8ceefbaa9f8 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/RegExRouteTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/RegExRouteTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.jupiter.api.Test;
 
 public class RegExRouteTest extends ContextTestSupport {
-    String orignalBody = "Foo and another Foo";
-    String expectedBody = "Bar and another Bar";
+    final String orignalBody = "Foo and another Foo";
+    final String expectedBody = "Bar and another Bar";
 
     @Test
     public void testSendingMessage() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/SetHeaderUsingDslExpressionsTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/SetHeaderUsingDslExpressionsTest.java
index 5cf20122dfa..44ad67e5944 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/SetHeaderUsingDslExpressionsTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/SetHeaderUsingDslExpressionsTest.java
@@ -25,7 +25,7 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class SetHeaderUsingDslExpressionsTest extends ContextTestSupport {
-    protected String body = "<person name='James' city='London'/>";
+    protected final String body = "<person name='James' city='London'/>";
     protected MockEndpoint expected;
 
     public static final class MyValueClass {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/SetHeadersProcessorTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/SetHeadersProcessorTest.java
index 06dca409ec0..4517011dd34 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/SetHeadersProcessorTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/SetHeadersProcessorTest.java
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
 public class SetHeadersProcessorTest extends ContextTestSupport {
 
     public static class HeaderBean {
-        Map<String, String> map = new java.util.LinkedHashMap<>();
+        final Map<String, String> map = new java.util.LinkedHashMap<>();
 
         public HeaderBean() {
         }
@@ -45,7 +45,7 @@ public class SetHeadersProcessorTest extends 
ContextTestSupport {
     }
 
     private final Map<String, Expression> headerMap = new 
java.util.LinkedHashMap<>();
-    protected String body = "<person name='Jane' age='10'/>";
+    protected final String body = "<person name='Jane' age='10'/>";
     protected MockEndpoint expected;
 
     @Test
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/SplitTimeoutCancelTaskTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/SplitTimeoutCancelTaskTest.java
index 449528bdaa2..2fbd766340a 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/SplitTimeoutCancelTaskTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/SplitTimeoutCancelTaskTest.java
@@ -24,8 +24,8 @@ import org.junit.jupiter.api.Test;
 
 public class SplitTimeoutCancelTaskTest extends ContextTestSupport {
 
-    String payload1 = 
"<items><item><id>1</id><name>one</name></item><item><id>2</id><name>two</name></item></items>";
-    String payload2 = 
"<items><item><id>3</id><name>three</name></item><item><id>4</id><name>four</name></item></items>";
+    final String payload1 = 
"<items><item><id>1</id><name>one</name></item><item><id>2</id><name>two</name></item></items>";
+    final String payload2 = 
"<items><item><id>3</id><name>three</name></item><item><id>4</id><name>four</name></item></items>";
 
     @Test
     public void testSplitterTimeoutShouldNotExhaustThreadPool() throws 
Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamCacheTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamCacheTest.java
index 1f4738c50ae..31ca1cfdcd0 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamCacheTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamCacheTest.java
@@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 public class SplitterStreamCacheTest extends ContextTestSupport {
 
     private static final String TEST_FILE = 
"org/apache/camel/converter/stream/test.xml";
-    protected int numMessages = 200;
+    protected final int numMessages = 200;
 
     @Test
     public void testSendStreamSource() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java
index 5a544fd1183..43d25f82697 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java
@@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class SplitterWithCustomThreadPoolExecutorTest extends 
ContextTestSupport {
 
-    protected ThreadPoolExecutor customThreadPoolExecutor
+    protected final ThreadPoolExecutor customThreadPoolExecutor
             = new ThreadPoolExecutor(8, 16, 0L, TimeUnit.MILLISECONDS, new 
LinkedBlockingQueue<Runnable>());
 
     @Test
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/ThreadsInvalidConfigTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/ThreadsInvalidConfigTest.java
index f67b3c41e11..6d108950cfa 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/ThreadsInvalidConfigTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/ThreadsInvalidConfigTest.java
@@ -27,7 +27,7 @@ import static org.junit.jupiter.api.Assertions.fail;
 
 public class ThreadsInvalidConfigTest extends ContextTestSupport {
 
-    ThreadPoolProfile threadPoolProfile = new ThreadPoolProfile("poll");
+    final ThreadPoolProfile threadPoolProfile = new ThreadPoolProfile("poll");
 
     @Test
     public void testCreateRouteIfNoInvalidOptions() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkTest.java 
b/core/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkTest.java
index 0078e30a114..b3424414597 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkTest.java
@@ -34,7 +34,7 @@ public class UnitOfWorkTest extends ContextTestSupport {
     protected Exchange completed;
     protected Exchange failed;
     protected String uri = "direct:foo";
-    protected CountDownLatch doneLatch = new CountDownLatch(1);
+    protected final CountDownLatch doneLatch = new CountDownLatch(1);
     protected Object foo;
     protected Object baz;
 
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/ValidationFinallyBlockNoCatchTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/ValidationFinallyBlockNoCatchTest.java
index a03122dcb91..d54f1ce8c89 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/ValidationFinallyBlockNoCatchTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/ValidationFinallyBlockNoCatchTest.java
@@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.fail;
  * No catch blocks but handle all should work
  */
 public class ValidationFinallyBlockNoCatchTest extends ContextTestSupport {
-    protected Processor validator = new MyValidator();
+    protected final Processor validator = new MyValidator();
     protected MockEndpoint validEndpoint;
     protected MockEndpoint allEndpoint;
     protected MockEndpoint deadEndpoint;
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/ValidationFinallyBlockTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/ValidationFinallyBlockTest.java
index 729a8d8477e..a9d85ce60d7 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/ValidationFinallyBlockTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/ValidationFinallyBlockTest.java
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
  * Test finallyBlock
  */
 public class ValidationFinallyBlockTest extends ContextTestSupport {
-    protected Processor validator = new MyValidator();
+    protected final Processor validator = new MyValidator();
     protected MockEndpoint validEndpoint;
     protected MockEndpoint invalidEndpoint;
     protected MockEndpoint allEndpoint;
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/ValidationTest.java 
b/core/camel-core/src/test/java/org/apache/camel/processor/ValidationTest.java
index 7b34abf5ec1..225bcc37a40 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/ValidationTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/ValidationTest.java
@@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ValidationTest extends ContextTestSupport {
-    protected Processor validator = new MyValidator();
+    protected final Processor validator = new MyValidator();
     protected MockEndpoint validEndpoint;
     protected MockEndpoint invalidEndpoint;
 
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/XPathFilterTest.java 
b/core/camel-core/src/test/java/org/apache/camel/processor/XPathFilterTest.java
index 67b3a01b72e..620b05a8912 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/XPathFilterTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/XPathFilterTest.java
@@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test;
 
 public class XPathFilterTest extends ContextTestSupport {
     protected String matchingBody = "<person name='James' city='London'/>";
-    protected String notMatchingBody = "<person name='Hiram' city='Tampa'/>";
+    protected final String notMatchingBody = "<person name='Hiram' 
city='Tampa'/>";
 
     @Test
     public void testSendMatchingMessage() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorTest.java
index e19398dd6e6..cb37d7ae5ed 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorTest.java
@@ -26,7 +26,7 @@ import 
org.apache.camel.processor.aggregate.UseLatestAggregationStrategy;
 import org.junit.jupiter.api.Test;
 
 public class AggregatorTest extends ContextTestSupport {
-    protected int messageCount = 100;
+    protected final int messageCount = 100;
 
     @Test
     public void testSendingLotsOfMessagesGetAggregatedToTheLatestMessage() 
throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherSendEventTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherSendEventTest.java
index adbd037d840..93f7d28bbbf 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherSendEventTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherSendEventTest.java
@@ -87,8 +87,8 @@ public class EnricherSendEventTest extends ContextTestSupport 
{
 
     static class MyEventNotifier extends EventNotifierSupport {
 
-        AtomicInteger exchangeSendingEvent = new AtomicInteger();
-        AtomicInteger exchangeSentEvent = new AtomicInteger();
+        final AtomicInteger exchangeSendingEvent = new AtomicInteger();
+        final AtomicInteger exchangeSentEvent = new AtomicInteger();
 
         @Override
         public void notify(CamelEvent event) throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipDataModificationTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipDataModificationTest.java
index 9d5a11320ad..d066dfa81c8 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipDataModificationTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipDataModificationTest.java
@@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertSame;
 public class RoutingSlipDataModificationTest extends ContextTestSupport {
     protected static final String ANSWER = "answer";
     protected static final String ROUTING_SLIP_HEADER = "routingSlipHeader";
-    protected MyBean myBean = new MyBean();
+    protected final MyBean myBean = new MyBean();
 
     @Test
     public void testModificationOfDataAlongRoute() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipWithExceptionTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipWithExceptionTest.java
index 79a524d33a2..0c7074b01e1 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipWithExceptionTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipWithExceptionTest.java
@@ -33,7 +33,7 @@ public class RoutingSlipWithExceptionTest extends 
ContextTestSupport {
 
     protected static final String ANSWER = "answer";
     protected static final String ROUTING_SLIP_HEADER = "destinations";
-    protected MyBean myBean = new MyBean();
+    protected final MyBean myBean = new MyBean();
     private MockEndpoint endEndpoint;
     private MockEndpoint exceptionEndpoint;
     private MockEndpoint aEndpoint;
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/throttle/concurrent/ThrottlerAsyncDelayedTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/throttle/concurrent/ThrottlerAsyncDelayedTest.java
index dd909d9e02f..24cc50b5e9d 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/throttle/concurrent/ThrottlerAsyncDelayedTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/throttle/concurrent/ThrottlerAsyncDelayedTest.java
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
 
 public class ThrottlerAsyncDelayedTest extends ContextTestSupport {
     private static final int INTERVAL = 500;
-    protected int messageCount = 9;
+    protected final int messageCount = 9;
 
     @Test
     public void testSendLotsOfMessages() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/throttle/concurrent/ThrottlerMethodCallTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/throttle/concurrent/ThrottlerMethodCallTest.java
index af06b3c857e..640fc6de2ff 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/throttle/concurrent/ThrottlerMethodCallTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/throttle/concurrent/ThrottlerMethodCallTest.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
 public class ThrottlerMethodCallTest extends ContextTestSupport {
     private static final Logger LOG = 
LoggerFactory.getLogger(ThrottlerMethodCallTest.class);
     private static final int INTERVAL = 100;
-    protected int messageCount = 10;
+    protected final int messageCount = 10;
     private MockEndpoint resultEndpoint;
     private ExecutorService executor;
 
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/throttle/requests/ThrottlerAsyncDelayedTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/throttle/requests/ThrottlerAsyncDelayedTest.java
index 996417dbe1c..13421ccda03 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/throttle/requests/ThrottlerAsyncDelayedTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/throttle/requests/ThrottlerAsyncDelayedTest.java
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
 
 public class ThrottlerAsyncDelayedTest extends ContextTestSupport {
     private static final int INTERVAL = 500;
-    protected int messageCount = 9;
+    protected final int messageCount = 9;
 
     @Test
     public void testSendLotsOfMessages() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/throttle/requests/ThrottlerDslTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/throttle/requests/ThrottlerDslTest.java
index 70737f051ff..23ec5c64925 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/throttle/requests/ThrottlerDslTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/throttle/requests/ThrottlerDslTest.java
@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 @DisabledOnOs(OS.WINDOWS)
 public class ThrottlerDslTest extends ContextTestSupport {
     private static final int INTERVAL = 500;
-    protected int messageCount = 9;
+    protected final int messageCount = 9;
 
     @Test
     public void testDsl() throws Exception {
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/support/cache/SimpleSoftCacheTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/support/cache/SimpleSoftCacheTest.java
index b79c6cd2ba8..3f9c0a3d20a 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/support/cache/SimpleSoftCacheTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/support/cache/SimpleSoftCacheTest.java
@@ -306,7 +306,7 @@ class SimpleSoftCacheTest {
 
     public static class LargeObject {
 
-        byte[] data;
+        final byte[] data;
 
         public LargeObject() {
             this.data = new byte[100 * 1024 * 1024]; // 100 MB
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/util/EventHelperTest.java 
b/core/camel-core/src/test/java/org/apache/camel/util/EventHelperTest.java
index 813cf31f896..c1d22192561 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/EventHelperTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/EventHelperTest.java
@@ -120,9 +120,9 @@ public class EventHelperTest {
 
     static class MyEventNotifier extends EventNotifierSupport {
 
-        AtomicInteger routeStartedEvent = new AtomicInteger();
-        AtomicInteger routeStoppedEvent = new AtomicInteger();
-        AtomicInteger camelContextStoppingEvent = new AtomicInteger();
+        final AtomicInteger routeStartedEvent = new AtomicInteger();
+        final AtomicInteger routeStoppedEvent = new AtomicInteger();
+        final AtomicInteger camelContextStoppingEvent = new AtomicInteger();
 
         @Override
         public void notify(CamelEvent event) throws Exception {
diff --git 
a/core/camel-management/src/test/java/org/apache/camel/management/JmxInstrumentationOnlyRegisterProcessorWithCustomIdTest.java
 
b/core/camel-management/src/test/java/org/apache/camel/management/JmxInstrumentationOnlyRegisterProcessorWithCustomIdTest.java
index b79782163bc..fcb0615772f 100644
--- 
a/core/camel-management/src/test/java/org/apache/camel/management/JmxInstrumentationOnlyRegisterProcessorWithCustomIdTest.java
+++ 
b/core/camel-management/src/test/java/org/apache/camel/management/JmxInstrumentationOnlyRegisterProcessorWithCustomIdTest.java
@@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 @DisabledOnOs(OS.AIX)
 public class JmxInstrumentationOnlyRegisterProcessorWithCustomIdTest extends 
ManagementTestSupport {
 
-    protected String domainName = DefaultManagementAgent.DEFAULT_DOMAIN;
+    protected final String domainName = DefaultManagementAgent.DEFAULT_DOMAIN;
     protected MBeanServer server;
 
     @Test
diff --git 
a/core/camel-management/src/test/java/org/apache/camel/management/LoadTimerTest.java
 
b/core/camel-management/src/test/java/org/apache/camel/management/LoadTimerTest.java
index 05a84efa948..9be434526b8 100644
--- 
a/core/camel-management/src/test/java/org/apache/camel/management/LoadTimerTest.java
+++ 
b/core/camel-management/src/test/java/org/apache/camel/management/LoadTimerTest.java
@@ -65,7 +65,7 @@ public class LoadTimerTest extends ContextTestSupport {
     private static class TestLoadAware implements TimerListener {
 
         volatile int counter;
-        LoadTriplet load = new LoadTriplet();
+        final LoadTriplet load = new LoadTriplet();
 
         @Override
         public void onTimer() {

Reply via email to