JCBC-2198, KCBC-192, SCBC-490: Followup

Motivation
----------
Analytics server added a stable 'prod' field
that is resistant to potential branding changes.

Modifications
-------------
When inspecting cluster type, use the stable
'prod' field instead of 'prodName'.

Simplify by removing ClusterType in favor of using
a primitive string; now that we can do exact string
matches, there's less need for a dedicated type.

Change-Id: I1d2c435e03f58879bc0590e0bf1ebb241969c0f7
Reviewed-on: https://review.couchbase.org/c/couchbase-jvm-clients/+/230781
Reviewed-by: Michael Reiche <michael.reiche@couchbase.com>
Tested-by: Build Bot <build@couchbase.com>

Author: dnault

core-io/src/main/java/com/couchbase/client/core/topology/ClusterIdentifier.java

@@ -29,12 +29,12 @@
 public class ClusterIdentifier {
   private final String clusterUuid;
   private final String clusterName;
-  private final ClusterType clusterType;
+  private final String product;
 
-  ClusterIdentifier(String clusterUuid, String clusterName, ClusterType product) {
+  ClusterIdentifier(String clusterUuid, String clusterName, String product) {
     this.clusterUuid = requireNonNull(clusterUuid);
     this.clusterName = requireNonNull(clusterName);
-    this.clusterType = requireNonNull(product);
+    this.product = requireNonNull(product);
   }
 
   public static @Nullable ClusterIdentifier parse(ObjectNode config) {
@@ -44,9 +44,10 @@ public class ClusterIdentifier {
       return null;
     }
 
-    JsonNode prodName = config.path("prodName"); // field added in Couchbase Server 8.0.
-    ClusterType type = ClusterType.of(prodName.textValue());
-    return new ClusterIdentifier(clusterUuid.asText(), clusterName.asText(), type);
+    // Field "prod" added in Couchbase Server 8.0 (value = "server") / Enterprise Analytics 1.0 (value = "analytics").
+    // Assume anything that doesn't set it is an older version of Couchbase Server.
+    String prod = config.path("prod").asText("server");
+    return new ClusterIdentifier(clusterUuid.asText(), clusterName.asText(), prod);
   }
 
   public String clusterUuid() {
@@ -57,8 +58,8 @@ public String clusterName() {
     return clusterName;
   }
 
-  public ClusterType clusterType() {
-    return clusterType;
+  public String product() {
+    return product;
   }
 
   @Override
@@ -67,20 +68,20 @@ public boolean equals(Object o) {
     ClusterIdentifier that = (ClusterIdentifier) o;
     return Objects.equals(clusterUuid, that.clusterUuid)
             && Objects.equals(clusterName, that.clusterName)
-            && Objects.equals(clusterType, that.clusterType);
+            && Objects.equals(product, that.product);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(clusterUuid, clusterName, clusterType);
+    return Objects.hash(clusterUuid, clusterName, product);
   }
 
   @Override
   public String toString() {
     return "ClusterIdent{" +
       "clusterUuid='" + clusterUuid + '\'' +
       ", clusterName='" + redactMeta(clusterName) + '\'' +
-      ", clusterType='" + clusterType + '\'' +
+      ", product='" + product + '\'' +
       '}';
   }
 }

core-io/src/main/java/com/couchbase/client/core/topology/ClusterTopologyBuilder.java

@@ -44,7 +44,7 @@ public final class ClusterTopologyBuilder {
   private NetworkResolution networkResolution = NetworkResolution.DEFAULT;
   private String clusterName = "fake-cluster";
   private String clusterUuid = "fake-cluster-uuid";
-  private ClusterType clusterType = ClusterType.COUCHBASE_SERVER;
+  private String product = "server";
   private Set<ClusterCapability> capabilities = EnumSet.allOf(ClusterCapability.class);
   private final List<HostAndServicePorts> nodes = new ArrayList<>();
 
@@ -55,7 +55,7 @@ public ClusterTopology build() {
   private ClusterTopology buildWithOrWithoutBucket(@Nullable BucketTopology bucket) {
     return ClusterTopology.of(
       revision,
-      new ClusterIdentifier(clusterUuid, clusterName, clusterType),
+      new ClusterIdentifier(clusterUuid, clusterName, product),
       nodes,
       capabilities,
       networkResolution,

core-io/src/main/java/com/couchbase/client/core/topology/ClusterType.java

@@ -22,8 +22,9 @@
 import com.couchbase.client.core.error.CouchbaseException;
 import com.couchbase.client.core.msg.analytics.AnalyticsRequest;
 import com.couchbase.client.core.msg.analytics.AnalyticsResponse;
-import com.couchbase.client.core.topology.ClusterType;
+import com.couchbase.client.core.topology.ClusterIdentifier;
 import com.couchbase.client.java.codec.JsonSerializer;
+import org.jspecify.annotations.Nullable;
 import reactor.core.publisher.Mono;
 
 import java.time.Duration;
@@ -85,17 +86,17 @@ private static Mono<Void> requireCouchbaseServer(Core core, Duration timeout) {
 
     return core.waitForClusterTopology(timeout)
       .mapNotNull(clusterTopology -> {
-        ClusterType type = ClusterType.from(clusterTopology.id());
-        if (type.isCouchbaseServer()) {
-          return null; // success! complete the empty mono.
+        if (isEnterpriseAnalytics(clusterTopology.id())) {
+          throw new CouchbaseException(
+            "This SDK is for Couchbase Server (operational) clusters, but the remote cluster is an Enterprise Analytics cluster." +
+              " Please use the Enterprise Analytics SDK to access this cluster."
+          );
         }
-
-        String message = "This SDK is for Couchbase Server (operational) clusters, but the remote cluster type is '" + type + "'.";
-        if (type.name().startsWith("Enterprise Analytics")) {
-          message += " Please use the Enterprise Analytics SDK to access this cluster.";
-        }
-
-        throw new CouchbaseException(message);
+        return null; // success! complete the empty mono.
       });
   }
+
+  private static boolean isEnterpriseAnalytics(@Nullable ClusterIdentifier clusterId) {
+    return clusterId != null && "analytics".equals(clusterId.product());
+  }
 }