Added installModule

Author: jruaux

subprojects/admin/admin.gradle

@@ -1,4 +1,5 @@
 dependencies {
+    implementation 'commons-io:commons-io:2.11.0'
     implementation 'org.slf4j:slf4j-api'
     implementation 'com.fasterxml.jackson.core:jackson-databind'
     implementation 'org.apache.httpcomponents.client5:httpclient5'

subprojects/admin/src/main/java/com/redis/enterprise/Admin.java

@@ -1,6 +1,8 @@
 package com.redis.enterprise;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.security.GeneralSecurityException;
@@ -9,6 +11,7 @@
 
 import javax.net.ssl.SSLContext;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.hc.client5.http.HttpResponseException;
 import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
 import org.apache.hc.client5.http.classic.methods.HttpDelete;
@@ -134,15 +137,20 @@ private <T> T get(String path, Class<T> type) throws ParseException, IOException
 	}
 
 	private <T> T get(String path, JavaType type) throws ParseException, IOException {
-		return read(new HttpGet(uri(path)), type, HttpStatus.SC_OK);
+		return read(header(new HttpGet(uri(path))), type, HttpStatus.SC_OK);
 	}
 
 	private <T> T delete(String path, Class<T> type) throws ParseException, IOException {
 		return delete(path, SimpleType.constructUnsafe(type));
 	}
 
 	private <T> T delete(String path, JavaType type) throws ParseException, IOException {
-		return read(new HttpDelete(uri(path)), type, HttpStatus.SC_OK);
+		return read(header(new HttpDelete(uri(path))), type, HttpStatus.SC_OK);
+	}
+
+	private ClassicHttpRequest header(ClassicHttpRequest request) {
+		request.setHeader(HttpHeaders.CONTENT_TYPE, CONTENT_TYPE_JSON);
+		return request;
 	}
 
 	private <T> T post(String path, Object request, Class<T> responseType) throws ParseException, IOException {
@@ -153,15 +161,10 @@ private <T> T post(String path, Object request, JavaType responseType) throws Pa
 		HttpPost post = new HttpPost(uri(path));
 		String json = objectMapper.writeValueAsString(request);
 		post.setEntity(new StringEntity(json));
-		return read(post, responseType, HttpStatus.SC_OK);
-	}
-
-	private <T> T read(ClassicHttpRequest request, Class<T> type, int successCode) throws ParseException, IOException {
-		return read(request, SimpleType.constructUnsafe(type), successCode);
+		return read(header(post), responseType, HttpStatus.SC_OK);
 	}
 
 	private <T> T read(ClassicHttpRequest request, JavaType type, int successCode) throws IOException, ParseException {
-		request.setHeader(HttpHeaders.CONTENT_TYPE, CONTENT_TYPE_JSON);
 		HttpHost target = new HttpHost(protocol, host, port);
 		HttpClientContext localContext = HttpClientContext.create();
 		if (credentials != null) {
@@ -170,9 +173,11 @@ private <T> T read(ClassicHttpRequest request, JavaType type, int successCode) t
 			localContext.resetAuthExchange(target, basicAuth);
 		}
 		CloseableHttpResponse response = client.execute(request, localContext);
+		String json = EntityUtils.toString(response.getEntity());
 		if (response.getCode() == successCode) {
-			return objectMapper.readValue(EntityUtils.toString(response.getEntity()), type);
+			return objectMapper.readValue(json, type);
 		}
+		log.error("Error: {}", json);
 		throw new HttpResponseException(response.getCode(), response.getReasonPhrase());
 	}
 
@@ -217,13 +222,18 @@ public void deleteDatabase(long uid) {
 		});
 	}
 
-	public ModuleInstallResponse installModule(String filename, byte[] bytes) throws ParseException, IOException {
+	public ModuleInstallResponse installModule(String filename, InputStream inputStream)
+			throws ParseException, IOException {
 		HttpPost post = new HttpPost(uri(v2(MODULES)));
 		MultipartEntityBuilder builder = MultipartEntityBuilder.create();
 		builder.setMode(HttpMultipartMode.STRICT);
-		builder.addPart("module", new ByteArrayBody(bytes, ContentType.MULTIPART_FORM_DATA, filename));
+		ByteArrayOutputStream baos = new ByteArrayOutputStream();
+		IOUtils.copy(inputStream, baos);
+		builder.addPart("module", new ByteArrayBody(baos.toByteArray(), ContentType.MULTIPART_FORM_DATA, filename));
 		post.setEntity(builder.build());
-		ModuleInstallResponse response = read(post, ModuleInstallResponse.class, HttpStatus.SC_ACCEPTED);
+		ModuleInstallResponse response = read(post, SimpleType.constructUnsafe(ModuleInstallResponse.class),
+				HttpStatus.SC_ACCEPTED);
+		baos.close();
 		Awaitility.await().timeout(Duration.ofSeconds(30)).pollInterval(Duration.ofSeconds(3)).until(() -> {
 			log.info("Checking status of action {}", response.getActionUid());
 			Action status = getAction(response.getActionUid());

subprojects/admin/src/test/java/com/redis/enterprise/AdminTests.java

@@ -1,6 +1,5 @@
 package com.redis.enterprise;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.GeneralSecurityException;
@@ -21,9 +20,9 @@
 import org.slf4j.LoggerFactory;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
-import org.testcontainers.shaded.org.apache.commons.io.IOUtils;
 
 import com.redis.enterprise.rest.Database;
+import com.redis.enterprise.rest.ModuleInstallResponse;
 import com.redis.testcontainers.RedisEnterpriseContainer;
 import com.redis.testcontainers.RedisEnterpriseContainer.RedisModule;
 
@@ -85,10 +84,9 @@ void deleteDatabase() throws ParseException, GeneralSecurityException, IOExcepti
 	void installModule() throws IOException, ParseException {
 		String gearsModuleFile = "redisgears.linux-bionic-x64.1.0.6.zip";
 		try (InputStream zipInputStream = getClass().getClassLoader().getResourceAsStream(gearsModuleFile)) {
-			ByteArrayOutputStream baos = new ByteArrayOutputStream();
-			IOUtils.copy(zipInputStream, baos);
 			log.info("Installing module {}", gearsModuleFile);
-			admin.installModule(gearsModuleFile, baos.toByteArray()).getActionUid();
+			ModuleInstallResponse response = admin.installModule(gearsModuleFile, zipInputStream);
+			log.info("Installed module {}, action ID: {}", gearsModuleFile, response.getActionUid());
 			Assertions.assertTrue(
 					admin.getModules().stream().anyMatch(m -> m.getName().equals(RedisModule.GEARS.getName())));
 		}