This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push: new 435b4b0242 Add missing dependencies to cli-connector extension and include dev-console service pattern 435b4b0242 is described below commit 435b4b0242f4c762718fcae51a97257316c40abf Author: James Netherton <jamesnether...@gmail.com> AuthorDate: Thu Aug 24 12:43:05 2023 +0100 Add missing dependencies to cli-connector extension and include dev-console service pattern --- extensions-jvm/cli-connector/deployment/pom.xml | 8 ++++++++ extensions-jvm/cli-connector/runtime/pom.xml | 8 ++++++++ .../console/deployment/ConsoleProcessor.java | 8 ++++++++ .../quarkus/component/console/it/ConsoleResource.java | 19 ++++++++----------- .../quarkus/component/console/it/ConsoleTest.java | 12 ++++++------ 5 files changed, 38 insertions(+), 17 deletions(-) diff --git a/extensions-jvm/cli-connector/deployment/pom.xml b/extensions-jvm/cli-connector/deployment/pom.xml index 1547a9c0b5..fd1a06b65a 100644 --- a/extensions-jvm/cli-connector/deployment/pom.xml +++ b/extensions-jvm/cli-connector/deployment/pom.xml @@ -36,6 +36,14 @@ <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-core-deployment</artifactId> </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-console-deployment</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-management-deployment</artifactId> + </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-cli-connector</artifactId> diff --git a/extensions-jvm/cli-connector/runtime/pom.xml b/extensions-jvm/cli-connector/runtime/pom.xml index d745fa2a00..8308cf0a70 100644 --- a/extensions-jvm/cli-connector/runtime/pom.xml +++ b/extensions-jvm/cli-connector/runtime/pom.xml @@ -41,6 +41,14 @@ <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-core</artifactId> </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-console</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-management</artifactId> + </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-cli-connector</artifactId> diff --git a/extensions-jvm/console/deployment/src/main/java/org/apache/camel/quarkus/component/console/deployment/ConsoleProcessor.java b/extensions-jvm/console/deployment/src/main/java/org/apache/camel/quarkus/component/console/deployment/ConsoleProcessor.java index ced3551b49..667b478d12 100644 --- a/extensions-jvm/console/deployment/src/main/java/org/apache/camel/quarkus/component/console/deployment/ConsoleProcessor.java +++ b/extensions-jvm/console/deployment/src/main/java/org/apache/camel/quarkus/component/console/deployment/ConsoleProcessor.java @@ -22,6 +22,8 @@ import io.quarkus.deployment.annotations.Record; import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.pkg.steps.NativeBuild; import org.apache.camel.quarkus.core.JvmOnlyRecorder; +import org.apache.camel.quarkus.core.deployment.spi.CamelServiceDestination; +import org.apache.camel.quarkus.core.deployment.spi.CamelServicePatternBuildItem; import org.jboss.logging.Logger; class ConsoleProcessor { @@ -34,6 +36,12 @@ class ConsoleProcessor { return new FeatureBuildItem(FEATURE); } + @BuildStep + CamelServicePatternBuildItem devConsoleServicePattern() { + return new CamelServicePatternBuildItem(CamelServiceDestination.DISCOVERY, true, + "META-INF/services/org/apache/camel/dev-console/*"); + } + /** * Remove this once this extension starts supporting the native mode. */ diff --git a/integration-tests-jvm/console/src/main/java/org/apache/camel/quarkus/component/console/it/ConsoleResource.java b/integration-tests-jvm/console/src/main/java/org/apache/camel/quarkus/component/console/it/ConsoleResource.java index 046454d78e..761f4f5206 100644 --- a/integration-tests-jvm/console/src/main/java/org/apache/camel/quarkus/component/console/it/ConsoleResource.java +++ b/integration-tests-jvm/console/src/main/java/org/apache/camel/quarkus/component/console/it/ConsoleResource.java @@ -22,26 +22,23 @@ import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; import org.apache.camel.CamelContext; -import org.jboss.logging.Logger; +import org.apache.camel.console.DevConsole; +import org.apache.camel.console.DevConsoleResolver; +import org.apache.camel.support.PluginHelper; @Path("/console") @ApplicationScoped public class ConsoleResource { - - private static final Logger LOG = Logger.getLogger(ConsoleResource.class); - - private static final String OTHER_CONSOLE = "console"; @Inject CamelContext context; - @Path("/load/other/console") + @Path("/context") @GET @Produces(MediaType.TEXT_PLAIN) - public Response loadOtherConsole() throws Exception { - /* This is an autogenerated test */ - /* No way to test a Camel artifact of kind "other" */ - return Response.ok().build(); + public String resolveContextDevConsole() throws Exception { + DevConsoleResolver devConsoleResolver = PluginHelper.getDevConsoleResolver(context); + DevConsole console = devConsoleResolver.resolveDevConsole("context"); + return console.getId(); } } diff --git a/integration-tests-jvm/console/src/test/java/org/apache/camel/quarkus/component/console/it/ConsoleTest.java b/integration-tests-jvm/console/src/test/java/org/apache/camel/quarkus/component/console/it/ConsoleTest.java index 949b427a6d..f06127b8a6 100644 --- a/integration-tests-jvm/console/src/test/java/org/apache/camel/quarkus/component/console/it/ConsoleTest.java +++ b/integration-tests-jvm/console/src/test/java/org/apache/camel/quarkus/component/console/it/ConsoleTest.java @@ -20,15 +20,15 @@ import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import org.junit.jupiter.api.Test; +import static org.hamcrest.Matchers.is; + @QuarkusTest class ConsoleTest { - @Test - public void loadOtherConsole() { - /* A simple autogenerated test */ - RestAssured.get("/console/load/other/console") + public void resolveContextDevConsole() { + RestAssured.get("/console/context") .then() - .statusCode(200); + .statusCode(200) + .body(is("context")); } - }