Adapt to vertx-core internal packages

vert-x3 · Jun 19, 2024 · d1f1a6f · d1f1a6f
1 parent 724d4db
commit d1f1a6f
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 21 deletions.
diff --git a/...y-bridge-consul/src/main/java/io/vertx/servicediscovery/consul/ConsulServiceImporter.java b/...y-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/...cker-links/src/main/java/io/vertx/servicediscovery/docker/DockerLinksServiceImporter.java b/...cker-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/...y-bridge-docker/src/main/java/io/vertx/servicediscovery/docker/DockerServiceImporter.java b/...y-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/...ernetes/src/main/java/io/vertx/servicediscovery/kubernetes/KubernetesServiceImporter.java b/...ernetes/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/...zookeeper/src/main/java/io/vertx/servicediscovery/zookeeper/ZookeeperServiceImporter.java b/...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/...idge-zookeeper/src/test/java/io/vertx/servicediscovery/zookeeper/ZookeeperBridgeTest.java b/...idge-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<List<Record>> serviceLookup(io.vertx.servicediscovery.ServiceDisc
     Promise<List<Record>> 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
@@ -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;