Fixes.

Signed-off-by: Yury-Fridlyand <[email protected]>

Author: Yury-Fridlyand

java/client/src/main/java/glide/api/commands/ServerManagementBaseCommands.java

@@ -3,6 +3,11 @@
 
 import java.util.concurrent.CompletableFuture;
 
+/**
+ * Server Management Commands interface for both standalone and cluster clients.
+ *
+ * @see <a href="https://redis.io/commands/?group=server">Server Management Commands</a>
+ */
 public interface ServerManagementBaseCommands {
 
     /**
@@ -15,7 +20,7 @@ public interface ServerManagementBaseCommands {
     CompletableFuture<String> configRewrite();
 
     /**
-     * Resets the statistics reported by Redis using the <code>INFO</code> and <code>LATENCY HISTOGRAM
+     * Reset the statistics reported by Redis using the <code>INFO</code> and <code>LATENCY HISTOGRAM
      * </code> commands.
      *
      * @see <a href="https://redis.io/commands/config-resetstat/">redis.io</a> for details.

java/client/src/main/java/glide/api/commands/ServerManagementClusterCommands.java

@@ -7,7 +7,7 @@
 import java.util.concurrent.CompletableFuture;
 
 /**
- * Server Management Commands interface.
+ * Server Management Commands interface for cluster client.
  *
  * @see <a href="https://redis.io/commands/?group=server">Server Management Commands</a>
  */

java/client/src/main/java/glide/api/commands/ServerManagementCommands.java

@@ -6,7 +6,7 @@
 import java.util.concurrent.CompletableFuture;
 
 /**
- * Server Management Commands interface.
+ * Server Management Commands interface for standalone client.
  *
  * @see <a href="https://redis.io/commands/?group=server">Server Management Commands</a>
  */

java/client/src/test/java/glide/api/models/ClusterTransactionTests.java

@@ -3,6 +3,8 @@
 
 import static glide.api.models.commands.SetOptions.RETURN_OLD_VALUE;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static redis_request.RedisRequestOuterClass.RequestType.ConfigResetStat;
+import static redis_request.RedisRequestOuterClass.RequestType.ConfigRewrite;
 import static redis_request.RedisRequestOuterClass.RequestType.GetString;
 import static redis_request.RedisRequestOuterClass.RequestType.Info;
 import static redis_request.RedisRequestOuterClass.RequestType.Ping;
@@ -57,6 +59,10 @@ public void transaction_builds_protobuf_request() {
                         Info,
                         ArgsArray.newBuilder().addArgs(InfoOptions.Section.EVERYTHING.toString()).build()));
 
+        transaction.configRewrite().configResetStat();
+        results.add(Pair.of(ConfigRewrite, ArgsArray.newBuilder().build()));
+        results.add(Pair.of(ConfigResetStat, ArgsArray.newBuilder().build()));
+
         var protobufTransaction = transaction.getProtobufTransaction().build();
 
         for (int idx = 0; idx < protobufTransaction.getCommandsCount(); idx++) {

java/client/src/test/java/glide/api/models/TransactionTests.java

@@ -58,10 +58,8 @@ public void transaction_builds_protobuf_request() {
                         Info,
                         ArgsArray.newBuilder().addArgs(InfoOptions.Section.EVERYTHING.toString()).build()));
 
-        transaction.configRewrite();
+        transaction.configRewrite().configResetStat();
         results.add(Pair.of(ConfigRewrite, ArgsArray.newBuilder().build()));
-
-        transaction.configResetStat();
         results.add(Pair.of(ConfigResetStat, ArgsArray.newBuilder().build()));
 
         var protobufTransaction = transaction.getProtobufTransaction().build();

java/integTest/src/test/java/glide/SharedCommandTests.java

@@ -7,11 +7,9 @@
 import static glide.api.models.commands.SetOptions.ConditionalSet.ONLY_IF_DOES_NOT_EXIST;
 import static glide.api.models.commands.SetOptions.ConditionalSet.ONLY_IF_EXISTS;
 import static glide.api.models.commands.SetOptions.Expiry.Milliseconds;
-import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import glide.api.BaseClient;
 import glide.api.RedisClient;
@@ -20,9 +18,7 @@
 import glide.api.models.configuration.NodeAddress;
 import glide.api.models.configuration.RedisClientConfiguration;
 import glide.api.models.configuration.RedisClusterClientConfiguration;
-import glide.api.models.exceptions.RequestException;
 import java.util.List;
-import java.util.concurrent.ExecutionException;
 import lombok.Getter;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.AfterAll;
@@ -252,18 +248,6 @@ public void set_missing_value_and_returnOldValue_is_null(BaseClient client) {
         assertNull(data);
     }
 
