Fix compilation for core-io changes

Change-Id: I832ba80e5cf4ddf1e99970c7b0c196a2c6421b84 Reviewed-on: http://review.couchbase.org/110038 Reviewed-by: Michael Nitschinger <michael.nitschinger@couchbase.com> Tested-by: Michael Nitschinger <michael.nitschinger@couchbase.com>
couchbase · Jun 3, 2019 · 5269b8f · 5269b8f
1 parent a2e3892
commit 5269b8f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/com/couchbase/client/java/cluster/DefaultAsyncClusterManager.java b/src/main/java/com/couchbase/client/java/cluster/DefaultAsyncClusterManager.java
@@ -656,9 +656,9 @@ public Observable<BucketSettings> call(ClusterInfo clusterInfo) {
     }
 
     Observable<Boolean> sendAddNodeRequest(final InetSocketAddress address) {
-        final NetworkAddress networkAddress = NetworkAddress.create(CouchbaseAsyncCluster.ALLOW_HOSTNAMES_AS_SEED_NODES ?
+        final String networkAddress = CouchbaseAsyncCluster.ALLOW_HOSTNAMES_AS_SEED_NODES ?
                 address.getHostName() :
-                address.getAddress().getHostAddress());
+                address.getAddress().getHostAddress();
         return core.<AddNodeResponse>send(new AddNodeRequest(networkAddress))
                 .flatMap(new Func1<AddNodeResponse, Observable<AddServiceResponse>>() {
                     @Override

diff --git a/src/main/java/com/couchbase/client/java/query/core/N1qlQueryExecutor.java b/src/main/java/com/couchbase/client/java/query/core/N1qlQueryExecutor.java
@@ -486,7 +486,7 @@ public Boolean call(NodeInfo nodeInfo) {
                 @Override
                 public Observable<GenericQueryResponse> call(NodeInfo nodeInfo) {
                     try {
-                        InetAddress hostname = InetAddress.getByName(nodeInfo.hostname().address());
+                        InetAddress hostname = InetAddress.getByName(nodeInfo.hostname());
                         final GenericQueryRequest req = createN1qlRequest(query, bucket, username, password, hostname);
                         return deferAndWatch(new Func1<Subscriber, Observable<? extends GenericQueryResponse>>() {
                             @Override

diff --git a/src/main/java/com/couchbase/client/java/util/NodeLocatorHelper.java b/src/main/java/com/couchbase/client/java/util/NodeLocatorHelper.java
@@ -156,7 +156,7 @@ public InetAddress replicaNodeForId(final String id, int replicaNum) {
                 throw new IllegalStateException("Replica not configured for this bucket.");
             }
             try {
-                return InetAddress.getByName(cbc.nodeAtIndex(nodeId).hostname().address());
+                return InetAddress.getByName(cbc.nodeAtIndex(nodeId).hostname());
             } catch (UnknownHostException e) {
                 throw new IllegalStateException(e);
             }
@@ -175,7 +175,7 @@ public List<InetAddress> nodes() {
         BucketConfig config = bucketConfig.get();
         for (NodeInfo nodeInfo : config.nodes()) {
             try {
-                allNodes.add(InetAddress.getByName(nodeInfo.hostname().address()));
+                allNodes.add(InetAddress.getByName(nodeInfo.hostname()));
             } catch (UnknownHostException e) {
                 throw new IllegalStateException(e);
             }
@@ -190,7 +190,7 @@ private static InetAddress nodeForIdOnCouchbaseBucket(final String id, final Cou
             throw new IllegalStateException("No partition assigned to node for Document ID: " + id);
         }
         try {
-            return InetAddress.getByName(config.nodeAtIndex(nodeId).hostname().address());
+            return InetAddress.getByName(config.nodeAtIndex(nodeId).hostname());
         } catch (UnknownHostException e) {
             throw new IllegalStateException(e);
         }
@@ -207,7 +207,7 @@ private static InetAddress nodeForIdOnMemcachedBucket(final String id, final Mem
             }
         }
         try {
-            return InetAddress.getByName(config.ketamaNodes().get(hash).hostname().address());
+            return InetAddress.getByName(config.ketamaNodes().get(hash).hostname());
         } catch (UnknownHostException e) {
             throw new IllegalStateException(e);
         }