feat: Added memcached support

Author: jruaux

core/redis-enterprise-admin/redis-enterprise-admin.gradle

@@ -2,6 +2,8 @@ dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-databind'
     implementation 'org.apache.httpcomponents.client5:httpclient5'
     implementation 'org.awaitility:awaitility'
+    implementation group: 'net.spy', name: 'spymemcached', version: spymemcachedVersion
+    
     testImplementation 'org.slf4j:slf4j-simple'
     testImplementation 'org.junit.jupiter:junit-jupiter-api'
     testImplementation 'org.junit.jupiter:junit-jupiter-params'

core/redis-enterprise-admin/src/main/java/com/redis/enterprise/Admin.java

@@ -1,16 +1,20 @@
 package com.redis.enterprise;
 
 import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.security.GeneralSecurityException;
 import java.security.KeyManagementException;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.time.Duration;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Stream;
 
 import javax.net.ssl.SSLContext;
@@ -39,16 +43,22 @@
 import org.apache.hc.core5.http.io.entity.StringEntity;
 import org.apache.hc.core5.ssl.SSLContexts;
 import org.awaitility.Awaitility;
+import org.awaitility.core.ConditionFactory;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.type.SimpleType;
 import com.redis.enterprise.Database.ModuleConfig;
+import com.redis.enterprise.Database.Type;
 import com.redis.enterprise.rest.Bootstrap;
 import com.redis.enterprise.rest.CommandResponse;
 import com.redis.enterprise.rest.InstalledModule;
 
+import net.spy.memcached.ConnectionObserver;
+import net.spy.memcached.DefaultConnectionFactory;
+import net.spy.memcached.MemcachedConnection;
+
 public class Admin implements AutoCloseable {
 
 	public static final String DEFAULT_USER_NAME = "admin@redis.com";
@@ -57,13 +67,16 @@ 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 String BOOTSTRAP = "bootstrap";
 	private static final String MODULES = "modules";
 	private static final String BDBS = "bdbs";
 	private static final String COMMAND = "command";
 	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(10);
+	private static final Duration DEFAULT_DATABASE_CREATION_POLL_INTERVAL = Duration.ofSeconds(1);
 
 	private final ObjectMapper objectMapper = new ObjectMapper()
 			.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
@@ -73,6 +86,8 @@ public class Admin implements AutoCloseable {
 	private String protocol = DEFAULT_PROTOCOL;
 	private String host = DEFAULT_HOST;
 	private int port = DEFAULT_PORT;
+	private Duration databaseCreationTimeout = DEFAULT_DATABASE_CREATION_TIMEOUT;
+	private Duration databaseCreationPollInterval = DEFAULT_DATABASE_CREATION_POLL_INTERVAL;
 
 	public void close() throws IOException {
 		if (client != null) {
@@ -111,6 +126,16 @@ public Admin withProtocol(String protocol) {
 		return this;
 	}
 
+	public Admin withDatabaseCreationPollInterval(Duration interval) {
+		this.databaseCreationPollInterval = interval;
+		return this;
+	}
+
+	public Admin withDatabaseCreationTimeout(Duration timeout) {
+		this.databaseCreationTimeout = timeout;
+		return this;
+	}
+
 	public Admin withPort(int port) {
 		this.port = port;
 		return this;
@@ -228,9 +253,33 @@ public Database createDatabase(Database database) throws IOException, GeneralSec
 			}
 		}
 		Database response = post(v1(BDBS), database, Database.class);
-		long uid = response.getUid();
-		Awaitility.await().pollInterval(Duration.ofSeconds(1)).ignoreExceptions()
-				.until(() -> executeCommand(uid, new Command("PING")).getResponse().asBoolean());
+		ConditionFactory await = Awaitility.await().pollInterval(databaseCreationPollInterval)
+				.timeout(databaseCreationTimeout).ignoreExceptions();
+		if (response.getType() == Type.REDIS) {
+			await.until(() -> executeCommand(response.getUid(), PING).getResponse().asBoolean());
+		} else {
+			DefaultConnectionFactory connectionFactory = new DefaultConnectionFactory();
+			MemcachedConnection connection = connectionFactory
+					.createConnection(Arrays.asList(new InetSocketAddress(host, response.getPort())));
+			AtomicBoolean connectionEstablished = new AtomicBoolean();
+			try {
+				connection.addObserver(new ConnectionObserver() {
+
+					@Override
+					public void connectionLost(SocketAddress sa) {
+						// do nothing
+					}
+
+					@Override
+					public void connectionEstablished(SocketAddress sa, int reconnectCount) {
+						connectionEstablished.set(true);
+					}
+				});
+				await.until(connectionEstablished::get);
+			} finally {
+				connection.shutdown();
+			}
+		}
 		return response;
 	}
 

core/redis-enterprise-admin/src/main/java/com/redis/enterprise/Command.java

@@ -1,6 +1,7 @@
 package com.redis.enterprise;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -34,4 +35,31 @@ public void setArgs(List<String> args) {
 		this.args = args;
 	}
 
+	public static Builder name(String name) {
+		return new Builder(name);
+	}
+
+	public static class Builder {
+
+		private final String command;
+		private List<String> args = new ArrayList<>();
+
+		public Builder(String name) {
+			this.command = name;
+		}
+
+		public Builder args(String... args) {
+			this.args = new ArrayList<>(Arrays.asList(args));
+			return this;
+		}
+
+		public Command build() {
+			Command cmd = new Command();
+			cmd.setCommand(this.command);
+			cmd.setArgs(args);
+			return cmd;
+		}
+
+	}
+
 }

gradle.properties

@@ -12,6 +12,7 @@ kordampBuildVersion        = 3.4.0
 kordampPluginVersion       = 0.54.0
 
 lettucemodVersion          = 4.2.0
+spymemcachedVersion        = 2.12.3
 testcontainersRedisVersion = 2.2.2
 
 org.gradle.daemon          = false