JVMCBC-1680 Retain raw JSON when parsing cluster topology

Motivation
----------
FIT proxy wants to know all TLS + non-TLS service ports, etc.

Modifications
-------------
Add ClusterTopology.json(), which returns the raw JSON
the topology was parsed from, or an empty node if the
topology was synthetic (created by a test).

Change-Id: I8611fc34016ea3a8cfc785725ce4846da1ef746f
Reviewed-on: https://review.couchbase.org/c/couchbase-jvm-clients/+/232811
Tested-by: Build Bot <[email protected]>
Reviewed-by: Graham Pople <[email protected]>

Author: dnault

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

@@ -18,6 +18,7 @@
 
 import com.couchbase.client.core.annotation.SinceCouchbase;
 import com.couchbase.client.core.annotation.Stability;
+import com.couchbase.client.core.deps.com.fasterxml.jackson.databind.node.ObjectNode;
 import com.couchbase.client.core.env.NetworkResolution;
 import org.jspecify.annotations.Nullable;
 
@@ -38,8 +39,10 @@ public class ClusterTopology {
   private final Set<ClusterCapability> capabilities;
   private final List<HostAndServicePorts> nodes;
   private final @Nullable ClusterIdentifier clusterIdent;
+  private final ObjectNode json;
 
   public static ClusterTopology of(
+    ObjectNode json,
     TopologyRevision revision,
     @Nullable ClusterIdentifier clusterIdent,
     List<HostAndServicePorts> nodes,
@@ -50,6 +53,7 @@ public static ClusterTopology of(
   ) {
     if (bucket != null) {
       return new ClusterTopologyWithBucket(
+        json,
         revision,
         nodes,
         capabilities,
@@ -61,6 +65,7 @@ public static ClusterTopology of(
     }
 
     return new ClusterTopology(
+      json,
       revision,
       nodes,
       capabilities,
@@ -71,6 +76,7 @@ public static ClusterTopology of(
   }
 
   protected ClusterTopology(
+    ObjectNode json,
     TopologyRevision revision,
     List<HostAndServicePorts> nodes,
     Set<ClusterCapability> capabilities,
@@ -82,6 +88,7 @@ protected ClusterTopology(
       throw new IllegalArgumentException("Must resolve 'auto' network before creating config.");
     }
 
+    this.json = requireNonNull(json);
     this.revision = requireNonNull(revision);
     this.nodes = listCopyOf(nodes);
     this.capabilities = unmodifiableSet(newEnumSet(ClusterCapability.class, capabilities));
@@ -90,6 +97,10 @@ protected ClusterTopology(
     this.clusterIdent = clusterIdent;
   }
 
+  public ObjectNode json() {
+    return json;
+  }
+
   public TopologyRevision revision() {
     return revision;
   }

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

@@ -17,6 +17,7 @@
 package com.couchbase.client.core.topology;
 
 import com.couchbase.client.core.annotation.Stability;
+import com.couchbase.client.core.deps.com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.couchbase.client.core.env.NetworkResolution;
 import com.couchbase.client.core.service.ServiceType;
 import com.couchbase.client.core.util.HostAndPort;
@@ -54,6 +55,7 @@ public ClusterTopology build() {
 
   private ClusterTopology buildWithOrWithoutBucket(@Nullable BucketTopology bucket) {
     return ClusterTopology.of(
+      JsonNodeFactory.instance.objectNode(),
       revision,
       new ClusterIdentifier(clusterUuid, clusterName, product),
       nodes,

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

@@ -64,6 +64,10 @@ public static ClusterTopology parse(
       throw new IllegalArgumentException("Invalid originHost. Expected a hostname, IPv4 address, or IPv6 address (without square brackets), but got: " + originHost);
     }
 
+    if (clusterConfig.isEmpty()) {
+      throw new CouchbaseException("Cluster topology JSON is an empty node. Server returned invalid topology, or maybe this was a doomed attempt to re-parse a synthetic topology.");
+    }
+
     ArrayNode nodesExt = (ArrayNode) clusterConfig.get("nodesExt");
     if (nodesExt == null) {
       throw new CouchbaseException("Couchbase Server version is too old for this SDK; missing 'nodesExt' field.");
@@ -132,6 +136,7 @@ resolvedNetwork, redactSystem(it)
     ClusterIdentifier clusterIdent = ClusterIdentifier.parse(clusterConfig);
 
     return ClusterTopology.of(
+      clusterConfig,
       TopologyRevision.parse(clusterConfig),
       clusterIdent,
       resolvedNodes,

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

@@ -17,6 +17,7 @@
 package com.couchbase.client.core.topology;
 
 import com.couchbase.client.core.annotation.Stability;
+import com.couchbase.client.core.deps.com.fasterxml.jackson.databind.node.ObjectNode;
 import com.couchbase.client.core.env.NetworkResolution;
 import org.jspecify.annotations.Nullable;
 
@@ -36,6 +37,7 @@ public class ClusterTopologyWithBucket extends ClusterTopology {
   private final BucketTopology bucket;
 
   ClusterTopologyWithBucket(
+    ObjectNode json,
     TopologyRevision revision,
     List<HostAndServicePorts> nodes,
     Set<ClusterCapability> capabilities,
@@ -44,7 +46,7 @@ public class ClusterTopologyWithBucket extends ClusterTopology {
     BucketTopology bucket,
     @Nullable ClusterIdentifier clusterIdent
   ) {
-    super(revision, nodes, capabilities, network, portSelector, clusterIdent);
+    super(json, revision, nodes, capabilities, network, portSelector, clusterIdent);
     this.bucket = requireNonNull(bucket);
   }