Spotless

Signed-off-by: Andrew Carbonetto <[email protected]>
Bit-Quill · Apr 1, 2024 · a193266 · a193266
1 parent 3df1021
commit a193266
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 66 deletions.
diff --git a/java/client/src/main/java/glide/api/BaseClient.java b/java/client/src/main/java/glide/api/BaseClient.java
@@ -78,7 +78,6 @@
 import glide.managers.CommandManager;
 import glide.managers.ConnectionManager;
 import java.util.List;
-import glide.utils.ArrayTransformUtils;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;

diff --git a/java/client/src/main/java/glide/api/models/BaseTransaction.java b/java/client/src/main/java/glide/api/models/BaseTransaction.java
@@ -56,8 +56,8 @@
 import static redis_request.RedisRequestOuterClass.RequestType.Time;
 import static redis_request.RedisRequestOuterClass.RequestType.Type;
 import static redis_request.RedisRequestOuterClass.RequestType.Unlink;
-import static redis_request.RedisRequestOuterClass.RequestType.ZScore;
 import static redis_request.RedisRequestOuterClass.RequestType.XAdd;
+import static redis_request.RedisRequestOuterClass.RequestType.ZScore;
 import static redis_request.RedisRequestOuterClass.RequestType.Zadd;
 import static redis_request.RedisRequestOuterClass.RequestType.Zcard;
 import static redis_request.RedisRequestOuterClass.RequestType.Zrem;

diff --git a/java/client/src/test/java/glide/api/RedisClientTest.java b/java/client/src/test/java/glide/api/RedisClientTest.java
@@ -75,8 +75,8 @@
 import static redis_request.RedisRequestOuterClass.RequestType.Time;
 import static redis_request.RedisRequestOuterClass.RequestType.Type;
 import static redis_request.RedisRequestOuterClass.RequestType.Unlink;
-import static redis_request.RedisRequestOuterClass.RequestType.ZScore;
 import static redis_request.RedisRequestOuterClass.RequestType.XAdd;
+import static redis_request.RedisRequestOuterClass.RequestType.ZScore;
 import static redis_request.RedisRequestOuterClass.RequestType.Zadd;
 import static redis_request.RedisRequestOuterClass.RequestType.Zcard;
 import static redis_request.RedisRequestOuterClass.RequestType.Zrem;
@@ -1827,7 +1827,6 @@ public void zscore_returns_success() {
         assertEquals(value, payload);
     }
 
