You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ji...@apache.org on 2023/04/18 10:55:24 UTC
[camel-quarkus] 13/28: Fixed getter/setter on ExtendedCamelContext - CAMEL-15105
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 8beac40ff365955b431743843e8b12d418aeac03
Author: JiriOndrusek <on...@gmail.com>
AuthorDate: Thu Mar 30 10:09:33 2023 +0200
Fixed getter/setter on ExtendedCamelContext - CAMEL-15105
---
.../java/org/apache/camel/quarkus/core/CamelContextRecorder.java | 3 ++-
.../src/main/java/org/apache/camel/quarkus/core/ConsumeRecorder.java | 3 ++-
.../org/apache/camel/quarkus/component/kamelet/KameletRecorder.java | 2 +-
.../microprofile/health/runtime/CamelMicroProfileHealthRecorder.java | 2 +-
.../src/main/java/org/apache/camel/quarkus/core/CoreResource.java | 3 ++-
.../org/apache/camel/quarkus/component/direct/it/DirectResource.java | 3 ++-
.../apache/camel/quarkus/component/kamelet/it/KameletResource.java | 2 +-
.../component/microprofile/it/health/MicroProfileHealthResource.java | 2 +-
.../camel/quarkus/test/junit5/RouteFilterPatternExcludeTest.java | 5 +++--
.../quarkus/test/junit5/RouteFilterPatternIncludeExcludeTest.java | 5 +++--
.../camel/quarkus/test/junit5/RouteFilterPatternIncludeTest.java | 5 +++--
.../quarkus/test/junit5/patterns/SimpleWeaveAddMockLastTest.java | 3 ++-
12 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java
index fe77110ee1..ebcaa4428e 100644
--- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelContextRecorder.java
@@ -64,7 +64,8 @@ public class CamelContextRecorder {
// Set ClassLoader first as some actions depend on it being available
ExtendedCamelContext extendedCamelContext = context.getCamelContextExtension();
context.setApplicationContextClassLoader(tccl);
- context.setDefaultExtension(RuntimeCamelCatalog.class, () -> new CamelRuntimeCatalog(config.runtimeCatalog));
+ context.getCamelContextExtension().addContextPlugin(RuntimeCamelCatalog.class,
+ new CamelRuntimeCatalog(config.runtimeCatalog));
extendedCamelContext.setRegistry(registry.getValue());
context.setTypeConverterRegistry(typeConverterRegistry.getValue());
context.setLoadTypeConverters(false);
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/ConsumeRecorder.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/ConsumeRecorder.java
index 359dcce066..36c21585d9 100644
--- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/ConsumeRecorder.java
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/ConsumeRecorder.java
@@ -72,7 +72,8 @@ public class ConsumeRecorder {
try {
final RoutesDefinition routes = routesDefinition.getValue();
routes.setCamelContext(camelContext.getValue());
- camelContext.getValue().getExtension(Model.class).addRouteDefinitions(routes.getRoutes());
+ camelContext.getValue().getCamelContextExtension().getContextPlugin(Model.class)
+ .addRouteDefinitions(routes.getRoutes());
} catch (Exception e) {
throw new RuntimeException("Could not add routes to context", e);
}
diff --git a/extensions/kamelet/runtime/src/main/java/org/apache/camel/quarkus/component/kamelet/KameletRecorder.java b/extensions/kamelet/runtime/src/main/java/org/apache/camel/quarkus/component/kamelet/KameletRecorder.java
index 1f59eadb94..eddc8a87a5 100644
--- a/extensions/kamelet/runtime/src/main/java/org/apache/camel/quarkus/component/kamelet/KameletRecorder.java
+++ b/extensions/kamelet/runtime/src/main/java/org/apache/camel/quarkus/component/kamelet/KameletRecorder.java
@@ -35,7 +35,7 @@ public class KameletRecorder {
@Override
public void configure(CamelContext context) {
try {
- context.getExtension(Model.class).addRouteTemplateDefinitions(definitions);
+ context.getCamelContextExtension().getContextPlugin(Model.class).addRouteTemplateDefinitions(definitions);
} catch (Exception e) {
throw new RuntimeException(e);
}
diff --git a/extensions/microprofile-health/runtime/src/main/java/org/apache/camel/quarkus/component/microprofile/health/runtime/CamelMicroProfileHealthRecorder.java b/extensions/microprofile-health/runtime/src/main/java/org/apache/camel/quarkus/component/microprofile/health/runtime/CamelMicroProfileHealthRecorder.java
index e33777b17b..4a951db780 100644
--- a/extensions/microprofile-health/runtime/src/main/java/org/apache/camel/quarkus/component/microprofile/health/runtime/CamelMicroProfileHealthRecorder.java
+++ b/extensions/microprofile-health/runtime/src/main/java/org/apache/camel/quarkus/component/microprofile/health/runtime/CamelMicroProfileHealthRecorder.java
@@ -35,7 +35,7 @@ public class CamelMicroProfileHealthRecorder {
registry.setId("camel-microprofile-health");
registry.setEnabled(true);
- camelContext.setExtension(HealthCheckRegistry.class, registry);
+ camelContext.getCamelContextExtension().addContextPlugin(HealthCheckRegistry.class, registry);
}
});
}
diff --git a/integration-test-groups/foundation/core/src/main/java/org/apache/camel/quarkus/core/CoreResource.java b/integration-test-groups/foundation/core/src/main/java/org/apache/camel/quarkus/core/CoreResource.java
index 68f775566a..5fa2ad28ec 100644
--- a/integration-test-groups/foundation/core/src/main/java/org/apache/camel/quarkus/core/CoreResource.java
+++ b/integration-test-groups/foundation/core/src/main/java/org/apache/camel/quarkus/core/CoreResource.java
@@ -137,7 +137,8 @@ public class CoreResource {
@GET
@Produces(MediaType.TEXT_PLAIN)
public Response catalog(@PathParam("type") String type, @PathParam("name") String name) throws IOException {
- final CamelRuntimeCatalog catalog = (CamelRuntimeCatalog) context.getExtension(RuntimeCamelCatalog.class);
+ final CamelRuntimeCatalog catalog = (CamelRuntimeCatalog) context.getCamelContextExtension()
+ .getContextPlugin(RuntimeCamelCatalog.class);
try {
final String schema;
diff --git a/integration-test-groups/foundation/direct/src/main/java/org/apache/camel/quarkus/component/direct/it/DirectResource.java b/integration-test-groups/foundation/direct/src/main/java/org/apache/camel/quarkus/component/direct/it/DirectResource.java
index 0c5d485abc..f54b0b0faf 100644
--- a/integration-test-groups/foundation/direct/src/main/java/org/apache/camel/quarkus/component/direct/it/DirectResource.java
+++ b/integration-test-groups/foundation/direct/src/main/java/org/apache/camel/quarkus/component/direct/it/DirectResource.java
@@ -61,7 +61,8 @@ public class DirectResource {
@GET
@Produces(MediaType.APPLICATION_JSON)
public Response catalog(@PathParam("type") String type, @PathParam("name") String name) throws IOException {
- final CamelRuntimeCatalog catalog = (CamelRuntimeCatalog) context.getExtension(RuntimeCamelCatalog.class);
+ final CamelRuntimeCatalog catalog = (CamelRuntimeCatalog) context.getCamelContextExtension()
+ .getContextPlugin(RuntimeCamelCatalog.class);
try {
final String schema;
diff --git a/integration-tests/kamelet/src/main/java/org/apache/camel/quarkus/component/kamelet/it/KameletResource.java b/integration-tests/kamelet/src/main/java/org/apache/camel/quarkus/component/kamelet/it/KameletResource.java
index d062eb5a06..37a73e5539 100644
--- a/integration-tests/kamelet/src/main/java/org/apache/camel/quarkus/component/kamelet/it/KameletResource.java
+++ b/integration-tests/kamelet/src/main/java/org/apache/camel/quarkus/component/kamelet/it/KameletResource.java
@@ -87,7 +87,7 @@ public class KameletResource {
public JsonArray list() {
JsonArrayBuilder builder = Json.createArrayBuilder();
- camelContext.getExtension(Model.class)
+ camelContext.getCamelContextExtension().getContextPlugin(Model.class)
.getRouteTemplateDefinitions()
.stream()
.map(OptionalIdentifiedDefinition::getId)
diff --git a/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroProfileHealthResource.java b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroProfileHealthResource.java
index 35755b8244..38857951d2 100644
--- a/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroProfileHealthResource.java
+++ b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/MicroProfileHealthResource.java
@@ -48,7 +48,7 @@ public class MicroProfileHealthResource {
@POST
public void healthCheckEnabled(@PathParam("healthCheckId") String healthCheckId,
@QueryParam("healthCheckEnabled") boolean isHealthCheckEnabled) {
- HealthCheckRegistry registry = camelContext.getExtension(HealthCheckRegistry.class);
+ HealthCheckRegistry registry = camelContext.getCamelContextExtension().getContextPlugin(HealthCheckRegistry.class);
registry.getCheck(healthCheckId).ifPresent(healthCheck -> {
healthCheck.setEnabled(isHealthCheckEnabled);
if (isHealthCheckEnabled) {
diff --git a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/RouteFilterPatternExcludeTest.java b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/RouteFilterPatternExcludeTest.java
index d9b3468c28..8955d4f96d 100644
--- a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/RouteFilterPatternExcludeTest.java
+++ b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/RouteFilterPatternExcludeTest.java
@@ -38,8 +38,9 @@ public class RouteFilterPatternExcludeTest extends CamelQuarkusTestSupport {
@Test
public void testRouteFilter() throws Exception {
assertEquals(1, context.getRoutes().size());
- assertEquals(1, context.getExtension(Model.class).getRouteDefinitions().size());
- assertEquals("foo", context.getExtension(Model.class).getRouteDefinitions().get(0).getId());
+ assertEquals(1, context.getCamelContextExtension().getContextPlugin(Model.class).getRouteDefinitions().size());
+ assertEquals("foo",
+ context.getCamelContextExtension().getContextPlugin(Model.class).getRouteDefinitions().get(0).getId());
getMockEndpoint("mock:foo").expectedMessageCount(1);
diff --git a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/RouteFilterPatternIncludeExcludeTest.java b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/RouteFilterPatternIncludeExcludeTest.java
index c5b664c312..c2b87805da 100644
--- a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/RouteFilterPatternIncludeExcludeTest.java
+++ b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/RouteFilterPatternIncludeExcludeTest.java
@@ -43,8 +43,9 @@ public class RouteFilterPatternIncludeExcludeTest extends CamelQuarkusTestSuppor
@Test
public void testRouteFilter() throws Exception {
assertEquals(1, context.getRoutes().size());
- assertEquals(1, context.getExtension(Model.class).getRouteDefinitions().size());
- assertEquals("foo", context.getExtension(Model.class).getRouteDefinitions().get(0).getId());
+ assertEquals(1, context.getCamelContextExtension().getContextPlugin(Model.class).getRouteDefinitions().size());
+ assertEquals("foo",
+ context.getCamelContextExtension().getContextPlugin(Model.class).getRouteDefinitions().get(0).getId());
getMockEndpoint("mock:foo").expectedMessageCount(1);
diff --git a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/RouteFilterPatternIncludeTest.java b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/RouteFilterPatternIncludeTest.java
index bd4e3a0479..eeced6cb9c 100644
--- a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/RouteFilterPatternIncludeTest.java
+++ b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/RouteFilterPatternIncludeTest.java
@@ -38,8 +38,9 @@ public class RouteFilterPatternIncludeTest extends CamelQuarkusTestSupport {
@Test
public void testRouteFilter() throws Exception {
assertEquals(1, context.getRoutes().size());
- assertEquals(1, context.getExtension(Model.class).getRouteDefinitions().size());
- assertEquals("foo", context.getExtension(Model.class).getRouteDefinitions().get(0).getId());
+ assertEquals(1, context.getCamelContextExtension().getContextPlugin(Model.class).getRouteDefinitions().size());
+ assertEquals("foo",
+ context.getCamelContextExtension().getContextPlugin(Model.class).getRouteDefinitions().get(0).getId());
getMockEndpoint("mock:foo").expectedMessageCount(1);
diff --git a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/SimpleWeaveAddMockLastTest.java b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/SimpleWeaveAddMockLastTest.java
index 06e83a226d..81e369ed5e 100644
--- a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/SimpleWeaveAddMockLastTest.java
+++ b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/SimpleWeaveAddMockLastTest.java
@@ -37,7 +37,8 @@ public class SimpleWeaveAddMockLastTest extends CamelQuarkusTestSupport {
@Test
public void testWeaveAddMockLast() throws Exception {
- AdviceWith.adviceWith(context.getExtension(Model.class).getRouteDefinitions().get(0), context,
+ AdviceWith.adviceWith(context.getCamelContextExtension().getContextPlugin(Model.class).getRouteDefinitions().get(0),
+ context,
new AdviceWithRouteBuilder() {
@Override
public void configure() {