From 36c41ba6315cd3b2562f2aa0a3b53c1cce99c213 Mon Sep 17 00:00:00 2001 From: jruaux Date: Wed, 20 Mar 2024 17:37:54 -0700 Subject: [PATCH] fix: Renamed command --- .../main/java/com/redis/enterprise/Admin.java | 6 ++--- .../{Command.java => RedisCommand.java} | 26 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) rename subprojects/redis-enterprise-admin/src/main/java/com/redis/enterprise/{Command.java => RedisCommand.java} (65%) diff --git a/subprojects/redis-enterprise-admin/src/main/java/com/redis/enterprise/Admin.java b/subprojects/redis-enterprise-admin/src/main/java/com/redis/enterprise/Admin.java index 01b168c..be8a196 100644 --- a/subprojects/redis-enterprise-admin/src/main/java/com/redis/enterprise/Admin.java +++ b/subprojects/redis-enterprise-admin/src/main/java/com/redis/enterprise/Admin.java @@ -66,7 +66,7 @@ public class Admin implements AutoCloseable { public static final String DEFAULT_HOST = "localhost"; public static final int DEFAULT_PORT = 9443; - private static final Command PING = Command.name("PING").build(); + private static final RedisCommand PING = RedisCommand.name("PING").build(); private static final String BOOTSTRAP = "bootstrap"; private static final String MODULES = "modules"; private static final String BDBS = "bdbs"; @@ -74,7 +74,7 @@ public class Admin implements AutoCloseable { private static final String CONTENT_TYPE_JSON = "application/json"; private static final String V1 = "/v1/"; private static final CharSequence PATH_SEPARATOR = "/"; - private static final Duration DEFAULT_DATABASE_CREATION_TIMEOUT = Duration.ofSeconds(30); + private static final Duration DEFAULT_DATABASE_CREATION_TIMEOUT = Duration.ofSeconds(10); private static final Duration DEFAULT_DATABASE_CREATION_POLL_INTERVAL = Duration.ofSeconds(1); private final ObjectMapper objectMapper = new ObjectMapper() @@ -310,7 +310,7 @@ private Bootstrap getBootstrap() throws IOException, GeneralSecurityException { return get(v1(BOOTSTRAP), Bootstrap.class); } - public CommandResponse executeCommand(long bdb, Command command) throws IOException, GeneralSecurityException { + public CommandResponse executeCommand(long bdb, RedisCommand command) throws IOException, GeneralSecurityException { return post(v1(BDBS, String.valueOf(bdb), COMMAND), command, CommandResponse.class); } diff --git a/subprojects/redis-enterprise-admin/src/main/java/com/redis/enterprise/Command.java b/subprojects/redis-enterprise-admin/src/main/java/com/redis/enterprise/RedisCommand.java similarity index 65% rename from subprojects/redis-enterprise-admin/src/main/java/com/redis/enterprise/Command.java rename to subprojects/redis-enterprise-admin/src/main/java/com/redis/enterprise/RedisCommand.java index 05373d1..1adb892 100644 --- a/subprojects/redis-enterprise-admin/src/main/java/com/redis/enterprise/Command.java +++ b/subprojects/redis-enterprise-admin/src/main/java/com/redis/enterprise/RedisCommand.java @@ -7,17 +7,17 @@ import com.fasterxml.jackson.annotation.JsonInclude; @JsonInclude(JsonInclude.Include.NON_NULL) -public class Command { +public class RedisCommand { - private String name; + private String command; private List args = new ArrayList<>(); - public String getName() { - return name; + public String getCommand() { + return command; } - public void setName(String command) { - this.name = command; + public void setCommand(String command) { + this.command = command; } public List getArgs() { @@ -34,11 +34,11 @@ public static Builder name(String name) { public static class Builder { - private final String name; + private final String command; private List args = new ArrayList<>(); public Builder(String name) { - this.name = name; + this.command = name; } public Builder args(String... args) { @@ -46,11 +46,11 @@ public Builder args(String... args) { return this; } - public Command build() { - Command command = new Command(); - command.setName(name); - command.setArgs(args); - return command; + public RedisCommand build() { + RedisCommand cmd = new RedisCommand(); + cmd.setCommand(this.command); + cmd.setArgs(args); + return cmd; } }