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 9abb9596e7e85c430e2a0654afc2bde28ffff877
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Mon Mar 27 15:53:32 2023 +0200

    CAMEL-15105: replace setExtension calls with the ones based on the plugin 
manager
---
 .../SecretsManagerClientHealthCheckProfileCredsTest.java            | 2 +-
 .../SecretsManagerClientHealthCheckStaticCredsTest.java             | 2 +-
 .../aws2/athena/Athena2ClientHealthCheckCustomClientTest.java       | 2 +-
 .../aws2/athena/Athena2ClientHealthCheckProfileCredsTest.java       | 2 +-
 .../aws2/athena/Athena2ClientHealthCheckStaticCredsTest.java        | 2 +-
 .../component/aws2/ddb/Ddb2ClientHealthCheckProfileCredsTest.java   | 2 +-
 .../component/aws2/ddb/Ddb2ClientHealthCheckStaticCredsTest.java    | 2 +-
 .../ddbstream/Ddb2StreamConsumerHealthCheckProfileCredsTest.java    | 2 +-
 .../ddbstream/Ddb2StreamConsumerHealthCheckStaticCredsTest.java     | 2 +-
 .../aws2/ddbstream/Ddb2StreamConsumerHealthCustomClientTest.java    | 2 +-
 .../component/aws2/ec2/AWS2EC2HealthCheckProfileCredsTest.java      | 2 +-
 .../camel/component/aws2/ec2/AWS2EC2HealthCheckStaticCredsTest.java | 2 +-
 .../component/aws2/ecs/ECS2ClientHealthCheckProfileCredsTest.java   | 2 +-
 .../component/aws2/ecs/ECS2ClientHealthCheckStaticCredsTest.java    | 2 +-
 .../component/aws2/eks/EKS2CliientHealthCheckProfileCredsTest.java  | 2 +-
 .../component/aws2/eks/EKS2CliientHealthCheckStaticCredsTest.java   | 2 +-
 .../eventbridge/EventbridgeClientHealthCheckProfileCredsTest.java   | 2 +-
 .../eventbridge/EventbridgeClientHealthCheckStaticCredsTest.java    | 2 +-
 .../camel/component/aws2/iam/IAM2HealthCheckProfileCredsTest.java   | 2 +-
 .../camel/component/aws2/iam/IAM2HealthCheckStaticCredsTest.java    | 2 +-
 .../aws2/kinesis/Kinesis2ConsumerHealthCheckProfileCredsTest.java   | 2 +-
 .../aws2/kinesis/Kinesis2ConsumerHealthCheckStaticCredsTest.java    | 2 +-
 .../aws2/kinesis/Kinesis2ConsumerHealthCustomClientTest.java        | 2 +-
 .../aws2/lambda/Lambda2ClientHealthCheckProfileCredsTest.java       | 2 +-
 .../aws2/lambda/Lambda2ClientHealthCheckStaticCredsTest.java        | 2 +-
 .../component/aws2/mq/MQ2ClientHealthCheckProfileCredsTest.java     | 2 +-
 .../component/aws2/mq/MQ2ClientHealthCheckStaticCredsTest.java      | 2 +-
 .../camel/component/aws2/msk/MSK2HealthCheckProfileCredsTest.java   | 2 +-
 .../camel/component/aws2/msk/MSK2HealthCheckStaticCredsTest.java    | 2 +-
 .../aws2/s3/AWS2S3ConsumerHealthCheckProfileCredsTest.java          | 2 +-
 .../component/aws2/s3/AWS2S3ConsumerHealthCheckStaticCredsTest.java | 2 +-
 .../camel/component/aws2/ses/Ses2HealthCheckProfileCredsTest.java   | 2 +-
 .../camel/component/aws2/ses/Ses2HealthCheckStaticCredsTest.java    | 2 +-
 .../camel/component/aws2/sns/Sns2HealthCheckProfileCredsTest.java   | 2 +-
 .../camel/component/aws2/sns/Sns2HealthCheckStaticCredsTest.java    | 2 +-
 .../aws2/sqs/Sqs2ConsumerHealthCheckIAMProfileCredsTest.java        | 2 +-
 .../component/aws2/sqs/Sqs2ConsumerHealthCheckProfileCredsTest.java | 2 +-
 .../component/aws2/sqs/Sqs2ConsumerHealthCheckStaticCredsTest.java  | 2 +-
 .../aws2/translate/Translate2ClientHealthCheckProfileCredsTest.java | 2 +-
 .../aws2/translate/Translate2ClientHealthCheckStaticCredsTest.java  | 2 +-
 .../kafka/integration/health/KafkaHealthCheckTestSupport.java       | 2 +-
 .../health/CamelMicroProfileHealthSupervisedRoutesMainTest.java     | 2 +-
 .../microprofile/health/CamelMicroProfileHealthTestSupport.java     | 2 +-
 .../java/org/apache/camel/impl/engine/AbstractCamelContext.java     | 4 ++--
 .../src/main/java/org/apache/camel/impl/engine/DefaultChannel.java  | 2 +-
 .../main/java/org/apache/camel/impl/engine/SimpleCamelContext.java  | 2 +-
 .../org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java  | 4 ++--
 .../java/org/apache/camel/main/DefaultConfigurationConfigurer.java  | 6 +++---
 .../java/org/apache/camel/management/JmxManagementStrategy.java     | 2 +-
 .../java/org/apache/camel/management/ManagedHealthCheckTest.java    | 2 +-
 50 files changed, 54 insertions(+), 54 deletions(-)

