This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push: new ca3f62b camel-jbang - Use /q for dev and health console to harmonise with camel-k ca3f62b is described below commit ca3f62b6b1a26f7714783772e81f07a96ee6e68b Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Fri Mar 18 15:49:07 2022 +0100 camel-jbang - Use /q for dev and health console to harmonise with camel-k --- .../java/org/apache/camel/dsl/jbang/core/commands/Run.java | 4 ++-- .../src/main/java/org/apache/camel/main/VertxHttpServer.java | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java index 224c118..57390a1 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java @@ -116,10 +116,10 @@ class Run implements Callable<Integer> { @Option(names = { "--port" }, description = "Embeds a local HTTP server on this port") private int port; - @Option(names = { "--console" }, description = "Developer console at /dev on local HTTP server (port 8080 by default)") + @Option(names = { "--console" }, description = "Developer console at /q/dev on local HTTP server (port 8080 by default)") private boolean console; - @Option(names = { "--health" }, description = "Health check at /health on local HTTP server (port 8080 by default)") + @Option(names = { "--health" }, description = "Health check at /q/health on local HTTP server (port 8080 by default)") private boolean health; @Option(names = { "--modeline" }, description = "Enables Camel-K style modeline") diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/VertxHttpServer.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/VertxHttpServer.java index d8e4566..e6450b8 100644 --- a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/VertxHttpServer.java +++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/VertxHttpServer.java @@ -148,7 +148,7 @@ public final class VertxHttpServer { } private static void doRegisterConsole(CamelContext context) { - Route dev = router.route("/dev"); + Route dev = router.route("/q/dev"); dev.method(HttpMethod.GET); dev.produces("text/plain"); dev.handler(new Handler<RoutingContext>() { @@ -180,7 +180,7 @@ public final class VertxHttpServer { } } }); - phc.addHttpEndpoint("/dev"); + phc.addHttpEndpoint("/q/dev"); } public static void registerHealthCheck(CamelContext camelContext) { @@ -190,13 +190,13 @@ public final class VertxHttpServer { } private static void doRegisterHealthCheck(CamelContext context) { - final Route health = router.route("/health"); + final Route health = router.route("/q/health"); health.method(HttpMethod.GET); health.produces("application/json"); - final Route live = router.route("/health/live"); + final Route live = router.route("/q/health/live"); live.method(HttpMethod.GET); live.produces("application/json"); - final Route ready = router.route("/health/ready"); + final Route ready = router.route("/q/health/ready"); ready.method(HttpMethod.GET); ready.produces("application/json"); @@ -237,7 +237,7 @@ public final class VertxHttpServer { live.handler(handler); ready.handler(handler); - phc.addHttpEndpoint("/health"); + phc.addHttpEndpoint("/q/health"); } private static void healthCheckOneline(StringBuilder sb, Collection<HealthCheck.Result> res) {