You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2024/04/18 07:08:50 UTC

(camel) 02/02: (chores) camel-core: use final variables in tests

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 a8172375c4291eb26a4595870ac654567be972f2
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Tue Apr 16 14:51:18 2024 +0200

    (chores) camel-core: use final variables in tests
---
 .../org/apache/camel/impl/cloud/LoadBalancerTest.java    |  2 +-
 ...eanChoseMethodWithMatchingTypeAndSkipSettersTest.java |  2 +-
 .../apache/camel/component/bean/BeanInPipelineTest.java  |  2 +-
 .../org/apache/camel/component/bean/BeanMapPutTest.java  |  2 +-
 .../component/bean/BeanMethodValueWithCommaTest.java     |  4 ++--
 .../camel/component/bean/BeanOgnlPerformanceTest.java    |  2 +-
 .../camel/component/bean/BeanParameterValueOgnlTest.java |  4 ++--
 .../bean/BeanWithHeadersAndBodyInject2Test.java          |  4 ++--
 .../java/org/apache/camel/component/bean/MyCurrency.java |  2 +-
 .../org/apache/camel/component/bean/NewInstanceTest.java |  2 +-
 ...mpleLanguageBeanFunctionMethodValueWithCommaTest.java |  4 ++--
 ...nguageBeanFunctionMethodValueWithParenthesisTest.java |  4 ++--
 .../bean/issues/BeanRouteToDerivedClassTest.java         |  2 +-
 .../apache/camel/component/bean/issues/MyMessage.java    |  2 +-
 .../component/controlbus/ControlBusRestartRouteTest.java |  2 +-
 .../camel/component/dataset/CustomDataSetTest.java       |  2 +-
 .../camel/component/dataset/DataSetPreloadTest.java      |  4 ++--
 .../apache/camel/component/dataset/DataSetSedaTest.java  |  4 ++--
 .../camel/component/dataset/DataSetTestEndpointTest.java |  2 +-
 .../camel/component/dataset/RoutePerformanceTest.java    |  6 +++---
 .../component/file/FileBeginFailureOneTimeTest.java      |  2 +-
 .../FileConsumerAbsoluteRootPathDefaultMoveTest.java     |  2 +-
 .../FileConsumerBridgeRouteExceptionHandlerTest.java     |  2 +-
 .../file/FileConsumerCustomExceptionHandlerTest.java     |  4 ++--
 .../component/file/FileConsumerCustomSchedulerTest.java  |  2 +-
 .../component/file/FileConsumerSuspendAndResumeTest.java |  2 +-
 .../file/FileConsumerThreadsInProgressIssueTest.java     |  2 +-
 .../file/FileProducerCharsetUTFOptimizedTest.java        |  2 +-
 .../file/FileProducerMoveExistingStrategyTest.java       |  2 +-
 .../file/FilerProducerDoneFileNameRouteTest.java         |  2 +-
 .../component/file/FilerProducerDoneFileNameTest.java    |  2 +-
 .../camel/component/file/GenericFileMessageTest.java     |  2 +-
 .../apache/camel/component/file/NewFileConsumeTest.java  |  2 +-
 .../MarkerFileExclusiveReadLockStrategyTest.java         |  4 ++--
 .../component/language/LanguageRouteConvertBodyTest.java |  4 ++--
 .../org/apache/camel/component/mock/MockAsBeanTest.java  |  2 +-
 .../component/mock/MockEndpointWithParametersTest.java   |  2 +-
 .../PropertiesComponentLookupListenerTest.java           |  2 +-
 .../apache/camel/component/rest/RestProducerTest.java    |  2 +-
 .../camel/component/scheduler/SchedulerRouteTest.java    |  2 +-
 .../TwoSchedulerConcurrentTasksOneRouteTest.java         |  2 +-
 .../apache/camel/component/seda/SedaEndpointTest.java    |  2 +-
 .../apache/camel/component/seda/SedaUnitOfWorkTest.java  |  4 ++--
 .../camel/component/timer/TimerGracefulShutdownTest.java |  2 +-
 .../org/apache/camel/component/timer/TimerNameTest.java  |  2 +-
 .../org/apache/camel/component/timer/TimerRouteTest.java |  2 +-
 .../component/xslt/XsltCustomErrorListenerTest.java      |  2 +-
 .../camel/impl/BindToRegistryBeanPostProcessorTest.java  |  2 +-
 ...CamelContextReloadStrategyPropertiesFunctionTest.java |  2 +-
 .../org/apache/camel/impl/CamelContextTrackerTest.java   |  2 +-
 .../camel/impl/CustomHeadersMapFactoryRouteTest.java     |  2 +-
 .../apache/camel/impl/DataFormatContextAwareTest.java    |  2 +-
 .../camel/impl/DefaultCamelBeanPostProcessorTest.java    |  2 +-
 .../camel/impl/DefaultCamelContextStopFailureTest.java   |  4 ++--
 ...aultCamelContextWithLifecycleStrategyRestartTest.java |  6 +++---
 .../org/apache/camel/impl/DefaultExchangeHolderTest.java |  2 +-
 .../java/org/apache/camel/impl/DefaultInjectorTest.java  |  2 +-
 .../org/apache/camel/impl/DefaultProducerCacheTest.java  |  2 +-
 .../impl/EventDrivenPollingConsumerQueueSizeTest.java    |  2 +-
 .../java/org/apache/camel/impl/FromEndpointTest.java     |  2 +-
 .../apache/camel/impl/LanguageCamelContextAwareTest.java |  2 +-
 .../camel/impl/LifecycleStrategyFailOnStartupTest.java   |  2 +-
 .../apache/camel/impl/LifecycleStrategyServiceTest.java  |  2 +-
 .../camel/impl/PendingExchangesShutdownGracefulTest.java |  2 +-
 .../PendingExchangesTwoRouteShutdownGracefulTest.java    |  2 +-
 .../impl/RoutePolicyAutoStartupCancelledOnInitTest.java  |  2 +-
 .../org/apache/camel/impl/RoutePolicySupportTest.java    |  2 +-
 .../test/java/org/apache/camel/impl/RoutePolicyTest.java | 12 ++++++------
 .../apache/camel/impl/RouteSuspendResumeWarmUpTest.java  |  2 +-
 .../org/apache/camel/impl/SimpleRegistryWrapTest.java    |  2 +-
 .../java/org/apache/camel/impl/StartupListenerTest.java  |  2 +-
 .../java/org/apache/camel/impl/StopTimeoutRouteTest.java |  2 +-
 .../camel/impl/TypeConverterRegistryPerformanceTest.java |  2 +-
 .../org/apache/camel/impl/VetoCamelContextStartTest.java |  2 +-
 .../apache/camel/impl/converter/TypeConvertersTest.java  |  2 +-
 .../camel/impl/engine/CamelPostProcessorHelperTest.java  |  4 ++--
 .../camel/impl/engine/CustomThreadPoolFactoryTest.java   |  2 +-
 .../engine/DefaultSupervisingRouteControllerTest.java    |  2 +-
 .../EventNotifierServiceStoppingFailedEventTest.java     |  4 ++--
 .../camel/issues/CBRCustomPredicateAsFilterTest.java     |  4 ++--
 .../apache/camel/issues/CustomFailveOverProcessor.java   |  4 ++--
 .../org/apache/camel/issues/ExceptionCamel4022Test.java  |  2 +-
 .../camel/issues/FilterCustomPredicateAsFilterTest.java  |  4 ++--
 .../issues/InterceptCustomPredicateAsFilterTest.java     |  4 ++--
 .../apache/camel/issues/MethodClassByTypeIssueTest.java  |  2 +-
 .../RetryRouteScopedUntilRecipientListIssueTest.java     |  2 +-
 .../camel/issues/RouteIdAnonymousAndFixedClashTest.java  |  2 +-
 .../apache/camel/issues/SedaFileIdempotentIssueTest.java |  2 +-
 .../camel/issues/SentExchangeEventNotifierIssueTest.java |  2 +-
 .../issues/SentExchangeEventNotifierTwoIssueTest.java    |  2 +-
 .../camel/issues/SplitPropertiesFileIssueTest.java       |  2 +-
 .../apache/camel/issues/SplitterParallelIssueTest.java   |  2 +-
 ...itterParallelRuntimeExceptionInHasNextOrNextTest.java |  4 ++--
 .../camel/issues/TransactedSetHeaderIssueTest.java       |  2 +-
 .../org/apache/camel/issues/XPathSplitStreamTest.java    |  2 +-
 .../camel/language/BeanLanguageInvalidOGNLTest.java      |  2 +-
 .../org/apache/camel/language/BeanLanguageOGNLTest.java  |  2 +-
 .../org/apache/camel/language/LanguageServiceTest.java   |  2 +-
 .../apache/camel/language/SimpleOgnlMapIssueTest.java    |  2 +-
 .../apache/camel/language/SimpleXPathTransformTest.java  |  2 +-
 ...okenPairIteratorSplitChoicePerformanceManualTest.java |  2 +-
 .../language/XPathSplitChoicePerformanceManualTest.java  |  2 +-
 .../org/apache/camel/language/simple/SimpleTest.java     |  8 ++++----
 .../BeanRecipientListInterfaceAnnotationTest.java        |  4 ++--
 .../apache/camel/processor/BeanRecipientListTest.java    |  4 ++--
 .../java/org/apache/camel/processor/BeanRouteTest.java   |  4 ++--
 .../processor/CBRPredicateBeanThrowExceptionTest.java    |  4 ++--
 .../camel/processor/ChoiceWhenBeanExpressionTest.java    |  2 +-
 .../ChoiceWhenBeanExpressionWithExceptionTest.java       |  2 +-
 .../apache/camel/processor/CustomGlobalVariableTest.java |  4 ++--
 .../apache/camel/processor/CustomRoutePolicyTest.java    |  2 +-
 .../java/org/apache/camel/processor/DelayerTest.java     |  4 ++--
 .../camel/processor/DynamicRouterAnnotationTest.java     |  2 +-
 .../processor/DynamicRouterExchangeHeaders2Test.java     |  4 ++--
 .../processor/DynamicRouterExchangeHeadersTest.java      |  2 +-
 .../processor/DynamicRouterExchangePropertiesTest.java   |  2 +-
 .../org/apache/camel/processor/DynamicRouterTest.java    |  2 +-
 .../camel/processor/ExchangeIdempotentConsumerTest.java  |  6 +++---
 .../processor/IdempotentConsumerRepoExceptionTest.java   |  2 +-
 .../org/apache/camel/processor/MDCCustomKeysTest.java    |  4 ++--
 .../camel/processor/MessageHistoryDumpRoutingTest.java   |  2 +-
 .../MultiErrorHandlerInRouteNotHandledTest.java          |  4 ++--
 .../camel/processor/MultiErrorHandlerInRouteTest.java    |  4 ++--
 .../apache/camel/processor/MulticastUnitOfWorkTest.java  |  2 +-
 .../processor/OnCompletionShutdownProcessorTest.java     |  2 +-
 .../apache/camel/processor/PipelineConcurrentTest.java   |  2 +-
 .../ProducerTemplateDisableEventNotifierTest.java        |  2 +-
 ...pientListExchangePropertyAggregationStrategyTest.java |  2 +-
 .../processor/RecipientListExchangePropertyTest.java     |  2 +-
 .../processor/RedeliveryPolicyDelayPatternTest.java      |  2 +-
 .../apache/camel/processor/RemoveGlobalVariableTest.java |  4 ++--
 .../org/apache/camel/processor/RemoveHeaderTest.java     |  4 ++--
 .../processor/RemovePropertiesWithExclusionTest.java     | 16 ++++++++--------
 .../processor/RemovePropertiesWithoutExclusionTest.java  | 10 +++++-----
 .../org/apache/camel/processor/RemovePropertyTest.java   |  4 ++--
 .../org/apache/camel/processor/RemoveVariableTest.java   |  4 ++--
 .../apache/camel/processor/RouteAwareProcessorTest.java  |  2 +-
 .../apache/camel/processor/RouteFormattedUriTest.java    |  6 +++---
 .../camel/processor/RoutePerformanceCountTest.java       |  4 ++--
 .../camel/processor/RouteServicesStartupOrderTest.java   | 10 +++++-----
 .../camel/processor/RoutingSlipInOutAndInOnlyTest.java   |  2 +-
 .../test/java/org/apache/camel/processor/SagaTest.java   |  6 +++---
 .../apache/camel/processor/SetGlobalVariableTest.java    |  4 ++--
 .../processor/SetHeaderUsingDslExpressionsTest.java      |  4 ++--
 .../apache/camel/processor/SetHeadersProcessorTest.java  |  2 +-
 .../java/org/apache/camel/processor/SetPropertyTest.java |  4 ++--
 .../org/apache/camel/processor/SetRouteVariableTest.java |  6 +++---
 .../camel/processor/SetRouteVariableTransferTest.java    |  4 ++--
 .../java/org/apache/camel/processor/SetVariableTest.java |  4 ++--
 .../camel/processor/ShutdownCompleteAllTasksTest.java    |  4 ++--
 .../java/org/apache/camel/processor/SimulatorTest.java   |  2 +-
 .../apache/camel/processor/SplitAggregateInOutTest.java  |  2 +-
 .../apache/camel/processor/SplitIteratorNullTest.java    |  2 +-
 .../camel/processor/SplitTwoSubUnitOfWorkTest.java       |  4 ++--
 .../SplitterUseOriginalNotPropagateExceptionTest.java    |  2 +-
 .../apache/camel/processor/StepEventNotifierTest.java    |  2 +-
 .../camel/processor/StreamCacheInternalErrorTest.java    |  4 ++--
 .../StreamCachingCustomShouldSpoolRuleTest.java          |  2 +-
 .../StreamCachingSpoolDirectoryQuarkusTest.java          |  2 +-
 .../apache/camel/processor/UnitOfWorkProducerTest.java   |  2 +-
 .../camel/processor/WireTapBeanAsProcessorTest.java      |  2 +-
 .../java/org/apache/camel/processor/WireTapMDCTest.java  |  6 +++---
 .../processor/aggregator/AggregateBiFunctionTest.java    |  2 +-
 .../aggregator/AggregateCompletionOnlyOneTest.java       |  2 +-
 .../aggregator/AggregateNewExchangeAndConfirmTest.java   |  2 +-
 .../AggregateSimpleExpressionIssueManualTest.java        |  4 ++--
 ...ationStrategyBeanAdapterAllowNullOldExchangeTest.java |  2 +-
 .../AggregationStrategyBeanAdapterAllowNullTest.java     |  4 ++--
 .../AggregationStrategyBeanAdapterOneMethodTest.java     |  2 +-
 ...egyBeanAdapterPollEnrichAllowNullNewExchangeTest.java |  2 +-
 .../AggregationStrategyBeanAdapterPollEnrichTest.java    |  2 +-
 .../aggregator/AggregationStrategyBeanAdapterTest.java   |  2 +-
 ...nStrategyBeanAdapterWithHeadersAndPropertiesTest.java |  2 +-
 .../AggregationStrategyBeanAdapterWithHeadersTest.java   |  2 +-
 .../aggregator/AggregationStrategyLifecycleTest.java     |  2 +-
 .../processor/aggregator/AlbertoAggregatorTest.java      |  4 ++--
 .../aggregator/BeanBeforeAggregateIssueTest.java         |  2 +-
 .../aggregator/CustomAggregationStrategyServiceTest.java |  2 +-
 .../aggregator/DistributedCompletionIntervalTest.java    |  2 +-
 .../DistributedConcurrentPerCorrelationKeyTest.java      |  2 +-
 .../aggregator/DistributedOptimisticLockFailingTest.java |  4 ++--
 .../processor/aggregator/DistributedTimeoutTest.java     |  2 +-
 .../aggregator/SplitRouteNumberOfProcessorTest.java      |  2 +-
 .../async/AsyncEndpointCustomAsyncInterceptorTest.java   |  4 ++--
 .../async/AsyncEndpointCustomInterceptorTest.java        |  4 ++--
 .../async/AsyncEndpointCustomRoutePolicyTest.java        |  2 +-
 .../camel/processor/async/AsyncEndpointDelayUoWTest.java |  6 +++---
 .../processor/async/AsyncEndpointDynamicRouterTest.java  |  2 +-
 .../processor/async/AsyncEndpointUoWFailedTest.java      |  6 +++---
 .../camel/processor/async/AsyncEndpointUoWTest.java      |  6 +++---
 ...ProcessorAwaitManagerInterruptWithRedeliveryTest.java |  2 +-
 .../camel/processor/enricher/EnricherBiFunctionTest.java |  4 ++--
 .../processor/enricher/EnricherRefBeanClassTest.java     |  2 +-
 .../processor/enricher/EnricherRefBeanTypeTest.java      |  2 +-
 .../apache/camel/processor/enricher/EnricherRefTest.java |  2 +-
 .../camel/processor/enricher/EnricherSendEventTest.java  |  2 +-
 .../apache/camel/processor/enricher/EnricherTest.java    |  2 +-
 .../enricher/PollEnrichBridgeErrorHandlerTest.java       |  2 +-
 .../camel/processor/enricher/PollEnricherRefTest.java    |  2 +-
 .../camel/processor/enricher/PollEnricherTest.java       |  2 +-
 .../CustomInterceptorRouteWithChildOutputTest.java       |  2 +-
 .../interceptor/DebugExceptionBreakpointTest.java        |  2 +-
 .../interceptor/DebugExceptionEventBreakpointTest.java   |  2 +-
 .../interceptor/DebugSingleStepConditionTest.java        |  2 +-
 .../camel/processor/interceptor/DebugSingleStepTest.java |  2 +-
 .../apache/camel/processor/interceptor/DebugTest.java    |  2 +-
 .../processor/resequencer/ResequencerEngineSync.java     |  2 +-
 .../camel/processor/resequencer/ResequencerRunner.java   |  4 ++--
 .../apache/camel/processor/resequencer/TestObject.java   |  2 +-
 .../routingslip/DynamicRouterEventNotifierTest.java      |  2 +-
 .../routingslip/RecipientListEventNotifierTest.java      |  2 +-
 .../routingslip/RoutingSlipEventNotifierTest.java        |  2 +-
 ...tlingExceptionRoutePolicyHalfOpenHandlerSedaTest.java |  4 ++--
 ...hrottlingExceptionRoutePolicyHalfOpenHandlerTest.java |  4 ++--
 .../ThrottlingExceptionRoutePolicyHalfOpenTest.java      |  4 ++--
 ...ThrottlingExceptionRoutePolicyKeepOpenOnInitTest.java |  4 ++--
 .../ThrottlingExceptionRoutePolicyOpenViaConfigTest.java |  2 +-
 .../throttle/ThrottlingExceptionRoutePolicyTest.java     |  4 ++--
 .../throttle/ThrottlingInflightRoutePolicyTest.java      |  2 +-
 .../processor/validation/CatalogLSResourceResolver.java  |  6 +++---
 .../org/apache/camel/support/DefaultRegistryTest.java    |  2 +-
 .../org/apache/camel/support/DefaultTimeoutMapTest.java  |  2 +-
 .../apache/camel/support/TimerListenerManagerTest.java   |  2 +-
 .../camel/support/component/ApiMethodHelperTest.java     |  4 ++--
 .../support/component/ApiMethodPropertiesHelperTest.java |  2 +-
 .../component/ArgumentSubstitutionParserTest.java        |  3 +--
 .../test/java/org/apache/camel/util/GZIPHelperTest.java  |  2 +-
 .../java/org/apache/camel/util/MessageHelperTest.java    |  2 +-
 .../test/java/org/apache/camel/util/MyDummyObject.java   |  2 +-
 .../camel/main/MainBeansClassFactoryMethodTest.java      |  6 +++---
 .../test/java/org/apache/camel/main/MainHelperTest.java  |  2 +-
 .../camel/main/MainIoCBeanPostProcessorDisabledTest.java |  2 +-
 .../camel/main/MainSupervisingRouteControllerTest.java   |  2 +-
 .../apache/camel/main/MainSupportCommandLineTest.java    |  2 +-
 .../src/test/java/org/apache/camel/main/MyAddress.java   |  4 ++--
 .../src/test/java/org/apache/camel/main/MyOrder.java     |  4 ++--
 .../org/apache/camel/main/support/MyDummyComponent.java  |  2 +-
 .../apache/camel/management/AddEventNotifierTest.java    |  2 +-
 .../camel/management/ManagedAggregateControllerTest.java |  2 +-
 .../apache/camel/management/ManagedRouteRestartTest.java |  2 +-
 .../apache/camel/management/ManagementTestSupport.java   |  2 +-
 .../apache/camel/management/RemoveEventNotifierTest.java |  2 +-
 242 files changed, 347 insertions(+), 348 deletions(-)

