Renamed admin artifact to redis-enterprise-admin

Author: jruaux

jreleaser.yml

@@ -92,7 +92,7 @@ checksum:
   files: false
 
 distributions:
-  admin:
+  redis-enterprise-admin:
     artifacts:
       - path: subprojects/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.zip
         transform: '{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}.zip'

subprojects/admin/gradle.properties …redis-enterprise-admin/gradle.propertiessubprojects/admin/gradle.properties renamed to subprojects/redis-enterprise-admin/gradle.properties subprojects/admin/gradle.properties renamed to subprojects/redis-enterprise-admin/gradle.properties

@@ -50,15 +50,12 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.type.CollectionType;
 import com.fasterxml.jackson.databind.type.SimpleType;
+import com.redis.enterprise.Database.ModuleConfig;
 import com.redis.enterprise.rest.Action;
 import com.redis.enterprise.rest.Bootstrap;
-import com.redis.enterprise.rest.Command;
 import com.redis.enterprise.rest.CommandResponse;
-import com.redis.enterprise.rest.Database;
-import com.redis.enterprise.rest.Database.ModuleConfig;
-import com.redis.enterprise.rest.Module;
+import com.redis.enterprise.rest.InstalledModule;
 import com.redis.enterprise.rest.ModuleInstallResponse;
 
 public class Admin implements AutoCloseable {
@@ -163,6 +160,7 @@ private <T> T post(String path, Object request, Class<T> responseType) throws Pa
 	private <T> T post(String path, Object request, JavaType responseType) throws ParseException, IOException {
 		HttpPost post = new HttpPost(uri(path));
 		String json = objectMapper.writeValueAsString(request);
+		log.debug("POST {}", json);
 		post.setEntity(new StringEntity(json));
 		return read(header(post), responseType, HttpStatus.SC_OK);
 	}
@@ -183,14 +181,14 @@ private <T> T read(ClassicHttpRequest request, JavaType type, int successCode) t
 		throw new HttpResponseException(response.getCode(), response.getReasonPhrase() + " " + json);
 	}
 
