From 9c78c96934daeac531ce1ec7cdd590f6efdf73da Mon Sep 17 00:00:00 2001 From: Andrew Carbonetto Date: Thu, 8 Feb 2024 22:03:29 -0800 Subject: [PATCH] Update to merge easier Signed-off-by: Andrew Carbonetto --- .../src/main/java/glide/api/RedisClusterClient.java | 5 ++--- .../src/test/java/glide/cluster/CommandTests.java | 12 ++++++------ .../src/test/java/glide/standalone/CommandTests.java | 7 +++---- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/java/client/src/main/java/glide/api/RedisClusterClient.java b/java/client/src/main/java/glide/api/RedisClusterClient.java index dcdc0a2ad9..4ff76d7d7c 100644 --- a/java/client/src/main/java/glide/api/RedisClusterClient.java +++ b/java/client/src/main/java/glide/api/RedisClusterClient.java @@ -43,7 +43,7 @@ public static CompletableFuture CreateClient( } @Override - public CompletableFuture> customCommand(@NonNull String[] args) { + public CompletableFuture> customCommand(String[] args) { // TODO if a command returns a map as a single value, ClusterValue misleads user return commandManager.submitNewCommand( CustomCommand, args, response -> ClusterValue.of(handleObjectOrNullResponse(response))); @@ -51,8 +51,7 @@ public CompletableFuture> customCommand(@NonNull String[] a @Override @SuppressWarnings("unchecked") - public CompletableFuture> customCommand( - @NonNull String[] args, @NonNull Route route) { + public CompletableFuture> customCommand(String[] args, Route route) { return commandManager.submitNewCommand( CustomCommand, args, diff --git a/java/integTest/src/test/java/glide/cluster/CommandTests.java b/java/integTest/src/test/java/glide/cluster/CommandTests.java index dcb53112d0..410ce4a46e 100644 --- a/java/integTest/src/test/java/glide/cluster/CommandTests.java +++ b/java/integTest/src/test/java/glide/cluster/CommandTests.java @@ -97,7 +97,7 @@ public void ping_with_message_with_route() { @Test @SneakyThrows public void info_without_options() { - ClusterValue data = clusterClient.info().get(10, SECONDS); + ClusterValue data = clusterClient.info().get(); assertTrue(data.hasMultiData()); for (String info : data.getMultiValue().values()) { for (String section : DEFAULT_INFO_SECTIONS) { @@ -109,7 +109,7 @@ public void info_without_options() { @Test @SneakyThrows public void info_with_route() { - ClusterValue data = clusterClient.info(RANDOM).get(10, SECONDS); + ClusterValue data = clusterClient.info(RANDOM).get(); assertTrue(data.hasSingleData()); String infoData = data.getSingleValue(); for (String section : DEFAULT_INFO_SECTIONS) { @@ -125,7 +125,7 @@ public void info_with_multiple_options() { builder.section(CPU).section(MEMORY); } InfoOptions options = builder.build(); - ClusterValue data = clusterClient.info(options).get(10, SECONDS); + ClusterValue data = clusterClient.info(options).get(); for (String info : data.getMultiValue().values()) { for (String section : options.toArgs()) { assertTrue(info.toLowerCase().contains("# " + section.toLowerCase()), "Section " + section + " is missing"); @@ -137,7 +137,7 @@ public void info_with_multiple_options() { @SneakyThrows public void info_with_everything_option() { InfoOptions options = InfoOptions.builder().section(EVERYTHING).build(); - ClusterValue data = clusterClient.info(options).get(10, SECONDS); + ClusterValue data = clusterClient.info(options).get(); assertTrue(data.hasMultiData()); for (String info : data.getMultiValue().values()) { for (String section : EVERYTHING_INFO_SECTIONS) { @@ -149,7 +149,7 @@ public void info_with_everything_option() { @Test @SneakyThrows public void info_with_routing_and_options() { - ClusterValue slotData = clusterClient.customCommand(new String[] {"cluster", "slots"}).get(10, SECONDS); + ClusterValue slotData = clusterClient.customCommand(new String[] {"cluster", "slots"}).get(); /* Nested Object arrays like 1) 1) (integer) 0 @@ -168,7 +168,7 @@ public void info_with_routing_and_options() { } InfoOptions options = builder.build(); SlotKeyRoute routing = new SlotKeyRoute(slotKey, PRIMARY); - ClusterValue data = clusterClient.info(options, routing).get(10, SECONDS); + ClusterValue data = clusterClient.info(options, routing).get(); for (String section : options.toArgs()) { assertTrue(data.getSingleValue().toLowerCase().contains("# " + section.toLowerCase()), "Section " + section + " is missing"); diff --git a/java/integTest/src/test/java/glide/standalone/CommandTests.java b/java/integTest/src/test/java/glide/standalone/CommandTests.java index 55da60703c..ef9820c5b9 100644 --- a/java/integTest/src/test/java/glide/standalone/CommandTests.java +++ b/java/integTest/src/test/java/glide/standalone/CommandTests.java @@ -9,7 +9,6 @@ import static glide.api.models.commands.InfoOptions.Section.MEMORY; import static glide.cluster.CommandTests.DEFAULT_INFO_SECTIONS; import static glide.cluster.CommandTests.EVERYTHING_INFO_SECTIONS; -import static java.util.concurrent.TimeUnit.SECONDS; import static org.junit.jupiter.api.Assertions.assertTrue; import glide.api.RedisClient; @@ -53,7 +52,7 @@ public void custom_command_info() { @Test @SneakyThrows public void info_without_options() { - String data = regularClient.info().get(10, SECONDS); + String data = regularClient.info().get(); for (String section : DEFAULT_INFO_SECTIONS) { assertTrue(data.contains("# " + section), "Section " + section + " is missing"); } @@ -67,7 +66,7 @@ public void info_with_multiple_options() { builder.section(CPU).section(MEMORY); } InfoOptions options = builder.build(); - String data = regularClient.info(options).get(10, SECONDS); + String data = regularClient.info(options).get(); for (String section : options.toArgs()) { assertTrue( data.toLowerCase().contains("# " + section.toLowerCase()), @@ -79,7 +78,7 @@ public void info_with_multiple_options() { @SneakyThrows public void info_with_everything_option() { InfoOptions options = InfoOptions.builder().section(EVERYTHING).build(); - String data = regularClient.info(options).get(10, SECONDS); + String data = regularClient.info(options).get(); for (String section : EVERYTHING_INFO_SECTIONS) { assertTrue(data.contains("# " + section), "Section " + section + " is missing"); }