From d1f1a6f1ac43d8c33cf8154e9ae6327584ad7ac1 Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Wed, 19 Jun 2024 12:16:49 +0200 Subject: [PATCH] Adapt to vertx-core internal packages --- .../servicediscovery/consul/ConsulServiceImporter.java | 4 ++-- .../docker/DockerLinksServiceImporter.java | 4 ++-- .../servicediscovery/docker/DockerServiceImporter.java | 4 ++-- .../kubernetes/KubernetesServiceImporter.java | 6 +++--- .../zookeeper/ZookeeperServiceImporter.java | 4 ++-- .../servicediscovery/zookeeper/ZookeeperBridgeTest.java | 9 ++------- .../io/vertx/servicediscovery/impl/DiscoveryImpl.java | 6 +++--- 7 files changed, 16 insertions(+), 21 deletions(-) diff --git a/vertx-service-discovery-bridge-consul/src/main/java/io/vertx/servicediscovery/consul/ConsulServiceImporter.java b/vertx-service-discovery-bridge-consul/src/main/java/io/vertx/servicediscovery/consul/ConsulServiceImporter.java index 1042766c..bfba5e37 100644 --- a/vertx-service-discovery-bridge-consul/src/main/java/io/vertx/servicediscovery/consul/ConsulServiceImporter.java +++ b/vertx-service-discovery-bridge-consul/src/main/java/io/vertx/servicediscovery/consul/ConsulServiceImporter.java @@ -21,8 +21,8 @@ import io.vertx.core.Promise; import io.vertx.core.Vertx; import io.vertx.core.json.JsonObject; -import io.vertx.core.impl.logging.Logger; -import io.vertx.core.impl.logging.LoggerFactory; +import io.vertx.core.internal.logging.Logger; +import io.vertx.core.internal.logging.LoggerFactory; import io.vertx.ext.consul.*; import io.vertx.servicediscovery.Record; import io.vertx.servicediscovery.impl.ServiceTypes; diff --git a/vertx-service-discovery-bridge-docker-links/src/main/java/io/vertx/servicediscovery/docker/DockerLinksServiceImporter.java b/vertx-service-discovery-bridge-docker-links/src/main/java/io/vertx/servicediscovery/docker/DockerLinksServiceImporter.java index 12ee9952..5a0db248 100644 --- a/vertx-service-discovery-bridge-docker-links/src/main/java/io/vertx/servicediscovery/docker/DockerLinksServiceImporter.java +++ b/vertx-service-discovery-bridge-docker-links/src/main/java/io/vertx/servicediscovery/docker/DockerLinksServiceImporter.java @@ -21,8 +21,8 @@ import io.vertx.core.Promise; import io.vertx.core.Vertx; import io.vertx.core.json.JsonObject; -import io.vertx.core.impl.logging.Logger; -import io.vertx.core.impl.logging.LoggerFactory; +import io.vertx.core.internal.logging.Logger; +import io.vertx.core.internal.logging.LoggerFactory; import io.vertx.servicediscovery.Record; import io.vertx.servicediscovery.spi.ServiceImporter; import io.vertx.servicediscovery.spi.ServicePublisher; diff --git a/vertx-service-discovery-bridge-docker/src/main/java/io/vertx/servicediscovery/docker/DockerServiceImporter.java b/vertx-service-discovery-bridge-docker/src/main/java/io/vertx/servicediscovery/docker/DockerServiceImporter.java index 588ed4ff..a14a2046 100644 --- a/vertx-service-discovery-bridge-docker/src/main/java/io/vertx/servicediscovery/docker/DockerServiceImporter.java +++ b/vertx-service-discovery-bridge-docker/src/main/java/io/vertx/servicediscovery/docker/DockerServiceImporter.java @@ -26,8 +26,8 @@ import io.vertx.core.Promise; import io.vertx.core.Vertx; import io.vertx.core.json.JsonObject; -import io.vertx.core.impl.logging.Logger; -import io.vertx.core.impl.logging.LoggerFactory; +import io.vertx.core.internal.logging.Logger; +import io.vertx.core.internal.logging.LoggerFactory; import io.vertx.servicediscovery.Record; import io.vertx.servicediscovery.spi.ServiceImporter; import io.vertx.servicediscovery.spi.ServicePublisher; diff --git a/vertx-service-discovery-bridge-kubernetes/src/main/java/io/vertx/servicediscovery/kubernetes/KubernetesServiceImporter.java b/vertx-service-discovery-bridge-kubernetes/src/main/java/io/vertx/servicediscovery/kubernetes/KubernetesServiceImporter.java index e7374826..ffc3d546 100644 --- a/vertx-service-discovery-bridge-kubernetes/src/main/java/io/vertx/servicediscovery/kubernetes/KubernetesServiceImporter.java +++ b/vertx-service-discovery-bridge-kubernetes/src/main/java/io/vertx/servicediscovery/kubernetes/KubernetesServiceImporter.java @@ -20,9 +20,9 @@ import io.vertx.core.buffer.Buffer; import io.vertx.core.http.HttpClient; import io.vertx.core.http.HttpClientOptions; -import io.vertx.core.impl.ContextInternal; -import io.vertx.core.impl.logging.Logger; -import io.vertx.core.impl.logging.LoggerFactory; +import io.vertx.core.internal.ContextInternal; +import io.vertx.core.internal.logging.Logger; +import io.vertx.core.internal.logging.LoggerFactory; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; import io.vertx.core.parsetools.JsonParser; diff --git a/vertx-service-discovery-bridge-zookeeper/src/main/java/io/vertx/servicediscovery/zookeeper/ZookeeperServiceImporter.java b/vertx-service-discovery-bridge-zookeeper/src/main/java/io/vertx/servicediscovery/zookeeper/ZookeeperServiceImporter.java index 96c7d78c..6b62a145 100644 --- a/vertx-service-discovery-bridge-zookeeper/src/main/java/io/vertx/servicediscovery/zookeeper/ZookeeperServiceImporter.java +++ b/vertx-service-discovery-bridge-zookeeper/src/main/java/io/vertx/servicediscovery/zookeeper/ZookeeperServiceImporter.java @@ -5,8 +5,8 @@ import io.vertx.core.Promise; import io.vertx.core.Vertx; import io.vertx.core.json.JsonObject; -import io.vertx.core.impl.logging.Logger; -import io.vertx.core.impl.logging.LoggerFactory; +import io.vertx.core.internal.logging.Logger; +import io.vertx.core.internal.logging.LoggerFactory; import io.vertx.servicediscovery.Record; import io.vertx.servicediscovery.spi.ServiceImporter; import io.vertx.servicediscovery.spi.ServicePublisher; diff --git a/vertx-service-discovery-bridge-zookeeper/src/test/java/io/vertx/servicediscovery/zookeeper/ZookeeperBridgeTest.java b/vertx-service-discovery-bridge-zookeeper/src/test/java/io/vertx/servicediscovery/zookeeper/ZookeeperBridgeTest.java index 94ce34f0..da0bf0db 100644 --- a/vertx-service-discovery-bridge-zookeeper/src/test/java/io/vertx/servicediscovery/zookeeper/ZookeeperBridgeTest.java +++ b/vertx-service-discovery-bridge-zookeeper/src/test/java/io/vertx/servicediscovery/zookeeper/ZookeeperBridgeTest.java @@ -1,11 +1,6 @@ package io.vertx.servicediscovery.zookeeper; -import io.vertx.core.AsyncResult; -import io.vertx.core.Future; -import io.vertx.core.Handler; -import io.vertx.core.Promise; -import io.vertx.core.Vertx; -import io.vertx.core.impl.NoStackTraceThrowable; +import io.vertx.core.*; import io.vertx.core.json.JsonObject; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; @@ -190,7 +185,7 @@ private Future> serviceLookup(io.vertx.servicediscovery.ServiceDisc Promise> promise = Promise.promise(); discovery.getRecords(x -> true).onComplete(ar -> { if (ar.failed()) { - NoStackTraceThrowable failure = new NoStackTraceThrowable("service lookup failed: " + ar.cause().getMessage()); + VertxException failure = VertxException.noStackTrace("service lookup failed: " + ar.cause().getMessage()); failure.initCause(ar.cause()); promise.fail(failure); } else if (ar.result().size() != expected) { diff --git a/vertx-service-discovery/src/main/java/io/vertx/servicediscovery/impl/DiscoveryImpl.java b/vertx-service-discovery/src/main/java/io/vertx/servicediscovery/impl/DiscoveryImpl.java index 2f78f681..59485ab7 100644 --- a/vertx-service-discovery/src/main/java/io/vertx/servicediscovery/impl/DiscoveryImpl.java +++ b/vertx-service-discovery/src/main/java/io/vertx/servicediscovery/impl/DiscoveryImpl.java @@ -18,9 +18,9 @@ import io.vertx.codegen.annotations.Nullable; import io.vertx.core.*; -import io.vertx.core.impl.VertxInternal; -import io.vertx.core.impl.logging.Logger; -import io.vertx.core.impl.logging.LoggerFactory; +import io.vertx.core.internal.VertxInternal; +import io.vertx.core.internal.logging.Logger; +import io.vertx.core.internal.logging.LoggerFactory; import io.vertx.core.json.JsonObject; import io.vertx.servicediscovery.*; import io.vertx.servicediscovery.Record;