Skip to content

Commit 9a16d86

Browse files
committed
Fix unit tests
Signed-off-by: Andrew Carbonetto <[email protected]>
1 parent b062b9b commit 9a16d86

File tree

6 files changed

+13
-34
lines changed

6 files changed

+13
-34
lines changed

java/client/src/main/java/glide/api/models/commands/InfoOptions.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
/** Object builder to add optional arguments to {@link ServerCommands#info(InfoOptions)} */
1111
@Builder
12-
public class InfoOptions extends Options {
12+
public class InfoOptions {
1313

1414
@Singular private final List<Section> sections;
1515

@@ -56,7 +56,7 @@ public enum Section {
5656
* @return String[]
5757
*/
5858
public String[] toInfoOptions() {
59-
optionArgs = sections.stream().map(Objects::toString).collect(Collectors.toList());
60-
return toArgs();
59+
List<String> optionArgs = sections.stream().map(Objects::toString).collect(Collectors.toList());
60+
return optionArgs.toArray(new String[0]);
6161
}
6262
}

java/client/src/main/java/glide/api/models/commands/Options.java

Lines changed: 0 additions & 21 deletions
This file was deleted.

java/client/src/main/java/glide/api/models/commands/SetOptions.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* String, SetOptions)}
1212
*/
1313
@Builder
14-
public class SetOptions extends Options {
14+
public class SetOptions {
1515

1616
/**
1717
* if `conditional` is not set the value will be set regardless of prior value existence. <br>
@@ -90,13 +90,12 @@ public enum TimeToLiveType {
9090
public static String TIME_TO_LIVE_UNIX_MILLISECONDS = "PXAT";
9191

9292
/**
93-
* Converts SetOptions into a String[] to add to a {@link glide.api.models.Command}
93+
* Converts SetOptions into a String[]
9494
*
95-
* @param arguments
96-
* @return
95+
* @return String[]
9796
*/
98-
public String[] toSetOptions(List<String> arguments) {
99-
optionArgs = new LinkedList();
97+
public String[] toArgs() {
98+
List<String> optionArgs = new LinkedList();
10099
if (conditionalSet != null) {
101100
if (conditionalSet == ConditionalSet.ONLY_IF_EXISTS) {
102101
optionArgs.add(CONDITIONAL_SET_ONLY_IF_EXISTS);
@@ -134,6 +133,6 @@ public String[] toSetOptions(List<String> arguments) {
134133
}
135134
}
136135

137-
return toArgs(arguments);
136+
return optionArgs.toArray(new String[0]);
138137
}
139138
}

java/client/src/main/java/glide/managers/CommandManager.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public class CommandManager {
3636
*/
3737
public <T> CompletableFuture<T> submitNewCommand(
3838
Command command, RedisExceptionCheckedFunction<Response, T> responseHandler) {
39+
var pb = prepareRedisRequest(command).build();
3940
// write command request to channel
4041
// when complete, convert the response to our expected type T using the given responseHandler
4142
return channel

java/client/src/main/java/glide/managers/models/Command.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ public static Command set(String key, String value) {
6868
/** Command to set the given key with the given value. */
6969
public static Command set(String key, String value, String[] options) {
7070
String[] args = ArrayUtils.addAll(new String[] {key, value}, options);
71-
return Command.builder().requestType(Command.RequestType.SET_STRING).arguments(args).build();
71+
Command cmd = Command.builder().requestType(Command.RequestType.SET_STRING).arguments(args).build();
72+
return cmd;
7273
}
7374

7475
public enum RequestType {

java/client/src/test/java/glide/managers/CommandManagerTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,6 @@ private RedisRequest.Builder prepareProtoBufRequest(
358358
RedisRequestOuterClass.Command.newBuilder()
359359
.setRequestType(requestType)
360360
.setArgsArray(argsArray)
361-
.build())
362-
.setRoute(Routes.newBuilder().setSimpleRoutes(SimpleRoutes.AllNodes).build());
361+
.build());
363362
}
364363
}

0 commit comments

Comments
 (0)