-	public List<Module> getModules() throws ParseException, IOException {
-		CollectionType type = objectMapper.getTypeFactory().constructCollectionType(List.class, Module.class);
-		return get(v1(MODULES), type);
+	public List<InstalledModule> getModules() throws ParseException, IOException {
+		return get(v1(MODULES),
+				objectMapper.getTypeFactory().constructCollectionType(List.class, InstalledModule.class));
 	}
 
 	public Database createDatabase(Database database) throws ParseException, IOException {
-		Map<String, Module> installedModules = new HashMap<>();
-		for (Module module : getModules()) {
+		Map<String, InstalledModule> installedModules = new HashMap<>();
+		for (InstalledModule module : getModules()) {
 			installedModules.put(module.getName(), module);
 		}
 		for (ModuleConfig moduleConfig : database.getModules()) {
@@ -201,7 +199,7 @@ public Database createDatabase(Database database) throws ParseException, IOExcep
 		}
 		Database response = post(v1(BDBS), database, Database.class);
 		long uid = response.getUid();
-		Awaitility.await().until(() -> {
+		Awaitility.await().pollInterval(Duration.ofSeconds(1)).until(() -> {
 			Command command = new Command();
 			command.setCommand("PING");
 			try {
@@ -215,12 +213,11 @@ public Database createDatabase(Database database) throws ParseException, IOExcep
 	}
 
 	public List<Database> getDatabases() throws ParseException, IOException {
-		CollectionType type = objectMapper.getTypeFactory().constructCollectionType(List.class, Database.class);
-		return get(v1(BDBS), type);
+		return get(v1(BDBS), objectMapper.getTypeFactory().constructCollectionType(List.class, Database.class));
 	}
 
 	public void deleteDatabase(long uid) {
-		Awaitility.await().timeout(Duration.ofSeconds(30)).pollInterval(Duration.ofSeconds(1)).until(() -> {
+		Awaitility.await().pollInterval(Duration.ofSeconds(1)).until(() -> {
 			try {
 				delete(v1(BDBS, String.valueOf(uid)), Database.class);
 				return true;
@@ -246,7 +243,7 @@ public ModuleInstallResponse installModule(String filename, InputStream inputStr
 		ModuleInstallResponse response = read(post, SimpleType.constructUnsafe(ModuleInstallResponse.class),
 				HttpStatus.SC_ACCEPTED);
 		baos.close();
-		Awaitility.await().timeout(Duration.ofSeconds(30)).pollInterval(Duration.ofSeconds(3)).until(() -> {
+		Awaitility.await().timeout(Duration.ofMinutes(1)).pollInterval(Duration.ofSeconds(1)).until(() -> {
 			log.info("Checking status of action {}", response.getActionUid());
 			Action status = getAction(response.getActionUid());
 			if ("completed".equals(status.getStatus())) {
@@ -259,7 +256,7 @@ public ModuleInstallResponse installModule(String filename, InputStream inputStr
 	}
 
 	public void waitForBoostrap() {
-		Awaitility.await().pollInterval(Duration.ofSeconds(3)).timeout(Duration.ofMinutes(1))
+		Awaitility.await().pollInterval(Duration.ofSeconds(1)).timeout(Duration.ofMinutes(1))
 				.until(() -> "idle".equals(getBootstrap().getStatus().getState()));
 
 	}
@@ -268,7 +265,7 @@ private Bootstrap getBootstrap() throws ParseException, IOException {
 		return get(v1(BOOTSTRAP), Bootstrap.class);
 	}
 
-	public Action getAction(String uid) throws ParseException, IOException {
+	private Action getAction(String uid) throws ParseException, IOException {
 		return get(v1(ACTIONS, uid), Action.class);
 	}
 

subprojects/admin/admin.gradle …rise-admin/redis-enterprise-admin.gradlesubprojects/admin/admin.gradle renamed to subprojects/redis-enterprise-admin/redis-enterprise-admin.gradle subprojects/admin/admin.gradle renamed to subprojects/redis-enterprise-admin/redis-enterprise-admin.gradle

@@ -1,4 +1,4 @@
-package com.redis.enterprise.rest;
+package com.redis.enterprise;
 
 import java.util.ArrayList;
 import java.util.List;

…ain/java/com/redis/enterprise/Admin.java …ain/java/com/redis/enterprise/Admin.javasubprojects/admin/src/main/java/com/redis/enterprise/Admin.java renamed to subprojects/redis-enterprise-admin/src/main/java/com/redis/enterprise/Admin.java subprojects/admin/src/main/java/com/redis/enterprise/Admin.java renamed to subprojects/redis-enterprise-admin/src/main/java/com/redis/enterprise/Admin.java

@@ -1,8 +1,9 @@
-package com.redis.enterprise.rest;
+package com.redis.enterprise;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import org.apache.hc.core5.util.Asserts;
@@ -67,15 +68,15 @@ public void setName(String name) {
 		this.name = name;
 	}
 
-	public boolean getReplication() {
+	public boolean isReplication() {
 		return replication;
 	}
 
 	public void setReplication(boolean replication) {
 		this.replication = replication;
 	}
 
-	public boolean getSharding() {
+	public boolean isSharding() {
 		return sharding;
 	}
 
@@ -109,7 +110,7 @@ public void setType(String type) {
 	}
 
 	@JsonProperty("oss_cluster")
-	public boolean getOssCluster() {
+	public boolean isOssCluster() {
 		return ossCluster;
 	}
 
@@ -171,6 +172,29 @@ public void setModules(List<ModuleConfig> modules) {
 		this.modules = modules;
 	}
 
+	@Override
+	public int hashCode() {
+		return Objects.hash(memory, modules, name, ossCluster, ossClusterAPIPreferredIPType, port, proxyPolicy,
+				replication, shardCount, shardKeyRegex, shardPlacement, sharding, type, uid);
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		Database other = (Database) obj;
+		return memory == other.memory && Objects.equals(modules, other.modules) && Objects.equals(name, other.name)
+				&& ossCluster == other.ossCluster && ossClusterAPIPreferredIPType == other.ossClusterAPIPreferredIPType
+				&& Objects.equals(port, other.port) && proxyPolicy == other.proxyPolicy
+				&& replication == other.replication && Objects.equals(shardCount, other.shardCount)
+				&& Objects.equals(shardKeyRegex, other.shardKeyRegex) && shardPlacement == other.shardPlacement
+				&& sharding == other.sharding && Objects.equals(type, other.type) && Objects.equals(uid, other.uid);
+	}
+
 	public enum IPType {
 		@JsonProperty("internal")
 		INTERNAL, @JsonProperty("external")
@@ -368,13 +392,13 @@ public Builder shardPlacement(ShardPlacement shardPlacement) {
 			return this;
 		}
 
-		public Builder module(Module module) {
-			this.moduleConfigs.add(new ModuleConfig(module.getName()));
+		public Builder module(RedisModule module) {
+			this.moduleConfigs.add(new ModuleConfig(module.getModuleName()));
 			return this;
 		}
 
-		public Builder modules(Module... modules) {
-			for (Module module : modules) {
+		public Builder modules(RedisModule... modules) {
+			for (RedisModule module : modules) {
 				module(module);
 			}
 			return this;
@@ -394,20 +418,5 @@ public Database build() {
 			return new Database(this);
 		}
 
-		public enum Module {
-
-			BLOOM("bf"), GEARS("rg"), GRAPH("graph"), JSON("ReJSON"), SEARCH("search"), TIMESERIES("timeseries");
-
-			private final String name;
-
-			Module(String name) {
-				this.name = name;
-			}
-
-			public String getName() {
-				return name;
-			}
-
-		}
 	}
 }

…a/com/redis/enterprise/rest/Command.java …n/java/com/redis/enterprise/Command.javasubprojects/admin/src/main/java/com/redis/enterprise/rest/Command.java renamed to subprojects/redis-enterprise-admin/src/main/java/com/redis/enterprise/Command.java subprojects/admin/src/main/java/com/redis/enterprise/rest/Command.java renamed to subprojects/redis-enterprise-admin/src/main/java/com/redis/enterprise/Command.java

@@ -0,0 +1,17 @@
+package com.redis.enterprise;
+
+public enum RedisModule {
+
+	BLOOM("bf"), GEARS("rg"), GRAPH("graph"), JSON("ReJSON"), SEARCH("search"), TIMESERIES("timeseries");
+
+	private final String moduleName;
+
+	RedisModule(String moduleName) {
+		this.moduleName = moduleName;
+	}
+
+	public String getModuleName() {
+		return moduleName;
+	}
+
+}