-    @SneakyThrows
-    @ParameterizedTest
-    @MethodSource("getClients")
-    public void config_rewrite(BaseClient client) {
-        var exception = assertThrows(ExecutionException.class, () -> client.configRewrite().get());
-        assertAll(
-                () -> assertTrue(exception.getCause() instanceof RequestException),
-                () ->
-                        assertTrue(
-                                exception.getMessage().contains("The server is running without a config file")));
-    }
-
     @SneakyThrows
     @ParameterizedTest
     @MethodSource("getClients")

java/integTest/src/test/java/glide/TestUtilities.java

@@ -3,30 +3,11 @@
 
 import static org.junit.jupiter.api.Assertions.fail;
 
-import glide.api.models.BaseTransaction;
 import glide.api.models.ClusterValue;
-import glide.api.models.commands.SetOptions;
-import java.util.UUID;
+import lombok.experimental.UtilityClass;
 
+@UtilityClass
 public class TestUtilities {
-
-    public static BaseTransaction<?> transactionTest(BaseTransaction<?> baseTransaction) {
-        String key1 = "{key}" + UUID.randomUUID();
-        String key2 = "{key}" + UUID.randomUUID();
-
-        baseTransaction
-                .configResetStat()
-                .set(key1, "bar")
-                .set(key2, "baz", SetOptions.builder().returnOldValue(true).build())
-                .customCommand("MGET", key1, key2);
-
-        return baseTransaction;
-    }
-
-    public static Object[] transactionTestResult() {
-        return new Object[] {"OK", "OK", null, new String[] {"bar", "baz"}};
-    }
-
     /** Extract integer parameter value from INFO command output */
     public static int getValueFromInfo(String data, String value) {
         for (var line : data.split("\r\n")) {

java/integTest/src/test/java/glide/TransactionTestUtilities.java

@@ -0,0 +1,28 @@
+/** Copyright GLIDE-for-Redis Project Contributors - SPDX Identifier: Apache-2.0 */
+package glide;
+
+import glide.api.models.BaseTransaction;
+import glide.api.models.commands.SetOptions;
+import java.util.UUID;
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class TransactionTestUtilities {
+
+    public static BaseTransaction<?> transactionTest(BaseTransaction<?> baseTransaction) {
+        String key1 = "{key}" + UUID.randomUUID();
+        String key2 = "{key}" + UUID.randomUUID();
+
+        baseTransaction
+                .configResetStat()
+                .set(key1, "bar")
+                .set(key2, "baz", SetOptions.builder().returnOldValue(true).build())
+                .customCommand("MGET", key1, key2);
+
+        return baseTransaction;
+    }
+
+    public static Object[] transactionTestResult() {
+        return new Object[] {"OK", "OK", null, new String[] {"bar", "baz"}};
+    }
+}

java/integTest/src/test/java/glide/cluster/ClusterTransactionTests.java

@@ -1,8 +1,8 @@
 /** Copyright GLIDE-for-Redis Project Contributors - SPDX Identifier: Apache-2.0 */
 package glide.cluster;
 
-import static glide.TestUtilities.transactionTest;
-import static glide.TestUtilities.transactionTestResult;
+import static glide.TransactionTestUtilities.transactionTest;
+import static glide.TransactionTestUtilities.transactionTestResult;
 import static glide.api.models.configuration.RequestRoutingConfiguration.SimpleRoute.RANDOM;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;

java/integTest/src/test/java/glide/cluster/CommandTests.java

@@ -9,7 +9,6 @@
 import static glide.api.models.commands.InfoOptions.Section.STATS;
 import static glide.api.models.configuration.RequestRoutingConfiguration.SimpleRoute.ALL_NODES;
 import static glide.api.models.configuration.RequestRoutingConfiguration.SimpleRoute.ALL_PRIMARIES;
-import static glide.TestConfiguration.CLUSTER_PORTS;
 import static glide.api.models.commands.InfoOptions.Section.CLIENTS;
 import static glide.api.models.commands.InfoOptions.Section.CLUSTER;
 import static glide.api.models.commands.InfoOptions.Section.COMMANDSTATS;
@@ -19,7 +18,6 @@
 import static glide.api.models.commands.InfoOptions.Section.REPLICATION;
 import static glide.api.models.configuration.RequestRoutingConfiguration.SimpleRoute.RANDOM;
 import static glide.api.models.configuration.RequestRoutingConfiguration.SlotType.PRIMARY;
-import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -31,7 +29,6 @@
 import glide.api.models.configuration.RedisClusterClientConfiguration;
 import glide.api.models.configuration.RequestRoutingConfiguration.SlotKeyRoute;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.AfterAll;

java/integTest/src/test/java/glide/standalone/TransactionTests.java

@@ -1,8 +1,8 @@
 /** Copyright GLIDE-for-Redis Project Contributors - SPDX Identifier: Apache-2.0 */
 package glide.standalone;
 
-import static glide.TestUtilities.transactionTest;
-import static glide.TestUtilities.transactionTestResult;
+import static glide.TransactionTestUtilities.transactionTest;
+import static glide.TransactionTestUtilities.transactionTestResult;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;