-
     @SneakyThrows
     @Test
     public void xadd_returns_success() {
@@ -1846,7 +1845,7 @@ public void xadd_returns_success() {
 
         // match on protobuf request
         when(commandManager.<String>submitNewCommand(eq(XAdd), eq(arguments), any()))
-            .thenReturn(testResponse);
+                .thenReturn(testResponse);
 
         // exercise
         CompletableFuture<String> response = service.xadd(key, fieldValues);
@@ -1866,21 +1865,21 @@ public void xadd_with_nomakestream_maxlen_options_returns_success() {
         fieldValues.put("testField1", "testValue1");
         fieldValues.put("testField2", "testValue2");
         StreamAddOptions options =
-            StreamAddOptions.builder()
-                .id("id")
-                .makeStream(false)
-                .trim(new StreamAddOptions.Maxlen(true, 5L))
-                .build();
+                StreamAddOptions.builder()
+                        .id("id")
+                        .makeStream(false)
+                        .trim(new StreamAddOptions.MaxLen(true, 5L))
+                        .build();
 
         String[] arguments =
-            new String[] {
-                key,
-                NO_MAKE_STREAM_REDIS_API,
-                TRIM_MAXLEN_REDIS_API,
-                TRIM_EXACT_REDIS_API,
-                Long.toString(5L),
-                "id"
-            };
+                new String[] {
+                    key,
+                    NO_MAKE_STREAM_REDIS_API,
+                    TRIM_MAXLEN_REDIS_API,
+                    TRIM_EXACT_REDIS_API,
+                    Long.toString(5L),
+                    "id"
+                };
         arguments = ArrayUtils.addAll(arguments, convertMapToKeyValueStringArray(fieldValues));
 
         String returnId = "testId";
@@ -1890,7 +1889,7 @@ public void xadd_with_nomakestream_maxlen_options_returns_success() {
 
         // match on protobuf request
         when(commandManager.<String>submitNewCommand(eq(XAdd), eq(arguments), any()))
-            .thenReturn(testResponse);
+                .thenReturn(testResponse);
 
         // exercise
         CompletableFuture<String> response = service.xadd(key, fieldValues, options);
@@ -1980,15 +1979,15 @@ public void xadd_with_options_returns_success(Pair<StreamAddOptions, String[]> o
         fieldValues.put("testField1", "testValue1");
         fieldValues.put("testField2", "testValue2");
         String[] arguments =
-            ArrayUtils.addAll(optionAndArgs.getRight(), convertMapToKeyValueStringArray(fieldValues));
+                ArrayUtils.addAll(optionAndArgs.getRight(), convertMapToKeyValueStringArray(fieldValues));
         String returnId = "testId";
 
         CompletableFuture<String> testResponse = mock(CompletableFuture.class);
         when(testResponse.get()).thenReturn(returnId);
 
         // match on protobuf request
         when(commandManager.<String>submitNewCommand(eq(XAdd), eq(arguments), any()))
-            .thenReturn(testResponse);
+                .thenReturn(testResponse);
 
         // exercise
         CompletableFuture<String> response = service.xadd(key, fieldValues, optionAndArgs.getLeft());

diff --git a/java/client/src/test/java/glide/api/models/TransactionTests.java b/java/client/src/test/java/glide/api/models/TransactionTests.java
@@ -54,8 +54,8 @@
 import static redis_request.RedisRequestOuterClass.RequestType.Time;
 import static redis_request.RedisRequestOuterClass.RequestType.Type;
 import static redis_request.RedisRequestOuterClass.RequestType.Unlink;
-import static redis_request.RedisRequestOuterClass.RequestType.ZScore;
 import static redis_request.RedisRequestOuterClass.RequestType.XAdd;
+import static redis_request.RedisRequestOuterClass.RequestType.ZScore;
 import static redis_request.RedisRequestOuterClass.RequestType.Zadd;
 import static redis_request.RedisRequestOuterClass.RequestType.Zcard;
 import static redis_request.RedisRequestOuterClass.RequestType.Zrem;
@@ -406,14 +406,14 @@ public void transaction_builds_protobuf_request(BaseTransaction<?> transaction)
 
         transaction.xadd("key", Map.of("field1", "foo1"), StreamAddOptions.builder().id("id").build());
         results.add(
-            Pair.of(
-                XAdd,
-                ArgsArray.newBuilder()
-                    .addArgs("key")
-                    .addArgs("id")
-                    .addArgs("field1")
-                    .addArgs("foo1")
-                    .build()));
+                Pair.of(
+                        XAdd,
+                        ArgsArray.newBuilder()
+                                .addArgs("key")
+                                .addArgs("id")
+                                .addArgs("field1")
+                                .addArgs("foo1")
+                                .build()));
 
         transaction.time();
         results.add(Pair.of(Time, ArgsArray.newBuilder().build()));

diff --git a/java/integTest/src/test/java/glide/SharedCommandTests.java b/java/integTest/src/test/java/glide/SharedCommandTests.java
@@ -1143,33 +1143,33 @@ public void xadd(BaseClient client) {
         String field2 = UUID.randomUUID().toString();
 
         assertNull(
-            client
-                .xadd(
-                    key,
-                    Map.of(field1, "foo0", field2, "bar0"),
-                    StreamAddOptions.builder().makeStream(Boolean.FALSE).build())
-                .get());
+                client
+                        .xadd(
+                                key,
+                                Map.of(field1, "foo0", field2, "bar0"),
+                                StreamAddOptions.builder().makeStream(Boolean.FALSE).build())
+                        .get());
 
         String timestamp1 = "0-1";
         assertEquals(
-            timestamp1,
-            client
-                .xadd(
-                    key,
-                    Map.of(field1, "foo1", field2, "bar1"),
-                    StreamAddOptions.builder().id(timestamp1).build())
-                .get());
+                timestamp1,
+                client
+                        .xadd(
+                                key,
+                                Map.of(field1, "foo1", field2, "bar1"),
+                                StreamAddOptions.builder().id(timestamp1).build())
+                        .get());
 
         assertNotNull(client.xadd(key, Map.of(field1, "foo2", field2, "bar2")).get());
         if (client instanceof RedisClient) {
             assertEquals(2L, ((RedisClient) client).customCommand(new String[] {"XLEN", key}).get());
         } else if (client instanceof RedisClusterClient) {
             assertEquals(
-                2L,
-                ((RedisClusterClient) client)
-                    .customCommand(new String[] {"XLEN", key})
-                    .get()
-                    .getSingleValue());
+                    2L,
+                    ((RedisClusterClient) client)
+                            .customCommand(new String[] {"XLEN", key})
+                            .get()
+                            .getSingleValue());
         }
 
         // this will trim the first entry.
@@ -1187,32 +1187,32 @@ public void xadd(BaseClient client) {
             assertEquals(2L, ((RedisClient) client).customCommand(new String[] {"XLEN", key}).get());
         } else if (client instanceof RedisClusterClient) {
             assertEquals(
-                2L,
-                ((RedisClusterClient) client)
-                    .customCommand(new String[] {"XLEN", key})
-                    .get()
-                    .getSingleValue());
+                    2L,
+                    ((RedisClusterClient) client)
+                            .customCommand(new String[] {"XLEN", key})
+                            .get()
+                            .getSingleValue());
         }
 
         // this will trim the second entry.
         assertNotNull(
-            client
-                .xadd(
-                    key,
-                    Map.of(field1, "foo4", field2, "bar4"),
-                    StreamAddOptions.builder()
-                        .trim(new StreamAddOptions.MinId(Boolean.TRUE, id))
-                        .build())
-                .get());
+                client
+                        .xadd(
+                                key,
+                                Map.of(field1, "foo4", field2, "bar4"),
+                                StreamAddOptions.builder()
+                                        .trim(new StreamAddOptions.MinId(Boolean.TRUE, id))
+                                        .build())
+                        .get());
         if (client instanceof RedisClient) {
             assertEquals(2L, ((RedisClient) client).customCommand(new String[] {"XLEN", key}).get());
         } else if (client instanceof RedisClusterClient) {
             assertEquals(
-                2L,
-                ((RedisClusterClient) client)
-                    .customCommand(new String[] {"XLEN", key})
-                    .get()
-                    .getSingleValue());
+                    2L,
+                    ((RedisClusterClient) client)
+                            .customCommand(new String[] {"XLEN", key})
+                            .get()
+                            .getSingleValue());
         }
 
         /**