Fix merge conflicts

Signed-off-by: Andrew Carbonetto <[email protected]>
valkey-io · Jun 26, 2024 · 3a316a2 · 3a316a2
1 parent 99b29d1
commit 3a316a2
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/glide-core/src/protobuf/redis_request.proto b/glide-core/src/protobuf/redis_request.proto
@@ -236,7 +236,7 @@ enum RequestType {
     SortReadOnly = 195;
     FunctionDump = 196;
     FunctionRestore = 197;
-    XPending = 196;
+    XPending = 198;
 }
 
 message Command {

diff --git a/glide-core/src/request_type.rs b/glide-core/src/request_type.rs
@@ -206,7 +206,7 @@ pub enum RequestType {
     SortReadOnly = 195,
     FunctionDump = 196,
     FunctionRestore = 197,
-    XPending = 196,
+    XPending = 198,
 }
 
 fn get_two_word_command(first: &str, second: &str) -> Cmd {

diff --git a/java/client/src/main/java/glide/api/commands/StreamBaseCommands.java b/java/client/src/main/java/glide/api/commands/StreamBaseCommands.java
@@ -631,7 +631,7 @@ CompletableFuture<Map<String, Map<String, String[][]>>> xreadgroup(
      * }</pre>
      */
     CompletableFuture<Object[][]> xpending(
-        String key, String group, StreamRange start, StreamRange end, long count);
+            String key, String group, StreamRange start, StreamRange end, long count);
 
     /**
      * Returns an extended form of stream message information for pending messages matching a given range of IDs.
@@ -678,10 +678,10 @@ CompletableFuture<Object[][]> xpending(
      * }</pre>
      */
     CompletableFuture<Object[][]> xpending(
-        String key,
-        String group,
-        StreamRange start,
-        StreamRange end,
-        long count,
-        StreamPendingOptions options);
+            String key,
+            String group,
+            StreamRange start,
+            StreamRange end,
+            long count,
+            StreamPendingOptions options);
 }
diff --git a/java/client/src/main/java/glide/api/models/commands/stream/StreamPendingOptions.java b/java/client/src/main/java/glide/api/models/commands/stream/StreamPendingOptions.java
@@ -1,4 +1,4 @@
-/** Copyright GLIDE-for-Redis Project Contributors - SPDX Identifier: Apache-2.0 */
+/** Copyright Valkey GLIDE Project Contributors - SPDX Identifier: Apache-2.0 */
 package glide.api.models.commands.stream;
 
 import glide.api.commands.StreamBaseCommands;

diff --git a/java/client/src/test/java/glide/api/RedisClientTest.java b/java/client/src/test/java/glide/api/RedisClientTest.java
@@ -5662,7 +5662,7 @@ public void xpending_returns_success() {
 
         // match on protobuf request
         when(commandManager.<Object[]>submitNewCommand(eq(XPending), eq(arguments), any()))
-            .thenReturn(testResponse);
+                .thenReturn(testResponse);
 
         // exercise
         CompletableFuture<Object[]> response = service.xpending(key, groupName);
@@ -5690,7 +5690,7 @@ public void xpending_with_start_end_count_returns_success() {
 
         // match on protobuf request
         when(commandManager.<Object[][]>submitNewCommand(eq(XPending), eq(arguments), any()))
-            .thenReturn(testResponse);
+                .thenReturn(testResponse);
 
         // exercise
         CompletableFuture<Object[][]> response = service.xpending(key, groupName, start, end, count);
@@ -5728,17 +5728,17 @@ public void xpending_with_start_end_count_options_returns_success() {
 
         // match on protobuf request
         when(commandManager.<Object[][]>submitNewCommand(eq(XPending), eq(arguments), any()))
-            .thenReturn(testResponse);
+                .thenReturn(testResponse);
 
         // exercise
         CompletableFuture<Object[][]> response =
-            service.xpending(
-                key,
-                groupName,
-                start,
-                end,
-                count,
-                StreamPendingOptions.builder().minIdleTime(100L).consumer(consumer).build());
+                service.xpending(
+                        key,
+                        groupName,
+                        start,
+                        end,
+                        count,
+                        StreamPendingOptions.builder().minIdleTime(100L).consumer(consumer).build());
         Object[][] payload = response.get();
 
         // verify