From f3795f8316ff1f7c8fff41b863b1a01b3ff4c8df Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Thu, 14 Sep 2023 13:44:11 +0300 Subject: [PATCH] Don't use VertxRecorder to get Vertx instance --- .../vault/runtime/client/SharedVertxVaultClient.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/runtime/src/main/java/io/quarkus/vault/runtime/client/SharedVertxVaultClient.java b/runtime/src/main/java/io/quarkus/vault/runtime/client/SharedVertxVaultClient.java index 2960ff21..c4d51197 100644 --- a/runtime/src/main/java/io/quarkus/vault/runtime/client/SharedVertxVaultClient.java +++ b/runtime/src/main/java/io/quarkus/vault/runtime/client/SharedVertxVaultClient.java @@ -7,6 +7,7 @@ import jakarta.annotation.PreDestroy; import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Instance; import jakarta.enterprise.inject.Produces; import jakarta.inject.Singleton; @@ -14,7 +15,6 @@ import io.quarkus.runtime.TlsConfig; import io.quarkus.vault.VaultException; import io.quarkus.vault.runtime.VaultConfigHolder; -import io.quarkus.vertx.runtime.VertxRecorder; import io.vertx.mutiny.core.Vertx; import io.vertx.mutiny.ext.web.client.WebClient; @@ -24,9 +24,9 @@ public class SharedVertxVaultClient extends VertxVaultClient { @Produces @Dependent - public static VertxVaultClient createSharedVaultClient() { + public static VertxVaultClient createSharedVaultClient(Instance vertx) { Annotation clientType; - if (VertxRecorder.getVertx() != null) { + if (vertx.isResolvable()) { clientType = Shared.Literal.INSTANCE; } else { clientType = Private.Literal.INSTANCE; @@ -36,11 +36,11 @@ public static VertxVaultClient createSharedVaultClient() { private final AtomicReference webClient = new AtomicReference<>(); - public SharedVertxVaultClient(VaultConfigHolder vaultConfigHolder, TlsConfig tlsConfig) { + public SharedVertxVaultClient(VaultConfigHolder vaultConfigHolder, Vertx quarkusMutinyVertx, TlsConfig tlsConfig) { super(vaultConfigHolder.getVaultRuntimeConfig().url().orElseThrow(() -> new VaultException("no vault url provided")), vaultConfigHolder.getVaultRuntimeConfig().enterprise().namespace(), vaultConfigHolder.getVaultRuntimeConfig().readTimeout()); - Vertx vertx = Vertx.newInstance(VertxRecorder.getVertx()); + Vertx vertx = Vertx.newInstance(quarkusMutinyVertx.getDelegate()); this.webClient.set(createHttpClient(vertx, vaultConfigHolder.getVaultRuntimeConfig(), tlsConfig)); }