From 475fcb9c10d29184c4c60e9654f74f1feed57b5e Mon Sep 17 00:00:00 2001 From: Jeff Yemin Date: Wed, 25 Oct 2023 13:55:04 -0400 Subject: [PATCH] Remove getCluster method from the following internal interfaces: * ClusterAwareReadWriteBinding * AsyncClusterAwareReadWriteBinding The interfaces remain as they have picket up a second method. JAVA-5217 --- .../binding/AsyncClusterAwareReadWriteBinding.java | 2 -- .../mongodb/internal/binding/AsyncClusterBinding.java | 5 ----- .../internal/binding/ClusterAwareReadWriteBinding.java | 2 -- .../com/mongodb/internal/binding/ClusterBinding.java | 10 +--------- .../client/internal/crypt/CryptBinding.java | 6 ------ .../main/com/mongodb/client/internal/CryptBinding.java | 8 +------- 6 files changed, 2 insertions(+), 31 deletions(-) diff --git a/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterAwareReadWriteBinding.java b/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterAwareReadWriteBinding.java index 8a0ee5d8241..c66dc321513 100644 --- a/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterAwareReadWriteBinding.java +++ b/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterAwareReadWriteBinding.java @@ -18,13 +18,11 @@ import com.mongodb.ServerAddress; import com.mongodb.internal.async.SingleResultCallback; -import com.mongodb.internal.connection.Cluster; /** *

This class is not part of the public API and may be removed or changed at any time

*/ public interface AsyncClusterAwareReadWriteBinding extends AsyncReadWriteBinding { - Cluster getCluster(); /** * Returns a connection source to the specified server diff --git a/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterBinding.java b/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterBinding.java index fb813c25327..acf75a3b1e8 100644 --- a/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterBinding.java +++ b/driver-core/src/main/com/mongodb/internal/binding/AsyncClusterBinding.java @@ -80,11 +80,6 @@ public AsyncClusterAwareReadWriteBinding retain() { return this; } - @Override - public Cluster getCluster() { - return cluster; - } - @Override public ReadPreference getReadPreference() { return readPreference; diff --git a/driver-core/src/main/com/mongodb/internal/binding/ClusterAwareReadWriteBinding.java b/driver-core/src/main/com/mongodb/internal/binding/ClusterAwareReadWriteBinding.java index 12e9c4d591b..8f7552341a7 100644 --- a/driver-core/src/main/com/mongodb/internal/binding/ClusterAwareReadWriteBinding.java +++ b/driver-core/src/main/com/mongodb/internal/binding/ClusterAwareReadWriteBinding.java @@ -17,13 +17,11 @@ package com.mongodb.internal.binding; import com.mongodb.ServerAddress; -import com.mongodb.internal.connection.Cluster; /** * This interface is not part of the public API and may be removed or changed at any time. */ public interface ClusterAwareReadWriteBinding extends ReadWriteBinding { - Cluster getCluster(); /** * Returns a connection source to the specified server address. diff --git a/driver-core/src/main/com/mongodb/internal/binding/ClusterBinding.java b/driver-core/src/main/com/mongodb/internal/binding/ClusterBinding.java index 81321b631f2..a2223d02014 100644 --- a/driver-core/src/main/com/mongodb/internal/binding/ClusterBinding.java +++ b/driver-core/src/main/com/mongodb/internal/binding/ClusterBinding.java @@ -22,10 +22,10 @@ import com.mongodb.ServerAddress; import com.mongodb.ServerApi; import com.mongodb.connection.ClusterConnectionMode; -import com.mongodb.internal.connection.OperationContext; import com.mongodb.connection.ServerDescription; import com.mongodb.internal.connection.Cluster; import com.mongodb.internal.connection.Connection; +import com.mongodb.internal.connection.OperationContext; import com.mongodb.internal.connection.ReadConcernAwareNoOpSessionContext; import com.mongodb.internal.connection.Server; import com.mongodb.internal.connection.ServerTuple; @@ -71,14 +71,6 @@ public ClusterBinding(final Cluster cluster, final ReadPreference readPreference operationContext = new OperationContext(); } - /** - * Return the cluster. - * @return the cluster - */ - public Cluster getCluster() { - return cluster; - } - @Override public ReadWriteBinding retain() { super.retain(); diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/CryptBinding.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/CryptBinding.java index 11ecef6813e..ae100283ab8 100644 --- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/CryptBinding.java +++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/CryptBinding.java @@ -25,7 +25,6 @@ import com.mongodb.internal.binding.AsyncClusterAwareReadWriteBinding; import com.mongodb.internal.binding.AsyncConnectionSource; import com.mongodb.internal.connection.AsyncConnection; -import com.mongodb.internal.connection.Cluster; import com.mongodb.internal.connection.OperationContext; import com.mongodb.internal.session.SessionContext; import com.mongodb.lang.Nullable; @@ -132,11 +131,6 @@ public int release() { return wrapped.release(); } - @Override - public Cluster getCluster() { - return wrapped.getCluster(); - } - private class CryptConnectionSource implements AsyncConnectionSource { private final AsyncConnectionSource wrapped; diff --git a/driver-sync/src/main/com/mongodb/client/internal/CryptBinding.java b/driver-sync/src/main/com/mongodb/client/internal/CryptBinding.java index 1b826177267..ab195a46dd5 100644 --- a/driver-sync/src/main/com/mongodb/client/internal/CryptBinding.java +++ b/driver-sync/src/main/com/mongodb/client/internal/CryptBinding.java @@ -20,13 +20,12 @@ import com.mongodb.RequestContext; import com.mongodb.ServerAddress; import com.mongodb.ServerApi; -import com.mongodb.internal.connection.OperationContext; import com.mongodb.connection.ServerDescription; import com.mongodb.internal.binding.ClusterAwareReadWriteBinding; import com.mongodb.internal.binding.ConnectionSource; import com.mongodb.internal.binding.ReadWriteBinding; -import com.mongodb.internal.connection.Cluster; import com.mongodb.internal.connection.Connection; +import com.mongodb.internal.connection.OperationContext; import com.mongodb.internal.session.SessionContext; import com.mongodb.lang.Nullable; @@ -101,11 +100,6 @@ public int release() { return wrapped.release(); } - @Override - public Cluster getCluster() { - return wrapped.getCluster(); - } - private class CryptConnectionSource implements ConnectionSource { private final ConnectionSource wrapped;