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 5520d5f916 Avoid usage of VertxHttpConfig runtime configuration for vertx-websocket build time 5520d5f916 is described below commit 5520d5f916941a3b11487fd94ab047a4f33c3f70 Author: James Netherton <jamesnether...@gmail.com> AuthorDate: Fri Aug 8 13:49:33 2025 +0100 Avoid usage of VertxHttpConfig runtime configuration for vertx-websocket build time --- .../websocket/deployment/VertxWebsocketProcessor.java | 5 +---- .../vertx/websocket/VertxWebsocketRecorder.java | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/extensions/vertx-websocket/deployment/src/main/java/org/apache/camel/quarkus/component/vertx/websocket/deployment/VertxWebsocketProcessor.java b/extensions/vertx-websocket/deployment/src/main/java/org/apache/camel/quarkus/component/vertx/websocket/deployment/VertxWebsocketProcessor.java index c8984cb873..aa41df4ec8 100644 --- a/extensions/vertx-websocket/deployment/src/main/java/org/apache/camel/quarkus/component/vertx/websocket/deployment/VertxWebsocketProcessor.java +++ b/extensions/vertx-websocket/deployment/src/main/java/org/apache/camel/quarkus/component/vertx/websocket/deployment/VertxWebsocketProcessor.java @@ -25,7 +25,6 @@ import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.LaunchModeBuildItem; import io.quarkus.vertx.deployment.VertxBuildItem; import io.quarkus.vertx.http.deployment.VertxWebRouterBuildItem; -import io.quarkus.vertx.http.runtime.VertxHttpConfig; import org.apache.camel.component.vertx.websocket.VertxWebsocketComponent; import org.apache.camel.quarkus.component.vertx.websocket.VertxWebsocketRecorder; import org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeBeanBuildItem; @@ -46,10 +45,8 @@ class VertxWebsocketProcessor { VertxBuildItem vertx, VertxWebRouterBuildItem router, LaunchModeBuildItem launchMode, - VertxHttpConfig httpConfig, VertxWebsocketRecorder recorder) { return new CamelRuntimeBeanBuildItem("vertx-websocket", VertxWebsocketComponent.class.getName(), - recorder.createVertxWebsocketComponent(vertx.getVertx(), router.getHttpRouter(), launchMode.getLaunchMode(), - httpConfig)); + recorder.createVertxWebsocketComponent(vertx.getVertx(), router.getHttpRouter(), launchMode.getLaunchMode())); } } diff --git a/extensions/vertx-websocket/runtime/src/main/java/org/apache/camel/quarkus/component/vertx/websocket/VertxWebsocketRecorder.java b/extensions/vertx-websocket/runtime/src/main/java/org/apache/camel/quarkus/component/vertx/websocket/VertxWebsocketRecorder.java index 5483a6df5d..846bef6197 100644 --- a/extensions/vertx-websocket/runtime/src/main/java/org/apache/camel/quarkus/component/vertx/websocket/VertxWebsocketRecorder.java +++ b/extensions/vertx-websocket/runtime/src/main/java/org/apache/camel/quarkus/component/vertx/websocket/VertxWebsocketRecorder.java @@ -49,17 +49,23 @@ public class VertxWebsocketRecorder { private static volatile int PORT; private static volatile String HOST; + private final RuntimeValue<VertxHttpConfig> httpConfigRuntimeValue; + + public VertxWebsocketRecorder(RuntimeValue<VertxHttpConfig> httpConfigRuntimeValue) { + this.httpConfigRuntimeValue = httpConfigRuntimeValue; + } + public RuntimeValue<VertxWebsocketComponent> createVertxWebsocketComponent( RuntimeValue<Vertx> vertx, RuntimeValue<Router> router, - LaunchMode launchMode, - VertxHttpConfig httpConfig) { + LaunchMode launchMode) { - boolean sslEnabled = isHttpSeverSecureTransportConfigured(httpConfig); - int httpPort = httpConfig.determinePort(launchMode); - int httpsPort = httpConfig.determineSslPort(launchMode); + VertxHttpConfig vertxHttpConfig = httpConfigRuntimeValue.getValue(); + boolean sslEnabled = isHttpSeverSecureTransportConfigured(vertxHttpConfig); + int httpPort = vertxHttpConfig.determinePort(launchMode); + int httpsPort = vertxHttpConfig.determineSslPort(launchMode); - HOST = httpConfig.host(); + HOST = vertxHttpConfig.host(); PORT = sslEnabled ? httpsPort : httpPort; QuarkusVertxWebsocketComponent component = new QuarkusVertxWebsocketComponent();