Update visibility.

Author: vbabanin

driver-core/src/main/com/mongodb/internal/connection/BaseCluster.java

@@ -68,7 +68,6 @@
 import static com.mongodb.connection.ServerDescription.MIN_DRIVER_WIRE_VERSION;
 import static com.mongodb.internal.Locks.withInterruptibleLock;
 import static com.mongodb.internal.VisibleForTesting.AccessModifier.PRIVATE;
-import static com.mongodb.internal.VisibleForTesting.AccessModifier.PROTECTED;
 import static com.mongodb.internal.connection.EventHelper.wouldDescriptionsGenerateEquivalentEvents;
 import static com.mongodb.internal.event.EventListenerHelper.singleClusterListener;
 import static com.mongodb.internal.logging.LogMessage.Component.SERVER_SELECTION;
@@ -95,8 +94,7 @@
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 import static java.util.stream.Collectors.toList;
 
-@VisibleForTesting(otherwise = PROTECTED)
-public abstract class BaseCluster implements Cluster {
+abstract class BaseCluster implements Cluster {
     private static final Logger LOGGER = Loggers.getLogger("cluster");
     private static final StructuredLogger STRUCTURED_LOGGER = new StructuredLogger("cluster");
 

driver-core/src/main/com/mongodb/internal/connection/OperationContext.java

@@ -241,8 +241,7 @@ ServerSelector apply(final ServerSelector wrappedSelector) {
             return new DeprioritizingSelector(wrappedSelector);
         }
 
-        @VisibleForTesting(otherwise = PACKAGE)
-        public void updateCandidate(final ServerAddress serverAddress, final ClusterType clusterType) {
+        void updateCandidate(final ServerAddress serverAddress, final ClusterType clusterType) {
             this.candidate = serverAddress;
             this.clusterType = clusterType;
         }
@@ -253,7 +252,7 @@ public void onAttemptFailure(final Throwable failure) {
                 return;
             }
 
-            boolean isSystemOverloadedError = failure instanceof MongoException 
+            boolean isSystemOverloadedError = failure instanceof MongoException
                     && ((MongoException) failure).hasErrorLabel(SYSTEM_OVERLOADED_ERROR_LABEL);
             if (clusterType == ClusterType.SHARDED || isSystemOverloadedError) {
                 deprioritized.add(candidate);

driver-core/src/main/com/mongodb/internal/operation/AsyncChangeStreamBatchCursor.java

@@ -73,7 +73,9 @@ final class AsyncChangeStreamBatchCursor<T> implements AsyncAggregateResponseBat
         this.wrapped = new AtomicReference<>(assertNotNull(wrapped));
         this.binding = binding;
         binding.retain();
-        this.initialOperationContext = operationContext.withOverride(TimeoutContext::withMaxTimeAsMaxAwaitTimeOverride);
+        this.initialOperationContext = operationContext
+                .withOverride(TimeoutContext::withMaxTimeAsMaxAwaitTimeOverride)
+                .withNewServerDeprioritization();
         this.resumeToken = resumeToken;
         this.maxWireVersion = maxWireVersion;
         isClosed = new AtomicBoolean();

driver-sync/src/test/functional/com/mongodb/client/AbstractRetryableReadsProseTest.java

@@ -53,7 +53,7 @@ public abstract class AbstractRetryableReadsProseTest {
 
     private static final String COLLECTION_NAME = "test";
 
-    protected abstract MongoClient createClient(final MongoClientSettings settings);
+    protected abstract MongoClient createClient(MongoClientSettings settings);
 
     @AfterEach
     void afterEach() {