diff --git a/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/LoadBalancerTest.java b/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/LoadBalancerTest.java
index 49731790a2c..431a5f7c5df 100644
--- a/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/LoadBalancerTest.java
+++ b/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/LoadBalancerTest.java
@@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class LoadBalancerTest {
 
-    private static StaticServiceDiscovery serviceDiscovery = new StaticServiceDiscovery();
+    private static final StaticServiceDiscovery serviceDiscovery = new StaticServiceDiscovery();
 
     @BeforeAll
     public static void setUp() {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanChoseMethodWithMatchingTypeAndSkipSettersTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanChoseMethodWithMatchingTypeAndSkipSettersTest.java
index 00815f258c2..f4d26b6c5da 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanChoseMethodWithMatchingTypeAndSkipSettersTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanChoseMethodWithMatchingTypeAndSkipSettersTest.java
@@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test;
 
 public class BeanChoseMethodWithMatchingTypeAndSkipSettersTest extends ContextTestSupport {
 
-    private OrderServiceBean service = new OrderServiceBean();
+    private final OrderServiceBean service = new OrderServiceBean();
 
     @Override
     protected Registry createCamelRegistry() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInPipelineTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInPipelineTest.java
index 3f5290e33d3..17d6ab2c01d 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInPipelineTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanInPipelineTest.java
@@ -54,7 +54,7 @@ public class BeanInPipelineTest extends ContextTestSupport {
 
     public static class MyBean {
 
-        private String postfix;
+        private final String postfix;
 
         public MyBean(String postfix) {
             this.postfix = postfix;
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMapPutTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMapPutTest.java
index abf6aaddc1f..82e336f5c13 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMapPutTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMapPutTest.java
@@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class BeanMapPutTest extends ContextTestSupport {
 
-    private Map<String, String> myMap = new HashMap<>();
+    private final Map<String, String> myMap = new HashMap<>();
 
     @Override
     protected Registry createCamelRegistry() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodValueWithCommaTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodValueWithCommaTest.java
index a9120e1d829..387507f9a09 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodValueWithCommaTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanMethodValueWithCommaTest.java
@@ -94,8 +94,8 @@ public class BeanMethodValueWithCommaTest extends ContextTestSupport {
 
     public static class MyCronBody {
 
-        private String id;
-        private String cron;
+        private final String id;
+        private final String cron;
 
         public MyCronBody(String id, String cron) {
             this.id = id;
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOgnlPerformanceTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOgnlPerformanceTest.java
index fb3a3c87470..25868137e6b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOgnlPerformanceTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanOgnlPerformanceTest.java
@@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test;
  */
 public class BeanOgnlPerformanceTest extends ContextTestSupport {
 
-    private String scope = "Singleton";
+    private final String scope = "Singleton";
 
     @Override
     protected Registry createCamelRegistry() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueOgnlTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueOgnlTest.java
index 7f263d6728a..68b46ff8128 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueOgnlTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueOgnlTest.java
@@ -103,8 +103,8 @@ public class BeanParameterValueOgnlTest extends ContextTestSupport {
     }
 
     public static final class Animal {
-        private String name;
-        private int age;
+        private final String name;
+        private final int age;
         private Animal friend;
 
         private Animal(String name, int age) {
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 d86c9acc070..1cc29bdd772 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
@@ -38,8 +38,8 @@ import static org.junit.jupiter.api.Assertions.*;
 
 public class BeanWithHeadersAndBodyInject2Test extends ContextTestSupport {
     private static final Logger LOG = LoggerFactory.getLogger(BeanWithHeadersAndBodyInject2Test.class);
-    private MyBean myBean = new MyBean();
-    private Map<String, User> users = new HashMap<>();
+    private final MyBean myBean = new MyBean();
+    private final Map<String, User> users = new HashMap<>();
 
     @Test
     public void testCannotBindToParameter() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/MyCurrency.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/MyCurrency.java
index f52c2d083b3..0df999c8582 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/MyCurrency.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/MyCurrency.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.bean;
 
 public final class MyCurrency {
 
-    private String symbol;
+    private final String symbol;
 
     public MyCurrency(String symbol) {
         this.symbol = symbol;
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/NewInstanceTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/NewInstanceTest.java
index 90a6cc3650d..ab4adee72df 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/NewInstanceTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/NewInstanceTest.java
@@ -69,7 +69,7 @@ public class NewInstanceTest extends ContextTestSupport {
 
     public static class MyBean {
         private static int counter;
-        private int id;
+        private final int id;
 
         public MyBean() {
             id = generateId();
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/SimpleLanguageBeanFunctionMethodValueWithCommaTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/SimpleLanguageBeanFunctionMethodValueWithCommaTest.java
index cb138a88f8b..c853169d2eb 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/SimpleLanguageBeanFunctionMethodValueWithCommaTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/SimpleLanguageBeanFunctionMethodValueWithCommaTest.java
@@ -103,8 +103,8 @@ public class SimpleLanguageBeanFunctionMethodValueWithCommaTest extends ContextT
 
     public static class MyCronBody {
 
-        private String id;
-        private String cron;
+        private final String id;
+        private final String cron;
 
         public MyCronBody(String id, String cron) {
             this.id = id;
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/SimpleLanguageBeanFunctionMethodValueWithParenthesisTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/SimpleLanguageBeanFunctionMethodValueWithParenthesisTest.java
index f2e3feced77..4bc09f4c3a0 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/SimpleLanguageBeanFunctionMethodValueWithParenthesisTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/SimpleLanguageBeanFunctionMethodValueWithParenthesisTest.java
@@ -103,8 +103,8 @@ public class SimpleLanguageBeanFunctionMethodValueWithParenthesisTest extends Co
 
     public static class MyCronBody {
 
-        private String id;
-        private String cron;
+        private final String id;
+        private final String cron;
 
         public MyCronBody(String id, String cron) {
             this.id = id;
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanRouteToDerivedClassTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanRouteToDerivedClassTest.java
index 814353a252a..56fc102b689 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanRouteToDerivedClassTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/BeanRouteToDerivedClassTest.java
@@ -27,7 +27,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class BeanRouteToDerivedClassTest extends ContextTestSupport {
 
-    private DerivedClass derived = new DerivedClass();
+    private final DerivedClass derived = new DerivedClass();
 
     @Override
     public boolean isUseRouteBuilder() {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/MyMessage.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/MyMessage.java
index 8b1bdd67bab..237c7e18b0b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/MyMessage.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/issues/MyMessage.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.bean.issues;
 
 public class MyMessage {
 
-    private String message;
+    private final String message;
 
     public MyMessage(String message) {
         this.message = message;
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusRestartRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusRestartRouteTest.java
index 39980676362..38b57b26583 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusRestartRouteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusRestartRouteTest.java
@@ -26,7 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ControlBusRestartRouteTest extends ContextTestSupport {
 
-    private MyRoutePolicy myRoutePolicy = new MyRoutePolicy();
+    private final MyRoutePolicy myRoutePolicy = new MyRoutePolicy();
 
     @Test
     public void testControlBusRestart() 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 525a7d499cd..aea59b9193c 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
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
 public class CustomDataSetTest extends ContextTestSupport {
 
     protected DataSet dataSet = new DataSetSupport() {
-        Expression expression = new XPathBuilder("/message/@index").resultType(Long.class);
+        final Expression expression = new XPathBuilder("/message/@index").resultType(Long.class);
 
         @Override
         public void assertMessageExpected(DataSetEndpoint dataSetEndpoint, Exchange expected, Exchange actual, long index)
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetPreloadTest.java b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetPreloadTest.java
index c3bbaeb08d1..39e56037c45 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetPreloadTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetPreloadTest.java
@@ -26,9 +26,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class DataSetPreloadTest extends ContextTestSupport {
 
-    private SimpleDataSet dataSet = new SimpleDataSet(20);
+    private final SimpleDataSet dataSet = new SimpleDataSet(20);
 
-    private String uri = "dataset:foo?initialDelay=0&preloadSize=5";
+    private final String uri = "dataset:foo?initialDelay=0&preloadSize=5";
 
     @Override
     protected Registry createCamelRegistry() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java
index b29674db550..af5ac778a66 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java
@@ -27,9 +27,9 @@ import org.junit.jupiter.api.Test;
  */
 public class DataSetSedaTest extends ContextTestSupport {
 
-    private SimpleDataSet dataSet = new SimpleDataSet(200);
+    private final SimpleDataSet dataSet = new SimpleDataSet(200);
 
-    private String uri = "dataset:foo?initialDelay=0&produceDelay=1";
+    private final String uri = "dataset:foo?initialDelay=0&produceDelay=1";
 
     @Override
     protected Registry createCamelRegistry() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestEndpointTest.java b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestEndpointTest.java
index 2ac8646a72e..f38c92755a7 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestEndpointTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestEndpointTest.java
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
 
 public class DataSetTestEndpointTest extends ContextTestSupport {
 
-    private String expectedBody = "Hello World";
+    private final String expectedBody = "Hello World";
 
     @Test
     public void testMocksAreValid() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/dataset/RoutePerformanceTest.java b/core/camel-core/src/test/java/org/apache/camel/component/dataset/RoutePerformanceTest.java
index c872977ee39..63d984b27e9 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/dataset/RoutePerformanceTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/dataset/RoutePerformanceTest.java
@@ -33,11 +33,11 @@ import org.junit.jupiter.api.Test;
  */
 public class RoutePerformanceTest extends ContextTestSupport {
 
-    private int size = 250;
+    private final int size = 250;
 
-    private SimpleDataSet dataSet = new SimpleDataSet(size);
+    private final SimpleDataSet dataSet = new SimpleDataSet(size);
 
-    private String uri = "mock:results";
+    private final String uri = "mock:results";
 
     @Override
     protected Registry createCamelRegistry() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileBeginFailureOneTimeTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileBeginFailureOneTimeTest.java
index 64665911179..7d38aa55d21 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileBeginFailureOneTimeTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileBeginFailureOneTimeTest.java
@@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class FileBeginFailureOneTimeTest extends ContextTestSupport {
 
-    private MyStrategy myStrategy = new MyStrategy();
+    private final MyStrategy myStrategy = new MyStrategy();
 
     @Override
     protected Registry createCamelRegistry() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsoluteRootPathDefaultMoveTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsoluteRootPathDefaultMoveTest.java
index 23a37af5a7e..481510b7186 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsoluteRootPathDefaultMoveTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerAbsoluteRootPathDefaultMoveTest.java
@@ -30,7 +30,7 @@ public class FileConsumerAbsoluteRootPathDefaultMoveTest extends ContextTestSupp
 
     // run this test manually
 
-    private String base = "/tmp/mytemp";
+    private final String base = "/tmp/mytemp";
 
     @Test
     @Disabled
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBridgeRouteExceptionHandlerTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBridgeRouteExceptionHandlerTest.java
index 1795a9793e6..4779fb698bd 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBridgeRouteExceptionHandlerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBridgeRouteExceptionHandlerTest.java
@@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
  */
 public class FileConsumerBridgeRouteExceptionHandlerTest extends ContextTestSupport {
 
-    private MyReadLockStrategy myReadLockStrategy = new MyReadLockStrategy();
+    private final MyReadLockStrategy myReadLockStrategy = new MyReadLockStrategy();
 
     @Test
     public void testCustomExceptionHandler() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCustomExceptionHandlerTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCustomExceptionHandlerTest.java
index 64fba646bcd..ff52f5b5fcd 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCustomExceptionHandlerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCustomExceptionHandlerTest.java
@@ -36,8 +36,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
  */
 public class FileConsumerCustomExceptionHandlerTest extends ContextTestSupport {
 
-    private MyReadLockStrategy myReadLockStrategy = new MyReadLockStrategy();
-    private MyExceptionHandler myExceptionHandler = new MyExceptionHandler();
+    private final MyReadLockStrategy myReadLockStrategy = new MyReadLockStrategy();
+    private final MyExceptionHandler myExceptionHandler = new MyExceptionHandler();
 
     @Test
     public void testCustomExceptionHandler() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCustomSchedulerTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCustomSchedulerTest.java
index 33cef79e946..e199d27400b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCustomSchedulerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCustomSchedulerTest.java
@@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class FileConsumerCustomSchedulerTest extends ContextTestSupport {
 
-    private MyScheduler scheduler = new MyScheduler();
+    private final MyScheduler scheduler = new MyScheduler();
 
     @Override
     protected Registry createCamelRegistry() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSuspendAndResumeTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSuspendAndResumeTest.java
index 9a60a8715ea..da2b7a7c42d 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSuspendAndResumeTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSuspendAndResumeTest.java
@@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class FileConsumerSuspendAndResumeTest extends ContextTestSupport {
 
-    private MyPolicy myPolicy = new MyPolicy();
+    private final MyPolicy myPolicy = new MyPolicy();
 
     @Test
     public void testConsumeSuspendAndResumeFile() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerThreadsInProgressIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerThreadsInProgressIssueTest.java
index e2b1b99b5c2..3456afe21af 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerThreadsInProgressIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerThreadsInProgressIssueTest.java
@@ -93,7 +93,7 @@ public class FileConsumerThreadsInProgressIssueTest extends ContextTestSupport {
     }
 
     private class SampleProcessor implements Processor {
-        private Map<String, Integer> duplicate;
+        private final Map<String, Integer> duplicate;
 
         public SampleProcessor(Map<String, Integer> duplicate) {
             this.duplicate = duplicate;
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerCharsetUTFOptimizedTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerCharsetUTFOptimizedTest.java
index cd60294a4c6..adf2be23b2c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerCharsetUTFOptimizedTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerCharsetUTFOptimizedTest.java
@@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 public class FileProducerCharsetUTFOptimizedTest extends ContextTestSupport {
 
     // use utf-8 as original payload with 00e6 which is a danish ae letter
-    private byte[] utf = "ABC\u00e6D\uD867\uDE3DE\uD83C\uDFF3".getBytes(StandardCharsets.UTF_8);
+    private final byte[] utf = "ABC\u00e6D\uD867\uDE3DE\uD83C\uDFF3".getBytes(StandardCharsets.UTF_8);
 
     @BeforeEach
     public void createData() throws IOException {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerMoveExistingStrategyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerMoveExistingStrategyTest.java
index b4c4dd31714..6fc97636c27 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerMoveExistingStrategyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerMoveExistingStrategyTest.java
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
  */
 public class FileProducerMoveExistingStrategyTest extends ContextTestSupport {
 
-    private MyStrategy myStrategy = new MyStrategy();
+    private final MyStrategy myStrategy = new MyStrategy();
 
     @Override
     protected Registry createCamelRegistry() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FilerProducerDoneFileNameRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FilerProducerDoneFileNameRouteTest.java
index 652b1bb7405..3b77b301e29 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FilerProducerDoneFileNameRouteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FilerProducerDoneFileNameRouteTest.java
@@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  */
 public class FilerProducerDoneFileNameRouteTest extends ContextTestSupport {
 
-    private Properties myProp = new Properties();
+    private final Properties myProp = new Properties();
 
     @Override
     protected Registry createCamelRegistry() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FilerProducerDoneFileNameTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FilerProducerDoneFileNameTest.java
index 69eb7623044..bfd48e14358 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FilerProducerDoneFileNameTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FilerProducerDoneFileNameTest.java
@@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  */
 public class FilerProducerDoneFileNameTest extends ContextTestSupport {
 
-    private Properties myProp = new Properties();
+    private final Properties myProp = new Properties();
 
     @Override
     protected Registry createCamelRegistry() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/GenericFileMessageTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/GenericFileMessageTest.java
index 56a7b1c1b75..d237b466788 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/GenericFileMessageTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/GenericFileMessageTest.java
@@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class GenericFileMessageTest extends ContextTestSupport {
 
-    private CamelContext camelContext = new DefaultCamelContext();
+    private final CamelContext camelContext = new DefaultCamelContext();
 
     @Test
     public void testGenericMessageToStringConversion() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/NewFileConsumeTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/NewFileConsumeTest.java
index 7c3bbfe03fb..e07235bafa9 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/NewFileConsumeTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/NewFileConsumeTest.java
@@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
  */
 public class NewFileConsumeTest extends ContextTestSupport {
 
-    private CountDownLatch latch = new CountDownLatch(1);
+    private final CountDownLatch latch = new CountDownLatch(1);
 
     @Override
     public boolean isUseRouteBuilder() {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategyTest.java
index 02c590e42c2..9131c0069ca 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategyTest.java
@@ -45,8 +45,8 @@ public class MarkerFileExclusiveReadLockStrategyTest extends ContextTestSupport
 
     private static final Logger LOG = LoggerFactory.getLogger(MarkerFileExclusiveReadLockStrategyTest.class);
     private static final int NUMBER_OF_THREADS = 5;
-    private AtomicInteger numberOfFilesProcessed = new AtomicInteger();
-    private CountDownLatch latch = new CountDownLatch(2);
+    private final AtomicInteger numberOfFilesProcessed = new AtomicInteger();
+    private final CountDownLatch latch = new CountDownLatch(2);
 
     @Test
     public void testMultithreadedLocking() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/language/LanguageRouteConvertBodyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/language/LanguageRouteConvertBodyTest.java
index 1370e555a1d..81d7623dc7d 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/language/LanguageRouteConvertBodyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/language/LanguageRouteConvertBodyTest.java
@@ -48,8 +48,8 @@ public class LanguageRouteConvertBodyTest extends ContextTestSupport {
     }
 
     private static final class MyOrder {
-        private int id;
-        private String name;
+        private final int id;
+        private final String name;
 
         private MyOrder(int id, String name) {
             this.id = id;
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/mock/MockAsBeanTest.java b/core/camel-core/src/test/java/org/apache/camel/component/mock/MockAsBeanTest.java
index 20ca056b8e8..4d305add14f 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/mock/MockAsBeanTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/mock/MockAsBeanTest.java
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
 public class MockAsBeanTest extends ContextTestSupport {
 
     // create foo bean as a mock endpoint
-    private MockEndpoint foo = new MockEndpoint("mock:foo", new MockComponent());
+    private final MockEndpoint foo = new MockEndpoint("mock:foo", new MockComponent());
 
     // START SNIPPET: e1
     @Test
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointWithParametersTest.java b/core/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointWithParametersTest.java
index cf5a5084ea1..caa4429a5d1 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointWithParametersTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointWithParametersTest.java
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
  */
 public class MockEndpointWithParametersTest extends ContextTestSupport {
 
-    private String uri = "smtp://host:9999?username=smtpusername&password=smtppassword";
+    private final String uri = "smtp://host:9999?username=smtpusername&password=smtppassword";
 
     @Test
     public void testMockEndpointWithParameter() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLookupListenerTest.java b/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLookupListenerTest.java
index c01c21f54c8..9fda4f264b9 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLookupListenerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLookupListenerTest.java
@@ -67,7 +67,7 @@ public class PropertiesComponentLookupListenerTest extends ContextTestSupport {
 
     private static class MyListener implements PropertiesLookupListener {
 
-        private Map<String, String[]> map = new HashMap<>();
+        private final Map<String, String[]> map = new HashMap<>();
 
         @Override
         public void onLookup(String name, String value, String defaultValue, String source) {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/rest/RestProducerTest.java b/core/camel-core/src/test/java/org/apache/camel/component/rest/RestProducerTest.java
index 6fb81a58dff..3547b5c2d0c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/rest/RestProducerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/rest/RestProducerTest.java
@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class RestProducerTest {
 
-    private CamelContext camelContext = new DefaultCamelContext();
+    private final CamelContext camelContext = new DefaultCamelContext();
 
     @Test
     public void shouldCreateMultipleQueryParameters() throws UnsupportedEncodingException, URISyntaxException {
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 2fc6e07253e..208cf43c6f6 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
@@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class SchedulerRouteTest extends ContextTestSupport {
     private static final Logger LOG = LoggerFactory.getLogger(SchedulerRouteTest.class);
-    private MyBean bean = new MyBean();
+    private final MyBean bean = new MyBean();
 
     @Test
     public void testSchedulerInvokesBeanMethod() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/scheduler/TwoSchedulerConcurrentTasksOneRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/component/scheduler/TwoSchedulerConcurrentTasksOneRouteTest.java
index 69188764c30..5a0f0903d8e 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/scheduler/TwoSchedulerConcurrentTasksOneRouteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/scheduler/TwoSchedulerConcurrentTasksOneRouteTest.java
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
 
 public class TwoSchedulerConcurrentTasksOneRouteTest extends ContextTestSupport {
 
-    private AtomicBoolean sleep = new AtomicBoolean(true);
+    private final AtomicBoolean sleep = new AtomicBoolean(true);
 
     @Test
     public void testTwoScheduler() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/seda/SedaEndpointTest.java b/core/camel-core/src/test/java/org/apache/camel/component/seda/SedaEndpointTest.java
index cf1f41d4f51..25951e2cd21 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/seda/SedaEndpointTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/seda/SedaEndpointTest.java
@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.*;
 
 public class SedaEndpointTest extends ContextTestSupport {
 
-    private BlockingQueue<Exchange> queue = new ArrayBlockingQueue<>(1000);
+    private final BlockingQueue<Exchange> queue = new ArrayBlockingQueue<>(1000);
 
     @Test
     public void testSedaEndpointUnboundedQueue() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/seda/SedaUnitOfWorkTest.java b/core/camel-core/src/test/java/org/apache/camel/component/seda/SedaUnitOfWorkTest.java
index 0f894d41615..053169d9a90 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/seda/SedaUnitOfWorkTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/seda/SedaUnitOfWorkTest.java
@@ -99,8 +99,8 @@ public class SedaUnitOfWorkTest extends ContextTestSupport {
 
     private static final class MyUOWProcessor implements Processor {
 
-        private SedaUnitOfWorkTest test;
-        private String id;
+        private final SedaUnitOfWorkTest test;
+        private final String id;
 
         private MyUOWProcessor(SedaUnitOfWorkTest test, String id) {
             this.test = test;
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/timer/TimerGracefulShutdownTest.java b/core/camel-core/src/test/java/org/apache/camel/component/timer/TimerGracefulShutdownTest.java
index 1cc031dd7fe..33b32232eca 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/timer/TimerGracefulShutdownTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/timer/TimerGracefulShutdownTest.java
@@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
 
 public class TimerGracefulShutdownTest extends ContextTestSupport {
 
-    private MyExceptionHandler eh = new MyExceptionHandler();
+    private final MyExceptionHandler eh = new MyExceptionHandler();
 
     @Override
     protected Registry createCamelRegistry() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/timer/TimerNameTest.java b/core/camel-core/src/test/java/org/apache/camel/component/timer/TimerNameTest.java
index 7091b6a1ad3..c690182cd8e 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/timer/TimerNameTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/timer/TimerNameTest.java
@@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class TimerNameTest extends ContextTestSupport {
 
-    private String uri = "timer://foo?delay=0&period=10&timerName=bar";
+    private final String uri = "timer://foo?delay=0&period=10&timerName=bar";
 
     @Test
     public void testTimerName() throws Exception {
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 be9e5d922f5..e20531aec95 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
@@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class TimerRouteTest extends ContextTestSupport {
     private static final Logger LOG = LoggerFactory.getLogger(TimerRouteTest.class);
-    private MyBean bean = new MyBean();
+    private final MyBean bean = new MyBean();
 
     @Test
     public void testTimerInvokesBeanMethod() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/xslt/XsltCustomErrorListenerTest.java b/core/camel-core/src/test/java/org/apache/camel/component/xslt/XsltCustomErrorListenerTest.java
index 25dbad13ab0..38f029bf8dc 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/xslt/XsltCustomErrorListenerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/xslt/XsltCustomErrorListenerTest.java
@@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.*;
  */
 public class XsltCustomErrorListenerTest extends TestSupport {
 
-    private MyErrorListener listener = new MyErrorListener();
+    private final MyErrorListener listener = new MyErrorListener();
 
     private static class MyErrorListener implements ErrorListener {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/BindToRegistryBeanPostProcessorTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/BindToRegistryBeanPostProcessorTest.java
index 77ae4cafdaa..9d0340049de 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/BindToRegistryBeanPostProcessorTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/BindToRegistryBeanPostProcessorTest.java
@@ -31,7 +31,7 @@ public class BindToRegistryBeanPostProcessorTest extends ContextTestSupport {
 
     // field
     @BindToRegistry(beanPostProcess = true)
-    private FooService foo = new FooService();
+    private final FooService foo = new FooService();
 
     // method
     @BindToRegistry(beanPostProcess = true)
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/CamelContextReloadStrategyPropertiesFunctionTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/CamelContextReloadStrategyPropertiesFunctionTest.java
index e8ffe0ba166..73faf9d2a82 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/CamelContextReloadStrategyPropertiesFunctionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/CamelContextReloadStrategyPropertiesFunctionTest.java
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
 
 public class CamelContextReloadStrategyPropertiesFunctionTest extends ContextTestSupport {
 
-    private MyFunction my = new MyFunction();
+    private final MyFunction my = new MyFunction();
 
     @Test
     public void testContextReload() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/CamelContextTrackerTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/CamelContextTrackerTest.java
index 185c267302c..12b0537c357 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/CamelContextTrackerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/CamelContextTrackerTest.java
@@ -31,7 +31,7 @@ public class CamelContextTrackerTest {
 
     private static final class MyContextTracker extends CamelContextTracker {
 
-        private List<String> names = new ArrayList<>();
+        private final List<String> names = new ArrayList<>();
 
         @Override
         public void contextCreated(CamelContext camelContext) {
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/CustomHeadersMapFactoryRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/CustomHeadersMapFactoryRouteTest.java
index fb149c64fc7..9c7c78b7710 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/CustomHeadersMapFactoryRouteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/CustomHeadersMapFactoryRouteTest.java
@@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertSame;
 
 public class CustomHeadersMapFactoryRouteTest extends ContextTestSupport {
 
-    private HeadersMapFactory custom = new CustomHeadersMapFactory();
+    private final HeadersMapFactory custom = new CustomHeadersMapFactory();
 
     @Override
     protected CamelContext createCamelContext() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/DataFormatContextAwareTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/DataFormatContextAwareTest.java
index 6db754c5509..8cf983616f7 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/DataFormatContextAwareTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/DataFormatContextAwareTest.java
@@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
  */
 public class DataFormatContextAwareTest extends ContextTestSupport {
 
-    private MyDataFormat my = new MyDataFormat();
+    private final MyDataFormat my = new MyDataFormat();
 
     @Override
     protected Registry createCamelRegistry() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelBeanPostProcessorTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelBeanPostProcessorTest.java
index 74e69fb79fa..94d158bd192 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelBeanPostProcessorTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelBeanPostProcessorTest.java
@@ -72,7 +72,7 @@ public class DefaultCamelBeanPostProcessorTest extends ContextTestSupport {
         @Produce
         private ProducerTemplate bar;
         @BindToRegistry("myCoolBean")
-        private MySerialBean myBean = new MySerialBean();
+        private final MySerialBean myBean = new MySerialBean();
 
         @BindToRegistry
         public FooBar doSomething() {
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextStopFailureTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextStopFailureTest.java
index a93ceebcf5c..58ef6a701f3 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextStopFailureTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextStopFailureTest.java
@@ -47,8 +47,8 @@ public class DefaultCamelContextStopFailureTest extends ContextTestSupport {
 
     private static final class MyService implements Service {
 
-        private String name;
-        private boolean fail;
+        private final String name;
+        private final boolean fail;
 
         private MyService(String name, boolean fail) {
             this.name = name;
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextWithLifecycleStrategyRestartTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextWithLifecycleStrategyRestartTest.java
index 83b493c2e8c..936b6d1d782 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextWithLifecycleStrategyRestartTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextWithLifecycleStrategyRestartTest.java
@@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.*;
  */
 public class DefaultCamelContextWithLifecycleStrategyRestartTest extends ContextTestSupport {
 
-    private MyStrategy strategy = new MyStrategy();
+    private final MyStrategy strategy = new MyStrategy();
 
     @Test
     public void testRestart() throws Exception {
@@ -100,8 +100,8 @@ public class DefaultCamelContextWithLifecycleStrategyRestartTest extends Context
 
     private static class MyStrategy extends LifecycleStrategySupport {
 
-        private AtomicInteger contextStartCounter = new AtomicInteger();
-        private AtomicInteger removeCounter = new AtomicInteger();
+        private final AtomicInteger contextStartCounter = new AtomicInteger();
+        private final AtomicInteger removeCounter = new AtomicInteger();
 
         @Override
         public void onContextStarting(CamelContext context) throws VetoCamelContextStartException {
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeHolderTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeHolderTest.java
index 93eb89aa9a7..8994d6e02e3 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeHolderTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeHolderTest.java
@@ -189,7 +189,7 @@ public class DefaultExchangeHolderTest extends ContextTestSupport {
     }
 
     private static final class MyFoo {
-        private String foo;
+        private final String foo;
 
         private MyFoo(String foo) {
             this.foo = foo;
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultInjectorTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultInjectorTest.java
index 101f42a8e0e..6f6dd8df464 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultInjectorTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultInjectorTest.java
@@ -65,7 +65,7 @@ public class DefaultInjectorTest {
 
     public static class MyOtherBean {
 
-        private static MyOtherBean me = new MyOtherBean();
+        private static final MyOtherBean me = new MyOtherBean();
 
         public static MyOtherBean getInstance() {
             return me;
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerCacheTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerCacheTest.java
index 54463453b44..1243c63828d 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerCacheTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerCacheTest.java
@@ -342,7 +342,7 @@ public class DefaultProducerCacheTest extends ContextTestSupport {
 
     private final class MyProducer extends DefaultProducer {
 
-        private int id;
+        private final int id;
 
         MyProducer(Endpoint endpoint) {
             super(endpoint);
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/EventDrivenPollingConsumerQueueSizeTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/EventDrivenPollingConsumerQueueSizeTest.java
index 11696379e07..19b14f183c6 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/EventDrivenPollingConsumerQueueSizeTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/EventDrivenPollingConsumerQueueSizeTest.java
@@ -42,7 +42,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class EventDrivenPollingConsumerQueueSizeTest extends ContextTestSupport {
 
-    private String uri = "my:foo?pollingConsumerQueueSize=10&pollingConsumerBlockWhenFull=false";
+    private final String uri = "my:foo?pollingConsumerQueueSize=10&pollingConsumerBlockWhenFull=false";
 
     @Override
     @BeforeEach
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/FromEndpointTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/FromEndpointTest.java
index f86e07eb4be..9f8fdac1945 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/FromEndpointTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/FromEndpointTest.java
@@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class FromEndpointTest extends ContextTestSupport {
-    private Object expectedBody = "<hello>world!</hello>";
+    private final Object expectedBody = "<hello>world!</hello>";
 
     @Test
     public void testReceivedMessageHasFromEndpointSet() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/LanguageCamelContextAwareTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/LanguageCamelContextAwareTest.java
index d19ae3ed285..30a242ad3b4 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/LanguageCamelContextAwareTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/LanguageCamelContextAwareTest.java
@@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
  */
 public class LanguageCamelContextAwareTest extends ContextTestSupport {
 
-    private MyLanguage my = new MyLanguage();
+    private final MyLanguage my = new MyLanguage();
 
     @Override
     protected Registry createCamelRegistry() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/LifecycleStrategyFailOnStartupTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/LifecycleStrategyFailOnStartupTest.java
index 4565cd74637..ed9edc1a662 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/LifecycleStrategyFailOnStartupTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/LifecycleStrategyFailOnStartupTest.java
@@ -26,7 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class LifecycleStrategyFailOnStartupTest extends TestSupport {
 
-    private MyLifecycleStrategy dummy1 = new MyLifecycleStrategy();
+    private final MyLifecycleStrategy dummy1 = new MyLifecycleStrategy();
 
     protected CamelContext createCamelContext() throws Exception {
         CamelContext context = new DefaultCamelContext();
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/LifecycleStrategyServiceTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/LifecycleStrategyServiceTest.java
index c8f9b2dbe14..243ac10b0d7 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/LifecycleStrategyServiceTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/LifecycleStrategyServiceTest.java
@@ -26,7 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class LifecycleStrategyServiceTest extends TestSupport {
 
-    private MyLifecycleStrategy dummy1 = new MyLifecycleStrategy();
+    private final MyLifecycleStrategy dummy1 = new MyLifecycleStrategy();
 
     protected CamelContext createCamelContext() throws Exception {
         CamelContext context = new DefaultCamelContext();
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/PendingExchangesShutdownGracefulTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/PendingExchangesShutdownGracefulTest.java
index b44ce6bdc5f..5ada3b781aa 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/PendingExchangesShutdownGracefulTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/PendingExchangesShutdownGracefulTest.java
@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 public class PendingExchangesShutdownGracefulTest extends ContextTestSupport {
 
     private static String foo = "";
-    private static CountDownLatch latch = new CountDownLatch(1);
+    private static final CountDownLatch latch = new CountDownLatch(1);
 
     @Test
     public void testShutdownGraceful() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/PendingExchangesTwoRouteShutdownGracefulTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/PendingExchangesTwoRouteShutdownGracefulTest.java
index 1bf6e7fc3e6..274b3c4e7e8 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/PendingExchangesTwoRouteShutdownGracefulTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/PendingExchangesTwoRouteShutdownGracefulTest.java
@@ -32,7 +32,7 @@ public class PendingExchangesTwoRouteShutdownGracefulTest extends ContextTestSup
 
     private static String foo = "";
     private static String bar = "";
-    private static CountDownLatch latch = new CountDownLatch(2);
+    private static final CountDownLatch latch = new CountDownLatch(2);
 
     @Test
     public void testShutdownGraceful() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/RoutePolicyAutoStartupCancelledOnInitTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/RoutePolicyAutoStartupCancelledOnInitTest.java
index 2a4530a9001..95b8526f9d8 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/RoutePolicyAutoStartupCancelledOnInitTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/RoutePolicyAutoStartupCancelledOnInitTest.java
@@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class RoutePolicyAutoStartupCancelledOnInitTest extends ContextTestSupport {
 
-    private RoutePolicy policy = new RoutePolicySupport() {
+    private final RoutePolicy policy = new RoutePolicySupport() {
         @Override
         public void onInit(Route route) {
             route.setAutoStartup(false);
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/RoutePolicySupportTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/RoutePolicySupportTest.java
index a1aa11f008a..316b1b99fc6 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/RoutePolicySupportTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/RoutePolicySupportTest.java
@@ -27,7 +27,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class RoutePolicySupportTest extends ContextTestSupport {
 
-    private MyRoutePolicy policy = new MyRoutePolicy();
+    private final MyRoutePolicy policy = new MyRoutePolicy();
 
     public static class MyRoutePolicy extends RoutePolicySupport {
     }
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/RoutePolicyTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/RoutePolicyTest.java
index 3922a77d8a9..cb881779123 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/RoutePolicyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/RoutePolicyTest.java
@@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class RoutePolicyTest extends ContextTestSupport {
-    private MyRoutPolicy routePolicy = new MyRoutPolicy();
+    private final MyRoutPolicy routePolicy = new MyRoutPolicy();
 
     @Test
     public void testStartCalledWhenCamelStarts() throws Exception {
@@ -103,11 +103,11 @@ public class RoutePolicyTest extends ContextTestSupport {
     }
 
     private static class MyRoutPolicy implements RoutePolicy {
-        private AtomicInteger removeCounter = new AtomicInteger();
-        private AtomicInteger startCounter = new AtomicInteger();
-        private AtomicInteger stopCounter = new AtomicInteger();
-        private AtomicInteger suspendCounter = new AtomicInteger();
-        private AtomicInteger resumeCounter = new AtomicInteger();
+        private final AtomicInteger removeCounter = new AtomicInteger();
+        private final AtomicInteger startCounter = new AtomicInteger();
+        private final AtomicInteger stopCounter = new AtomicInteger();
+        private final AtomicInteger suspendCounter = new AtomicInteger();
+        private final AtomicInteger resumeCounter = new AtomicInteger();
 
         @Override
         public void onRemove(Route route) {
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/RouteSuspendResumeWarmUpTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/RouteSuspendResumeWarmUpTest.java
index 8bd9f5075ac..e113ec46a50 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/RouteSuspendResumeWarmUpTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/RouteSuspendResumeWarmUpTest.java
@@ -27,7 +27,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class RouteSuspendResumeWarmUpTest extends ContextTestSupport {
 
-    private MyService service = new MyService();
+    private final MyService service = new MyService();
 
     @Test
     public void testRouteSuspendResumeWarmUpTest() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/SimpleRegistryWrapTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/SimpleRegistryWrapTest.java
index 3d67e60dbcf..b5dc9d8f5cd 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/SimpleRegistryWrapTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/SimpleRegistryWrapTest.java
@@ -26,7 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class SimpleRegistryWrapTest {
 
-    private SimpleRegistry registry = new SimpleRegistry() {
+    private final SimpleRegistry registry = new SimpleRegistry() {
 
         @Override
         public Object wrap(Object value) {
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/StartupListenerTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/StartupListenerTest.java
index a2359db55d0..57acfe7df98 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/StartupListenerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/StartupListenerTest.java
@@ -26,7 +26,7 @@ import static org.junit.jupiter.api.Assertions.*;
 
 public class StartupListenerTest extends ContextTestSupport {
 
-    private MyStartupListener my = new MyStartupListener();
+    private final MyStartupListener my = new MyStartupListener();
 
     @Override
     protected CamelContext createCamelContext() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/StopTimeoutRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/StopTimeoutRouteTest.java
index 3a3c1754e2f..a8354ec182f 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/StopTimeoutRouteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/StopTimeoutRouteTest.java
@@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 @DisabledIfSystemProperty(named = "ci.env.name", matches = "github.com", disabledReason = "Flaky on GitHub Actions")
 public class StopTimeoutRouteTest extends ContextTestSupport {
 
-    private CountDownLatch latch = new CountDownLatch(1);
+    private final CountDownLatch latch = new CountDownLatch(1);
 
     @Test
     public void testStopTimeout() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/TypeConverterRegistryPerformanceTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/TypeConverterRegistryPerformanceTest.java
index 29ee2f3c650..1ebbd5926d5 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/TypeConverterRegistryPerformanceTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/TypeConverterRegistryPerformanceTest.java
@@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class TypeConverterRegistryPerformanceTest extends ContextTestSupport {
 
-    private int inner = 10;
+    private final int inner = 10;
 
     private CountDownLatch latch;
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/VetoCamelContextStartTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/VetoCamelContextStartTest.java
index dc883214b4c..122bceda530 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/VetoCamelContextStartTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/VetoCamelContextStartTest.java
@@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  */
 public class VetoCamelContextStartTest extends ContextTestSupport {
 
-    private LifecycleStrategy veto = new MyVeto();
+    private final LifecycleStrategy veto = new MyVeto();
 
     @Test
     public void testVetoCamelContextStart() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/converter/TypeConvertersTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/converter/TypeConvertersTest.java
index 54adddd8835..42ab66df039 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/converter/TypeConvertersTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/converter/TypeConvertersTest.java
@@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class TypeConvertersTest extends ContextTestSupport {
 
-    private MyConverters converters = new MyConverters();
+    private final MyConverters converters = new MyConverters();
 
     @Test
     public void testAdd() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/engine/CamelPostProcessorHelperTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/engine/CamelPostProcessorHelperTest.java
index 9562bce0174..212a7e868f9 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/engine/CamelPostProcessorHelperTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/engine/CamelPostProcessorHelperTest.java
@@ -57,8 +57,8 @@ import static org.junit.jupiter.api.Assertions.fail;
 
 public class CamelPostProcessorHelperTest extends ContextTestSupport {
 
-    private MySynchronization mySynchronization = new MySynchronization();
-    private Properties myProp = new Properties();
+    private final MySynchronization mySynchronization = new MySynchronization();
+    private final Properties myProp = new Properties();
 
     @Override
     protected Registry createCamelRegistry() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/engine/CustomThreadPoolFactoryTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/engine/CustomThreadPoolFactoryTest.java
index 93dc943449a..be491c4f019 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/engine/CustomThreadPoolFactoryTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/engine/CustomThreadPoolFactoryTest.java
@@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  */
 public class CustomThreadPoolFactoryTest extends ContextTestSupport {
 
-    private MyCustomThreadPoolFactory factory = new MyCustomThreadPoolFactory();
+    private final MyCustomThreadPoolFactory factory = new MyCustomThreadPoolFactory();
 
     @Override
     protected CamelContext createCamelContext() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultSupervisingRouteControllerTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultSupervisingRouteControllerTest.java
index 2b4ec86cba2..e080ee2d573 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultSupervisingRouteControllerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultSupervisingRouteControllerTest.java
@@ -145,7 +145,7 @@ public class DefaultSupervisingRouteControllerTest extends ContextTestSupport {
 
     private static class MyJmsEndpoint extends SedaEndpoint {
 
-        private String name;
+        private final String name;
 
         public MyJmsEndpoint(String name) {
             this.name = name;
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierServiceStoppingFailedEventTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierServiceStoppingFailedEventTest.java
index 5a2a11ad946..efbec653bbb 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierServiceStoppingFailedEventTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierServiceStoppingFailedEventTest.java
@@ -75,8 +75,8 @@ public class EventNotifierServiceStoppingFailedEventTest extends ContextTestSupp
 
     private static final class MyService implements Service {
 
-        private String name;
-        private boolean fail;
+        private final String name;
+        private final boolean fail;
 
         private MyService(String name, boolean fail) {
             this.name = name;
diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/CBRCustomPredicateAsFilterTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/CBRCustomPredicateAsFilterTest.java
index 54ec77563ba..12a24dfa342 100644
--- a/core/camel-core/src/test/java/org/apache/camel/issues/CBRCustomPredicateAsFilterTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/issues/CBRCustomPredicateAsFilterTest.java
@@ -29,11 +29,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class CBRCustomPredicateAsFilterTest extends ContextTestSupport {
 
-    private MyFiler filter = new MyFiler();
+    private final MyFiler filter = new MyFiler();
 
     private static class MyFiler implements Predicate {
 
-        private List<String> bodies = new ArrayList<>();
+        private final List<String> bodies = new ArrayList<>();
 
         @Override
         public boolean matches(Exchange exchange) {
diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/CustomFailveOverProcessor.java b/core/camel-core/src/test/java/org/apache/camel/issues/CustomFailveOverProcessor.java
index fb812b23afe..8626eeb8935 100644
--- a/core/camel-core/src/test/java/org/apache/camel/issues/CustomFailveOverProcessor.java
+++ b/core/camel-core/src/test/java/org/apache/camel/issues/CustomFailveOverProcessor.java
@@ -66,8 +66,8 @@ public class CustomFailveOverProcessor extends ContextTestSupport {
 
     private static class MyFailOverProcessor implements Processor {
 
-        private List<String> uris;
-        private ProducerTemplate template;
+        private final List<String> uris;
+        private final ProducerTemplate template;
 
         MyFailOverProcessor(ProducerTemplate template, String... uris) {
             this.template = template;
diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/ExceptionCamel4022Test.java b/core/camel-core/src/test/java/org/apache/camel/issues/ExceptionCamel4022Test.java
index e040d35f1a6..65780d107d9 100644
--- a/core/camel-core/src/test/java/org/apache/camel/issues/ExceptionCamel4022Test.java
+++ b/core/camel-core/src/test/java/org/apache/camel/issues/ExceptionCamel4022Test.java
@@ -47,7 +47,7 @@ public class ExceptionCamel4022Test extends ContextTestSupport {
 
     public static class MyExceptionThrower implements Processor {
 
-        private String msg;
+        private final String msg;
 
         public MyExceptionThrower(String msg) {
             this.msg = msg;
diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/FilterCustomPredicateAsFilterTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/FilterCustomPredicateAsFilterTest.java
index 492e1abba60..e1be31c25cd 100644
--- a/core/camel-core/src/test/java/org/apache/camel/issues/FilterCustomPredicateAsFilterTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/issues/FilterCustomPredicateAsFilterTest.java
@@ -29,11 +29,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class FilterCustomPredicateAsFilterTest extends ContextTestSupport {
 
-    private MyFiler filter = new MyFiler();
+    private final MyFiler filter = new MyFiler();
 
     private static class MyFiler implements Predicate {
 
-        private List<String> bodies = new ArrayList<>();
+        private final List<String> bodies = new ArrayList<>();
 
         @Override
         public boolean matches(Exchange exchange) {
diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/InterceptCustomPredicateAsFilterTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/InterceptCustomPredicateAsFilterTest.java
index 3433ddffe50..54e0a8c516c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/issues/InterceptCustomPredicateAsFilterTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/issues/InterceptCustomPredicateAsFilterTest.java
@@ -30,11 +30,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class InterceptCustomPredicateAsFilterTest extends ContextTestSupport {
 
-    private MyFiler filter = new MyFiler();
+    private final MyFiler filter = new MyFiler();
 
     private static class MyFiler implements Predicate {
 
-        private List<String> bodies = new ArrayList<>();
+        private final List<String> bodies = new ArrayList<>();
 
         @Override
         public boolean matches(Exchange exchange) {
diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/MethodClassByTypeIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/MethodClassByTypeIssueTest.java
index b9e01ff3841..6abeb8c707d 100644
--- a/core/camel-core/src/test/java/org/apache/camel/issues/MethodClassByTypeIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/issues/MethodClassByTypeIssueTest.java
@@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test;
  */
 public class MethodClassByTypeIssueTest extends ContextTestSupport {
 
-    private Object methodClass = MyTransformBean.class;
+    private final Object methodClass = MyTransformBean.class;
 
     @Test
     public void testMethodClassByTypeAIssue() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/RetryRouteScopedUntilRecipientListIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/RetryRouteScopedUntilRecipientListIssueTest.java
index 8f69761e593..16092674ec0 100644
--- a/core/camel-core/src/test/java/org/apache/camel/issues/RetryRouteScopedUntilRecipientListIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/issues/RetryRouteScopedUntilRecipientListIssueTest.java
@@ -41,7 +41,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class RetryRouteScopedUntilRecipientListIssueTest extends ContextTestSupport {
 
-    private AtomicInteger invoked = new AtomicInteger();
+    private final AtomicInteger invoked = new AtomicInteger();
 
     @BeforeEach
     public void resetInvoked() {
diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/RouteIdAnonymousAndFixedClashTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/RouteIdAnonymousAndFixedClashTest.java
index f3476b92825..ea93e60b224 100644
--- a/core/camel-core/src/test/java/org/apache/camel/issues/RouteIdAnonymousAndFixedClashTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/issues/RouteIdAnonymousAndFixedClashTest.java
@@ -44,7 +44,7 @@ public class RouteIdAnonymousAndFixedClashTest extends ContextTestSupport {
     protected CamelContext createCamelContext() throws Exception {
         DefaultCamelContext ctx = new DefaultCamelContext(true);
         ctx.getCamelContextExtension().addContextPlugin(NodeIdFactory.class, new NodeIdFactory() {
-            AtomicInteger counter = new AtomicInteger();
+            final AtomicInteger counter = new AtomicInteger();
 
             @Override
             public String createId(NamedNode definition) {
diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentIssueTest.java
index fe698679c28..c907bfb63fa 100644
--- a/core/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/issues/SedaFileIdempotentIssueTest.java
@@ -40,7 +40,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 public class SedaFileIdempotentIssueTest extends ContextTestSupport {
 
     private final CountDownLatch latch = new CountDownLatch(1);
-    private FileIdempotentRepository repository = new FileIdempotentRepository();
+    private final FileIdempotentRepository repository = new FileIdempotentRepository();
 
     @Override
     @BeforeEach
diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/SentExchangeEventNotifierIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/SentExchangeEventNotifierIssueTest.java
index e382c176a42..12fdadb0664 100644
--- a/core/camel-core/src/test/java/org/apache/camel/issues/SentExchangeEventNotifierIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/issues/SentExchangeEventNotifierIssueTest.java
@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class SentExchangeEventNotifierIssueTest extends ContextTestSupport {
 
-    private MyNotifier notifier = new MyNotifier();
+    private final MyNotifier notifier = new MyNotifier();
 
     private static class MyNotifier extends EventNotifierSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/SentExchangeEventNotifierTwoIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/SentExchangeEventNotifierTwoIssueTest.java
index b99001d9d10..ca579127638 100644
--- a/core/camel-core/src/test/java/org/apache/camel/issues/SentExchangeEventNotifierTwoIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/issues/SentExchangeEventNotifierTwoIssueTest.java
@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class SentExchangeEventNotifierTwoIssueTest extends ContextTestSupport {
 
-    private MyNotifier notifier = new MyNotifier();
+    private final MyNotifier notifier = new MyNotifier();
 
     private static class MyNotifier extends EventNotifierSupport {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/SplitPropertiesFileIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/SplitPropertiesFileIssueTest.java
index 1c535048bd4..9a1aefdea73 100644
--- a/core/camel-core/src/test/java/org/apache/camel/issues/SplitPropertiesFileIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/issues/SplitPropertiesFileIssueTest.java
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
 
 public class SplitPropertiesFileIssueTest extends ContextTestSupport {
 
-    private String body = "foo=1" + LS + "bar=2" + LS + "bar=3" + LS + "foo=4";
+    private final String body = "foo=1" + LS + "bar=2" + LS + "bar=3" + LS + "foo=4";
 
     @Test
     public void testSplitPropertiesFileAndRoute() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/SplitterParallelIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/SplitterParallelIssueTest.java
index cef5dc8b5a4..3a55c1cfd0e 100644
--- a/core/camel-core/src/test/java/org/apache/camel/issues/SplitterParallelIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/issues/SplitterParallelIssueTest.java
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
  */
 public class SplitterParallelIssueTest extends ContextTestSupport {
 
-    private int delay = 100;
+    private final int delay = 100;
 
     @Test
     public void testSplitParallel() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/SplitterParallelRuntimeExceptionInHasNextOrNextTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/SplitterParallelRuntimeExceptionInHasNextOrNextTest.java
index c7c002087ea..fb511813619 100644
--- a/core/camel-core/src/test/java/org/apache/camel/issues/SplitterParallelRuntimeExceptionInHasNextOrNextTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/issues/SplitterParallelRuntimeExceptionInHasNextOrNextTest.java
@@ -91,8 +91,8 @@ public class SplitterParallelRuntimeExceptionInHasNextOrNextTest extends Context
     static class CustomIterator implements Iterator<String>, Closeable {
 
         private int index;
-        private InputStream request;
-        private boolean errorInHasNext;
+        private final InputStream request;
+        private final boolean errorInHasNext;
 
         CustomIterator(Exchange exchange, InputStream request, boolean errorInHasNext) {
             this.request = request;
diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/TransactedSetHeaderIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/TransactedSetHeaderIssueTest.java
index bbf473ae18f..6cf8ce68bcd 100644
--- a/core/camel-core/src/test/java/org/apache/camel/issues/TransactedSetHeaderIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/issues/TransactedSetHeaderIssueTest.java
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
 
 public class TransactedSetHeaderIssueTest extends ContextTestSupport {
 
-    private Policy policy = new Policy() {
+    private final Policy policy = new Policy() {
         @Override
         public void beforeWrap(Route route, NamedNode definition) {
             // noop
diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/XPathSplitStreamTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/XPathSplitStreamTest.java
index 71683e464d5..28b2aaf9a65 100644
--- a/core/camel-core/src/test/java/org/apache/camel/issues/XPathSplitStreamTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/issues/XPathSplitStreamTest.java
@@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test;
 
 public class XPathSplitStreamTest extends ContextTestSupport {
 
-    private static int size = 100;
+    private static final int size = 100;
 
     @Override
     @BeforeEach
diff --git a/core/camel-core/src/test/java/org/apache/camel/language/BeanLanguageInvalidOGNLTest.java b/core/camel-core/src/test/java/org/apache/camel/language/BeanLanguageInvalidOGNLTest.java
index ef4340f00b6..0834671767c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/language/BeanLanguageInvalidOGNLTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/language/BeanLanguageInvalidOGNLTest.java
@@ -60,7 +60,7 @@ public class BeanLanguageInvalidOGNLTest extends ContextTestSupport {
 
     public static class MyReallyCoolBean {
 
-        private Map<?, ?> map = new LinkedHashMap<>();
+        private final Map<?, ?> map = new LinkedHashMap<>();
 
         public Map<?, ?> getOther() {
             return map;
diff --git a/core/camel-core/src/test/java/org/apache/camel/language/BeanLanguageOGNLTest.java b/core/camel-core/src/test/java/org/apache/camel/language/BeanLanguageOGNLTest.java
index cc0057ef922..7bc0ffdc942 100644
--- a/core/camel-core/src/test/java/org/apache/camel/language/BeanLanguageOGNLTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/language/BeanLanguageOGNLTest.java
@@ -42,7 +42,7 @@ public class BeanLanguageOGNLTest extends ContextTestSupport {
 
     public static class MyReallyCoolBean {
 
-        private MyOtherReallyCoolBean other = new MyOtherReallyCoolBean();
+        private final MyOtherReallyCoolBean other = new MyOtherReallyCoolBean();
 
         public MyOtherReallyCoolBean getOther() {
             return other;
diff --git a/core/camel-core/src/test/java/org/apache/camel/language/LanguageServiceTest.java b/core/camel-core/src/test/java/org/apache/camel/language/LanguageServiceTest.java
index d3023f8a9c3..71e73584a2a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/language/LanguageServiceTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/language/LanguageServiceTest.java
@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.*;
 
 public class LanguageServiceTest extends ContextTestSupport {
 
-    private MyLanguage my = new MyLanguage();
+    private final MyLanguage my = new MyLanguage();
 
     @Override
     protected Registry createCamelRegistry() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/language/SimpleOgnlMapIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/language/SimpleOgnlMapIssueTest.java
index b87de6490e9..a549537983e 100644
--- a/core/camel-core/src/test/java/org/apache/camel/language/SimpleOgnlMapIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/language/SimpleOgnlMapIssueTest.java
@@ -64,7 +64,7 @@ public class SimpleOgnlMapIssueTest extends ContextTestSupport {
     }
 
     public static final class MyObjectMessage {
-        private Map<Object, Object> property;
+        private final Map<Object, Object> property;
 
         public MyObjectMessage() {
             this.property = new HashMap<>();
diff --git a/core/camel-core/src/test/java/org/apache/camel/language/SimpleXPathTransformTest.java b/core/camel-core/src/test/java/org/apache/camel/language/SimpleXPathTransformTest.java
index dbba17e0d76..1bc6375cb26 100644
--- a/core/camel-core/src/test/java/org/apache/camel/language/SimpleXPathTransformTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/language/SimpleXPathTransformTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
 
 public class SimpleXPathTransformTest extends ContextTestSupport {
 
-    private static String EXPECTED = """
+    private static final String EXPECTED = """
             <user>
               <rool>123</rool>
               <country>sweden</country>
diff --git a/core/camel-core/src/test/java/org/apache/camel/language/TokenPairIteratorSplitChoicePerformanceManualTest.java b/core/camel-core/src/test/java/org/apache/camel/language/TokenPairIteratorSplitChoicePerformanceManualTest.java
index a50ddca71a5..efc51956d50 100644
--- a/core/camel-core/src/test/java/org/apache/camel/language/TokenPairIteratorSplitChoicePerformanceManualTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/language/TokenPairIteratorSplitChoicePerformanceManualTest.java
@@ -42,7 +42,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 @Disabled("Test manually")
 public class TokenPairIteratorSplitChoicePerformanceManualTest extends ContextTestSupport {
 
-    private int size = 20 * 1000;
+    private final int size = 20 * 1000;
     private final AtomicInteger tiny = new AtomicInteger();
     private final AtomicInteger small = new AtomicInteger();
     private final AtomicInteger med = new AtomicInteger();
diff --git a/core/camel-core/src/test/java/org/apache/camel/language/XPathSplitChoicePerformanceManualTest.java b/core/camel-core/src/test/java/org/apache/camel/language/XPathSplitChoicePerformanceManualTest.java
index ba78be8f09c..02755e29139 100644
--- a/core/camel-core/src/test/java/org/apache/camel/language/XPathSplitChoicePerformanceManualTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/language/XPathSplitChoicePerformanceManualTest.java
@@ -42,7 +42,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 @Disabled("Test manually")
 public class XPathSplitChoicePerformanceManualTest extends ContextTestSupport {
 
-    private int size = 20 * 1000;
+    private final int size = 20 * 1000;
     private final AtomicInteger tiny = new AtomicInteger();
     private final AtomicInteger small = new AtomicInteger();
     private final AtomicInteger med = new AtomicInteger();
diff --git a/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java b/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
index 7a6704fc6d5..90e3d5aa516 100644
--- a/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
@@ -2360,8 +2360,8 @@ public class SimpleTest extends LanguageTestSupport {
     }
 
     public static final class Animal {
-        private String name;
-        private int age;
+        private final String name;
+        private final int age;
         private Animal friend;
 
         private Animal(String name, int age) {
@@ -2412,8 +2412,8 @@ public class SimpleTest extends LanguageTestSupport {
     }
 
     public static final class OrderLine {
-        private int id;
-        private String name;
+        private final int id;
+        private final String name;
 
         public OrderLine(int id, String name) {
             this.id = id;
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListInterfaceAnnotationTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListInterfaceAnnotationTest.java
index 6d03658b541..e87487a6c03 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListInterfaceAnnotationTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListInterfaceAnnotationTest.java
@@ -39,8 +39,8 @@ public class BeanRecipientListInterfaceAnnotationTest extends BeanRecipientListT
     }
 
     public static class MyBean implements Route {
-        private static AtomicInteger counter = new AtomicInteger();
-        private int id;
+        private static final AtomicInteger counter = new AtomicInteger();
+        private final int id;
 
         public MyBean() {
             id = counter.incrementAndGet();
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 33da9e364f2..0dc33d00907 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
@@ -73,8 +73,8 @@ public class BeanRecipientListTest extends ContextTestSupport {
     }
 
     public static class MyBean {
-        private static AtomicInteger counter = new AtomicInteger();
-        private int id;
+        private static final AtomicInteger counter = new AtomicInteger();
+        private final int id;
 
         public MyBean() {
             id = counter.incrementAndGet();
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 eba6b713819..37cfac04567 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
@@ -84,9 +84,9 @@ public class BeanRouteTest extends ContextTestSupport {
     }
 
     public static class MyBean {
-        private static AtomicInteger counter = new AtomicInteger();
+        private static final AtomicInteger counter = new AtomicInteger();
         public String body;
-        private int id;
+        private final int id;
 
         public MyBean() {
             id = counter.incrementAndGet();
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/CBRPredicateBeanThrowExceptionTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/CBRPredicateBeanThrowExceptionTest.java
index 6500e9a9650..92ff573f095 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/CBRPredicateBeanThrowExceptionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/CBRPredicateBeanThrowExceptionTest.java
@@ -30,8 +30,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class CBRPredicateBeanThrowExceptionTest extends ContextTestSupport {
 
-    private static AtomicBoolean check = new AtomicBoolean();
-    private static AtomicBoolean check2 = new AtomicBoolean();
+    private static final AtomicBoolean check = new AtomicBoolean();
+    private static final AtomicBoolean check2 = new AtomicBoolean();
 
     @Override
     protected Registry createCamelRegistry() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/ChoiceWhenBeanExpressionTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/ChoiceWhenBeanExpressionTest.java
index dfe418cc666..8d9e5bf116a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/ChoiceWhenBeanExpressionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/ChoiceWhenBeanExpressionTest.java
@@ -86,7 +86,7 @@ public class ChoiceWhenBeanExpressionTest extends ContextTestSupport {
     }
 
     static class Student {
-        private int grade;
+        private final int grade;
 
         Student(int grade) {
             this.grade = grade;
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/ChoiceWhenBeanExpressionWithExceptionTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/ChoiceWhenBeanExpressionWithExceptionTest.java
index 819fe21e9c7..1381119153b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/ChoiceWhenBeanExpressionWithExceptionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/ChoiceWhenBeanExpressionWithExceptionTest.java
@@ -102,7 +102,7 @@ public class ChoiceWhenBeanExpressionWithExceptionTest extends ContextTestSuppor
     }
 
     static class Student {
-        private int grade;
+        private final int grade;
 
         Student(int grade) {
             this.grade = grade;
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/CustomGlobalVariableTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/CustomGlobalVariableTest.java
index 609ed161d27..5d94a4dd447 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/CustomGlobalVariableTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/CustomGlobalVariableTest.java
@@ -34,8 +34,8 @@ import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class CustomGlobalVariableTest extends ContextTestSupport {
     private MockEndpoint end;
-    private String variableName = "foo";
-    private String expectedVariableValue = "bar";
+    private final String variableName = "foo";
+    private final String expectedVariableValue = "bar";
 
     @Override
     protected CamelContext createCamelContext() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/CustomRoutePolicyTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/CustomRoutePolicyTest.java
index 43ca7805cb3..9db729d9cdd 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/CustomRoutePolicyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/CustomRoutePolicyTest.java
@@ -34,7 +34,7 @@ public class CustomRoutePolicyTest extends ContextTestSupport {
 
     private static class MyCustomRoutePolicy extends RoutePolicySupport {
 
-        private volatile AtomicBoolean stopped = new AtomicBoolean();
+        private final AtomicBoolean stopped = new AtomicBoolean();
 
         @Override
         public void onExchangeDone(Route route, Exchange exchange) {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java
index b34322b58ce..c9bc3f7a607 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java
@@ -25,9 +25,9 @@ import static org.apache.camel.processor.ExchangeAwareDelayCalcBean.BEAN_DELAYER
 
 public class DelayerTest extends ContextTestSupport {
 
-    private MyDelayCalcBean bean = new MyDelayCalcBean();
+    private final MyDelayCalcBean bean = new MyDelayCalcBean();
 
-    private ExchangeAwareDelayCalcBean exchangeAwareBean = new ExchangeAwareDelayCalcBean();
+    private final ExchangeAwareDelayCalcBean exchangeAwareBean = new ExchangeAwareDelayCalcBean();
 
     @Test
     public void testSendingMessageGetsDelayed() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterAnnotationTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterAnnotationTest.java
index 10bdcfbdc90..a9bcdc07305 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterAnnotationTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterAnnotationTest.java
@@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 public class DynamicRouterAnnotationTest extends ContextTestSupport {
 
     private static int invoked;
-    private static List<String> bodies = new ArrayList<>();
+    private static final List<String> bodies = new ArrayList<>();
 
     @Test
     public void testDynamicRouterAnnotation() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterExchangeHeaders2Test.java b/core/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterExchangeHeaders2Test.java
index 7ee6d87b5f2..5a7f45c17b0 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterExchangeHeaders2Test.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterExchangeHeaders2Test.java
@@ -31,8 +31,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class DynamicRouterExchangeHeaders2Test extends ContextTestSupport {
 
-    private static List<String> bodies = new ArrayList<>();
-    private static List<String> previouses = new ArrayList<>();
+    private static final List<String> bodies = new ArrayList<>();
+    private static final List<String> previouses = new ArrayList<>();
 
     @Test
     public void testDynamicRouter() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterExchangeHeadersTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterExchangeHeadersTest.java
index ea1d0a40454..b63d3e62a16 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterExchangeHeadersTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterExchangeHeadersTest.java
@@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class DynamicRouterExchangeHeadersTest extends ContextTestSupport {
 
-    private static List<String> bodies = new ArrayList<>();
+    private static final List<String> bodies = new ArrayList<>();
 
     @Test
     public void testDynamicRouter() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterExchangePropertiesTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterExchangePropertiesTest.java
index 90346456a43..39b5faa61f9 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterExchangePropertiesTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterExchangePropertiesTest.java
@@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class DynamicRouterExchangePropertiesTest extends ContextTestSupport {
 
-    private static List<String> bodies = new ArrayList<>();
+    private static final List<String> bodies = new ArrayList<>();
 
     @Test
     public void testDynamicRouter() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterTest.java
index df36632a5d5..9af7a379a57 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/DynamicRouterTest.java
@@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 public class DynamicRouterTest extends ContextTestSupport {
 
     private static int invoked;
-    private static List<String> bodies = new ArrayList<>();
+    private static final List<String> bodies = new ArrayList<>();
 
     @Test
     public void testDynamicRouter() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/ExchangeIdempotentConsumerTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/ExchangeIdempotentConsumerTest.java
index 556061a2c33..c875ccdf25c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/ExchangeIdempotentConsumerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/ExchangeIdempotentConsumerTest.java
@@ -38,7 +38,7 @@ public class ExchangeIdempotentConsumerTest extends ContextTestSupport {
     protected Endpoint startEndpoint;
     protected MockEndpoint resultEndpoint;
 
-    private MyIdempotentRepo repo = new MyIdempotentRepo();
+    private final MyIdempotentRepo repo = new MyIdempotentRepo();
 
     @Override
     public boolean isUseRouteBuilder() {
@@ -99,8 +99,8 @@ public class ExchangeIdempotentConsumerTest extends ContextTestSupport {
 
     private static final class MyIdempotentRepo implements IdempotentRepository {
 
-        private IdempotentRepository delegate;
-        private Set<String> exchanges = new LinkedHashSet<>();
+        private final IdempotentRepository delegate;
+        private final Set<String> exchanges = new LinkedHashSet<>();
 
         private MyIdempotentRepo() {
             delegate = MemoryIdempotentRepository.memoryIdempotentRepository(200);
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerRepoExceptionTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerRepoExceptionTest.java
index d8c0c366aa8..c8894490e43 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerRepoExceptionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerRepoExceptionTest.java
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
 
 public class IdempotentConsumerRepoExceptionTest extends ContextTestSupport {
 
-    private IdempotentRepository myRepo = new MyRepo();
+    private final IdempotentRepository myRepo = new MyRepo();
 
     @Test
     public void testRepoException() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/MDCCustomKeysTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/MDCCustomKeysTest.java
index 20c0b58f60d..9a443dea557 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/MDCCustomKeysTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/MDCCustomKeysTest.java
@@ -31,8 +31,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class MDCCustomKeysTest extends ContextTestSupport {
 
-    private MdcCheckerProcessor checker1 = new MdcCheckerProcessor("N/A");
-    private MdcCheckerProcessor checker2 = new MdcCheckerProcessor("World");
+    private final MdcCheckerProcessor checker1 = new MdcCheckerProcessor("N/A");
+    private final MdcCheckerProcessor checker2 = new MdcCheckerProcessor("World");
 
     @Test
     public void testMdcPreserved() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/MessageHistoryDumpRoutingTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/MessageHistoryDumpRoutingTest.java
index 7a503350f03..1288726e500 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/MessageHistoryDumpRoutingTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/MessageHistoryDumpRoutingTest.java
@@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test;
 
 public class MessageHistoryDumpRoutingTest extends ContextTestSupport {
 
-    private String body
+    private final String body
             = "Hello World 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890";
 
     @Test
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/MultiErrorHandlerInRouteNotHandledTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/MultiErrorHandlerInRouteNotHandledTest.java
index aaee2714927..03986298994 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/MultiErrorHandlerInRouteNotHandledTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/MultiErrorHandlerInRouteNotHandledTest.java
@@ -27,8 +27,8 @@ import org.junit.jupiter.api.Test;
  * Unit test with multi route specific error handlers
  */
 public class MultiErrorHandlerInRouteNotHandledTest extends ContextTestSupport {
-    private MyProcessor outer = new MyProcessor();
-    private MyProcessor inner = new MyProcessor();
+    private final MyProcessor outer = new MyProcessor();
+    private final MyProcessor inner = new MyProcessor();
 
     @Test
     public void testNoErrors() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/MultiErrorHandlerInRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/MultiErrorHandlerInRouteTest.java
index f7093606b5a..d9d05a7257b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/MultiErrorHandlerInRouteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/MultiErrorHandlerInRouteTest.java
@@ -27,8 +27,8 @@ import org.junit.jupiter.api.Test;
  * Unit test with multi route specific error handlers
  */
 public class MultiErrorHandlerInRouteTest extends ContextTestSupport {
-    private MyProcessor outer = new MyProcessor();
-    private MyProcessor inner = new MyProcessor();
+    private final MyProcessor outer = new MyProcessor();
+    private final MyProcessor inner = new MyProcessor();
 
     @Test
     public void testNoErrors() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/MulticastUnitOfWorkTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/MulticastUnitOfWorkTest.java
index 0549a9d7723..29987528fa7 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/MulticastUnitOfWorkTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/MulticastUnitOfWorkTest.java
@@ -75,7 +75,7 @@ public class MulticastUnitOfWorkTest extends ContextTestSupport {
 
     private static final class MyUOWProcessor implements Processor {
 
-        private String id;
+        private final String id;
 
         private MyUOWProcessor(String id) {
             this.id = id;
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/OnCompletionShutdownProcessorTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/OnCompletionShutdownProcessorTest.java
index 575b8edefe5..2dc1031aa01 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/OnCompletionShutdownProcessorTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/OnCompletionShutdownProcessorTest.java
@@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class OnCompletionShutdownProcessorTest extends ContextTestSupport {
 
-    private MyProcessor processor = new MyProcessor();
+    private final MyProcessor processor = new MyProcessor();
 
     @Test
     public void testSynchronizeComplete() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/PipelineConcurrentTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/PipelineConcurrentTest.java
index 186131bf933..39302e65c3e 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/PipelineConcurrentTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/PipelineConcurrentTest.java
@@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test;
  */
 public class PipelineConcurrentTest extends ContextTestSupport {
 
-    private String uri = "seda:in?size=2000&concurrentConsumers=10";
+    private final String uri = "seda:in?size=2000&concurrentConsumers=10";
 
     @Test
     public void testConcurrentPipeline() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/ProducerTemplateDisableEventNotifierTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/ProducerTemplateDisableEventNotifierTest.java
index 90bf8d3b37f..42b3475e964 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/ProducerTemplateDisableEventNotifierTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/ProducerTemplateDisableEventNotifierTest.java
@@ -27,7 +27,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ProducerTemplateDisableEventNotifierTest extends ContextTestSupport {
 
-    private MySentEventNotifier notifier = new MySentEventNotifier();
+    private final MySentEventNotifier notifier = new MySentEventNotifier();
 
     @Override
     protected CamelContext createCamelContext() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListExchangePropertyAggregationStrategyTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListExchangePropertyAggregationStrategyTest.java
index b7ba798bbea..376adf64ee4 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListExchangePropertyAggregationStrategyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListExchangePropertyAggregationStrategyTest.java
@@ -73,7 +73,7 @@ public class RecipientListExchangePropertyAggregationStrategyTest extends Contex
 
     private static class MyAggregationStrategy implements AggregationStrategy {
 
-        private List<String> uris = new ArrayList<>();
+        private final List<String> uris = new ArrayList<>();
 
         @Override
         public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListExchangePropertyTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListExchangePropertyTest.java
index dde43b0bd3d..f07accb9797 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListExchangePropertyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/RecipientListExchangePropertyTest.java
@@ -57,7 +57,7 @@ public class RecipientListExchangePropertyTest extends ContextTestSupport {
 
     private static final class MyStuff {
 
-        private String name;
+        private final String name;
 
         private MyStuff(String name) {
             this.name = name;
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/RedeliveryPolicyDelayPatternTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/RedeliveryPolicyDelayPatternTest.java
index 286ebb0147e..0b054a74c87 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/RedeliveryPolicyDelayPatternTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/RedeliveryPolicyDelayPatternTest.java
@@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class RedeliveryPolicyDelayPatternTest {
 
-    private RedeliveryPolicy policy = new RedeliveryPolicy();
+    private final RedeliveryPolicy policy = new RedeliveryPolicy();
 
     @Test
     public void testDelayPattern() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/RemoveGlobalVariableTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/RemoveGlobalVariableTest.java
index 44ab6ae7a34..008a59d3472 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/RemoveGlobalVariableTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/RemoveGlobalVariableTest.java
@@ -30,8 +30,8 @@ import static org.junit.jupiter.api.Assertions.assertNull;
 public class RemoveGlobalVariableTest extends ContextTestSupport {
     private MockEndpoint end;
     private MockEndpoint mid;
-    private String variableName = "foo";
-    private String expectedVariableValue = "bar";
+    private final String variableName = "foo";
+    private final String expectedVariableValue = "bar";
 
     @Test
     public void testSetHeaderMidRouteThenRemove() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/RemoveHeaderTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/RemoveHeaderTest.java
index 096b751ff29..7c07dfb8c7f 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/RemoveHeaderTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/RemoveHeaderTest.java
@@ -31,8 +31,8 @@ import static org.junit.jupiter.api.Assertions.assertNull;
 public class RemoveHeaderTest extends ContextTestSupport {
     private MockEndpoint end;
     private MockEndpoint mid;
-    private String headerName = "foo";
-    private String expectedHeaderValue = "bar";
+    private final String headerName = "foo";
+    private final String expectedHeaderValue = "bar";
 
     @Test
     public void testSetHeaderMidRouteThenRemove() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/RemovePropertiesWithExclusionTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/RemovePropertiesWithExclusionTest.java
index b1706251cc2..7d90571eef8 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/RemovePropertiesWithExclusionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/RemovePropertiesWithExclusionTest.java
@@ -31,14 +31,14 @@ import static org.junit.jupiter.api.Assertions.assertNull;
 public class RemovePropertiesWithExclusionTest extends ContextTestSupport {
     private MockEndpoint end;
     private MockEndpoint mid;
-    private String propertyName = "foo";
-    private String expectedPropertyValue = "bar";
-    private String propertyName1 = "fee";
-    private String expectedPropertyValue1 = "bar1";
-    private String propertyName2 = "fiu";
-    private String expectedPropertyValue2 = "bar2";
-    private String pattern = "f*";
-    private String exclusion = "fiu";
+    private final String propertyName = "foo";
+    private final String expectedPropertyValue = "bar";
+    private final String propertyName1 = "fee";
+    private final String expectedPropertyValue1 = "bar1";
+    private final String propertyName2 = "fiu";
+    private final String expectedPropertyValue2 = "bar2";
+    private final String pattern = "f*";
+    private final String exclusion = "fiu";
 
     @Test
     public void testSetExchangePropertiesMidRouteThenRemoveWithPatternAndExclusion() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/RemovePropertiesWithoutExclusionTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/RemovePropertiesWithoutExclusionTest.java
index 4d5df1ec9a3..85f406faefe 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/RemovePropertiesWithoutExclusionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/RemovePropertiesWithoutExclusionTest.java
@@ -31,11 +31,11 @@ import static org.junit.jupiter.api.Assertions.assertNull;
 public class RemovePropertiesWithoutExclusionTest extends ContextTestSupport {
     private MockEndpoint end;
     private MockEndpoint mid;
-    private String propertyName = "foo";
-    private String expectedPropertyValue = "bar";
-    private String propertyName1 = "fee";
-    private String expectedPropertyValue1 = "bar1";
-    private String pattern = "f*";
+    private final String propertyName = "foo";
+    private final String expectedPropertyValue = "bar";
+    private final String propertyName1 = "fee";
+    private final String expectedPropertyValue1 = "bar1";
+    private final String pattern = "f*";
 
     @Test
     public void testSetExchangePropertiesMidRouteThenRemoveWithPattern() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/RemovePropertyTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/RemovePropertyTest.java
index 671f4d1f46a..6771e299227 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/RemovePropertyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/RemovePropertyTest.java
@@ -31,8 +31,8 @@ import static org.junit.jupiter.api.Assertions.assertNull;
 public class RemovePropertyTest extends ContextTestSupport {
     private MockEndpoint end;
     private MockEndpoint mid;
-    private String propertyName = "foo";
-    private String expectedPropertyValue = "bar";
+    private final String propertyName = "foo";
+    private final String expectedPropertyValue = "bar";
 
     @Test
     public void testSetExchangePropertyMidRouteThenRemove() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/RemoveVariableTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/RemoveVariableTest.java
index 10fe7d440cc..acdb24b60ca 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/RemoveVariableTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/RemoveVariableTest.java
@@ -31,8 +31,8 @@ import static org.junit.jupiter.api.Assertions.assertNull;
 public class RemoveVariableTest extends ContextTestSupport {
     private MockEndpoint end;
     private MockEndpoint mid;
-    private String variableName = "foo";
-    private String expectedVariableValue = "bar";
+    private final String variableName = "foo";
+    private final String expectedVariableValue = "bar";
 
     @Test
     public void testSetHeaderMidRouteThenRemove() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/RouteAwareProcessorTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/RouteAwareProcessorTest.java
index e218bb485a4..45b020a8e17 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/RouteAwareProcessorTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/RouteAwareProcessorTest.java
@@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test;
 
 public class RouteAwareProcessorTest extends ContextTestSupport {
 
-    private MyProcessor processor = new MyProcessor();
+    private final MyProcessor processor = new MyProcessor();
 
     @Test
     public void testRouteIdAware() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/RouteFormattedUriTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/RouteFormattedUriTest.java
index 59f754c6726..bb9207666f9 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/RouteFormattedUriTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/RouteFormattedUriTest.java
@@ -23,9 +23,9 @@ import org.junit.jupiter.api.Test;
 
 public class RouteFormattedUriTest extends ContextTestSupport {
 
-    private String name = "hello.txt";
-    private String pattern = ".*txt$";
-    private String result = "result";
+    private final String name = "hello.txt";
+    private final String pattern = ".*txt$";
+    private final String result = "result";
 
     @Test
     public void testFormattedUri() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/RoutePerformanceCountTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/RoutePerformanceCountTest.java
index 0f764b057d1..86f727a1713 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/RoutePerformanceCountTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/RoutePerformanceCountTest.java
@@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class RoutePerformanceCountTest extends ContextTestSupport {
 
-    private CountProcessor processor = new CountProcessor();
+    private final CountProcessor processor = new CountProcessor();
 
     @Test
     public void testSendMessages() throws Exception {
@@ -67,7 +67,7 @@ public class RoutePerformanceCountTest extends ContextTestSupport {
     }
 
     private static class CountProcessor implements Processor {
-        private AtomicInteger counter = new AtomicInteger();
+        private final AtomicInteger counter = new AtomicInteger();
 
         @Override
         public void process(Exchange exchange) throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/RouteServicesStartupOrderTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/RouteServicesStartupOrderTest.java
index 0573c07f27e..cbf8a782f42 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/RouteServicesStartupOrderTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/RouteServicesStartupOrderTest.java
@@ -34,10 +34,10 @@ public class RouteServicesStartupOrderTest extends ContextTestSupport {
 
     private static String startOrder = "";
 
-    private MyServiceBean service1 = new MyServiceBean("1");
-    private MyServiceBean service2 = new MyServiceBean("2");
-    private MyServiceBean service3 = new MyServiceBean("3");
-    private MyServiceBean service4 = new MyServiceBean("4");
+    private final MyServiceBean service1 = new MyServiceBean("1");
+    private final MyServiceBean service2 = new MyServiceBean("2");
+    private final MyServiceBean service3 = new MyServiceBean("3");
+    private final MyServiceBean service4 = new MyServiceBean("4");
 
     @Test
     public void testRouteServiceStartupOrder() throws Exception {
@@ -80,7 +80,7 @@ public class RouteServicesStartupOrderTest extends ContextTestSupport {
 
     public static class MyServiceBean extends ServiceSupport implements Processor {
 
-        private String name;
+        private final String name;
         private boolean started;
 
         public MyServiceBean(String name) {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/RoutingSlipInOutAndInOnlyTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/RoutingSlipInOutAndInOnlyTest.java
index 44b7f06f91c..372d157197f 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/RoutingSlipInOutAndInOnlyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/RoutingSlipInOutAndInOnlyTest.java
@@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class RoutingSlipInOutAndInOnlyTest extends ContextTestSupport {
 
-    private String slip = "direct:a,direct:b,direct:c";
+    private final String slip = "direct:a,direct:b,direct:c";
 
     @Test
     public void testRoutingSlipInOut() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/SagaTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/SagaTest.java
index 0f9fb8aaf90..bc2d8e8c928 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/SagaTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/SagaTest.java
@@ -131,7 +131,7 @@ public class SagaTest extends ContextTestSupport {
 
     public static class OrderManagerService {
 
-        private Set<String> orders = new HashSet<>();
+        private final Set<String> orders = new HashSet<>();
 
         public synchronized void newOrder(String id) {
             orders.add(id);
@@ -148,9 +148,9 @@ public class SagaTest extends ContextTestSupport {
 
     public static class CreditService {
 
-        private int totalCredit;
+        private final int totalCredit;
 
-        private Map<String, Integer> reservations = new HashMap<>();
+        private final Map<String, Integer> reservations = new HashMap<>();
 
         public CreditService(int totalCredit) {
             this.totalCredit = totalCredit;
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/SetGlobalVariableTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/SetGlobalVariableTest.java
index 7870bd292f1..ef513e22b03 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/SetGlobalVariableTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/SetGlobalVariableTest.java
@@ -30,8 +30,8 @@ import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class SetGlobalVariableTest extends ContextTestSupport {
     private MockEndpoint end;
-    private String variableName = "foo";
-    private String expectedVariableValue = "bar";
+    private final String variableName = "foo";
+    private final String expectedVariableValue = "bar";
 
     @Test
     public void testSetExchangeVariableMidRoute() 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 35ad17dad63..5cf20122dfa 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
@@ -30,8 +30,8 @@ public class SetHeaderUsingDslExpressionsTest extends ContextTestSupport {
 
     public static final class MyValueClass {
 
-        private String value1;
-        private String value2;
+        private final String value1;
+        private final String value2;
 
         public MyValueClass(String v1, String v2) {
             value1 = v1;
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 82bf3d8b3c9..06dca409ec0 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
@@ -44,7 +44,7 @@ public class SetHeadersProcessorTest extends ContextTestSupport {
         }
     }
 
-    private Map<String, Expression> headerMap = new java.util.LinkedHashMap<>();
+    private final Map<String, Expression> headerMap = new java.util.LinkedHashMap<>();
     protected String body = "<person name='Jane' age='10'/>";
     protected MockEndpoint expected;
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/SetPropertyTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/SetPropertyTest.java
index 235602d884d..ff830daa414 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/SetPropertyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/SetPropertyTest.java
@@ -29,8 +29,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class SetPropertyTest extends ContextTestSupport {
     private MockEndpoint end;
-    private String propertyName = "foo";
-    private String expectedPropertyValue = "bar";
+    private final String propertyName = "foo";
+    private final String expectedPropertyValue = "bar";
 
     @Test
     public void testSetExchangePropertyMidRoute() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/SetRouteVariableTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/SetRouteVariableTest.java
index 4e845f7dede..525e4063d29 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/SetRouteVariableTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/SetRouteVariableTest.java
@@ -30,9 +30,9 @@ import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class SetRouteVariableTest extends ContextTestSupport {
     private MockEndpoint end;
-    private String variableName = "foo";
-    private String expectedVariableValue = "bar";
-    private String expectedVariableValue2 = "bar2";
+    private final String variableName = "foo";
+    private final String expectedVariableValue = "bar";
+    private final String expectedVariableValue2 = "bar2";
 
     @Test
     public void testSetExchangeVariableMidRoute() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/SetRouteVariableTransferTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/SetRouteVariableTransferTest.java
index 4d6001ce91b..08923c05179 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/SetRouteVariableTransferTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/SetRouteVariableTransferTest.java
@@ -24,8 +24,8 @@ import org.junit.jupiter.api.Test;
 
 public class SetRouteVariableTransferTest extends ContextTestSupport {
     private MockEndpoint end;
-    private String variableName = "foo";
-    private String expectedVariableValue = "bar";
+    private final String variableName = "foo";
+    private final String expectedVariableValue = "bar";
 
     @Test
     public void testSetExchangeVariableMidRoute() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/SetVariableTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/SetVariableTest.java
index d3cacb3645e..3e61c1cca43 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/SetVariableTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/SetVariableTest.java
@@ -29,8 +29,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class SetVariableTest extends ContextTestSupport {
     private MockEndpoint end;
-    private String variableName = "foo";
-    private String expectedVariableValue = "bar";
+    private final String variableName = "foo";
+    private final String expectedVariableValue = "bar";
 
     @Test
     public void testSetExchangeVariableMidRoute() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteAllTasksTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteAllTasksTest.java
index 9263d402c76..ecee4c99d2f 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteAllTasksTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteAllTasksTest.java
@@ -35,8 +35,8 @@ public class ShutdownCompleteAllTasksTest extends ContextTestSupport {
 
     public static final String FILE_URI_QUERY = "?initialDelay=0&delay=10&synchronous=true";
 
-    private AtomicInteger counter = new AtomicInteger();
-    private CountDownLatch latch = new CountDownLatch(2);
+    private final AtomicInteger counter = new AtomicInteger();
+    private final CountDownLatch latch = new CountDownLatch(2);
 
     @Override
     @BeforeEach
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/SimulatorTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/SimulatorTest.java
index 50bae91103e..9d95084a711 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/SimulatorTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/SimulatorTest.java
@@ -74,7 +74,7 @@ public class SimulatorTest extends ContextTestSupport {
     }
 
     public static class MyBean {
-        private String value;
+        private final String value;
 
         public MyBean(String value) {
             this.value = value;
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/SplitAggregateInOutTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/SplitAggregateInOutTest.java
index 4d3eee0921c..2bddf74efe0 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/SplitAggregateInOutTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/SplitAggregateInOutTest.java
@@ -32,7 +32,7 @@ public class SplitAggregateInOutTest extends ContextTestSupport {
 
     private static final Logger LOG = LoggerFactory.getLogger(SplitAggregateInOutTest.class);
 
-    private String expectedBody = "Response[(id=1,item=A);(id=2,item=B);(id=3,item=C)]";
+    private final String expectedBody = "Response[(id=1,item=A);(id=2,item=B);(id=3,item=C)]";
 
     @Test
     public void testSplitAndAggregateInOut() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/SplitIteratorNullTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/SplitIteratorNullTest.java
index 46eb4dd5886..4327592840e 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/SplitIteratorNullTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/SplitIteratorNullTest.java
@@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class SplitIteratorNullTest extends ContextTestSupport {
 
-    private MyIterator myIterator = new MyIterator();
+    private final MyIterator myIterator = new MyIterator();
 
     @Test
     public void testSplitIteratorNull() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/SplitTwoSubUnitOfWorkTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/SplitTwoSubUnitOfWorkTest.java
index e2674c0bc31..f5377d8a856 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/SplitTwoSubUnitOfWorkTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/SplitTwoSubUnitOfWorkTest.java
@@ -99,8 +99,8 @@ public class SplitTwoSubUnitOfWorkTest extends ContextTestSupport {
     }
 
     public static final class MyBody {
-        private String foo;
-        private String bar;
+        private final String foo;
+        private final String bar;
 
         private MyBody(String foo, String bar) {
             this.foo = foo;
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/SplitterUseOriginalNotPropagateExceptionTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/SplitterUseOriginalNotPropagateExceptionTest.java
index e7a8a919775..f0820346d81 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/SplitterUseOriginalNotPropagateExceptionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/SplitterUseOriginalNotPropagateExceptionTest.java
@@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.fail;
 
 public class SplitterUseOriginalNotPropagateExceptionTest extends ContextTestSupport {
 
-    private MyEventNotifier notifier = new MyEventNotifier();
+    private final MyEventNotifier notifier = new MyEventNotifier();
 
     @Override
     protected CamelContext createCamelContext() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/StepEventNotifierTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/StepEventNotifierTest.java
index 0fb9a6111c7..fbb915e62c7 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/StepEventNotifierTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/StepEventNotifierTest.java
@@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class StepEventNotifierTest extends ContextTestSupport {
 
-    private MyEventNotifier notifier = new MyEventNotifier();
+    private final MyEventNotifier notifier = new MyEventNotifier();
 
     @Test
     public void testStepEventNotifier() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/StreamCacheInternalErrorTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/StreamCacheInternalErrorTest.java
index 71c6234843a..cbd668e2297 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/StreamCacheInternalErrorTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/StreamCacheInternalErrorTest.java
@@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test;
 
 public class StreamCacheInternalErrorTest extends ContextTestSupport {
 
-    private BodyToStreamCacheConverter converter = new BodyToStreamCacheConverter();
+    private final BodyToStreamCacheConverter converter = new BodyToStreamCacheConverter();
 
     @Test
     public void testOk() throws Exception {
@@ -131,7 +131,7 @@ public class StreamCacheInternalErrorTest extends ContextTestSupport {
     }
 
     private static class MyBody {
-        private String body;
+        private final String body;
 
         public MyBody(String body) {
             this.body = body;
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/StreamCachingCustomShouldSpoolRuleTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/StreamCachingCustomShouldSpoolRuleTest.java
index f1930e0af3a..c7c33a96efc 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/StreamCachingCustomShouldSpoolRuleTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/StreamCachingCustomShouldSpoolRuleTest.java
@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class StreamCachingCustomShouldSpoolRuleTest extends ContextTestSupport {
 
-    private MyCustomSpoolRule spoolRule = new MyCustomSpoolRule();
+    private final MyCustomSpoolRule spoolRule = new MyCustomSpoolRule();
 
     @Test
     public void testByteArrayInputStream() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/StreamCachingSpoolDirectoryQuarkusTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/StreamCachingSpoolDirectoryQuarkusTest.java
index d9b2e472536..fc0c9c1418b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/StreamCachingSpoolDirectoryQuarkusTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/StreamCachingSpoolDirectoryQuarkusTest.java
@@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class StreamCachingSpoolDirectoryQuarkusTest extends ContextTestSupport {
 
-    private MyCustomSpoolRule spoolRule = new MyCustomSpoolRule();
+    private final MyCustomSpoolRule spoolRule = new MyCustomSpoolRule();
 
     private static class MyCamelContext extends DefaultCamelContext {
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkProducerTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkProducerTest.java
index fef8c7b23af..029bb4e219c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkProducerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkProducerTest.java
@@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class UnitOfWorkProducerTest extends ContextTestSupport {
 
-    private static List<CamelEvent> events = new ArrayList<>();
+    private static final List<CamelEvent> events = new ArrayList<>();
 
     @Override
     protected CamelContext createCamelContext() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/WireTapBeanAsProcessorTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/WireTapBeanAsProcessorTest.java
index dbac642b0b1..8d8e1ccdb6c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/WireTapBeanAsProcessorTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/WireTapBeanAsProcessorTest.java
@@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
  * Wire tap unit test
  */
 public class WireTapBeanAsProcessorTest extends ContextTestSupport {
-    private MyBean myBean = new MyBean();
+    private final MyBean myBean = new MyBean();
     private MockEndpoint result;
 
     @Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/WireTapMDCTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/WireTapMDCTest.java
index a1a2dff54ad..1b94f9d1213 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/WireTapMDCTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/WireTapMDCTest.java
@@ -89,9 +89,9 @@ public class WireTapMDCTest extends ContextTestSupport {
         private Long threadId;
         private String foo;
 
-        private String expected1;
-        private String expected2;
-        private String expected3;
+        private final String expected1;
+        private final String expected2;
+        private final String expected3;
 
         public MdcCheckerProcessor(String expected1, String expected2, String expected3) {
             this.expected1 = expected1;
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateBiFunctionTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateBiFunctionTest.java
index b92640107fd..b17729ad1eb 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateBiFunctionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateBiFunctionTest.java
@@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test;
 
 public class AggregateBiFunctionTest extends ContextTestSupport {
 
-    private BiFunction<Exchange, Exchange, Object> myAgg
+    private final BiFunction<Exchange, Exchange, Object> myAgg
             = (Exchange e1, Exchange e2) -> e1.getMessage().getBody(String.class) + "+" + e2.getMessage().getBody(String.class);
 
     @Test
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateCompletionOnlyOneTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateCompletionOnlyOneTest.java
index 740e772d73f..b124056ee2a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateCompletionOnlyOneTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateCompletionOnlyOneTest.java
@@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class AggregateCompletionOnlyOneTest extends ContextTestSupport {
 
-    private MyRepo repo = new MyRepo();
+    private final MyRepo repo = new MyRepo();
 
     @Test
     public void testOnlyOne() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateNewExchangeAndConfirmTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateNewExchangeAndConfirmTest.java
index 2e79f5fb2ba..bd7a60228d5 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateNewExchangeAndConfirmTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateNewExchangeAndConfirmTest.java
@@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
  */
 public class AggregateNewExchangeAndConfirmTest extends ContextTestSupport {
 
-    private MyRepo repo = new MyRepo();
+    private final MyRepo repo = new MyRepo();
 
     @Test
     public void testAggregateNewExchangeAndConfirm() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateSimpleExpressionIssueManualTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateSimpleExpressionIssueManualTest.java
index 2530426768f..f783c4baac0 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateSimpleExpressionIssueManualTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateSimpleExpressionIssueManualTest.java
@@ -39,8 +39,8 @@ public class AggregateSimpleExpressionIssueManualTest extends ContextTestSupport
     private static final Logger LOG = LoggerFactory.getLogger(AggregateSimpleExpressionIssueManualTest.class);
     private static final String DATA = "100,200,1,123456,2010-03-01T12:13:14,100,USD,Best Buy,5045,Santa Monica,CA,Type\n";
 
-    private MyBean myBean = new MyBean();
-    private AggStrategy aggStrategy = new AggStrategy();
+    private final MyBean myBean = new MyBean();
+    private final AggStrategy aggStrategy = new AggStrategy();
 
     @Test
     public void testAggregateSimpleExpression() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterAllowNullOldExchangeTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterAllowNullOldExchangeTest.java
index 0ffdd1c6562..b145f8941e8 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterAllowNullOldExchangeTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterAllowNullOldExchangeTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
 
 public class AggregationStrategyBeanAdapterAllowNullOldExchangeTest extends ContextTestSupport {
 
-    private MyBodyAppender appender = new MyBodyAppender();
+    private final MyBodyAppender appender = new MyBodyAppender();
     private AggregationStrategyBeanAdapter myStrategy;
 
     @Test
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterAllowNullTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterAllowNullTest.java
index 384336b83aa..6a712f4e0e2 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterAllowNullTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterAllowNullTest.java
@@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class AggregationStrategyBeanAdapterAllowNullTest extends ContextTestSupport {
 
-    private MyUserAppender appender = new MyUserAppender();
+    private final MyUserAppender appender = new MyUserAppender();
 
     @Test
     public void testAggregate() throws Exception {
@@ -75,7 +75,7 @@ public class AggregationStrategyBeanAdapterAllowNullTest extends ContextTestSupp
      */
     @XmlRootElement(name = "user")
     public static final class User {
-        private String name;
+        private final String name;
 
         public User(String name) {
             this.name = name;
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterOneMethodTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterOneMethodTest.java
index 8eae5b3f86d..6ee6f3dc614 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterOneMethodTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterOneMethodTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
 
 public class AggregationStrategyBeanAdapterOneMethodTest extends ContextTestSupport {
 
-    private MyBodyAppender appender = new MyBodyAppender();
+    private final MyBodyAppender appender = new MyBodyAppender();
 
     @Test
     public void testAggregate() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterPollEnrichAllowNullNewExchangeTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterPollEnrichAllowNullNewExchangeTest.java
index 3dd9b26b3d7..8ac59adb9fc 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterPollEnrichAllowNullNewExchangeTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterPollEnrichAllowNullNewExchangeTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
 
 public class AggregationStrategyBeanAdapterPollEnrichAllowNullNewExchangeTest extends ContextTestSupport {
 
-    private MyBodyAppender appender = new MyBodyAppender();
+    private final MyBodyAppender appender = new MyBodyAppender();
     private AggregationStrategyBeanAdapter myStrategy;
 
     @Test
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterPollEnrichTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterPollEnrichTest.java
index 565125fc45e..5584ea631bb 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterPollEnrichTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterPollEnrichTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
 
 public class AggregationStrategyBeanAdapterPollEnrichTest extends ContextTestSupport {
 
-    private MyBodyAppender appender = new MyBodyAppender();
+    private final MyBodyAppender appender = new MyBodyAppender();
 
     @Test
     public void testNoData() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterTest.java
index 7877433d17d..10a089423cf 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
 
 public class AggregationStrategyBeanAdapterTest extends ContextTestSupport {
 
-    private MyBodyAppender appender = new MyBodyAppender();
+    private final MyBodyAppender appender = new MyBodyAppender();
 
     @Test
     public void testAggregate() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterWithHeadersAndPropertiesTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterWithHeadersAndPropertiesTest.java
index c0bd2536060..eb98359ee23 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterWithHeadersAndPropertiesTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterWithHeadersAndPropertiesTest.java
@@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test;
 
 public class AggregationStrategyBeanAdapterWithHeadersAndPropertiesTest extends ContextTestSupport {
 
-    private MyBodyAppender appender = new MyBodyAppender();
+    private final MyBodyAppender appender = new MyBodyAppender();
 
     @Test
     public void testAggregate() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterWithHeadersTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterWithHeadersTest.java
index f3dad0896a3..5444a0a0586 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterWithHeadersTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyBeanAdapterWithHeadersTest.java
@@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test;
 
 public class AggregationStrategyBeanAdapterWithHeadersTest extends ContextTestSupport {
 
-    private MyBodyAppender appender = new MyBodyAppender();
+    private final MyBodyAppender appender = new MyBodyAppender();
 
     @Test
     public void testAggregate() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyLifecycleTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyLifecycleTest.java
index 0f50a68d86f..798a598d13a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyLifecycleTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyLifecycleTest.java
@@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class AggregationStrategyLifecycleTest extends ContextTestSupport {
 
-    private MyCompletionStrategy strategy = new MyCompletionStrategy();
+    private final MyCompletionStrategy strategy = new MyCompletionStrategy();
 
     @Test
     public void testAggregateLifecycle() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AlbertoAggregatorTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AlbertoAggregatorTest.java
index 470817b0ae7..1903f8b9dde 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AlbertoAggregatorTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AlbertoAggregatorTest.java
@@ -76,7 +76,7 @@ public class AlbertoAggregatorTest extends ContextTestSupport {
     protected RouteBuilder createRouteBuilder() throws Exception {
 
         return new RouteBuilder() {
-            AggregationStrategy surnameAggregator = new AggregationStrategy() {
+            final AggregationStrategy surnameAggregator = new AggregationStrategy() {
                 @SuppressWarnings("unchecked")
                 public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
                     debugIn("Surname Aggregator", oldExchange, newExchange);
@@ -100,7 +100,7 @@ public class AlbertoAggregatorTest extends ContextTestSupport {
             };
 
             @SuppressWarnings("unchecked")
-            AggregationStrategy brothersAggregator = new AggregationStrategy() {
+            final AggregationStrategy brothersAggregator = new AggregationStrategy() {
                 public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
                     debugIn("Brothers Aggregator", oldExchange, newExchange);
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/BeanBeforeAggregateIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/BeanBeforeAggregateIssueTest.java
index 739672dace0..e11102f41b5 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/BeanBeforeAggregateIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/BeanBeforeAggregateIssueTest.java
@@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class BeanBeforeAggregateIssueTest extends ContextTestSupport {
 
-    private MyAggRepo myRepo = new MyAggRepo();
+    private final MyAggRepo myRepo = new MyAggRepo();
 
     @Test
     public void testBeanBeforeAggregation() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomAggregationStrategyServiceTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomAggregationStrategyServiceTest.java
index c333dfaad2f..a9c83871072 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomAggregationStrategyServiceTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomAggregationStrategyServiceTest.java
@@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class CustomAggregationStrategyServiceTest extends ContextTestSupport {
 
-    private MyCustomStrategy strategy = new MyCustomStrategy();
+    private final MyCustomStrategy strategy = new MyCustomStrategy();
 
     @Test
     public void testCustomAggregationStrategy() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/DistributedCompletionIntervalTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/DistributedCompletionIntervalTest.java
index f8f1c21b33e..981a0453b86 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/DistributedCompletionIntervalTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/DistributedCompletionIntervalTest.java
@@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test;
  */
 public class DistributedCompletionIntervalTest extends AbstractDistributedTest {
 
-    private MemoryAggregationRepository sharedAggregationRepository = new MemoryAggregationRepository(true);
+    private final MemoryAggregationRepository sharedAggregationRepository = new MemoryAggregationRepository(true);
 
     @Test
     public void testCamelContext1Wins() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/DistributedConcurrentPerCorrelationKeyTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/DistributedConcurrentPerCorrelationKeyTest.java
index e0ccfbc6969..c0ec413d559 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/DistributedConcurrentPerCorrelationKeyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/DistributedConcurrentPerCorrelationKeyTest.java
@@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class DistributedConcurrentPerCorrelationKeyTest extends AbstractDistributedTest {
 
-    private MemoryAggregationRepository sharedAggregationRepository = new MemoryAggregationRepository(true);
+    private final MemoryAggregationRepository sharedAggregationRepository = new MemoryAggregationRepository(true);
 
     @Test
     public void testAggregateConcurrentPerCorrelationKey() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/DistributedOptimisticLockFailingTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/DistributedOptimisticLockFailingTest.java
index b3e5814fbd6..b14e0f33d0e 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/DistributedOptimisticLockFailingTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/DistributedOptimisticLockFailingTest.java
@@ -49,7 +49,7 @@ public class DistributedOptimisticLockFailingTest extends AbstractDistributedTes
     }
 
     private static final class EverySecondOneFailsRepository extends MemoryAggregationRepository {
-        private AtomicInteger counter = new AtomicInteger();
+        private final AtomicInteger counter = new AtomicInteger();
 
         private EverySecondOneFailsRepository() {
             super(true);
@@ -66,7 +66,7 @@ public class DistributedOptimisticLockFailingTest extends AbstractDistributedTes
         }
     }
 
-    private EverySecondOneFailsRepository sharedRepository = new EverySecondOneFailsRepository();
+    private final EverySecondOneFailsRepository sharedRepository = new EverySecondOneFailsRepository();
 
     @Test
     public void testAlwaysFails() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/DistributedTimeoutTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/DistributedTimeoutTest.java
index 7c8c1f165fd..fa5eeca94f4 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/DistributedTimeoutTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/DistributedTimeoutTest.java
@@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class DistributedTimeoutTest extends AbstractDistributedTest {
 
-    private MemoryAggregationRepository sharedAggregationRepository = new MemoryAggregationRepository(true);
+    private final MemoryAggregationRepository sharedAggregationRepository = new MemoryAggregationRepository(true);
 
     private final AtomicInteger invoked = new AtomicInteger();
     private volatile Exchange receivedExchange;
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/SplitRouteNumberOfProcessorTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/SplitRouteNumberOfProcessorTest.java
index 96b85dd3e0b..7c544e4fe93 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/SplitRouteNumberOfProcessorTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/SplitRouteNumberOfProcessorTest.java
@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class SplitRouteNumberOfProcessorTest extends ContextTestSupport {
 
-    private static AtomicBoolean failed = new AtomicBoolean();
+    private static final AtomicBoolean failed = new AtomicBoolean();
 
     @Override
     public boolean isUseRouteBuilder() {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointCustomAsyncInterceptorTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointCustomAsyncInterceptorTest.java
index 3560ab625b3..d25ef7df79a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointCustomAsyncInterceptorTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointCustomAsyncInterceptorTest.java
@@ -36,7 +36,7 @@ public class AsyncEndpointCustomAsyncInterceptorTest extends ContextTestSupport
 
     private static String beforeThreadName;
     private static String afterThreadName;
-    private MyInterceptor interceptor = new MyInterceptor();
+    private final MyInterceptor interceptor = new MyInterceptor();
 
     @Test
     public void testAsyncEndpoint() throws Exception {
@@ -77,7 +77,7 @@ public class AsyncEndpointCustomAsyncInterceptorTest extends ContextTestSupport
 
     // START SNIPPET: e1
     private static class MyInterceptor implements InterceptStrategy {
-        private AtomicInteger counter = new AtomicInteger();
+        private final AtomicInteger counter = new AtomicInteger();
 
         @Override
         public Processor wrapProcessorInInterceptors(
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointCustomInterceptorTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointCustomInterceptorTest.java
index c754ef98857..9885e50e1c7 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointCustomInterceptorTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointCustomInterceptorTest.java
@@ -41,7 +41,7 @@ public class AsyncEndpointCustomInterceptorTest extends ContextTestSupport {
 
     private static String beforeThreadName;
     private static String afterThreadName;
-    private MyInterceptor interceptor = new MyInterceptor();
+    private final MyInterceptor interceptor = new MyInterceptor();
 
     @Test
     public void testAsyncEndpoint() throws Exception {
@@ -82,7 +82,7 @@ public class AsyncEndpointCustomInterceptorTest extends ContextTestSupport {
 
     // START SNIPPET: e1
     private static class MyInterceptor implements InterceptStrategy {
-        private AtomicInteger counter = new AtomicInteger();
+        private final AtomicInteger counter = new AtomicInteger();
 
         @Override
         public Processor wrapProcessorInInterceptors(
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointCustomRoutePolicyTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointCustomRoutePolicyTest.java
index 0256ff0acaf..17f65103fe6 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointCustomRoutePolicyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointCustomRoutePolicyTest.java
@@ -41,7 +41,7 @@ public class AsyncEndpointCustomRoutePolicyTest extends ContextTestSupport {
     private static class MyCustomRoutePolicy extends RoutePolicySupport {
 
         private volatile int invoked;
-        private volatile AtomicBoolean stopped = new AtomicBoolean();
+        private final AtomicBoolean stopped = new AtomicBoolean();
 
         @Override
         public void onExchangeDone(Route route, Exchange exchange) {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointDelayUoWTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointDelayUoWTest.java
index d0a612c863e..1bd759e2269 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointDelayUoWTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointDelayUoWTest.java
@@ -33,7 +33,7 @@ public class AsyncEndpointDelayUoWTest extends ContextTestSupport {
 
     private static String beforeThreadName;
     private static String afterThreadName;
-    private MySynchronization sync = new MySynchronization();
+    private final MySynchronization sync = new MySynchronization();
 
     @Test
     public void testAsyncEndpoint() throws Exception {
@@ -75,8 +75,8 @@ public class AsyncEndpointDelayUoWTest extends ContextTestSupport {
 
     private static class MySynchronization extends SynchronizationAdapter {
 
-        private AtomicInteger onComplete = new AtomicInteger();
-        private AtomicInteger onFailure = new AtomicInteger();
+        private final AtomicInteger onComplete = new AtomicInteger();
+        private final AtomicInteger onFailure = new AtomicInteger();
 
         @Override
         public void onComplete(Exchange exchange) {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointDynamicRouterTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointDynamicRouterTest.java
index 62e59c12bb8..5e43265b948 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointDynamicRouterTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointDynamicRouterTest.java
@@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 public class AsyncEndpointDynamicRouterTest extends ContextTestSupport {
 
     private static int invoked;
-    private static List<String> bodies = new ArrayList<>();
+    private static final List<String> bodies = new ArrayList<>();
 
     @Test
     public void testAsyncEndpoint() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointUoWFailedTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointUoWFailedTest.java
index 1bfbe7e6e7d..f4a3f333e4b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointUoWFailedTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointUoWFailedTest.java
@@ -35,7 +35,7 @@ public class AsyncEndpointUoWFailedTest extends ContextTestSupport {
 
     private static String beforeThreadName;
     private static String afterThreadName;
-    private MySynchronization sync = new MySynchronization();
+    private final MySynchronization sync = new MySynchronization();
 
     @Test
     public void testAsyncEndpoint() throws Exception {
@@ -84,8 +84,8 @@ public class AsyncEndpointUoWFailedTest extends ContextTestSupport {
 
     private static class MySynchronization extends SynchronizationAdapter {
 
-        private AtomicInteger onComplete = new AtomicInteger();
-        private AtomicInteger onFailure = new AtomicInteger();
+        private final AtomicInteger onComplete = new AtomicInteger();
+        private final AtomicInteger onFailure = new AtomicInteger();
 
         @Override
         public void onComplete(Exchange exchange) {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointUoWTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointUoWTest.java
index a7ed9463839..ea971022138 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointUoWTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointUoWTest.java
@@ -33,7 +33,7 @@ public class AsyncEndpointUoWTest extends ContextTestSupport {
 
     private static String beforeThreadName;
     private static String afterThreadName;
-    private MySynchronization sync = new MySynchronization();
+    private final MySynchronization sync = new MySynchronization();
 
     @Test
     public void testAsyncEndpoint() throws Exception {
@@ -77,8 +77,8 @@ public class AsyncEndpointUoWTest extends ContextTestSupport {
 
     private static class MySynchronization extends SynchronizationAdapter {
 
-        private AtomicInteger onComplete = new AtomicInteger();
-        private AtomicInteger onFailure = new AtomicInteger();
+        private final AtomicInteger onComplete = new AtomicInteger();
+        private final AtomicInteger onFailure = new AtomicInteger();
 
         @Override
         public void onComplete(Exchange exchange) {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncProcessorAwaitManagerInterruptWithRedeliveryTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncProcessorAwaitManagerInterruptWithRedeliveryTest.java
index 1926eccf07d..8b959ee9a13 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncProcessorAwaitManagerInterruptWithRedeliveryTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncProcessorAwaitManagerInterruptWithRedeliveryTest.java
@@ -129,7 +129,7 @@ public class AsyncProcessorAwaitManagerInterruptWithRedeliveryTest extends Conte
     }
 
     public static class MyBean {
-        private CountDownLatch latch;
+        private final CountDownLatch latch;
 
         public MyBean(CountDownLatch latch) {
             this.latch = latch;
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherBiFunctionTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherBiFunctionTest.java
index 8a63e4ef116..1df443a6c32 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherBiFunctionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherBiFunctionTest.java
@@ -31,9 +31,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class EnricherBiFunctionTest extends ContextTestSupport {
 
-    private MockEndpoint cool = new MockEndpoint("mock:cool", new MockComponent(context));
+    private final MockEndpoint cool = new MockEndpoint("mock:cool", new MockComponent(context));
 
-    private BiFunction<Exchange, Exchange, Object> myAgg
+    private final BiFunction<Exchange, Exchange, Object> myAgg
             = (Exchange e1, Exchange e2) -> e1.getMessage().getBody(String.class) + "+" + e2.getMessage().getBody(String.class);
 
     @Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherRefBeanClassTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherRefBeanClassTest.java
index 8c5bc79d7e7..29821e9a309 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherRefBeanClassTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherRefBeanClassTest.java
@@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class EnricherRefBeanClassTest extends ContextTestSupport {
 
-    private MockEndpoint cool = new MockEndpoint("mock:cool", new MockComponent(context));
+    private final MockEndpoint cool = new MockEndpoint("mock:cool", new MockComponent(context));
 
     @Override
     protected Registry createCamelRegistry() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherRefBeanTypeTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherRefBeanTypeTest.java
index b9f88a74e52..612e369660b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherRefBeanTypeTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherRefBeanTypeTest.java
@@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class EnricherRefBeanTypeTest extends ContextTestSupport {
 
-    private MockEndpoint cool = new MockEndpoint("mock:cool", new MockComponent(context));
+    private final MockEndpoint cool = new MockEndpoint("mock:cool", new MockComponent(context));
 
     @Override
     protected Registry createCamelRegistry() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherRefTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherRefTest.java
index b81efed367d..95d53554700 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherRefTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherRefTest.java
@@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class EnricherRefTest extends ContextTestSupport {
 
-    private MockEndpoint cool = new MockEndpoint("mock:cool", new MockComponent(context));
+    private final MockEndpoint cool = new MockEndpoint("mock:cool", new MockComponent(context));
 
     @Override
     protected Registry createCamelRegistry() 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 5841310178a..adbd037d840 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
@@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class EnricherSendEventTest extends ContextTestSupport {
-    private MyEventNotifier en = new MyEventNotifier();
+    private final MyEventNotifier en = new MyEventNotifier();
 
     @Test
     public void testAsyncEnricher() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherTest.java
index e248300115f..08a09c54c93 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherTest.java
@@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.*;
 
 public class EnricherTest extends ContextTestSupport {
 
-    private static SampleAggregator aggregationStrategy = new SampleAggregator();
+    private static final SampleAggregator aggregationStrategy = new SampleAggregator();
 
     protected MockEndpoint mock;
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichBridgeErrorHandlerTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichBridgeErrorHandlerTest.java
index b9625e10e4d..b0d5aa28452 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichBridgeErrorHandlerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnrichBridgeErrorHandlerTest.java
@@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class PollEnrichBridgeErrorHandlerTest extends ContextTestSupport {
 
-    private MyPollingStrategy myPoll = new MyPollingStrategy();
+    private final MyPollingStrategy myPoll = new MyPollingStrategy();
 
     @Override
     protected Registry createCamelRegistry() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherRefTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherRefTest.java
index e14d0c42122..3b0b1daa893 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherRefTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherRefTest.java
@@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class PollEnricherRefTest extends ContextTestSupport {
 
-    private SedaEndpoint cool = new SedaEndpoint();
+    private final SedaEndpoint cool = new SedaEndpoint();
 
     @Override
     protected Registry createCamelRegistry() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherTest.java
index d59010c78fe..d290c50300c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherTest.java
@@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.*;
 
 public class PollEnricherTest extends ContextTestSupport {
 
-    private static SampleAggregator aggregationStrategy = new SampleAggregator();
+    private static final SampleAggregator aggregationStrategy = new SampleAggregator();
 
     protected MockEndpoint mock;
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/CustomInterceptorRouteWithChildOutputTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/CustomInterceptorRouteWithChildOutputTest.java
index 7a0c425d2c0..a4d56521c36 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/CustomInterceptorRouteWithChildOutputTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/CustomInterceptorRouteWithChildOutputTest.java
@@ -38,7 +38,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
  */
 public class CustomInterceptorRouteWithChildOutputTest extends ContextTestSupport {
 
-    private MyInterceptor myInterceptor = new MyInterceptor();
+    private final MyInterceptor myInterceptor = new MyInterceptor();
 
     @Test
     public void testCustomInterceptor() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugExceptionBreakpointTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugExceptionBreakpointTest.java
index fd7c3cdbd58..00da286aa7f 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugExceptionBreakpointTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugExceptionBreakpointTest.java
@@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.fail;
 
 public class DebugExceptionBreakpointTest extends ContextTestSupport {
 
-    private List<String> logs = new ArrayList<>();
+    private final List<String> logs = new ArrayList<>();
     private Condition exceptionCondition;
     private Breakpoint breakpoint;
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugExceptionEventBreakpointTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugExceptionEventBreakpointTest.java
index 681eb8d901a..67bb40f9e92 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugExceptionEventBreakpointTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugExceptionEventBreakpointTest.java
@@ -37,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.fail;
 
 public class DebugExceptionEventBreakpointTest extends ContextTestSupport {
 
-    private List<String> logs = new ArrayList<>();
+    private final List<String> logs = new ArrayList<>();
     private Condition exceptionCondition;
     private Breakpoint breakpoint;
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugSingleStepConditionTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugSingleStepConditionTest.java
index fa20c2fddfe..568c73a6821 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugSingleStepConditionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugSingleStepConditionTest.java
@@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class DebugSingleStepConditionTest extends ContextTestSupport {
 
-    private List<String> logs = new ArrayList<>();
+    private final List<String> logs = new ArrayList<>();
     private Breakpoint breakpoint;
     private Condition beerCondition;
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugSingleStepTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugSingleStepTest.java
index f7fda326c36..bd7e699ec21 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugSingleStepTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugSingleStepTest.java
@@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class DebugSingleStepTest extends ContextTestSupport {
 
-    private List<String> logs = new ArrayList<>();
+    private final List<String> logs = new ArrayList<>();
     private Breakpoint breakpoint;
 
     @Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugTest.java
index 1eaaa36393a..50bd512ee7a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugTest.java
@@ -38,7 +38,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class DebugTest extends ContextTestSupport {
 
-    private List<String> logs = new ArrayList<>();
+    private final List<String> logs = new ArrayList<>();
     private Condition camelCondition;
     private Condition mockCondition;
     private Condition doneCondition;
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerEngineSync.java b/core/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerEngineSync.java
index 5e7125207ed..f71f5482e05 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerEngineSync.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerEngineSync.java
@@ -24,7 +24,7 @@ package org.apache.camel.processor.resequencer;
  */
 public class ResequencerEngineSync<E> {
 
-    private ResequencerEngine<E> resequencer;
+    private final ResequencerEngine<E> resequencer;
 
     public ResequencerEngineSync(ResequencerEngine<E> resequencer) {
         this.resequencer = resequencer;
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerRunner.java b/core/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerRunner.java
index ce95a070b98..d0c04fae6fa 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerRunner.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerRunner.java
@@ -22,9 +22,9 @@ import org.slf4j.LoggerFactory;
 public class ResequencerRunner<E> extends Thread {
     private static final Logger LOG = LoggerFactory.getLogger(ResequencerRunner.class);
 
-    private ResequencerEngineSync<E> resequencer;
+    private final ResequencerEngineSync<E> resequencer;
 
-    private long interval;
+    private final long interval;
 
     private boolean cancelRequested;
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/resequencer/TestObject.java b/core/camel-core/src/test/java/org/apache/camel/processor/resequencer/TestObject.java
index 33f6f22b5ff..364553019df 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/resequencer/TestObject.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/resequencer/TestObject.java
@@ -18,7 +18,7 @@ package org.apache.camel.processor.resequencer;
 
 public class TestObject {
 
-    private int value;
+    private final int value;
 
     public TestObject(int value) {
         this.value = value;
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/routingslip/DynamicRouterEventNotifierTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/routingslip/DynamicRouterEventNotifierTest.java
index 1ec33375e8d..e68d4539348 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/routingslip/DynamicRouterEventNotifierTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/routingslip/DynamicRouterEventNotifierTest.java
@@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class DynamicRouterEventNotifierTest extends ContextTestSupport {
 
-    private MyEventNotifier notifier = new MyEventNotifier();
+    private final MyEventNotifier notifier = new MyEventNotifier();
 
     @Override
     protected CamelContext createCamelContext() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/routingslip/RecipientListEventNotifierTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/routingslip/RecipientListEventNotifierTest.java
index ad67f86e8f4..b39c00aa9e7 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/routingslip/RecipientListEventNotifierTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/routingslip/RecipientListEventNotifierTest.java
@@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class RecipientListEventNotifierTest extends ContextTestSupport {
 
-    private MyEventNotifier notifier = new MyEventNotifier();
+    private final MyEventNotifier notifier = new MyEventNotifier();
 
     @Override
     protected CamelContext createCamelContext() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipEventNotifierTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipEventNotifierTest.java
index 7a2bbf6fdae..83b89f9b832 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipEventNotifierTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipEventNotifierTest.java
@@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class RoutingSlipEventNotifierTest extends ContextTestSupport {
 
-    private MyEventNotifier notifier = new MyEventNotifier();
+    private final MyEventNotifier notifier = new MyEventNotifier();
 
     @Override
     protected CamelContext createCamelContext() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/throttle/ThrottlingExceptionRoutePolicyHalfOpenHandlerSedaTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/throttle/ThrottlingExceptionRoutePolicyHalfOpenHandlerSedaTest.java
index a4c31a09e9a..43aba8a88f2 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/throttle/ThrottlingExceptionRoutePolicyHalfOpenHandlerSedaTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/throttle/ThrottlingExceptionRoutePolicyHalfOpenHandlerSedaTest.java
@@ -36,9 +36,9 @@ import org.slf4j.LoggerFactory;
 import static org.awaitility.Awaitility.await;
 
 public class ThrottlingExceptionRoutePolicyHalfOpenHandlerSedaTest extends ContextTestSupport {
-    private static Logger log = LoggerFactory.getLogger(ThrottlingExceptionRoutePolicyHalfOpenHandlerSedaTest.class);
+    private static final Logger log = LoggerFactory.getLogger(ThrottlingExceptionRoutePolicyHalfOpenHandlerSedaTest.class);
 
-    private String url = "seda:foo?concurrentConsumers=2";
+    private final String url = "seda:foo?concurrentConsumers=2";
     private MockEndpoint result;
 
     @Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/throttle/ThrottlingExceptionRoutePolicyHalfOpenHandlerTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/throttle/ThrottlingExceptionRoutePolicyHalfOpenHandlerTest.java
index 9acfa165f8f..6b704a5fbeb 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/throttle/ThrottlingExceptionRoutePolicyHalfOpenHandlerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/throttle/ThrottlingExceptionRoutePolicyHalfOpenHandlerTest.java
@@ -38,9 +38,9 @@ import static org.awaitility.Awaitility.await;
 
 @Isolated("Does not play well with parallel execution")
 public class ThrottlingExceptionRoutePolicyHalfOpenHandlerTest extends ContextTestSupport {
-    private static Logger log = LoggerFactory.getLogger(ThrottlingExceptionRoutePolicyHalfOpenHandlerTest.class);
+    private static final Logger log = LoggerFactory.getLogger(ThrottlingExceptionRoutePolicyHalfOpenHandlerTest.class);
 
-    private String url = "direct:start?block=false";
+    private final String url = "direct:start?block=false";
     private MockEndpoint result;
 
     @Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/throttle/ThrottlingExceptionRoutePolicyHalfOpenTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/throttle/ThrottlingExceptionRoutePolicyHalfOpenTest.java
index 22b8895449b..0378e16bb60 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/throttle/ThrottlingExceptionRoutePolicyHalfOpenTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/throttle/ThrottlingExceptionRoutePolicyHalfOpenTest.java
@@ -37,9 +37,9 @@ import static org.awaitility.Awaitility.await;
 
 @Isolated("Does not play well with parallel execution")
 public class ThrottlingExceptionRoutePolicyHalfOpenTest extends ContextTestSupport {
-    private static Logger log = LoggerFactory.getLogger(ThrottlingExceptionRoutePolicyHalfOpenTest.class);
+    private static final Logger log = LoggerFactory.getLogger(ThrottlingExceptionRoutePolicyHalfOpenTest.class);
 
-    private String url = "direct:start?block=false";
+    private final String url = "direct:start?block=false";
     private MockEndpoint result;
 
     @Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/throttle/ThrottlingExceptionRoutePolicyKeepOpenOnInitTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/throttle/ThrottlingExceptionRoutePolicyKeepOpenOnInitTest.java
index a349547fc6a..9d8a52d87b4 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/throttle/ThrottlingExceptionRoutePolicyKeepOpenOnInitTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/throttle/ThrottlingExceptionRoutePolicyKeepOpenOnInitTest.java
@@ -25,9 +25,9 @@ import org.junit.jupiter.api.Test;
 
 public class ThrottlingExceptionRoutePolicyKeepOpenOnInitTest extends ContextTestSupport {
 
-    private String url = "seda:foo?concurrentConsumers=20";
+    private final String url = "seda:foo?concurrentConsumers=20";
     private MockEndpoint result;
-    private int size = 5;
+    private final int size = 5;
 
     private ThrottlingExceptionRoutePolicy policy;
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/throttle/ThrottlingExceptionRoutePolicyOpenViaConfigTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/throttle/ThrottlingExceptionRoutePolicyOpenViaConfigTest.java
index 35c8e102d89..67a9264f049 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/throttle/ThrottlingExceptionRoutePolicyOpenViaConfigTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/throttle/ThrottlingExceptionRoutePolicyOpenViaConfigTest.java
@@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test;
 
 public class ThrottlingExceptionRoutePolicyOpenViaConfigTest extends ContextTestSupport {
 
-    private String url = "seda:foo?concurrentConsumers=20";
+    private final String url = "seda:foo?concurrentConsumers=20";
     private MockEndpoint result;
 
     private ThrottlingExceptionRoutePolicy policy;
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/throttle/ThrottlingExceptionRoutePolicyTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/throttle/ThrottlingExceptionRoutePolicyTest.java
index a68200c1d53..4d080f7226c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/throttle/ThrottlingExceptionRoutePolicyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/throttle/ThrottlingExceptionRoutePolicyTest.java
@@ -36,9 +36,9 @@ import org.slf4j.LoggerFactory;
 import static org.awaitility.Awaitility.await;
 
 public class ThrottlingExceptionRoutePolicyTest extends ContextTestSupport {
-    private static Logger log = LoggerFactory.getLogger(ThrottlingExceptionRoutePolicyTest.class);
+    private static final Logger log = LoggerFactory.getLogger(ThrottlingExceptionRoutePolicyTest.class);
 
-    private String url = "seda:foo?concurrentConsumers=2";
+    private final String url = "seda:foo?concurrentConsumers=2";
     private MockEndpoint result;
 
     @Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/throttle/ThrottlingInflightRoutePolicyTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/throttle/ThrottlingInflightRoutePolicyTest.java
index b9f8ee97e81..6a02b6855ae 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/throttle/ThrottlingInflightRoutePolicyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/throttle/ThrottlingInflightRoutePolicyTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
 
 public class ThrottlingInflightRoutePolicyTest extends ContextTestSupport {
 
-    private String url = "seda:foo?concurrentConsumers=20";
+    private final String url = "seda:foo?concurrentConsumers=20";
 
     @Test
     public void testThrottlingRoutePolicy() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/validation/CatalogLSResourceResolver.java b/core/camel-core/src/test/java/org/apache/camel/processor/validation/CatalogLSResourceResolver.java
index 2db98b62765..2301d0ba198 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/validation/CatalogLSResourceResolver.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/validation/CatalogLSResourceResolver.java
@@ -51,10 +51,10 @@ public class CatalogLSResourceResolver implements LSResourceResolver {
     }
 
     class LSInputSource implements LSInput {
-        private InputSource inputSource;
+        private final InputSource inputSource;
         private String publicId;
-        private String systemId;
-        private String baseURI;
+        private final String systemId;
+        private final String baseURI;
 
         LSInputSource(String namespaceURI, String publicId, String systemId, String baseURI) {
             if (publicId == null) {
diff --git a/core/camel-core/src/test/java/org/apache/camel/support/DefaultRegistryTest.java b/core/camel-core/src/test/java/org/apache/camel/support/DefaultRegistryTest.java
index 3e1b1ac798e..812198887fa 100644
--- a/core/camel-core/src/test/java/org/apache/camel/support/DefaultRegistryTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/support/DefaultRegistryTest.java
@@ -293,7 +293,7 @@ public class DefaultRegistryTest {
 
         private CamelContext camelContext;
 
-        private String name;
+        private final String name;
 
         public MyBean(String name) {
             this.name = name;
diff --git a/core/camel-core/src/test/java/org/apache/camel/support/DefaultTimeoutMapTest.java b/core/camel-core/src/test/java/org/apache/camel/support/DefaultTimeoutMapTest.java
index 6f04a5852af..ae27b0f0eb2 100644
--- a/core/camel-core/src/test/java/org/apache/camel/support/DefaultTimeoutMapTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/support/DefaultTimeoutMapTest.java
@@ -37,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.*;
 public class DefaultTimeoutMapTest {
 
     private static final Logger LOG = LoggerFactory.getLogger(DefaultTimeoutMapTest.class);
-    private ScheduledExecutorService executor = new ScheduledThreadPoolExecutor(1);
+    private final ScheduledExecutorService executor = new ScheduledThreadPoolExecutor(1);
 
     @Test
     public void testDefaultTimeoutMap() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/support/TimerListenerManagerTest.java b/core/camel-core/src/test/java/org/apache/camel/support/TimerListenerManagerTest.java
index b2e5116126f..5340eb10ee0 100644
--- a/core/camel-core/src/test/java/org/apache/camel/support/TimerListenerManagerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/support/TimerListenerManagerTest.java
@@ -56,7 +56,7 @@ public class TimerListenerManagerTest extends ContextTestSupport {
 
     private static class MyTask implements TimerListener {
 
-        private CountDownLatch latch = new CountDownLatch(1);
+        private final CountDownLatch latch = new CountDownLatch(1);
 
         @Override
         public void onTimer() {
diff --git a/core/camel-core/src/test/java/org/apache/camel/support/component/ApiMethodHelperTest.java b/core/camel-core/src/test/java/org/apache/camel/support/component/ApiMethodHelperTest.java
index e2c1a901138..c2fc2baeece 100644
--- a/core/camel-core/src/test/java/org/apache/camel/support/component/ApiMethodHelperTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/support/component/ApiMethodHelperTest.java
@@ -31,8 +31,8 @@ import static org.junit.jupiter.api.Assertions.*;
 
 public class ApiMethodHelperTest {
 
-    private static TestMethod[] sayHis = new TestMethod[] { TestMethod.SAYHI, TestMethod.SAYHI_1 };
-    private static ApiMethodHelper<TestMethod> apiMethodHelper;
+    private static final TestMethod[] sayHis = new TestMethod[] { TestMethod.SAYHI, TestMethod.SAYHI_1 };
+    private static final ApiMethodHelper<TestMethod> apiMethodHelper;
 
     static {
         final HashMap<String, String> aliases = new HashMap<>();
diff --git a/core/camel-core/src/test/java/org/apache/camel/support/component/ApiMethodPropertiesHelperTest.java b/core/camel-core/src/test/java/org/apache/camel/support/component/ApiMethodPropertiesHelperTest.java
index f500191353a..ce2bbe4be60 100644
--- a/core/camel-core/src/test/java/org/apache/camel/support/component/ApiMethodPropertiesHelperTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/support/component/ApiMethodPropertiesHelperTest.java
@@ -44,7 +44,7 @@ public class ApiMethodPropertiesHelperTest {
     private static final String VALUE_4 = "true";
     private static final String VALUE_5 = "CamelCaseValue";
 
-    private static ApiMethodPropertiesHelper<TestComponentConfiguration> propertiesHelper
+    private static final ApiMethodPropertiesHelper<TestComponentConfiguration> propertiesHelper
             = new ApiMethodPropertiesHelper<TestComponentConfiguration>(
                     new DefaultCamelContext(), TestComponentConfiguration.class,
                     TEST_PREFIX) {
diff --git a/core/camel-core/src/test/java/org/apache/camel/support/component/ArgumentSubstitutionParserTest.java b/core/camel-core/src/test/java/org/apache/camel/support/component/ArgumentSubstitutionParserTest.java
index 483fe540b60..d93ae1c2bc2 100644
--- a/core/camel-core/src/test/java/org/apache/camel/support/component/ArgumentSubstitutionParserTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/support/component/ArgumentSubstitutionParserTest.java
@@ -39,8 +39,7 @@ public class ArgumentSubstitutionParserTest {
         adapters[2] = new Substitution(".+", "(.+)", "java.util.List", "$1List");
         adapters[3] = new Substitution(".+", "(.+)", ".*?(\\w++)\\[\\]", "$1Array", true);
 
-        final ApiMethodParser<TestProxy> parser =
-                getTestProxyApiMethodParser(adapters);
+        final ApiMethodParser<TestProxy> parser = getTestProxyApiMethodParser(adapters);
 
         final List<ApiMethodParser.ApiMethodModel> methodModels = parser.parse();
         assertEquals(9, methodModels.size());
diff --git a/core/camel-core/src/test/java/org/apache/camel/util/GZIPHelperTest.java b/core/camel-core/src/test/java/org/apache/camel/util/GZIPHelperTest.java
index 59d8c67590b..2c8bb668bbb 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/GZIPHelperTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/GZIPHelperTest.java
@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.*;
 
 public class GZIPHelperTest {
 
-    private static byte[] sampleBytes = new byte[] { 1, 2, 3, 1, 2, 3 };
+    private static final byte[] sampleBytes = new byte[] { 1, 2, 3, 1, 2, 3 };
 
     @Test
     public void toGZIPInputStreamShouldReturnTheSameInputStream() throws IOException {
diff --git a/core/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java b/core/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java
index 50bd014673d..34a4fcd71d8 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java
@@ -41,7 +41,7 @@ import static org.junit.jupiter.api.Assertions.*;
 public class MessageHelperTest {
 
     private Message message;
-    private CamelContext camelContext = new DefaultCamelContext();
+    private final CamelContext camelContext = new DefaultCamelContext();
 
     @BeforeEach
     public void setUp() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/util/MyDummyObject.java b/core/camel-core/src/test/java/org/apache/camel/util/MyDummyObject.java
index 611b991f645..d1bd30268d4 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/MyDummyObject.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/MyDummyObject.java
@@ -21,7 +21,7 @@ package org.apache.camel.util;
  */
 public class MyDummyObject {
 
-    private String name;
+    private final String name;
 
     public MyDummyObject(String name) {
         this.name = name;
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainBeansClassFactoryMethodTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainBeansClassFactoryMethodTest.java
index 56228278b15..e4a8fe1ce8c 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/MainBeansClassFactoryMethodTest.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MainBeansClassFactoryMethodTest.java
@@ -63,9 +63,9 @@ public class MainBeansClassFactoryMethodTest {
 
     public static class MyDriver {
 
-        private String url;
-        private String username;
-        private String password;
+        private final String url;
+        private final String username;
+        private final String password;
 
         public MyDriver(String url, String username, String password) {
             this.url = url;
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainHelperTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainHelperTest.java
index 0770c5e5070..964f56d871e 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/MainHelperTest.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MainHelperTest.java
@@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test;
 
 public class MainHelperTest {
 
-    private MainHelper helper = new MainHelper();
+    private final MainHelper helper = new MainHelper();
 
     @Test
     public void testAddComponentEnvVariables() {
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainIoCBeanPostProcessorDisabledTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainIoCBeanPostProcessorDisabledTest.java
index 07f46c2117b..dc71b495058 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/MainIoCBeanPostProcessorDisabledTest.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MainIoCBeanPostProcessorDisabledTest.java
@@ -65,7 +65,7 @@ public class MainIoCBeanPostProcessorDisabledTest {
     public static class MyRouteBuilder extends RouteBuilder {
 
         @BindToRegistry("tiger")
-        private String foo = "tony";
+        private final String foo = "tony";
 
         @Override
         public void configure() throws Exception {
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainSupervisingRouteControllerTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainSupervisingRouteControllerTest.java
index c90db7f41cb..89e228c40e9 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/MainSupervisingRouteControllerTest.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MainSupervisingRouteControllerTest.java
@@ -184,7 +184,7 @@ public class MainSupervisingRouteControllerTest {
 
     private static class MyJmsEndpoint extends SedaEndpoint {
 
-        private String name;
+        private final String name;
 
         public MyJmsEndpoint(String name) {
             this.name = name;
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainSupportCommandLineTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainSupportCommandLineTest.java
index 736a8af118c..b2ce9244733 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/MainSupportCommandLineTest.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MainSupportCommandLineTest.java
@@ -26,7 +26,7 @@ public class MainSupportCommandLineTest {
 
     private static class MyMainSupport extends MainCommandLineSupport {
 
-        private CamelContext context = new DefaultCamelContext();
+        private final CamelContext context = new DefaultCamelContext();
 
         @Override
         protected ProducerTemplate findOrCreateCamelTemplate() {
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MyAddress.java b/core/camel-main/src/test/java/org/apache/camel/main/MyAddress.java
index e0f59d89dfa..0b17ca6fb33 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/MyAddress.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MyAddress.java
@@ -18,8 +18,8 @@ package org.apache.camel.main;
 
 public class MyAddress {
 
-    private int zip;
-    private String street;
+    private final int zip;
+    private final String street;
 
     public MyAddress(int zip, String street) {
         this.zip = zip;
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MyOrder.java b/core/camel-main/src/test/java/org/apache/camel/main/MyOrder.java
index 376d08bbf67..91a1a2a0e51 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/MyOrder.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MyOrder.java
@@ -18,8 +18,8 @@ package org.apache.camel.main;
 
 public class MyOrder {
 
-    private String company;
-    private MyAddress address;
+    private final String company;
+    private final MyAddress address;
 
     public MyOrder(String company, MyAddress address) {
         this.company = company;
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/support/MyDummyComponent.java b/core/camel-main/src/test/java/org/apache/camel/main/support/MyDummyComponent.java
index 5c823799c77..bd5e936f4b9 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/support/MyDummyComponent.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/support/MyDummyComponent.java
@@ -26,7 +26,7 @@ import org.apache.camel.support.DefaultComponent;
 @Component("dummy")
 public class MyDummyComponent extends DefaultComponent {
     private MyDummyConfiguration configuration;
-    private boolean configurer;
+    private final boolean configurer;
     private String componentValue;
 
     public MyDummyComponent(boolean configurer) {
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/AddEventNotifierTest.java b/core/camel-management/src/test/java/org/apache/camel/management/AddEventNotifierTest.java
index 14dfb9dde44..264068a98cd 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/AddEventNotifierTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/AddEventNotifierTest.java
@@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 @DisabledOnOs(OS.AIX)
 public class AddEventNotifierTest extends ContextTestSupport {
 
-    private static List<CamelEvent> events = new ArrayList<>();
+    private static final List<CamelEvent> events = new ArrayList<>();
 
     @Override
     @BeforeEach
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedAggregateControllerTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedAggregateControllerTest.java
index 0d3cff21af6..7c49e64a89a 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedAggregateControllerTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedAggregateControllerTest.java
@@ -42,7 +42,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 @DisabledOnOs(OS.AIX)
 public class ManagedAggregateControllerTest extends ManagementTestSupport {
 
-    private AggregateController controller = new DefaultAggregateController();
+    private final AggregateController controller = new DefaultAggregateController();
     private MBeanServer mbeanServer;
     private ObjectName on;
 
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteRestartTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteRestartTest.java
index 42be2b6a678..d0c2c80f7d0 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteRestartTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteRestartTest.java
@@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 @DisabledOnOs(OS.AIX)
 public class ManagedRouteRestartTest extends ManagementTestSupport {
 
-    private MyRoutePolicy myRoutePolicy = new MyRoutePolicy();
+    private final MyRoutePolicy myRoutePolicy = new MyRoutePolicy();
 
     @Test
     public void testRestartRoute() throws Exception {
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagementTestSupport.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagementTestSupport.java
index a1aacf9621f..9e77ffcb0d1 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagementTestSupport.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagementTestSupport.java
@@ -86,7 +86,7 @@ public abstract class ManagementTestSupport extends ContextTestSupport {
 
     private static NodeIdFactory buildNodeIdFactory() {
         return new NodeIdFactory() {
-            private AtomicInteger counter = new AtomicInteger();
+            private final AtomicInteger counter = new AtomicInteger();
 
             @Override
             public String createId(NamedNode definition) {
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/RemoveEventNotifierTest.java b/core/camel-management/src/test/java/org/apache/camel/management/RemoveEventNotifierTest.java
index acd5019af7d..0052a6c544e 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/RemoveEventNotifierTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/RemoveEventNotifierTest.java
@@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 @DisabledOnOs(OS.AIX)
 public class RemoveEventNotifierTest extends ContextTestSupport {
 
-    private static List<CamelEvent> events = new ArrayList<>();
+    private static final List<CamelEvent> events = new ArrayList<>();
     private EventNotifier notifier;
 
     @Override