Skip to content

Commit

Permalink
Spotless
Browse files Browse the repository at this point in the history 
Signed-off-by: Andrew Carbonetto <[email protected]>
  • Loading branch information
@acarbonetto
acarbonetto committed Apr 4, 2024
1 parent 1b6d0ed commit 57a6598
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 64 deletions.
6 changes: 3 additions & 3 deletions java/client/src/main/java/glide/api/BaseClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -701,10 +701,10 @@ public CompletableFuture<String> xadd(@NonNull String key, @NonNull Map<String,

@Override
public CompletableFuture<String> xadd(
@NonNull String key, @NonNull Map<String, String> values, @NonNull StreamAddOptions options) {
@NonNull String key, @NonNull Map<String, String> values, @NonNull StreamAddOptions options) {
String[] arguments =
ArrayUtils.addAll(
ArrayUtils.addFirst(options.toArgs(), key), convertMapToKeyValueStringArray(values));
ArrayUtils.addAll(
ArrayUtils.addFirst(options.toArgs(), key), convertMapToKeyValueStringArray(values));
return commandManager.submitNewCommand(XAdd, arguments, this::handleStringOrNullResponse);
}

Expand Down
6 changes: 3 additions & 3 deletions java/client/src/main/java/glide/api/models/BaseTransaction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1492,10 +1492,10 @@ public T xadd(@NonNull String key, @NonNull Map<String, String> values) {
* <code>key</code> exists.
*/
public T xadd(
@NonNull String key, @NonNull Map<String, String> values, @NonNull StreamAddOptions options) {
@NonNull String key, @NonNull Map<String, String> values, @NonNull StreamAddOptions options) {
String[] arguments =
ArrayUtils.addAll(
ArrayUtils.addFirst(options.toArgs(), key), convertMapToKeyValueStringArray(values));
ArrayUtils.addAll(
ArrayUtils.addFirst(options.toArgs(), key), convertMapToKeyValueStringArray(values));
ArgsArray commandArgs = buildArgs(arguments);
protobufTransaction.addCommands(buildCommand(XAdd, commandArgs));
return getThis();
Expand Down
32 changes: 16 additions & 16 deletions java/client/src/test/java/glide/api/models/TransactionTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -446,25 +446,25 @@ public void transaction_builds_protobuf_request(BaseTransaction<?> transaction)

transaction.xadd("key", Map.of("field1", "foo1"));
results.add(
Pair.of(
XAdd,
ArgsArray.newBuilder()
.addArgs("key")
.addArgs("*")
.addArgs("field1")
.addArgs("foo1")
.build()));
Pair.of(
XAdd,
ArgsArray.newBuilder()
.addArgs("key")
.addArgs("*")
.addArgs("field1")
.addArgs("foo1")
.build()));

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()));
Expand Down
72 changes: 36 additions & 36 deletions java/integTest/src/test/java/glide/SharedCommandTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1283,57 +1283,57 @@ 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());
// TODO update test when XLEN is available
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.
String id =
client
.xadd(
key,
Map.of(field1, "foo3", field2, "bar3"),
StreamAddOptions.builder()
.trim(new StreamAddOptions.MaxLen(Boolean.TRUE, 2L))
.build())
.get();
client
.xadd(
key,
Map.of(field1, "foo3", field2, "bar3"),
StreamAddOptions.builder()
.trim(new StreamAddOptions.MaxLen(Boolean.TRUE, 2L))
.build())
.get();
assertNotNull(id);
// TODO update test when XLEN is available
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 second entry.
Expand All @@ -1351,11 +1351,11 @@ 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());
}

/**
Expand Down
18 changes: 12 additions & 6 deletions java/integTest/src/test/java/glide/TransactionTestUtilities.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,12 @@ public static BaseTransaction<?> transactionTest(BaseTransaction<?> baseTransact
baseTransaction.zpopmin(key8);
baseTransaction.zpopmax(key8);

baseTransaction.xadd(key9, Map.of("field1", "value1"), StreamAddOptions.builder().id("0-1").build());
baseTransaction.xadd(key9, Map.of("field2", "value2"), StreamAddOptions.builder().id("0-2").build());
baseTransaction.xadd(key9, Map.of("field3", "value3"), StreamAddOptions.builder().id("0-3").build());
baseTransaction.xadd(
key9, Map.of("field1", "value1"), StreamAddOptions.builder().id("0-1").build());
baseTransaction.xadd(
key9, Map.of("field2", "value2"), StreamAddOptions.builder().id("0-2").build());
baseTransaction.xadd(
key9, Map.of("field3", "value3"), StreamAddOptions.builder().id("0-3").build());

baseTransaction.configSet(Map.of("timeout", "1000"));
baseTransaction.configGet(new String[] {"timeout"});
Expand Down Expand Up @@ -175,9 +178,12 @@ public static Object[] transactionTestResult() {
2.0, // zscore(key8, "two")
Map.of("two", 2.0), // zpopmin(key8)
Map.of("three", 3.0), // zpopmax(key8)
"0-1", // xadd(key9, Map.of("field1", "value1"), StreamAddOptions.builder().id("0-1").build());
"0-2", // xadd(key9, Map.of("field2", "value2"), StreamAddOptions.builder().id("0-2").build());
"0-3", // xadd(key9, Map.of("field3", "value3"), StreamAddOptions.builder().id("0-3").build());
"0-1", // xadd(key9, Map.of("field1", "value1"),
// StreamAddOptions.builder().id("0-1").build());
"0-2", // xadd(key9, Map.of("field2", "value2"),
// StreamAddOptions.builder().id("0-2").build());
"0-3", // xadd(key9, Map.of("field3", "value3"),
// StreamAddOptions.builder().id("0-3").build());
OK,
Map.of("timeout", "1000"),
OK,
Expand Down

0 comments on commit 57a6598

Please sign in to comment.