Addressed PR comments

valkey-io · Jun 13, 2024 · 3a145be · 3a145be
1 parent fafbf82
commit 3a145be
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 29 deletions.
diff --git a/java/client/src/main/java/glide/api/commands/TransactionsBaseClusterCommands.java b/java/client/src/main/java/glide/api/commands/TransactionsBaseClusterCommands.java
@@ -20,8 +20,8 @@ public interface TransactionsBaseClusterCommands {
      * @return The string <code>OK</code>.
      * @example
      *     <pre>{@code
-     * client.watch(new String[] {"sampleKey"});
-     * client.unwatch(ALL_PRIMARIES); // Flushes "sampleKey" from watched keys for all primary nodes.
+     * assert client.watch(new String[] {"sampleKey"}).get() == "OK";
+     * assert client.unwatch(ALL_PRIMARIES).get() == "OK"; // Flushes "sampleKey" from watched keys for all primary nodes.
      * }</pre>
      */
     CompletableFuture<String> unwatch(Route route);

diff --git a/java/client/src/main/java/glide/api/commands/TransactionsBaseCommands.java b/java/client/src/main/java/glide/api/commands/TransactionsBaseCommands.java
@@ -20,9 +20,10 @@ public interface TransactionsBaseCommands {
      * @return The string <code>OK</code>.
      * @example
      *     <pre>{@code
-     * client.watch(new String[] {"sampleKey"});
+     * assert client.watch(new String[] {"sampleKey"}).get() == "OK";
      * transaction.set("sampleKey", "foobar");
-     * client.exec(transaction).get(); // Executes successfully and keys are unwatched.
+     * Object[] result = client.exec(transaction).get();
+     * assert result != null; // Executes successfully and keys are unwatched.
      * }</pre>
      */
     CompletableFuture<String> watch(String[] keys);
@@ -35,8 +36,8 @@ public interface TransactionsBaseCommands {
      * @return The string <code>OK</code>.
      * @example
      *     <pre>{@code
-     * client.watch(new String[] {"sampleKey"});
-     * client.unwatch(); // Flushes "sampleKey" from watched keys.
+     * assert client.watch(new String[] {"sampleKey"}).get() == "OK";
+     * assert client.unwatch().get() == "OK"; // Flushes "sampleKey" from watched keys.
      * }</pre>
      */
     CompletableFuture<String> unwatch();

diff --git a/java/integTest/src/test/java/glide/cluster/ClusterTransactionTests.java b/java/integTest/src/test/java/glide/cluster/ClusterTransactionTests.java
@@ -9,7 +9,6 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
-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 static org.junit.jupiter.api.Assumptions.assumeTrue;
@@ -68,17 +67,6 @@ public void custom_command_info() {
         assertTrue(((String) result[0]).contains("# Stats"));
     }
 
-    @Test
-    @SneakyThrows
-    public void WATCH_transaction_failure_returns_null() {
-        ClusterTransaction transaction = new ClusterTransaction();
-        transaction.get("key");
-        assertEquals(
-                OK, clusterClient.customCommand(new String[] {"WATCH", "key"}).get().getSingleValue());
-        assertEquals(OK, clusterClient.set("key", "foo").get());
-        assertNull(clusterClient.exec(transaction).get());
-    }
-
     @Test
     @SneakyThrows
     public void info_simple_route_test() {

diff --git a/java/integTest/src/test/java/glide/standalone/TransactionTests.java b/java/integTest/src/test/java/glide/standalone/TransactionTests.java
@@ -8,7 +8,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
-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 static org.junit.jupiter.api.Assumptions.assumeTrue;
@@ -222,16 +221,6 @@ public void zrank_zrevrank_withscores() {
         assertArrayEquals(new Object[] {2L, 1.0}, (Object[]) result[2]);
     }
 
-    @Test
-    @SneakyThrows
-    public void WATCH_transaction_failure_returns_null() {
-        Transaction transaction = new Transaction();
-        transaction.get("key");
-        assertEquals(OK, client.customCommand(new String[] {"WATCH", "key"}).get());
-        assertEquals(OK, client.set("key", "foo").get());
-        assertNull(client.exec(transaction).get());
-    }
-
     @Test
     @SneakyThrows
     public void copy() {