diff --git 
a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerClientHealthCheckProfileCredsTest.java
 
b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerClientHealthCheckProfileCredsTest.java
index 4aa9b30defa..e44f3887204 100644
--- 
a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerClientHealthCheckProfileCredsTest.java
+++ 
b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerClientHealthCheckProfileCredsTest.java
@@ -54,7 +54,7 @@ public class SecretsManagerClientHealthCheckProfileCredsTest 
extends CamelTestSu
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerClientHealthCheckStaticCredsTest.java
 
b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerClientHealthCheckStaticCredsTest.java
index 2268d331dba..95bf7117392 100644
--- 
a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerClientHealthCheckStaticCredsTest.java
+++ 
b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerClientHealthCheckStaticCredsTest.java
@@ -54,7 +54,7 @@ public class SecretsManagerClientHealthCheckStaticCredsTest 
extends CamelTestSup
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ClientHealthCheckCustomClientTest.java
 
b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ClientHealthCheckCustomClientTest.java
index 37a27d92902..6a6cacedea1 100644
--- 
a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ClientHealthCheckCustomClientTest.java
+++ 
b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ClientHealthCheckCustomClientTest.java
@@ -56,7 +56,7 @@ public class Athena2ClientHealthCheckCustomClientTest extends 
CamelTestSupport {
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ClientHealthCheckProfileCredsTest.java
 
b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ClientHealthCheckProfileCredsTest.java
index 778b835d215..c9aafcec27a 100644
--- 
a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ClientHealthCheckProfileCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ClientHealthCheckProfileCredsTest.java
@@ -55,7 +55,7 @@ public class Athena2ClientHealthCheckProfileCredsTest extends 
CamelTestSupport {
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ClientHealthCheckStaticCredsTest.java
 
b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ClientHealthCheckStaticCredsTest.java
index ec3c65f6711..654e75f68a2 100644
--- 
a/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ClientHealthCheckStaticCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-athena/src/test/java/org/apache/camel/component/aws2/athena/Athena2ClientHealthCheckStaticCredsTest.java
@@ -55,7 +55,7 @@ public class Athena2ClientHealthCheckStaticCredsTest extends 
CamelTestSupport {
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ClientHealthCheckProfileCredsTest.java
 
b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ClientHealthCheckProfileCredsTest.java
index 285f3941139..cb82b752058 100644
--- 
a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ClientHealthCheckProfileCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ClientHealthCheckProfileCredsTest.java
@@ -55,7 +55,7 @@ public class Ddb2ClientHealthCheckProfileCredsTest extends 
CamelTestSupport {
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ClientHealthCheckStaticCredsTest.java
 
b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ClientHealthCheckStaticCredsTest.java
index 677501980ff..672c07f1ea0 100644
--- 
a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ClientHealthCheckStaticCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/Ddb2ClientHealthCheckStaticCredsTest.java
@@ -55,7 +55,7 @@ public class Ddb2ClientHealthCheckStaticCredsTest extends 
CamelTestSupport {
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheckProfileCredsTest.java
 
b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheckProfileCredsTest.java
index 3d5dd9866c1..50794dd399b 100644
--- 
a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheckProfileCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheckProfileCredsTest.java
@@ -63,7 +63,7 @@ public class Ddb2StreamConsumerHealthCheckProfileCredsTest 
extends CamelTestSupp
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheckStaticCredsTest.java
 
b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheckStaticCredsTest.java
index e4da968fceb..ddb5d0d40d7 100644
--- 
a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheckStaticCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheckStaticCredsTest.java
@@ -58,7 +58,7 @@ public class Ddb2StreamConsumerHealthCheckStaticCredsTest 
extends CamelTestSuppo
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCustomClientTest.java
 
b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCustomClientTest.java
index da19822e72e..7ab2b81fde1 100644
--- 
a/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCustomClientTest.java
+++ 
b/components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCustomClientTest.java
@@ -61,7 +61,7 @@ public class Ddb2StreamConsumerHealthCustomClientTest extends 
CamelTestSupport {
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2HealthCheckProfileCredsTest.java
 
b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2HealthCheckProfileCredsTest.java
index 5c0c1341f30..c72f79e20fc 100644
--- 
a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2HealthCheckProfileCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2HealthCheckProfileCredsTest.java
@@ -54,7 +54,7 @@ public class AWS2EC2HealthCheckProfileCredsTest extends 
CamelTestSupport {
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2HealthCheckStaticCredsTest.java
 
b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2HealthCheckStaticCredsTest.java
index 83b12cd6b71..ad815bc8d60 100644
--- 
a/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2HealthCheckStaticCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/AWS2EC2HealthCheckStaticCredsTest.java
@@ -54,7 +54,7 @@ public class AWS2EC2HealthCheckStaticCredsTest extends 
CamelTestSupport {
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ClientHealthCheckProfileCredsTest.java
 
b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ClientHealthCheckProfileCredsTest.java
index 0d26320bc9c..4a8fd77b302 100644
--- 
a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ClientHealthCheckProfileCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ClientHealthCheckProfileCredsTest.java
@@ -55,7 +55,7 @@ public class ECS2ClientHealthCheckProfileCredsTest extends 
CamelTestSupport {
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ClientHealthCheckStaticCredsTest.java
 
b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ClientHealthCheckStaticCredsTest.java
index 33b98b5cf4b..1853967095e 100644
--- 
a/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ClientHealthCheckStaticCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ClientHealthCheckStaticCredsTest.java
@@ -55,7 +55,7 @@ public class ECS2ClientHealthCheckStaticCredsTest extends 
CamelTestSupport {
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2CliientHealthCheckProfileCredsTest.java
 
b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2CliientHealthCheckProfileCredsTest.java
index d4bea798670..7d5397631cc 100644
--- 
a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2CliientHealthCheckProfileCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2CliientHealthCheckProfileCredsTest.java
@@ -55,7 +55,7 @@ public class EKS2CliientHealthCheckProfileCredsTest extends 
CamelTestSupport {
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2CliientHealthCheckStaticCredsTest.java
 
b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2CliientHealthCheckStaticCredsTest.java
index 51bf1b54dbf..deeceeb2200 100644
--- 
a/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2CliientHealthCheckStaticCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-eks/src/test/java/org/apache/camel/component/aws2/eks/EKS2CliientHealthCheckStaticCredsTest.java
@@ -55,7 +55,7 @@ public class EKS2CliientHealthCheckStaticCredsTest extends 
CamelTestSupport {
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeClientHealthCheckProfileCredsTest.java
 
b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeClientHealthCheckProfileCredsTest.java
index 0d1152bf3c8..9c74813ec65 100644
--- 
a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeClientHealthCheckProfileCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeClientHealthCheckProfileCredsTest.java
@@ -55,7 +55,7 @@ public class EventbridgeClientHealthCheckProfileCredsTest 
extends CamelTestSuppo
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeClientHealthCheckStaticCredsTest.java
 
b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeClientHealthCheckStaticCredsTest.java
index 95832d559d6..8c3f43ac686 100644
--- 
a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeClientHealthCheckStaticCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/EventbridgeClientHealthCheckStaticCredsTest.java
@@ -55,7 +55,7 @@ public class EventbridgeClientHealthCheckStaticCredsTest 
extends CamelTestSuppor
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2HealthCheckProfileCredsTest.java
 
b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2HealthCheckProfileCredsTest.java
index 4c99ab14440..e2761ca3b2a 100644
--- 
a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2HealthCheckProfileCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2HealthCheckProfileCredsTest.java
@@ -53,7 +53,7 @@ public class IAM2HealthCheckProfileCredsTest extends 
CamelTestSupport {
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2HealthCheckStaticCredsTest.java
 
b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2HealthCheckStaticCredsTest.java
index 81c1292404f..91fc262ace7 100644
--- 
a/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2HealthCheckStaticCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAM2HealthCheckStaticCredsTest.java
@@ -53,7 +53,7 @@ public class IAM2HealthCheckStaticCredsTest extends 
CamelTestSupport {
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckProfileCredsTest.java
 
b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckProfileCredsTest.java
index 30c8e6696a3..a3cf01fe650 100644
--- 
a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckProfileCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckProfileCredsTest.java
@@ -63,7 +63,7 @@ public class Kinesis2ConsumerHealthCheckProfileCredsTest 
extends CamelTestSuppor
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckStaticCredsTest.java
 
b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckStaticCredsTest.java
index 3e6e7e8e376..bf08849405d 100644
--- 
a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckStaticCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheckStaticCredsTest.java
@@ -64,7 +64,7 @@ public class Kinesis2ConsumerHealthCheckStaticCredsTest 
extends CamelTestSupport
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCustomClientTest.java
 
b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCustomClientTest.java
index 704091eb9e5..97f0963a387 100644
--- 
a/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCustomClientTest.java
+++ 
b/components/camel-aws/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCustomClientTest.java
@@ -65,7 +65,7 @@ public class Kinesis2ConsumerHealthCustomClientTest extends 
CamelTestSupport {
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ClientHealthCheckProfileCredsTest.java
 
b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ClientHealthCheckProfileCredsTest.java
index effb61b9e08..a518ff3570c 100644
--- 
a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ClientHealthCheckProfileCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ClientHealthCheckProfileCredsTest.java
@@ -55,7 +55,7 @@ public class Lambda2ClientHealthCheckProfileCredsTest extends 
CamelTestSupport {
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ClientHealthCheckStaticCredsTest.java
 
b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ClientHealthCheckStaticCredsTest.java
index d14ca2e4bbb..594a35d0ac6 100644
--- 
a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ClientHealthCheckStaticCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/Lambda2ClientHealthCheckStaticCredsTest.java
@@ -55,7 +55,7 @@ public class Lambda2ClientHealthCheckStaticCredsTest extends 
CamelTestSupport {
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ClientHealthCheckProfileCredsTest.java
 
b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ClientHealthCheckProfileCredsTest.java
index 6b275a2d6df..11aa2098050 100644
--- 
a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ClientHealthCheckProfileCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ClientHealthCheckProfileCredsTest.java
@@ -55,7 +55,7 @@ public class MQ2ClientHealthCheckProfileCredsTest extends 
CamelTestSupport {
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ClientHealthCheckStaticCredsTest.java
 
b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ClientHealthCheckStaticCredsTest.java
index a09450deae7..56a596b01ed 100644
--- 
a/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ClientHealthCheckStaticCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-mq/src/test/java/org/apache/camel/component/aws2/mq/MQ2ClientHealthCheckStaticCredsTest.java
@@ -55,7 +55,7 @@ public class MQ2ClientHealthCheckStaticCredsTest extends 
CamelTestSupport {
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2HealthCheckProfileCredsTest.java
 
b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2HealthCheckProfileCredsTest.java
index bd44f05b3ee..e8bfa1ac3ef 100644
--- 
a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2HealthCheckProfileCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2HealthCheckProfileCredsTest.java
@@ -54,7 +54,7 @@ public class MSK2HealthCheckProfileCredsTest extends 
CamelTestSupport {
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2HealthCheckStaticCredsTest.java
 
b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2HealthCheckStaticCredsTest.java
index 66eb461e7cb..d02ca9d7596 100644
--- 
a/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2HealthCheckStaticCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-msk/src/test/java/org/apache/camel/component/aws2/msk/MSK2HealthCheckStaticCredsTest.java
@@ -54,7 +54,7 @@ public class MSK2HealthCheckStaticCredsTest extends 
CamelTestSupport {
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckProfileCredsTest.java
 
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckProfileCredsTest.java
index f242e26cceb..32285c86d47 100644
--- 
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckProfileCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckProfileCredsTest.java
@@ -63,7 +63,7 @@ public class AWS2S3ConsumerHealthCheckProfileCredsTest 
extends CamelTestSupport
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckStaticCredsTest.java
 
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckStaticCredsTest.java
index 275f323374c..2d4b14b1b8d 100644
--- 
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckStaticCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheckStaticCredsTest.java
@@ -64,7 +64,7 @@ public class AWS2S3ConsumerHealthCheckStaticCredsTest extends 
CamelTestSupport {
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2HealthCheckProfileCredsTest.java
 
b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2HealthCheckProfileCredsTest.java
index e9811c137aa..35ae715957f 100644
--- 
a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2HealthCheckProfileCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2HealthCheckProfileCredsTest.java
@@ -55,7 +55,7 @@ public class Ses2HealthCheckProfileCredsTest extends 
CamelTestSupport {
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2HealthCheckStaticCredsTest.java
 
b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2HealthCheckStaticCredsTest.java
index 386d623de7d..f38913f7af4 100644
--- 
a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2HealthCheckStaticCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/Ses2HealthCheckStaticCredsTest.java
@@ -54,7 +54,7 @@ public class Ses2HealthCheckStaticCredsTest extends 
CamelTestSupport {
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2HealthCheckProfileCredsTest.java
 
b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2HealthCheckProfileCredsTest.java
index 4a492aa8209..dc33d1e97c6 100644
--- 
a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2HealthCheckProfileCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2HealthCheckProfileCredsTest.java
@@ -54,7 +54,7 @@ public class Sns2HealthCheckProfileCredsTest extends 
CamelTestSupport {
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2HealthCheckStaticCredsTest.java
 
b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2HealthCheckStaticCredsTest.java
index 664b5f102f3..3e3f93f3230 100644
--- 
a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2HealthCheckStaticCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/Sns2HealthCheckStaticCredsTest.java
@@ -54,7 +54,7 @@ public class Sns2HealthCheckStaticCredsTest extends 
CamelTestSupport {
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckIAMProfileCredsTest.java
 
b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckIAMProfileCredsTest.java
index 156f869049d..edc6c1f8ff2 100644
--- 
a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckIAMProfileCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckIAMProfileCredsTest.java
@@ -64,7 +64,7 @@ public class Sqs2ConsumerHealthCheckIAMProfileCredsTest 
extends CamelTestSupport
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckProfileCredsTest.java
 
b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckProfileCredsTest.java
index 509291f8bca..c8b5fdf8ca1 100644
--- 
a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckProfileCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckProfileCredsTest.java
@@ -64,7 +64,7 @@ public class Sqs2ConsumerHealthCheckProfileCredsTest extends 
CamelTestSupport {
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckStaticCredsTest.java
 
b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckStaticCredsTest.java
index 2ba1e4e435b..9da82b16b01 100644
--- 
a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckStaticCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckStaticCredsTest.java
@@ -64,7 +64,7 @@ public class Sqs2ConsumerHealthCheckStaticCredsTest extends 
CamelTestSupport {
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ClientHealthCheckProfileCredsTest.java
 
b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ClientHealthCheckProfileCredsTest.java
index f28a2c80b73..3d411b8ed20 100644
--- 
a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ClientHealthCheckProfileCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ClientHealthCheckProfileCredsTest.java
@@ -55,7 +55,7 @@ public class Translate2ClientHealthCheckProfileCredsTest 
extends CamelTestSuppor
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ClientHealthCheckStaticCredsTest.java
 
b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ClientHealthCheckStaticCredsTest.java
index a341e72e7a7..1598abc22db 100644
--- 
a/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ClientHealthCheckStaticCredsTest.java
+++ 
b/components/camel-aws/camel-aws2-translate/src/test/java/org/apache/camel/component/aws2/translate/Translate2ClientHealthCheckStaticCredsTest.java
@@ -55,7 +55,7 @@ public class Translate2ClientHealthCheckStaticCredsTest 
extends CamelTestSupport
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }
diff --git 
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/health/KafkaHealthCheckTestSupport.java
 
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/health/KafkaHealthCheckTestSupport.java
index cfabb5e6546..f3decba14b5 100644
--- 
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/health/KafkaHealthCheckTestSupport.java
+++ 
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/health/KafkaHealthCheckTestSupport.java
@@ -90,7 +90,7 @@ abstract class KafkaHealthCheckTestSupport implements 
ConfigurableRoute, Configu
         registry.register(hc);
         hc = registry.resolveById("consumers");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
     }
 
     @Override
diff --git 
a/components/camel-microprofile/camel-microprofile-health/src/test/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthSupervisedRoutesMainTest.java
 
b/components/camel-microprofile/camel-microprofile-health/src/test/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthSupervisedRoutesMainTest.java
index 7fe261ff741..d6fac8d05a1 100644
--- 
a/components/camel-microprofile/camel-microprofile-health/src/test/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthSupervisedRoutesMainTest.java
+++ 
b/components/camel-microprofile/camel-microprofile-health/src/test/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthSupervisedRoutesMainTest.java
@@ -44,7 +44,7 @@ public class CamelMicroProfileHealthSupervisedRoutesMainTest {
         CamelContext context = new DefaultCamelContext();
         CamelMicroProfileHealthCheckRegistry registry = new 
CamelMicroProfileHealthCheckRegistry(context);
         context.addComponent("my", new 
CamelMicroProfileHealthTestHelper.MyComponent());
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
         context.getRouteController().supervising();
         context.addRoutes(new RouteBuilder() {
             @Override
diff --git 
a/components/camel-microprofile/camel-microprofile-health/src/test/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthTestSupport.java
 
b/components/camel-microprofile/camel-microprofile-health/src/test/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthTestSupport.java
index 8b7ea6869da..f5849552acf 100644
--- 
a/components/camel-microprofile/camel-microprofile-health/src/test/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthTestSupport.java
+++ 
b/components/camel-microprofile/camel-microprofile-health/src/test/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthTestSupport.java
@@ -68,7 +68,7 @@ public class CamelMicroProfileHealthTestSupport extends 
CamelTestSupport {
     protected CamelContext createCamelContext() throws Exception {
         CamelContext camelContext = super.createCamelContext();
         HealthCheckRegistry registry = new 
CamelMicroProfileHealthCheckRegistry();
-        camelContext.setExtension(HealthCheckRegistry.class, registry);
+        
camelContext.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class,
 registry);
         return camelContext;
     }
 
diff --git 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index c96c800d2f5..552e132683f 100644
--- 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++ 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -2188,7 +2188,7 @@ public abstract class AbstractCamelContext extends 
BaseService
             if (hcr != null) {
                 // install health-check registry if it was discovered from 
classpath (camel-health)
                 hcr.setCamelContext(this);
-                setExtension(HealthCheckRegistry.class, hcr);
+                
getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, hcr);
             }
             startupStepRecorder.endStep(step4);
         }
@@ -2201,7 +2201,7 @@ public abstract class AbstractCamelContext extends 
BaseService
             if (dcr != null) {
                 // install dev-console registry if it was discovered from 
classpath (camel-console)
                 dcr.setCamelContext(this);
-                setExtension(DevConsoleRegistry.class, dcr);
+                
getCamelContextExtension().addContextPlugin(DevConsoleRegistry.class, dcr);
             }
             startupStepRecorder.endStep(step5);
         }
diff --git 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java
 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java
index 62145a50679..f0ab9329db5 100644
--- 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java
+++ 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java
@@ -281,7 +281,7 @@ public class DefaultChannel extends CamelInternalProcessor 
implements Channel {
             tracer = BacklogTracer.createTracer(camelContext);
             tracer.setEnabled(camelContext.isBacklogTracing() != null && 
camelContext.isBacklogTracing());
             tracer.setStandby(camelContext.isBacklogTracingStandby());
-            camelContext.setExtension(BacklogTracer.class, tracer);
+            
camelContext.getCamelContextExtension().addContextPlugin(BacklogTracer.class, 
tracer);
         }
         return tracer;
     }
diff --git 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
index d7e38b279fc..ee5df1e23c3 100644
--- 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
+++ 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
@@ -578,7 +578,7 @@ public class SimpleCamelContext extends 
AbstractCamelContext {
             tracer = new DefaultTracer();
             tracer.setEnabled(isTracing());
             tracer.setStandby(isTracingStandby());
-            setExtension(Tracer.class, tracer);
+            getCamelContextExtension().addContextPlugin(Tracer.class, tracer);
         }
         return tracer;
     }
diff --git 
a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
 
b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
index f1935a7494f..fbc5c103ac2 100644
--- 
a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
+++ 
b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
@@ -407,7 +407,7 @@ public abstract class AbstractCamelContextFactoryBean<T 
extends ModelCamelContex
         if (healthCheckRegistry != null) {
             healthCheckRegistry.setCamelContext(getContext());
             LOG.debug("Using HealthCheckRegistry: {}", healthCheckRegistry);
-            getContext().setExtension(HealthCheckRegistry.class, 
healthCheckRegistry);
+            
getContext().getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class,
 healthCheckRegistry);
         } else {
             // okay attempt to inject this camel context into existing health 
check (if any)
             healthCheckRegistry = HealthCheckRegistry.get(getContext());
@@ -429,7 +429,7 @@ public abstract class AbstractCamelContextFactoryBean<T 
extends ModelCamelContex
         if (devConsoleRegistry != null) {
             devConsoleRegistry.setCamelContext(getContext());
             LOG.debug("Using DevConsoleRegistry: {}", devConsoleRegistry);
-            getContext().setExtension(DevConsoleRegistry.class, 
devConsoleRegistry);
+            
getContext().getCamelContextExtension().addContextPlugin(DevConsoleRegistry.class,
 devConsoleRegistry);
         } else {
             // okay attempt to inject this camel context into existing dev 
console (if any)
             devConsoleRegistry = DevConsoleRegistry.get(getContext());
diff --git 
a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
 
b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
index 7c9966403b0..0e7b9ac1903 100644
--- 
a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
+++ 
b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
@@ -373,7 +373,7 @@ public final class DefaultConfigurationConfigurer {
         }
         BacklogTracer bt = getSingleBeanOfType(registry, BacklogTracer.class);
         if (bt != null) {
-            ecc.setExtension(BacklogTracer.class, bt);
+            
ecc.getCamelContextExtension().addContextPlugin(BacklogTracer.class, bt);
         }
         InflightRepository ir = getSingleBeanOfType(registry, 
InflightRepository.class);
         if (ir != null) {
@@ -530,7 +530,7 @@ public final class DefaultConfigurationConfigurer {
         if (healthCheckRegistry != null) {
             healthCheckRegistry.setCamelContext(camelContext);
             LOG.debug("Using HealthCheckRegistry: {}", healthCheckRegistry);
-            camelContext.setExtension(HealthCheckRegistry.class, 
healthCheckRegistry);
+            
camelContext.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class,
 healthCheckRegistry);
         } else {
             // okay attempt to inject this camel context into existing health 
check (if any)
             healthCheckRegistry = HealthCheckRegistry.get(camelContext);
@@ -552,7 +552,7 @@ public final class DefaultConfigurationConfigurer {
         if (devConsoleRegistry != null) {
             devConsoleRegistry.setCamelContext(camelContext);
             LOG.debug("Using DevConsoleRegistry: {}", devConsoleRegistry);
-            camelContext.setExtension(DevConsoleRegistry.class, 
devConsoleRegistry);
+            
camelContext.getCamelContextExtension().addContextPlugin(DevConsoleRegistry.class,
 devConsoleRegistry);
         } else {
             // okay attempt to inject this camel context into existing dev 
console (if any)
             devConsoleRegistry = DevConsoleRegistry.get(camelContext);
diff --git 
a/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementStrategy.java
 
b/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementStrategy.java
index 0d8d82cd23c..56aa8ffecd8 100644
--- 
a/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementStrategy.java
+++ 
b/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementStrategy.java
@@ -55,7 +55,7 @@ public class JmxManagementStrategy extends 
DefaultManagementStrategy {
     public JmxManagementStrategy(CamelContext context, ManagementAgent 
managementAgent) {
         super(context, managementAgent);
         // add JMX capable CamelContext as extension
-        context.setExtension(ManagedCamelContext.class, new 
ManagedCamelContextImpl(context));
+        
context.getCamelContextExtension().addContextPlugin(ManagedCamelContext.class, 
new ManagedCamelContextImpl(context));
     }
 
     @Override
diff --git 
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedHealthCheckTest.java
 
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedHealthCheckTest.java
index b367728c25d..aacb0c8d65f 100644
--- 
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedHealthCheckTest.java
+++ 
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedHealthCheckTest.java
@@ -50,7 +50,7 @@ public class ManagedHealthCheckTest extends 
ManagementTestSupport {
         registry.setCamelContext(context);
         Object hc = registry.resolveById("context");
         registry.register(hc);
-        context.setExtension(HealthCheckRegistry.class, registry);
+        
context.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, 
registry);
 
         return context;
     }

Reply via email to