From b45fc0bb7797d3bd886aecf9f4913a8ca977cf4c Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Mon, 9 Sep 2024 16:36:13 +0200 Subject: [PATCH] Support JPMS Motivation: Support JPMS. Changes: - add a module info descriptor - update to endpoint manager -> resource manager (from core) - move test classes in a package that is not the main module package --- pom.xml | 27 +++++++++++---- .../redis/client/RedisOptionsConverter.java | 8 +++++ .../vertx/redis/client/impl/ArrayQueue.java | 10 +++--- .../redis/client/impl/BaseRedisClient.java | 4 +++ .../vertx/redis/client/impl/RESPParser.java | 2 +- .../client/impl/RedisConnectionManager.java | 33 ++++++++++--------- .../vertx/redis/client/impl/RequestImpl.java | 4 +-- src/main/java/module-info.java | 9 +++++ .../redis/client}/ClusterUtils.java | 2 +- .../redis/client/CommandGenerator.java | 4 ++- .../redis/client}/PreservesContext.java | 2 +- .../client}/RedisClient5SecureFailedTest.java | 6 ++-- .../redis/client}/RedisClient5SecureTest.java | 6 ++-- .../redis/client}/RedisClient5Test.java | 6 ++-- .../client}/RedisClient6SecureFailedTest.java | 6 ++-- .../redis/client}/RedisClient6SecureTest.java | 6 ++-- .../redis/client}/RedisClient6Test.java | 6 ++-- .../redis/client}/RedisClient7Test.java | 6 ++-- .../redis/client}/RedisClientLoadTest.java | 4 +-- .../redis/client}/RedisClientMetricsTest.java | 4 +-- .../client}/RedisClientPikaSecureTest.java | 4 +-- .../redis/client}/RedisClientPikaTest.java | 4 +-- .../redis/client}/RedisClientPubSubTest.java | 4 +-- .../redis/client}/RedisClientREJSONTest.java | 2 +- .../redis/client}/RedisClientTLSTest.java | 6 ++-- .../redis/client}/RedisClientTest.java | 8 ++--- .../client}/RedisClientToBadServerTest.java | 2 +- .../redis/client}/RedisClusterAskTest.java | 4 +-- .../redis/client}/RedisClusterMovedTest.java | 4 +-- .../RedisClusterMovedToNewNodeTest.java | 4 +-- .../redis/client}/RedisClusterTest.java | 9 +++-- .../client}/RedisConnectOptionsTest.java | 2 +- .../redis/client}/RedisOptionsTest.java | 2 +- .../redis/client}/RedisPoolMetricsTest.java | 4 +-- .../redis/client}/RedisPooledTest.java | 6 ++-- .../client}/RedisProtocolVersionTest.java | 4 +-- .../redis/client/RedisPubSub2Test.java} | 6 ++-- .../redis/client}/RedisPubSubTest.java | 4 +-- .../redis/client}/RedisReconnectTest.java | 4 +-- .../redis/client}/RedisReplicationTest.java | 8 ++--- .../RedisSentinelMasterFailoverTest.java | 6 ++-- .../redis/client}/RedisSentinelTest.java | 8 ++--- .../redis/client}/RedisTest.java | 6 ++-- .../client}/RedisThreadConsistencyTest.java | 4 +-- .../redis/client}/RedisTracingTest.java | 4 +-- .../client}/SharedRedisConnectionTest.java | 4 +-- .../redis/client}/TestUtils.java | 2 +- .../containers/KeyPairAndCertificate.java | 2 +- .../redis/containers/RedisCluster.java | 2 +- .../redis/containers/RedisReplication.java | 2 +- .../redis/containers/RedisSentinel.java | 2 +- .../redis/containers/RedisStandalone.java | 2 +- .../redis/internal}/ArrayQueueTest.java | 3 +- .../redis/internal}/BufferTest.java | 3 +- .../internal}/CommandNormalizationTest.java | 4 ++- .../internal}/ConnectionRecyclingTest.java | 17 ++++++---- .../redis/internal}/RedisURITest.java | 3 +- .../redis/internal}/ReplyParserTest.java | 4 ++- .../redis/internal}/RequestImplTest.java | 3 +- .../redis/internal}/ZModemTest.java | 2 +- 60 files changed, 189 insertions(+), 140 deletions(-) create mode 100644 src/main/java/module-info.java rename src/test/java/io/vertx/{redis/client/test => tests/redis/client}/ClusterUtils.java (97%) rename src/test/java/io/vertx/{ => tests}/redis/client/CommandGenerator.java (98%) rename src/test/java/io/vertx/{redis/client/test => tests/redis/client}/PreservesContext.java (98%) rename src/test/java/io/vertx/{test/redis => tests/redis/client}/RedisClient5SecureFailedTest.java (90%) rename src/test/java/io/vertx/{test/redis => tests/redis/client}/RedisClient5SecureTest.java (89%) rename src/test/java/io/vertx/{test/redis => tests/redis/client}/RedisClient5Test.java (94%) rename src/test/java/io/vertx/{test/redis => tests/redis/client}/RedisClient6SecureFailedTest.java (90%) rename src/test/java/io/vertx/{test/redis => tests/redis/client}/RedisClient6SecureTest.java (89%) rename src/test/java/io/vertx/{test/redis => tests/redis/client}/RedisClient6Test.java (97%) rename src/test/java/io/vertx/{test/redis => tests/redis/client}/RedisClient7Test.java (98%) rename src/test/java/io/vertx/{test/redis => tests/redis/client}/RedisClientLoadTest.java (98%) rename src/test/java/io/vertx/{redis/client/test => tests/redis/client}/RedisClientMetricsTest.java (97%) rename src/test/java/io/vertx/{test/redis => tests/redis/client}/RedisClientPikaSecureTest.java (96%) rename src/test/java/io/vertx/{test/redis => tests/redis/client}/RedisClientPikaTest.java (96%) rename src/test/java/io/vertx/{redis/client/test => tests/redis/client}/RedisClientPubSubTest.java (97%) rename src/test/java/io/vertx/{test/redis => tests/redis/client}/RedisClientREJSONTest.java (98%) rename src/test/java/io/vertx/{test/redis => tests/redis/client}/RedisClientTLSTest.java (94%) rename src/test/java/io/vertx/{test/redis => tests/redis/client}/RedisClientTest.java (99%) rename src/test/java/io/vertx/{test/redis => tests/redis/client}/RedisClientToBadServerTest.java (96%) rename src/test/java/io/vertx/{redis/client/test => tests/redis/client}/RedisClusterAskTest.java (97%) rename src/test/java/io/vertx/{redis/client/test => tests/redis/client}/RedisClusterMovedTest.java (98%) rename src/test/java/io/vertx/{redis/client/test => tests/redis/client}/RedisClusterMovedToNewNodeTest.java (98%) rename src/test/java/io/vertx/{redis/client/test => tests/redis/client}/RedisClusterTest.java (99%) rename src/test/java/io/vertx/{redis/client/test => tests/redis/client}/RedisConnectOptionsTest.java (99%) rename src/test/java/io/vertx/{redis/client/test => tests/redis/client}/RedisOptionsTest.java (98%) rename src/test/java/io/vertx/{redis/client/test => tests/redis/client}/RedisPoolMetricsTest.java (97%) rename src/test/java/io/vertx/{redis/client/test => tests/redis/client}/RedisPooledTest.java (98%) rename src/test/java/io/vertx/{redis/client/test => tests/redis/client}/RedisProtocolVersionTest.java (97%) rename src/test/java/io/vertx/{redis/client/test/RedisPubSubTest.java => tests/redis/client/RedisPubSub2Test.java} (97%) rename src/test/java/io/vertx/{test/redis => tests/redis/client}/RedisPubSubTest.java (97%) rename src/test/java/io/vertx/{test/redis => tests/redis/client}/RedisReconnectTest.java (97%) rename src/test/java/io/vertx/{redis/client/test => tests/redis/client}/RedisReplicationTest.java (97%) rename src/test/java/io/vertx/{redis/client/test => tests/redis/client}/RedisSentinelMasterFailoverTest.java (91%) rename src/test/java/io/vertx/{redis/client/test => tests/redis/client}/RedisSentinelTest.java (96%) rename src/test/java/io/vertx/{redis/client/test => tests/redis/client}/RedisTest.java (98%) rename src/test/java/io/vertx/{test/redis => tests/redis/client}/RedisThreadConsistencyTest.java (96%) rename src/test/java/io/vertx/{redis/client/test => tests/redis/client}/RedisTracingTest.java (97%) rename src/test/java/io/vertx/{redis/client/test => tests/redis/client}/SharedRedisConnectionTest.java (97%) rename src/test/java/io/vertx/{redis/client/test => tests/redis/client}/TestUtils.java (96%) rename src/test/java/io/vertx/{ => tests}/redis/containers/KeyPairAndCertificate.java (99%) rename src/test/java/io/vertx/{ => tests}/redis/containers/RedisCluster.java (98%) rename src/test/java/io/vertx/{ => tests}/redis/containers/RedisReplication.java (96%) rename src/test/java/io/vertx/{ => tests}/redis/containers/RedisSentinel.java (97%) rename src/test/java/io/vertx/{ => tests}/redis/containers/RedisStandalone.java (98%) rename src/test/java/io/vertx/{redis/client/impl => tests/redis/internal}/ArrayQueueTest.java (91%) rename src/test/java/io/vertx/{redis/client/impl => tests/redis/internal}/BufferTest.java (97%) rename src/test/java/io/vertx/{redis/client/impl => tests/redis/internal}/CommandNormalizationTest.java (85%) rename src/test/java/io/vertx/{redis/client/impl => tests/redis/internal}/ConnectionRecyclingTest.java (87%) rename src/test/java/io/vertx/{redis/client/impl => tests/redis/internal}/RedisURITest.java (98%) rename src/test/java/io/vertx/{redis/client/impl => tests/redis/internal}/ReplyParserTest.java (98%) rename src/test/java/io/vertx/{redis/client/impl => tests/redis/internal}/RequestImplTest.java (83%) rename src/test/java/io/vertx/{redis/impl => tests/redis/internal}/ZModemTest.java (97%) diff --git a/pom.xml b/pom.xml index 40745707..4d8acc91 100644 --- a/pom.xml +++ b/pom.xml @@ -61,12 +61,17 @@ io.vertx - vertx-codegen + vertx-codegen-api true io.vertx - vertx-docgen + vertx-codegen-json + true + + + io.vertx + vertx-docgen-api true @@ -115,10 +120,19 @@ default-compile compile - - io.vertx.codegen.CodeGenProcessor - io.vertx.docgen.JavaDocGenProcessor - + ${project.basedir}/src/main/generated + + + io.vertx + vertx-codegen + processor + + + io.vertx + vertx-docgen-processor + processor + + @@ -141,6 +155,7 @@ org.apache.maven.plugins maven-surefire-plugin + false src/test/resources/logging.properties diff --git a/src/main/generated/io/vertx/redis/client/RedisOptionsConverter.java b/src/main/generated/io/vertx/redis/client/RedisOptionsConverter.java index 1e6ff9ef..230396df 100644 --- a/src/main/generated/io/vertx/redis/client/RedisOptionsConverter.java +++ b/src/main/generated/io/vertx/redis/client/RedisOptionsConverter.java @@ -113,6 +113,11 @@ static void fromJson(Iterable> json, RedisOp obj.setPoolName((String)member.getValue()); } break; + case "metricsName": + if (member.getValue() instanceof String) { + obj.setMetricsName((String)member.getValue()); + } + break; case "hashSlotCacheTTL": if (member.getValue() instanceof Number) { obj.setHashSlotCacheTTL(((Number)member.getValue()).longValue()); @@ -174,6 +179,9 @@ static void toJson(RedisOptions obj, java.util.Map json) { if (obj.getPoolName() != null) { json.put("poolName", obj.getPoolName()); } + if (obj.getMetricsName() != null) { + json.put("metricsName", obj.getMetricsName()); + } json.put("hashSlotCacheTTL", obj.getHashSlotCacheTTL()); json.put("autoFailover", obj.isAutoFailover()); } diff --git a/src/main/java/io/vertx/redis/client/impl/ArrayQueue.java b/src/main/java/io/vertx/redis/client/impl/ArrayQueue.java index 7ca15c4e..a30fe91a 100644 --- a/src/main/java/io/vertx/redis/client/impl/ArrayQueue.java +++ b/src/main/java/io/vertx/redis/client/impl/ArrayQueue.java @@ -19,7 +19,7 @@ import java.util.Objects; -final class ArrayQueue { +public final class ArrayQueue { private int cur, // current number of elements @@ -31,7 +31,7 @@ final class ArrayQueue { /** * Creates a new empty queue. */ - ArrayQueue(int capacity) { + public ArrayQueue(int capacity) { queue = new Object[capacity]; back = -1; front = 0; @@ -54,7 +54,7 @@ boolean isEmpty() { * @throws IndexOutOfBoundsException if the queue is full. * @throws NullPointerException if the value is {@code null} */ - void offer(T value) { + public void offer(T value) { Objects.requireNonNull(value, "'value' cannot be null"); if (isFull()) { throw new IndexOutOfBoundsException(); @@ -87,7 +87,7 @@ void offer(T value) { * * @return element at front of the queue or {@code null} if the queue is empty. */ - @Nullable T poll() { + public @Nullable T poll() { if (isEmpty()) { return null; } @@ -102,7 +102,7 @@ void offer(T value) { return e; } - int freeSlots() { + public int freeSlots() { return queue.length - cur; } diff --git a/src/main/java/io/vertx/redis/client/impl/BaseRedisClient.java b/src/main/java/io/vertx/redis/client/impl/BaseRedisClient.java index e5b9c734..4a3e52d0 100644 --- a/src/main/java/io/vertx/redis/client/impl/BaseRedisClient.java +++ b/src/main/java/io/vertx/redis/client/impl/BaseRedisClient.java @@ -26,6 +26,10 @@ public BaseRedisClient(Vertx vertx, NetClientOptions tcpOptions, PoolOptions poo this.connectionManager.start(); } + public RedisConnectionManager connectionManager() { + return connectionManager; + } + @Override public void close() { this.connectionManager.close(); diff --git a/src/main/java/io/vertx/redis/client/impl/RESPParser.java b/src/main/java/io/vertx/redis/client/impl/RESPParser.java index 5cdcfcd2..081ff35a 100644 --- a/src/main/java/io/vertx/redis/client/impl/RESPParser.java +++ b/src/main/java/io/vertx/redis/client/impl/RESPParser.java @@ -37,7 +37,7 @@ public final class RESPParser implements Handler { // nesting while parsing private final ArrayStack stack; - RESPParser(ParserHandler handler, int maxStack) { + public RESPParser(ParserHandler handler, int maxStack) { this.handler = handler; this.stack = new ArrayStack(maxStack); } diff --git a/src/main/java/io/vertx/redis/client/impl/RedisConnectionManager.java b/src/main/java/io/vertx/redis/client/impl/RedisConnectionManager.java index ddf85e80..84cdee79 100644 --- a/src/main/java/io/vertx/redis/client/impl/RedisConnectionManager.java +++ b/src/main/java/io/vertx/redis/client/impl/RedisConnectionManager.java @@ -18,12 +18,11 @@ import io.vertx.core.Future; import io.vertx.core.Handler; import io.vertx.core.Promise; +import io.vertx.core.internal.resource.ManagedResource; +import io.vertx.core.internal.resource.ResourceManager; import io.vertx.core.net.ConnectOptions; import io.vertx.core.net.NetClientOptions; import io.vertx.core.net.NetSocket; -import io.vertx.core.net.impl.endpoint.EndpointManager; -import io.vertx.core.net.impl.endpoint.EndpointProvider; -import io.vertx.core.net.impl.endpoint.Endpoint; import io.vertx.core.internal.pool.*; import io.vertx.core.internal.net.NetClientInternal; import io.vertx.core.internal.ContextInternal; @@ -38,8 +37,9 @@ import io.vertx.redis.client.impl.types.ErrorType; import java.util.Objects; +import java.util.function.Function; -class RedisConnectionManager implements EndpointProvider { +public class RedisConnectionManager implements Function { private static final Logger LOG = LoggerFactory.getLogger(RedisConnectionManager.class); @@ -53,7 +53,7 @@ class RedisConnectionManager implements EndpointProvider pooledConnectionManager; + private final ResourceManager pooledConnectionManager; private long timerID; RedisConnectionManager(VertxInternal vertx, NetClientOptions tcpOptions, PoolOptions poolOptions, RedisConnectOptions connectOptions, TracingPolicy tracingPolicy) { @@ -65,11 +65,11 @@ class RedisConnectionManager implements EndpointProvider(); + this.pooledConnectionManager = new ResourceManager<>(); } - private RedisEndpoint connectionEndpointProvider(Runnable dispose, String connectionString, Request setup) { - return new RedisEndpoint(vertx, netClient, tcpOptions, poolOptions, connectOptions, tracingPolicy, dispose, connectionString, setup); + private RedisEndpoint connectionEndpointProvider(String connectionString, Request setup) { + return new RedisEndpoint(vertx, netClient, tcpOptions, poolOptions, connectOptions, tracingPolicy, connectionString, setup); } synchronized void start() { @@ -93,7 +93,7 @@ private void checkExpired(long period) { timerID = vertx.setTimer(period, id -> checkExpired(period)); } - static class ConnectionKey { + public static class ConnectionKey { private final String string; private final Request setup; @@ -338,8 +338,8 @@ private Future setup(ContextInternal ctx, RedisConnection connection, Requ } @Override - public RedisEndpoint create(ConnectionKey key, Runnable dispose) { - return connectionEndpointProvider(dispose, key.string, key.setup); + public RedisEndpoint apply(ConnectionKey key) { + return connectionEndpointProvider(key.string, key.setup); } public Future getConnection(String connectionString, Request setup) { @@ -353,7 +353,7 @@ public Future getConnection(String connectionString, Requ final boolean metricsEnabled = metrics != null; final Object queueMetric = metricsEnabled ? metrics.enqueue() : null; - Future> future = pooledConnectionManager.withEndpointAsync(new ConnectionKey(connectionString, setup), this, (endpoint, created) -> { + Future> future = pooledConnectionManager.withResourceAsync(new ConnectionKey(connectionString, setup), this, (endpoint, created) -> { return endpoint.requestConnection(eventLoopContext); }); return future @@ -379,12 +379,15 @@ public void close() { } } - static class RedisEndpoint extends Endpoint { + public static class RedisEndpoint extends ManagedResource { final ConnectionPool pool; - public RedisEndpoint(VertxInternal vertx, NetClientInternal netClient, NetClientOptions netClientOptions, PoolOptions poolOptions, RedisConnectOptions connectOptions, TracingPolicy tracingPolicy, Runnable dispose, String connectionString, Request setup) { - super(dispose); + public ConnectionPool pool() { + return pool; + } + + public RedisEndpoint(VertxInternal vertx, NetClientInternal netClient, NetClientOptions netClientOptions, PoolOptions poolOptions, RedisConnectOptions connectOptions, TracingPolicy tracingPolicy, String connectionString, Request setup) { PoolConnector connector = new RedisConnectionProvider(vertx, netClient, netClientOptions, poolOptions, connectOptions, tracingPolicy, connectionString, setup); pool = ConnectionPool.pool(connector, new int[]{poolOptions.getMaxSize()}, poolOptions.getMaxWaiting()); } diff --git a/src/main/java/io/vertx/redis/client/impl/RequestImpl.java b/src/main/java/io/vertx/redis/client/impl/RequestImpl.java index d9a3bbfd..a2c0cae1 100644 --- a/src/main/java/io/vertx/redis/client/impl/RequestImpl.java +++ b/src/main/java/io/vertx/redis/client/impl/RequestImpl.java @@ -123,7 +123,7 @@ public Request arg(Buffer arg) { return this; } - Buffer encode() { + public Buffer encode() { return encode(Buffer.buffer()); } @@ -153,7 +153,7 @@ Buffer encode(Buffer buffer) { return buffer; } - List getArgs() { + public List getArgs() { return args; } diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java new file mode 100644 index 00000000..d43352d5 --- /dev/null +++ b/src/main/java/module-info.java @@ -0,0 +1,9 @@ + +module io.vertx.client.redis { + requires io.vertx.core; + requires io.vertx.core.logging; + requires static io.vertx.docgen; + requires static io.vertx.codegen.api; + requires static io.vertx.codegen.json; + exports io.vertx.redis.client; +} diff --git a/src/test/java/io/vertx/redis/client/test/ClusterUtils.java b/src/test/java/io/vertx/tests/redis/client/ClusterUtils.java similarity index 97% rename from src/test/java/io/vertx/redis/client/test/ClusterUtils.java rename to src/test/java/io/vertx/tests/redis/client/ClusterUtils.java index b428d1ab..fe95aede 100644 --- a/src/test/java/io/vertx/redis/client/test/ClusterUtils.java +++ b/src/test/java/io/vertx/tests/redis/client/ClusterUtils.java @@ -1,4 +1,4 @@ -package io.vertx.redis.client.test; +package io.vertx.tests.redis.client; import io.vertx.core.Future; import io.vertx.core.Vertx; diff --git a/src/test/java/io/vertx/redis/client/CommandGenerator.java b/src/test/java/io/vertx/tests/redis/client/CommandGenerator.java similarity index 98% rename from src/test/java/io/vertx/redis/client/CommandGenerator.java rename to src/test/java/io/vertx/tests/redis/client/CommandGenerator.java index 1d4712f6..a9ffda2e 100644 --- a/src/test/java/io/vertx/redis/client/CommandGenerator.java +++ b/src/test/java/io/vertx/tests/redis/client/CommandGenerator.java @@ -1,7 +1,9 @@ -package io.vertx.redis.client; +package io.vertx.tests.redis.client; import io.vertx.core.AbstractVerticle; import io.vertx.core.Vertx; +import io.vertx.redis.client.Redis; +import io.vertx.redis.client.Response; import java.util.ArrayList; import java.util.Comparator; diff --git a/src/test/java/io/vertx/redis/client/test/PreservesContext.java b/src/test/java/io/vertx/tests/redis/client/PreservesContext.java similarity index 98% rename from src/test/java/io/vertx/redis/client/test/PreservesContext.java rename to src/test/java/io/vertx/tests/redis/client/PreservesContext.java index b5da76f5..caf55082 100644 --- a/src/test/java/io/vertx/redis/client/test/PreservesContext.java +++ b/src/test/java/io/vertx/tests/redis/client/PreservesContext.java @@ -1,4 +1,4 @@ -package io.vertx.redis.client.test; +package io.vertx.tests.redis.client; import io.vertx.core.Context; import io.vertx.core.Vertx; diff --git a/src/test/java/io/vertx/test/redis/RedisClient5SecureFailedTest.java b/src/test/java/io/vertx/tests/redis/client/RedisClient5SecureFailedTest.java similarity index 90% rename from src/test/java/io/vertx/test/redis/RedisClient5SecureFailedTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisClient5SecureFailedTest.java index aad0611e..3129e4b3 100644 --- a/src/test/java/io/vertx/test/redis/RedisClient5SecureFailedTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisClient5SecureFailedTest.java @@ -1,4 +1,4 @@ -package io.vertx.test.redis; +package io.vertx.tests.redis.client; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; @@ -6,7 +6,7 @@ import io.vertx.ext.unit.junit.VertxUnitRunner; import io.vertx.redis.client.Redis; import io.vertx.redis.client.RedisOptions; -import io.vertx.redis.containers.RedisStandalone; +import io.vertx.tests.redis.containers.RedisStandalone; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; @@ -16,7 +16,7 @@ import static io.vertx.redis.client.Command.GET; import static io.vertx.redis.client.Request.cmd; -import static io.vertx.redis.client.test.TestUtils.randomKey; +import static io.vertx.tests.redis.client.TestUtils.randomKey; @RunWith(VertxUnitRunner.class) public class RedisClient5SecureFailedTest { diff --git a/src/test/java/io/vertx/test/redis/RedisClient5SecureTest.java b/src/test/java/io/vertx/tests/redis/client/RedisClient5SecureTest.java similarity index 89% rename from src/test/java/io/vertx/test/redis/RedisClient5SecureTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisClient5SecureTest.java index 864ca663..2c88677a 100644 --- a/src/test/java/io/vertx/test/redis/RedisClient5SecureTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisClient5SecureTest.java @@ -1,4 +1,4 @@ -package io.vertx.test.redis; +package io.vertx.tests.redis.client; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; @@ -6,7 +6,7 @@ import io.vertx.ext.unit.junit.VertxUnitRunner; import io.vertx.redis.client.Redis; import io.vertx.redis.client.RedisOptions; -import io.vertx.redis.containers.RedisStandalone; +import io.vertx.tests.redis.containers.RedisStandalone; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; @@ -16,7 +16,7 @@ import static io.vertx.redis.client.Command.GET; import static io.vertx.redis.client.Request.cmd; -import static io.vertx.redis.client.test.TestUtils.randomKey; +import static io.vertx.tests.redis.client.TestUtils.randomKey; @RunWith(VertxUnitRunner.class) public class RedisClient5SecureTest { diff --git a/src/test/java/io/vertx/test/redis/RedisClient5Test.java b/src/test/java/io/vertx/tests/redis/client/RedisClient5Test.java similarity index 94% rename from src/test/java/io/vertx/test/redis/RedisClient5Test.java rename to src/test/java/io/vertx/tests/redis/client/RedisClient5Test.java index c1a4fdf3..8386d11b 100644 --- a/src/test/java/io/vertx/test/redis/RedisClient5Test.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisClient5Test.java @@ -1,4 +1,4 @@ -package io.vertx.test.redis; +package io.vertx.tests.redis.client; import io.vertx.core.json.JsonObject; import io.vertx.ext.unit.Async; @@ -7,7 +7,7 @@ import io.vertx.ext.unit.junit.VertxUnitRunner; import io.vertx.redis.client.Redis; import io.vertx.redis.client.RedisOptions; -import io.vertx.redis.containers.RedisStandalone; +import io.vertx.tests.redis.containers.RedisStandalone; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; @@ -20,7 +20,7 @@ import static io.vertx.redis.client.Command.HSET; import static io.vertx.redis.client.Command.SET; import static io.vertx.redis.client.Request.cmd; -import static io.vertx.redis.client.test.TestUtils.randomKey; +import static io.vertx.tests.redis.client.TestUtils.randomKey; @RunWith(VertxUnitRunner.class) public class RedisClient5Test { diff --git a/src/test/java/io/vertx/test/redis/RedisClient6SecureFailedTest.java b/src/test/java/io/vertx/tests/redis/client/RedisClient6SecureFailedTest.java similarity index 90% rename from src/test/java/io/vertx/test/redis/RedisClient6SecureFailedTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisClient6SecureFailedTest.java index 2e98be6c..2134f6d4 100644 --- a/src/test/java/io/vertx/test/redis/RedisClient6SecureFailedTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisClient6SecureFailedTest.java @@ -1,4 +1,4 @@ -package io.vertx.test.redis; +package io.vertx.tests.redis.client; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; @@ -7,7 +7,7 @@ import io.vertx.redis.client.Redis; import io.vertx.redis.client.RedisOptions; import io.vertx.redis.client.impl.types.ErrorType; -import io.vertx.redis.containers.RedisStandalone; +import io.vertx.tests.redis.containers.RedisStandalone; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; @@ -17,7 +17,7 @@ import static io.vertx.redis.client.Command.GET; import static io.vertx.redis.client.Request.cmd; -import static io.vertx.redis.client.test.TestUtils.randomKey; +import static io.vertx.tests.redis.client.TestUtils.randomKey; @RunWith(VertxUnitRunner.class) public class RedisClient6SecureFailedTest { diff --git a/src/test/java/io/vertx/test/redis/RedisClient6SecureTest.java b/src/test/java/io/vertx/tests/redis/client/RedisClient6SecureTest.java similarity index 89% rename from src/test/java/io/vertx/test/redis/RedisClient6SecureTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisClient6SecureTest.java index 1ef556bb..e2d292ee 100644 --- a/src/test/java/io/vertx/test/redis/RedisClient6SecureTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisClient6SecureTest.java @@ -1,4 +1,4 @@ -package io.vertx.test.redis; +package io.vertx.tests.redis.client; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; @@ -6,7 +6,7 @@ import io.vertx.ext.unit.junit.VertxUnitRunner; import io.vertx.redis.client.Redis; import io.vertx.redis.client.RedisOptions; -import io.vertx.redis.containers.RedisStandalone; +import io.vertx.tests.redis.containers.RedisStandalone; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; @@ -16,7 +16,7 @@ import static io.vertx.redis.client.Command.GET; import static io.vertx.redis.client.Request.cmd; -import static io.vertx.redis.client.test.TestUtils.randomKey; +import static io.vertx.tests.redis.client.TestUtils.randomKey; @RunWith(VertxUnitRunner.class) public class RedisClient6SecureTest { diff --git a/src/test/java/io/vertx/test/redis/RedisClient6Test.java b/src/test/java/io/vertx/tests/redis/client/RedisClient6Test.java similarity index 97% rename from src/test/java/io/vertx/test/redis/RedisClient6Test.java rename to src/test/java/io/vertx/tests/redis/client/RedisClient6Test.java index 136ce3a8..43d97a76 100644 --- a/src/test/java/io/vertx/test/redis/RedisClient6Test.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisClient6Test.java @@ -1,4 +1,4 @@ -package io.vertx.test.redis; +package io.vertx.tests.redis.client; import io.vertx.core.json.JsonObject; import io.vertx.ext.unit.Async; @@ -9,7 +9,7 @@ import io.vertx.redis.client.RedisOptions; import io.vertx.redis.client.Response; import io.vertx.redis.client.impl.types.ErrorType; -import io.vertx.redis.containers.RedisStandalone; +import io.vertx.tests.redis.containers.RedisStandalone; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; @@ -25,7 +25,7 @@ import static io.vertx.redis.client.Command.SET; import static io.vertx.redis.client.Command.SUBSCRIBE; import static io.vertx.redis.client.Request.cmd; -import static io.vertx.redis.client.test.TestUtils.randomKey; +import static io.vertx.tests.redis.client.TestUtils.randomKey; @RunWith(VertxUnitRunner.class) public class RedisClient6Test { diff --git a/src/test/java/io/vertx/test/redis/RedisClient7Test.java b/src/test/java/io/vertx/tests/redis/client/RedisClient7Test.java similarity index 98% rename from src/test/java/io/vertx/test/redis/RedisClient7Test.java rename to src/test/java/io/vertx/tests/redis/client/RedisClient7Test.java index a2da675d..8407e126 100644 --- a/src/test/java/io/vertx/test/redis/RedisClient7Test.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisClient7Test.java @@ -1,4 +1,4 @@ -package io.vertx.test.redis; +package io.vertx.tests.redis.client; import io.vertx.core.AbstractVerticle; import io.vertx.core.DeploymentOptions; @@ -13,7 +13,7 @@ import io.vertx.redis.client.RedisOptions; import io.vertx.redis.client.Response; import io.vertx.redis.client.impl.types.ErrorType; -import io.vertx.redis.containers.RedisStandalone; +import io.vertx.tests.redis.containers.RedisStandalone; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; @@ -33,7 +33,7 @@ import static io.vertx.redis.client.Command.SET; import static io.vertx.redis.client.Command.SUBSCRIBE; import static io.vertx.redis.client.Request.cmd; -import static io.vertx.redis.client.test.TestUtils.randomKey; +import static io.vertx.tests.redis.client.TestUtils.randomKey; @RunWith(VertxUnitRunner.class) public class RedisClient7Test { diff --git a/src/test/java/io/vertx/test/redis/RedisClientLoadTest.java b/src/test/java/io/vertx/tests/redis/client/RedisClientLoadTest.java similarity index 98% rename from src/test/java/io/vertx/test/redis/RedisClientLoadTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisClientLoadTest.java index 21f6cb7d..99b17c01 100644 --- a/src/test/java/io/vertx/test/redis/RedisClientLoadTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisClientLoadTest.java @@ -1,4 +1,4 @@ -package io.vertx.test.redis; +package io.vertx.tests.redis.client; import io.vertx.core.AbstractVerticle; import io.vertx.core.DeploymentOptions; @@ -16,7 +16,7 @@ import io.vertx.redis.client.Redis; import io.vertx.redis.client.RedisOptions; import io.vertx.redis.client.Request; -import io.vertx.redis.containers.RedisStandalone; +import io.vertx.tests.redis.containers.RedisStandalone; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/io/vertx/redis/client/test/RedisClientMetricsTest.java b/src/test/java/io/vertx/tests/redis/client/RedisClientMetricsTest.java similarity index 97% rename from src/test/java/io/vertx/redis/client/test/RedisClientMetricsTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisClientMetricsTest.java index 3cc55ab5..309323dd 100644 --- a/src/test/java/io/vertx/redis/client/test/RedisClientMetricsTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisClientMetricsTest.java @@ -1,4 +1,4 @@ -package io.vertx.redis.client.test; +package io.vertx.tests.redis.client; import io.vertx.core.Vertx; import io.vertx.core.net.SocketAddress; @@ -12,7 +12,7 @@ import io.vertx.redis.client.RedisOptions; import io.vertx.redis.client.Request; import io.vertx.redis.client.impl.CommandImpl; -import io.vertx.redis.containers.RedisStandalone; +import io.vertx.tests.redis.containers.RedisStandalone; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; diff --git a/src/test/java/io/vertx/test/redis/RedisClientPikaSecureTest.java b/src/test/java/io/vertx/tests/redis/client/RedisClientPikaSecureTest.java similarity index 96% rename from src/test/java/io/vertx/test/redis/RedisClientPikaSecureTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisClientPikaSecureTest.java index 7392b59b..3846eaa0 100644 --- a/src/test/java/io/vertx/test/redis/RedisClientPikaSecureTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisClientPikaSecureTest.java @@ -1,4 +1,4 @@ -package io.vertx.test.redis; +package io.vertx.tests.redis.client; import io.vertx.core.json.JsonObject; import io.vertx.ext.unit.Async; @@ -21,7 +21,7 @@ import static io.vertx.redis.client.Command.HSET; import static io.vertx.redis.client.Command.SET; import static io.vertx.redis.client.Request.cmd; -import static io.vertx.redis.client.test.TestUtils.randomKey; +import static io.vertx.tests.redis.client.TestUtils.randomKey; @RunWith(VertxUnitRunner.class) public class RedisClientPikaSecureTest { diff --git a/src/test/java/io/vertx/test/redis/RedisClientPikaTest.java b/src/test/java/io/vertx/tests/redis/client/RedisClientPikaTest.java similarity index 96% rename from src/test/java/io/vertx/test/redis/RedisClientPikaTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisClientPikaTest.java index 5320fd29..734c0e31 100644 --- a/src/test/java/io/vertx/test/redis/RedisClientPikaTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisClientPikaTest.java @@ -1,4 +1,4 @@ -package io.vertx.test.redis; +package io.vertx.tests.redis.client; import io.vertx.core.json.JsonObject; import io.vertx.ext.unit.Async; @@ -20,7 +20,7 @@ import static io.vertx.redis.client.Command.HSET; import static io.vertx.redis.client.Command.SET; import static io.vertx.redis.client.Request.cmd; -import static io.vertx.redis.client.test.TestUtils.randomKey; +import static io.vertx.tests.redis.client.TestUtils.randomKey; @RunWith(VertxUnitRunner.class) public class RedisClientPikaTest { diff --git a/src/test/java/io/vertx/redis/client/test/RedisClientPubSubTest.java b/src/test/java/io/vertx/tests/redis/client/RedisClientPubSubTest.java similarity index 97% rename from src/test/java/io/vertx/redis/client/test/RedisClientPubSubTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisClientPubSubTest.java index 61358b92..54212221 100644 --- a/src/test/java/io/vertx/redis/client/test/RedisClientPubSubTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisClientPubSubTest.java @@ -13,7 +13,7 @@ *

* You may elect to redistribute this code under either of these licenses. */ -package io.vertx.redis.client.test; +package io.vertx.tests.redis.client; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; @@ -24,7 +24,7 @@ import io.vertx.redis.client.RedisConnection; import io.vertx.redis.client.RedisOptions; import io.vertx.redis.client.Request; -import io.vertx.redis.containers.RedisStandalone; +import io.vertx.tests.redis.containers.RedisStandalone; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; diff --git a/src/test/java/io/vertx/test/redis/RedisClientREJSONTest.java b/src/test/java/io/vertx/tests/redis/client/RedisClientREJSONTest.java similarity index 98% rename from src/test/java/io/vertx/test/redis/RedisClientREJSONTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisClientREJSONTest.java index ac467972..e92d1cf9 100644 --- a/src/test/java/io/vertx/test/redis/RedisClientREJSONTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisClientREJSONTest.java @@ -13,7 +13,7 @@ *

* You may elect to redistribute this code under either of these licenses. */ -package io.vertx.test.redis; +package io.vertx.tests.redis.client; import io.vertx.core.Future; import io.vertx.ext.unit.Async; diff --git a/src/test/java/io/vertx/test/redis/RedisClientTLSTest.java b/src/test/java/io/vertx/tests/redis/client/RedisClientTLSTest.java similarity index 94% rename from src/test/java/io/vertx/test/redis/RedisClientTLSTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisClientTLSTest.java index 93969e8c..4cc5f18e 100644 --- a/src/test/java/io/vertx/test/redis/RedisClientTLSTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisClientTLSTest.java @@ -1,4 +1,4 @@ -package io.vertx.test.redis; +package io.vertx.tests.redis.client; import io.vertx.core.buffer.Buffer; import io.vertx.core.net.JksOptions; @@ -11,8 +11,8 @@ import io.vertx.redis.client.Redis; import io.vertx.redis.client.RedisOptions; import io.vertx.redis.client.Request; -import io.vertx.redis.containers.KeyPairAndCertificate; -import io.vertx.redis.containers.RedisStandalone; +import io.vertx.tests.redis.containers.KeyPairAndCertificate; +import io.vertx.tests.redis.containers.RedisStandalone; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/io/vertx/test/redis/RedisClientTest.java b/src/test/java/io/vertx/tests/redis/client/RedisClientTest.java similarity index 99% rename from src/test/java/io/vertx/test/redis/RedisClientTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisClientTest.java index 17c46aa6..5ac96a74 100644 --- a/src/test/java/io/vertx/test/redis/RedisClientTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisClientTest.java @@ -13,11 +13,9 @@ *

* You may elect to redistribute this code under either of these licenses. */ -package io.vertx.test.redis; +package io.vertx.tests.redis.client; import io.vertx.core.Context; -import io.vertx.core.json.JsonArray; -import io.vertx.core.net.NetSocket; import io.vertx.core.internal.pool.PoolConnector; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; @@ -32,7 +30,7 @@ import io.vertx.redis.client.impl.PooledRedisConnection; import io.vertx.redis.client.impl.RedisConnectionInternal; import io.vertx.redis.client.impl.RedisStandaloneConnection; -import io.vertx.redis.containers.RedisStandalone; +import io.vertx.tests.redis.containers.RedisStandalone; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; @@ -46,7 +44,7 @@ import java.util.List; import java.util.Map; -import static io.vertx.redis.client.test.TestUtils.randomKey; +import static io.vertx.tests.redis.client.TestUtils.randomKey; @RunWith(VertxUnitRunner.class) public class RedisClientTest { diff --git a/src/test/java/io/vertx/test/redis/RedisClientToBadServerTest.java b/src/test/java/io/vertx/tests/redis/client/RedisClientToBadServerTest.java similarity index 96% rename from src/test/java/io/vertx/test/redis/RedisClientToBadServerTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisClientToBadServerTest.java index 27f94840..d774c1f5 100644 --- a/src/test/java/io/vertx/test/redis/RedisClientToBadServerTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisClientToBadServerTest.java @@ -1,4 +1,4 @@ -package io.vertx.test.redis; +package io.vertx.tests.redis.client; import io.vertx.core.net.NetSocket; import io.vertx.ext.unit.Async; diff --git a/src/test/java/io/vertx/redis/client/test/RedisClusterAskTest.java b/src/test/java/io/vertx/tests/redis/client/RedisClusterAskTest.java similarity index 97% rename from src/test/java/io/vertx/redis/client/test/RedisClusterAskTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisClusterAskTest.java index 3bcd43f0..b0f43584 100644 --- a/src/test/java/io/vertx/redis/client/test/RedisClusterAskTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisClusterAskTest.java @@ -1,4 +1,4 @@ -package io.vertx.redis.client.test; +package io.vertx.tests.redis.client; import io.vertx.core.Future; import io.vertx.ext.unit.Async; @@ -12,7 +12,7 @@ import io.vertx.redis.client.RedisOptions; import io.vertx.redis.client.RedisReplicas; import io.vertx.redis.client.Request; -import io.vertx.redis.containers.RedisCluster; +import io.vertx.tests.redis.containers.RedisCluster; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; diff --git a/src/test/java/io/vertx/redis/client/test/RedisClusterMovedTest.java b/src/test/java/io/vertx/tests/redis/client/RedisClusterMovedTest.java similarity index 98% rename from src/test/java/io/vertx/redis/client/test/RedisClusterMovedTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisClusterMovedTest.java index 0e66ed82..9dd442ee 100644 --- a/src/test/java/io/vertx/redis/client/test/RedisClusterMovedTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisClusterMovedTest.java @@ -1,4 +1,4 @@ -package io.vertx.redis.client.test; +package io.vertx.tests.redis.client; import io.vertx.core.Future; import io.vertx.core.net.SocketAddress; @@ -14,7 +14,7 @@ import io.vertx.redis.client.RedisReplicas; import io.vertx.redis.client.Request; import io.vertx.redis.client.impl.PooledRedisConnection; -import io.vertx.redis.containers.RedisCluster; +import io.vertx.tests.redis.containers.RedisCluster; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; diff --git a/src/test/java/io/vertx/redis/client/test/RedisClusterMovedToNewNodeTest.java b/src/test/java/io/vertx/tests/redis/client/RedisClusterMovedToNewNodeTest.java similarity index 98% rename from src/test/java/io/vertx/redis/client/test/RedisClusterMovedToNewNodeTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisClusterMovedToNewNodeTest.java index 165108ee..98ecf5ef 100644 --- a/src/test/java/io/vertx/redis/client/test/RedisClusterMovedToNewNodeTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisClusterMovedToNewNodeTest.java @@ -1,4 +1,4 @@ -package io.vertx.redis.client.test; +package io.vertx.tests.redis.client; import io.vertx.core.Future; import io.vertx.core.net.SocketAddress; @@ -14,7 +14,7 @@ import io.vertx.redis.client.RedisReplicas; import io.vertx.redis.client.Request; import io.vertx.redis.client.impl.PooledRedisConnection; -import io.vertx.redis.containers.RedisCluster; +import io.vertx.tests.redis.containers.RedisCluster; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; diff --git a/src/test/java/io/vertx/redis/client/test/RedisClusterTest.java b/src/test/java/io/vertx/tests/redis/client/RedisClusterTest.java similarity index 99% rename from src/test/java/io/vertx/redis/client/test/RedisClusterTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisClusterTest.java index 1b6fc203..632b94c9 100644 --- a/src/test/java/io/vertx/redis/client/test/RedisClusterTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisClusterTest.java @@ -1,4 +1,4 @@ -package io.vertx.redis.client.test; +package io.vertx.tests.redis.client; import io.vertx.codegen.annotations.Nullable; import io.vertx.core.Context; @@ -8,7 +8,6 @@ import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.RunTestOnContext; import io.vertx.ext.unit.junit.VertxUnitRunner; -import io.vertx.redis.client.Command; import io.vertx.redis.client.Redis; import io.vertx.redis.client.RedisClientType; import io.vertx.redis.client.RedisConnection; @@ -17,7 +16,7 @@ import io.vertx.redis.client.Request; import io.vertx.redis.client.Response; import io.vertx.redis.client.ResponseType; -import io.vertx.redis.containers.RedisCluster; +import io.vertx.tests.redis.containers.RedisCluster; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; @@ -65,8 +64,8 @@ import static io.vertx.redis.client.Command.TTL; import static io.vertx.redis.client.Command.WAIT; import static io.vertx.redis.client.Request.cmd; -import static io.vertx.redis.client.test.TestUtils.randomKey; -import static io.vertx.redis.client.test.TestUtils.retryUntilSuccess; +import static io.vertx.tests.redis.client.TestUtils.randomKey; +import static io.vertx.tests.redis.client.TestUtils.retryUntilSuccess; @RunWith(VertxUnitRunner.class) diff --git a/src/test/java/io/vertx/redis/client/test/RedisConnectOptionsTest.java b/src/test/java/io/vertx/tests/redis/client/RedisConnectOptionsTest.java similarity index 99% rename from src/test/java/io/vertx/redis/client/test/RedisConnectOptionsTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisConnectOptionsTest.java index 63c450e1..26d660e3 100644 --- a/src/test/java/io/vertx/redis/client/test/RedisConnectOptionsTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisConnectOptionsTest.java @@ -1,4 +1,4 @@ -package io.vertx.redis.client.test; +package io.vertx.tests.redis.client; import io.vertx.redis.client.RedisClusterConnectOptions; import io.vertx.redis.client.RedisReplicas; diff --git a/src/test/java/io/vertx/redis/client/test/RedisOptionsTest.java b/src/test/java/io/vertx/tests/redis/client/RedisOptionsTest.java similarity index 98% rename from src/test/java/io/vertx/redis/client/test/RedisOptionsTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisOptionsTest.java index e6806dd7..47f24a8e 100644 --- a/src/test/java/io/vertx/redis/client/test/RedisOptionsTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisOptionsTest.java @@ -1,4 +1,4 @@ -package io.vertx.redis.client.test; +package io.vertx.tests.redis.client; import io.vertx.core.tracing.TracingPolicy; import io.vertx.redis.client.RedisClientType; diff --git a/src/test/java/io/vertx/redis/client/test/RedisPoolMetricsTest.java b/src/test/java/io/vertx/tests/redis/client/RedisPoolMetricsTest.java similarity index 97% rename from src/test/java/io/vertx/redis/client/test/RedisPoolMetricsTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisPoolMetricsTest.java index 78cf3c0f..8dc83717 100644 --- a/src/test/java/io/vertx/redis/client/test/RedisPoolMetricsTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisPoolMetricsTest.java @@ -1,4 +1,4 @@ -package io.vertx.redis.client.test; +package io.vertx.tests.redis.client; import io.vertx.core.Vertx; import io.vertx.core.VertxOptions; @@ -14,7 +14,7 @@ import io.vertx.redis.client.RedisConnection; import io.vertx.redis.client.RedisOptions; import io.vertx.redis.client.Request; -import io.vertx.redis.containers.RedisStandalone; +import io.vertx.tests.redis.containers.RedisStandalone; import io.vertx.test.fakemetrics.FakePoolMetrics; import org.junit.ClassRule; import org.junit.Rule; diff --git a/src/test/java/io/vertx/redis/client/test/RedisPooledTest.java b/src/test/java/io/vertx/tests/redis/client/RedisPooledTest.java similarity index 98% rename from src/test/java/io/vertx/redis/client/test/RedisPooledTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisPooledTest.java index a1490eea..f3a7c87b 100644 --- a/src/test/java/io/vertx/redis/client/test/RedisPooledTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisPooledTest.java @@ -1,4 +1,4 @@ -package io.vertx.redis.client.test; +package io.vertx.tests.redis.client; import io.vertx.core.Vertx; import io.vertx.ext.unit.Async; @@ -11,7 +11,7 @@ import io.vertx.redis.client.RedisOptions; import io.vertx.redis.client.Request; import io.vertx.redis.client.impl.PooledRedisConnection; -import io.vertx.redis.containers.RedisStandalone; +import io.vertx.tests.redis.containers.RedisStandalone; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; @@ -31,7 +31,7 @@ import static io.vertx.redis.client.Command.SET; import static io.vertx.redis.client.Command.SUBSCRIBE; import static io.vertx.redis.client.Request.cmd; -import static io.vertx.redis.client.test.TestUtils.randomKey; +import static io.vertx.tests.redis.client.TestUtils.randomKey; @RunWith(VertxUnitRunner.class) public class RedisPooledTest { diff --git a/src/test/java/io/vertx/redis/client/test/RedisProtocolVersionTest.java b/src/test/java/io/vertx/tests/redis/client/RedisProtocolVersionTest.java similarity index 97% rename from src/test/java/io/vertx/redis/client/test/RedisProtocolVersionTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisProtocolVersionTest.java index f12109fe..732d165b 100644 --- a/src/test/java/io/vertx/redis/client/test/RedisProtocolVersionTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisProtocolVersionTest.java @@ -1,4 +1,4 @@ -package io.vertx.redis.client.test; +package io.vertx.tests.redis.client; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; @@ -9,7 +9,7 @@ import io.vertx.redis.client.Redis; import io.vertx.redis.client.RedisOptions; import io.vertx.redis.client.Request; -import io.vertx.redis.containers.RedisStandalone; +import io.vertx.tests.redis.containers.RedisStandalone; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/io/vertx/redis/client/test/RedisPubSubTest.java b/src/test/java/io/vertx/tests/redis/client/RedisPubSub2Test.java similarity index 97% rename from src/test/java/io/vertx/redis/client/test/RedisPubSubTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisPubSub2Test.java index ce6b1df9..171e8e57 100644 --- a/src/test/java/io/vertx/redis/client/test/RedisPubSubTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisPubSub2Test.java @@ -1,4 +1,4 @@ -package io.vertx.redis.client.test; +package io.vertx.tests.redis.client; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; @@ -8,7 +8,7 @@ import io.vertx.redis.client.RedisConnection; import io.vertx.redis.client.RedisOptions; import io.vertx.redis.client.Request; -import io.vertx.redis.containers.RedisStandalone; +import io.vertx.tests.redis.containers.RedisStandalone; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; @@ -25,7 +25,7 @@ import static io.vertx.redis.client.Request.cmd; @RunWith(VertxUnitRunner.class) -public class RedisPubSubTest { +public class RedisPubSub2Test { @ClassRule public static final RedisStandalone redis = new RedisStandalone(); diff --git a/src/test/java/io/vertx/test/redis/RedisPubSubTest.java b/src/test/java/io/vertx/tests/redis/client/RedisPubSubTest.java similarity index 97% rename from src/test/java/io/vertx/test/redis/RedisPubSubTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisPubSubTest.java index 37f2ea99..a72f9eeb 100644 --- a/src/test/java/io/vertx/test/redis/RedisPubSubTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisPubSubTest.java @@ -1,4 +1,4 @@ -package io.vertx.test.redis; +package io.vertx.tests.redis.client; import io.vertx.core.VertxOptions; import io.vertx.ext.unit.Async; @@ -11,7 +11,7 @@ import io.vertx.redis.client.RedisConnection; import io.vertx.redis.client.RedisOptions; import io.vertx.redis.client.Request; -import io.vertx.redis.containers.RedisCluster; +import io.vertx.tests.redis.containers.RedisCluster; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; diff --git a/src/test/java/io/vertx/test/redis/RedisReconnectTest.java b/src/test/java/io/vertx/tests/redis/client/RedisReconnectTest.java similarity index 97% rename from src/test/java/io/vertx/test/redis/RedisReconnectTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisReconnectTest.java index d36d161d..791a8abb 100644 --- a/src/test/java/io/vertx/test/redis/RedisReconnectTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisReconnectTest.java @@ -1,4 +1,4 @@ -package io.vertx.test.redis; +package io.vertx.tests.redis.client; import io.vertx.core.Context; import io.vertx.ext.unit.Async; @@ -10,7 +10,7 @@ import io.vertx.redis.client.RedisConnection; import io.vertx.redis.client.RedisOptions; import io.vertx.redis.client.Request; -import io.vertx.redis.containers.RedisStandalone; +import io.vertx.tests.redis.containers.RedisStandalone; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; diff --git a/src/test/java/io/vertx/redis/client/test/RedisReplicationTest.java b/src/test/java/io/vertx/tests/redis/client/RedisReplicationTest.java similarity index 97% rename from src/test/java/io/vertx/redis/client/test/RedisReplicationTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisReplicationTest.java index 62c5652e..86c5a8b1 100644 --- a/src/test/java/io/vertx/redis/client/test/RedisReplicationTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisReplicationTest.java @@ -1,4 +1,4 @@ -package io.vertx.redis.client.test; +package io.vertx.tests.redis.client; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; @@ -11,14 +11,14 @@ import io.vertx.redis.client.RedisReplicas; import io.vertx.redis.client.RedisTopology; import io.vertx.redis.client.Request; -import io.vertx.redis.containers.RedisReplication; +import io.vertx.tests.redis.containers.RedisReplication; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import static io.vertx.redis.client.test.TestUtils.randomKey; -import static io.vertx.redis.client.test.TestUtils.retryUntilSuccess; +import static io.vertx.tests.redis.client.TestUtils.randomKey; +import static io.vertx.tests.redis.client.TestUtils.retryUntilSuccess; @RunWith(VertxUnitRunner.class) public class RedisReplicationTest { diff --git a/src/test/java/io/vertx/redis/client/test/RedisSentinelMasterFailoverTest.java b/src/test/java/io/vertx/tests/redis/client/RedisSentinelMasterFailoverTest.java similarity index 91% rename from src/test/java/io/vertx/redis/client/test/RedisSentinelMasterFailoverTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisSentinelMasterFailoverTest.java index 7105565e..918eeb91 100644 --- a/src/test/java/io/vertx/redis/client/test/RedisSentinelMasterFailoverTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisSentinelMasterFailoverTest.java @@ -1,4 +1,4 @@ -package io.vertx.redis.client.test; +package io.vertx.tests.redis.client; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; @@ -10,13 +10,13 @@ import io.vertx.redis.client.RedisOptions; import io.vertx.redis.client.RedisRole; import io.vertx.redis.client.Request; -import io.vertx.redis.containers.RedisSentinel; +import io.vertx.tests.redis.containers.RedisSentinel; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import static io.vertx.redis.client.test.TestUtils.retryUntilSuccess; +import static io.vertx.tests.redis.client.TestUtils.retryUntilSuccess; @RunWith(VertxUnitRunner.class) public class RedisSentinelMasterFailoverTest { diff --git a/src/test/java/io/vertx/redis/client/test/RedisSentinelTest.java b/src/test/java/io/vertx/tests/redis/client/RedisSentinelTest.java similarity index 96% rename from src/test/java/io/vertx/redis/client/test/RedisSentinelTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisSentinelTest.java index 66e56c76..1a446ef2 100644 --- a/src/test/java/io/vertx/redis/client/test/RedisSentinelTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisSentinelTest.java @@ -1,4 +1,4 @@ -package io.vertx.redis.client.test; +package io.vertx.tests.redis.client; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; @@ -11,14 +11,14 @@ import io.vertx.redis.client.RedisReplicas; import io.vertx.redis.client.RedisRole; import io.vertx.redis.client.Request; -import io.vertx.redis.containers.RedisSentinel; +import io.vertx.tests.redis.containers.RedisSentinel; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import static io.vertx.redis.client.test.TestUtils.randomKey; -import static io.vertx.redis.client.test.TestUtils.retryUntilSuccess; +import static io.vertx.tests.redis.client.TestUtils.randomKey; +import static io.vertx.tests.redis.client.TestUtils.retryUntilSuccess; @RunWith(VertxUnitRunner.class) public class RedisSentinelTest { diff --git a/src/test/java/io/vertx/redis/client/test/RedisTest.java b/src/test/java/io/vertx/tests/redis/client/RedisTest.java similarity index 98% rename from src/test/java/io/vertx/redis/client/test/RedisTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisTest.java index 6aacad13..7a4cdb21 100644 --- a/src/test/java/io/vertx/redis/client/test/RedisTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisTest.java @@ -1,4 +1,4 @@ -package io.vertx.redis.client.test; +package io.vertx.tests.redis.client; import io.vertx.core.Future; import io.vertx.core.Promise; @@ -15,7 +15,7 @@ import io.vertx.redis.client.Request; import io.vertx.redis.client.Response; import io.vertx.redis.client.ResponseType; -import io.vertx.redis.containers.RedisStandalone; +import io.vertx.tests.redis.containers.RedisStandalone; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; @@ -36,7 +36,7 @@ import static io.vertx.redis.client.Command.ZADD; import static io.vertx.redis.client.Command.ZRANGEBYSCORE; import static io.vertx.redis.client.Request.cmd; -import static io.vertx.redis.client.test.TestUtils.randomKey; +import static io.vertx.tests.redis.client.TestUtils.randomKey; @RunWith(VertxUnitRunner.class) public class RedisTest { diff --git a/src/test/java/io/vertx/test/redis/RedisThreadConsistencyTest.java b/src/test/java/io/vertx/tests/redis/client/RedisThreadConsistencyTest.java similarity index 96% rename from src/test/java/io/vertx/test/redis/RedisThreadConsistencyTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisThreadConsistencyTest.java index 07afe88e..893099cd 100644 --- a/src/test/java/io/vertx/test/redis/RedisThreadConsistencyTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisThreadConsistencyTest.java @@ -1,4 +1,4 @@ -package io.vertx.test.redis; +package io.vertx.tests.redis.client; import io.vertx.core.AbstractVerticle; import io.vertx.core.Promise; @@ -10,7 +10,7 @@ import io.vertx.redis.client.Redis; import io.vertx.redis.client.RedisAPI; import io.vertx.redis.client.RedisOptions; -import io.vertx.redis.containers.RedisStandalone; +import io.vertx.tests.redis.containers.RedisStandalone; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/io/vertx/redis/client/test/RedisTracingTest.java b/src/test/java/io/vertx/tests/redis/client/RedisTracingTest.java similarity index 97% rename from src/test/java/io/vertx/redis/client/test/RedisTracingTest.java rename to src/test/java/io/vertx/tests/redis/client/RedisTracingTest.java index 724bdc44..d34f4677 100644 --- a/src/test/java/io/vertx/redis/client/test/RedisTracingTest.java +++ b/src/test/java/io/vertx/tests/redis/client/RedisTracingTest.java @@ -1,4 +1,4 @@ -package io.vertx.redis.client.test; +package io.vertx.tests.redis.client; import io.vertx.core.Context; import io.vertx.core.Vertx; @@ -14,7 +14,7 @@ import io.vertx.redis.client.RedisOptions; import io.vertx.redis.client.Request; import io.vertx.redis.client.impl.CommandImpl; -import io.vertx.redis.containers.RedisStandalone; +import io.vertx.tests.redis.containers.RedisStandalone; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; diff --git a/src/test/java/io/vertx/redis/client/test/SharedRedisConnectionTest.java b/src/test/java/io/vertx/tests/redis/client/SharedRedisConnectionTest.java similarity index 97% rename from src/test/java/io/vertx/redis/client/test/SharedRedisConnectionTest.java rename to src/test/java/io/vertx/tests/redis/client/SharedRedisConnectionTest.java index 6ac5a586..b1743aec 100644 --- a/src/test/java/io/vertx/redis/client/test/SharedRedisConnectionTest.java +++ b/src/test/java/io/vertx/tests/redis/client/SharedRedisConnectionTest.java @@ -1,4 +1,4 @@ -package io.vertx.redis.client.test; +package io.vertx.tests.redis.client; import io.vertx.core.AbstractVerticle; import io.vertx.core.DeploymentOptions; @@ -11,7 +11,7 @@ import io.vertx.redis.client.RedisAPI; import io.vertx.redis.client.RedisOptions; import io.vertx.redis.client.Response; -import io.vertx.redis.containers.RedisStandalone; +import io.vertx.tests.redis.containers.RedisStandalone; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; diff --git a/src/test/java/io/vertx/redis/client/test/TestUtils.java b/src/test/java/io/vertx/tests/redis/client/TestUtils.java similarity index 96% rename from src/test/java/io/vertx/redis/client/test/TestUtils.java rename to src/test/java/io/vertx/tests/redis/client/TestUtils.java index 6c54c886..f5de76b1 100644 --- a/src/test/java/io/vertx/redis/client/test/TestUtils.java +++ b/src/test/java/io/vertx/tests/redis/client/TestUtils.java @@ -1,4 +1,4 @@ -package io.vertx.redis.client.test; +package io.vertx.tests.redis.client; import io.vertx.core.Future; import io.vertx.core.Promise; diff --git a/src/test/java/io/vertx/redis/containers/KeyPairAndCertificate.java b/src/test/java/io/vertx/tests/redis/containers/KeyPairAndCertificate.java similarity index 99% rename from src/test/java/io/vertx/redis/containers/KeyPairAndCertificate.java rename to src/test/java/io/vertx/tests/redis/containers/KeyPairAndCertificate.java index 94be15f4..19e23d1b 100644 --- a/src/test/java/io/vertx/redis/containers/KeyPairAndCertificate.java +++ b/src/test/java/io/vertx/tests/redis/containers/KeyPairAndCertificate.java @@ -1,4 +1,4 @@ -package io.vertx.redis.containers; +package io.vertx.tests.redis.containers; import org.bouncycastle.x509.X509V3CertificateGenerator; diff --git a/src/test/java/io/vertx/redis/containers/RedisCluster.java b/src/test/java/io/vertx/tests/redis/containers/RedisCluster.java similarity index 98% rename from src/test/java/io/vertx/redis/containers/RedisCluster.java rename to src/test/java/io/vertx/tests/redis/containers/RedisCluster.java index 035eed4f..cdcd1ff9 100644 --- a/src/test/java/io/vertx/redis/containers/RedisCluster.java +++ b/src/test/java/io/vertx/tests/redis/containers/RedisCluster.java @@ -1,4 +1,4 @@ -package io.vertx.redis.containers; +package io.vertx.tests.redis.containers; import org.junit.rules.TestRule; import org.junit.runner.Description; diff --git a/src/test/java/io/vertx/redis/containers/RedisReplication.java b/src/test/java/io/vertx/tests/redis/containers/RedisReplication.java similarity index 96% rename from src/test/java/io/vertx/redis/containers/RedisReplication.java rename to src/test/java/io/vertx/tests/redis/containers/RedisReplication.java index 61ac9cba..8a65712f 100644 --- a/src/test/java/io/vertx/redis/containers/RedisReplication.java +++ b/src/test/java/io/vertx/tests/redis/containers/RedisReplication.java @@ -1,4 +1,4 @@ -package io.vertx.redis.containers; +package io.vertx.tests.redis.containers; import org.junit.rules.TestRule; import org.junit.runner.Description; diff --git a/src/test/java/io/vertx/redis/containers/RedisSentinel.java b/src/test/java/io/vertx/tests/redis/containers/RedisSentinel.java similarity index 97% rename from src/test/java/io/vertx/redis/containers/RedisSentinel.java rename to src/test/java/io/vertx/tests/redis/containers/RedisSentinel.java index c38b109d..42cf4ee7 100644 --- a/src/test/java/io/vertx/redis/containers/RedisSentinel.java +++ b/src/test/java/io/vertx/tests/redis/containers/RedisSentinel.java @@ -1,4 +1,4 @@ -package io.vertx.redis.containers; +package io.vertx.tests.redis.containers; import org.junit.rules.TestRule; import org.junit.runner.Description; diff --git a/src/test/java/io/vertx/redis/containers/RedisStandalone.java b/src/test/java/io/vertx/tests/redis/containers/RedisStandalone.java similarity index 98% rename from src/test/java/io/vertx/redis/containers/RedisStandalone.java rename to src/test/java/io/vertx/tests/redis/containers/RedisStandalone.java index ab4dfaef..fe208020 100644 --- a/src/test/java/io/vertx/redis/containers/RedisStandalone.java +++ b/src/test/java/io/vertx/tests/redis/containers/RedisStandalone.java @@ -1,4 +1,4 @@ -package io.vertx.redis.containers; +package io.vertx.tests.redis.containers; import org.junit.rules.TestRule; import org.junit.runner.Description; diff --git a/src/test/java/io/vertx/redis/client/impl/ArrayQueueTest.java b/src/test/java/io/vertx/tests/redis/internal/ArrayQueueTest.java similarity index 91% rename from src/test/java/io/vertx/redis/client/impl/ArrayQueueTest.java rename to src/test/java/io/vertx/tests/redis/internal/ArrayQueueTest.java index 279d6cd3..d71b33f5 100644 --- a/src/test/java/io/vertx/redis/client/impl/ArrayQueueTest.java +++ b/src/test/java/io/vertx/tests/redis/internal/ArrayQueueTest.java @@ -1,5 +1,6 @@ -package io.vertx.redis.client.impl; +package io.vertx.tests.redis.internal; +import io.vertx.redis.client.impl.ArrayQueue; import org.junit.Ignore; import org.junit.Test; diff --git a/src/test/java/io/vertx/redis/client/impl/BufferTest.java b/src/test/java/io/vertx/tests/redis/internal/BufferTest.java similarity index 97% rename from src/test/java/io/vertx/redis/client/impl/BufferTest.java rename to src/test/java/io/vertx/tests/redis/internal/BufferTest.java index b50fcbf7..fb8df820 100644 --- a/src/test/java/io/vertx/redis/client/impl/BufferTest.java +++ b/src/test/java/io/vertx/tests/redis/internal/BufferTest.java @@ -1,10 +1,11 @@ -package io.vertx.redis.client.impl; +package io.vertx.tests.redis.internal; import io.netty.buffer.Unpooled; import io.vertx.core.buffer.Buffer; import io.vertx.core.internal.buffer.BufferInternal; import io.vertx.redis.client.Command; import io.vertx.redis.client.Request; +import io.vertx.redis.client.impl.RequestImpl; import org.junit.Test; import java.nio.charset.Charset; diff --git a/src/test/java/io/vertx/redis/client/impl/CommandNormalizationTest.java b/src/test/java/io/vertx/tests/redis/internal/CommandNormalizationTest.java similarity index 85% rename from src/test/java/io/vertx/redis/client/impl/CommandNormalizationTest.java rename to src/test/java/io/vertx/tests/redis/internal/CommandNormalizationTest.java index ff5b9665..c67d22ac 100644 --- a/src/test/java/io/vertx/redis/client/impl/CommandNormalizationTest.java +++ b/src/test/java/io/vertx/tests/redis/internal/CommandNormalizationTest.java @@ -1,7 +1,9 @@ -package io.vertx.redis.client.impl; +package io.vertx.tests.redis.internal; import io.vertx.redis.client.Command; import io.vertx.redis.client.Request; +import io.vertx.redis.client.impl.CommandImpl; +import io.vertx.redis.client.impl.RequestImpl; import org.junit.Test; import java.nio.charset.StandardCharsets; diff --git a/src/test/java/io/vertx/redis/client/impl/ConnectionRecyclingTest.java b/src/test/java/io/vertx/tests/redis/internal/ConnectionRecyclingTest.java similarity index 87% rename from src/test/java/io/vertx/redis/client/impl/ConnectionRecyclingTest.java rename to src/test/java/io/vertx/tests/redis/internal/ConnectionRecyclingTest.java index 4ece5b29..0a00b90c 100644 --- a/src/test/java/io/vertx/redis/client/impl/ConnectionRecyclingTest.java +++ b/src/test/java/io/vertx/tests/redis/internal/ConnectionRecyclingTest.java @@ -1,8 +1,8 @@ -package io.vertx.redis.client.impl; +package io.vertx.tests.redis.internal; import io.vertx.core.Vertx; import io.vertx.core.internal.pool.ConnectionPool; -import io.vertx.core.net.impl.endpoint.EndpointManager; +import io.vertx.core.internal.resource.ResourceManager; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; @@ -11,9 +11,12 @@ import io.vertx.redis.client.RedisConnection; import io.vertx.redis.client.RedisOptions; import io.vertx.redis.client.Request; +import io.vertx.redis.client.impl.RedisClient; +import io.vertx.redis.client.impl.RedisConnectionInternal; +import io.vertx.redis.client.impl.RedisConnectionManager; import io.vertx.redis.client.impl.RedisConnectionManager.ConnectionKey; import io.vertx.redis.client.impl.RedisConnectionManager.RedisEndpoint; -import io.vertx.redis.containers.RedisStandalone; +import io.vertx.tests.redis.containers.RedisStandalone; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; @@ -107,13 +110,13 @@ private void assertConnectionPool(TestContext test, int expectedSize) { IntBox size = new IntBox(0); try { - RedisConnectionManager connManager = ((RedisClient) client).connectionManager; + RedisConnectionManager connManager = ((RedisClient) client).connectionManager(); Field field = RedisConnectionManager.class.getDeclaredField("pooledConnectionManager"); field.setAccessible(true); - EndpointManager endpointManager = - (EndpointManager) field.get(connManager); + ResourceManager endpointManager = + (ResourceManager) field.get(connManager); endpointManager.forEach(endpoint -> { - ConnectionPool pool = ((RedisEndpoint) endpoint).pool; + ConnectionPool pool = ((RedisEndpoint) endpoint).pool(); size.value += pool.size(); }); } catch (ReflectiveOperationException e) { diff --git a/src/test/java/io/vertx/redis/client/impl/RedisURITest.java b/src/test/java/io/vertx/tests/redis/internal/RedisURITest.java similarity index 98% rename from src/test/java/io/vertx/redis/client/impl/RedisURITest.java rename to src/test/java/io/vertx/tests/redis/internal/RedisURITest.java index d1a606bd..b524e657 100644 --- a/src/test/java/io/vertx/redis/client/impl/RedisURITest.java +++ b/src/test/java/io/vertx/tests/redis/internal/RedisURITest.java @@ -1,5 +1,6 @@ -package io.vertx.redis.client.impl; +package io.vertx.tests.redis.internal; +import io.vertx.redis.client.impl.RedisURI; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/io/vertx/redis/client/impl/ReplyParserTest.java b/src/test/java/io/vertx/tests/redis/internal/ReplyParserTest.java similarity index 98% rename from src/test/java/io/vertx/redis/client/impl/ReplyParserTest.java rename to src/test/java/io/vertx/tests/redis/internal/ReplyParserTest.java index ab2abf55..acf824bc 100644 --- a/src/test/java/io/vertx/redis/client/impl/ReplyParserTest.java +++ b/src/test/java/io/vertx/tests/redis/internal/ReplyParserTest.java @@ -1,4 +1,4 @@ -package io.vertx.redis.client.impl; +package io.vertx.tests.redis.internal; import io.vertx.core.buffer.Buffer; import io.vertx.ext.unit.Async; @@ -6,6 +6,8 @@ import io.vertx.ext.unit.junit.RunTestOnContext; import io.vertx.ext.unit.junit.VertxUnitRunner; import io.vertx.redis.client.Response; +import io.vertx.redis.client.impl.ParserHandler; +import io.vertx.redis.client.impl.RESPParser; import io.vertx.redis.client.impl.types.BulkType; import io.vertx.redis.client.impl.types.MultiType; import org.junit.Ignore; diff --git a/src/test/java/io/vertx/redis/client/impl/RequestImplTest.java b/src/test/java/io/vertx/tests/redis/internal/RequestImplTest.java similarity index 83% rename from src/test/java/io/vertx/redis/client/impl/RequestImplTest.java rename to src/test/java/io/vertx/tests/redis/internal/RequestImplTest.java index 25fc57bf..23354173 100644 --- a/src/test/java/io/vertx/redis/client/impl/RequestImplTest.java +++ b/src/test/java/io/vertx/tests/redis/internal/RequestImplTest.java @@ -1,7 +1,8 @@ -package io.vertx.redis.client.impl; +package io.vertx.tests.redis.internal; import io.vertx.redis.client.Command; import io.vertx.redis.client.Request; +import io.vertx.redis.client.impl.RequestImpl; import org.junit.Test; public class RequestImplTest { diff --git a/src/test/java/io/vertx/redis/impl/ZModemTest.java b/src/test/java/io/vertx/tests/redis/internal/ZModemTest.java similarity index 97% rename from src/test/java/io/vertx/redis/impl/ZModemTest.java rename to src/test/java/io/vertx/tests/redis/internal/ZModemTest.java index ddf3287c..be06efd2 100644 --- a/src/test/java/io/vertx/redis/impl/ZModemTest.java +++ b/src/test/java/io/vertx/tests/redis/internal/ZModemTest.java @@ -1,4 +1,4 @@ -package io.vertx.redis.impl; +package io.vertx.tests.redis.internal; import io.vertx.redis.client.impl.ZModem; import org.junit.Test;