Remove Stream-related types from API

  MongoClientSettings#getStreamFactoryFactory()
  MongoClientSettings.Builder#streamFactoryFactory(StreamFactoryFactory)
  AsynchronousSocketChannelStreamFactory
  AsynchronousSocketChannelStreamFactoryFactory
  BufferProvider
  SocketStreamFactory
  Stream
  StreamFactory
  StreamFactoryFactory
  TlsChannelStreamFactoryFactory
  NettyStreamFactory
  NettyStreamFactoryFactory

JAVA-5161

Author: jyemin

driver-core/src/main/com/mongodb/MongoClientSettings.java

@@ -26,7 +26,6 @@
 import com.mongodb.connection.ServerSettings;
 import com.mongodb.connection.SocketSettings;
 import com.mongodb.connection.SslSettings;
-import com.mongodb.connection.StreamFactoryFactory;
 import com.mongodb.connection.TransportSettings;
 import com.mongodb.event.CommandListener;
 import com.mongodb.lang.Nullable;
@@ -63,7 +62,6 @@
  *
  * @since 3.7
  */
-@SuppressWarnings("deprecation")
 @Immutable
 public final class MongoClientSettings {
     private static final CodecRegistry DEFAULT_CODEC_REGISTRY =
@@ -92,7 +90,6 @@ public final class MongoClientSettings {
     private final ReadConcern readConcern;
     private final MongoCredential credential;
     private final TransportSettings transportSettings;
-    private final StreamFactoryFactory streamFactoryFactory;
     private final List<CommandListener> commandListeners;
     private final CodecRegistry codecRegistry;
     private final LoggerSettings loggerSettings;
@@ -213,7 +210,6 @@ public static final class Builder {
         private ReadConcern readConcern = ReadConcern.DEFAULT;
         private CodecRegistry codecRegistry = MongoClientSettings.getDefaultCodecRegistry();
         private TransportSettings transportSettings;
-        private StreamFactoryFactory streamFactoryFactory;
         private List<CommandListener> commandListeners = new ArrayList<>();
 
         private final LoggerSettings.Builder loggerSettingsBuilder = LoggerSettings.builder();
@@ -257,7 +253,6 @@ private Builder(final MongoClientSettings settings) {
             dnsClient = settings.getDnsClient();
             inetAddressResolver = settings.getInetAddressResolver();
             transportSettings = settings.getTransportSettings();
-            streamFactoryFactory = settings.getStreamFactoryFactory();
             autoEncryptionSettings = settings.getAutoEncryptionSettings();
             contextProvider = settings.getContextProvider();
             loggerSettingsBuilder.applySettings(settings.getLoggerSettings());
@@ -489,27 +484,9 @@ public Builder codecRegistry(final CodecRegistry codecRegistry) {
             return this;
         }
 
-        /**
-         * Sets the factory to use to create a {@code StreamFactory}.
-         *
-         * @param streamFactoryFactory the stream factory factory
-         * @return this
-         * @see #getStreamFactoryFactory()
-         * @deprecated Prefer {@link #transportSettings(TransportSettings)}
-         */
-        @Deprecated
-        public Builder streamFactoryFactory(final StreamFactoryFactory streamFactoryFactory) {
-            this.streamFactoryFactory = notNull("streamFactoryFactory", streamFactoryFactory);
-            return this;
-        }
-
         /**
          * Sets the {@link TransportSettings} to apply.
          *
-         * <p>
-         * If transport settings are applied, application of {@link #streamFactoryFactory} is ignored.
-         * </p>
-         *
          * @param transportSettings the transport settings
          * @return this
          * @see #getTransportSettings()
@@ -789,19 +766,6 @@ public CodecRegistry getCodecRegistry() {
         return codecRegistry;
     }
 
-    /**
-     * Gets the factory to use to create a {@code StreamFactory}.
-     *
-     * @return the stream factory factory
-     * @see Builder#streamFactoryFactory(StreamFactoryFactory)
-     * @deprecated  Prefer {@link #getTransportSettings()}
-     */
-    @Deprecated
-    @Nullable
-    public StreamFactoryFactory getStreamFactoryFactory() {
-        return streamFactoryFactory;
-    }
-
     /**
      * Gets the settings for the underlying transport implementation
      *
@@ -1017,7 +981,6 @@ public boolean equals(final Object o) {
                 && Objects.equals(readConcern, that.readConcern)
                 && Objects.equals(credential, that.credential)
                 && Objects.equals(transportSettings, that.transportSettings)
-                && Objects.equals(streamFactoryFactory, that.streamFactoryFactory)
                 && Objects.equals(commandListeners, that.commandListeners)
                 && Objects.equals(codecRegistry, that.codecRegistry)
                 && Objects.equals(loggerSettings, that.loggerSettings)
@@ -1040,7 +1003,7 @@ public boolean equals(final Object o) {
     @Override
     public int hashCode() {
         return Objects.hash(readPreference, writeConcern, retryWrites, retryReads, readConcern, credential, transportSettings,
-                streamFactoryFactory, commandListeners, codecRegistry, loggerSettings, clusterSettings, socketSettings,
+                commandListeners, codecRegistry, loggerSettings, clusterSettings, socketSettings,
                 heartbeatSocketSettings, connectionPoolSettings, serverSettings, sslSettings, applicationName, compressorList,
                 uuidRepresentation, serverApi, autoEncryptionSettings, heartbeatSocketTimeoutSetExplicitly,
                 heartbeatConnectTimeoutSetExplicitly, dnsClient, inetAddressResolver, contextProvider);
@@ -1056,7 +1019,6 @@ public String toString() {
                 + ", readConcern=" + readConcern
                 + ", credential=" + credential
                 + ", transportSettings=" + transportSettings
-                + ", streamFactoryFactory=" + streamFactoryFactory
                 + ", commandListeners=" + commandListeners
                 + ", codecRegistry=" + codecRegistry
                 + ", loggerSettings=" + loggerSettings
@@ -1085,7 +1047,6 @@ private MongoClientSettings(final Builder builder) {
         readConcern = builder.readConcern;
         credential = builder.credential;
         transportSettings = builder.transportSettings;
-        streamFactoryFactory = builder.streamFactoryFactory;
         codecRegistry = builder.codecRegistry;
         commandListeners = builder.commandListeners;
         applicationName = builder.applicationName;

driver-core/src/main/com/mongodb/connection/ProxySettings.java

@@ -19,6 +19,7 @@
 import com.mongodb.AutoEncryptionSettings;
 import com.mongodb.ClientEncryptionSettings;
 import com.mongodb.ConnectionString;
+import com.mongodb.MongoClientSettings;
 import com.mongodb.annotations.Immutable;
 import com.mongodb.lang.Nullable;
 
@@ -35,7 +36,7 @@
  * This setting is furthermore ignored if:
  * <ul>
  *     <li>the communication is via {@linkplain com.mongodb.UnixServerAddress Unix domain socket}.</li>
- *     <li>a {@link StreamFactoryFactory} is {@linkplain com.mongodb.MongoClientSettings.Builder#streamFactoryFactory(StreamFactoryFactory)
+ *     <li>a {@link TransportSettings} is {@linkplain MongoClientSettings.Builder#transportSettings(TransportSettings)}
  *     configured}.</li>
  * </ul>
  *

driver-core/src/main/com/mongodb/connection/SslSettings.java

@@ -112,10 +112,8 @@ public Builder invalidHostNameAllowed(final boolean invalidHostNameAllowed) {
         /**
          * Sets the SSLContext for use when SSL is enabled.
          *
-         * @param context the SSLContext to use for connections. Ignored if TLS/SSL is not {@linkplain #enabled(boolean) enabled},
-         *                or if a {@link StreamFactory} {@linkplain StreamFactoryFactory#create(SocketSettings, SslSettings) created}
-         *                by the {@linkplain com.mongodb.MongoClientSettings.Builder#streamFactoryFactory(StreamFactoryFactory) specified}
-         *                {@link StreamFactoryFactory} does not use {@link SSLContext}.
+         * @param context the SSLContext to use for connections. Ignored if TLS/SSL is not {@linkplain #enabled(boolean) enabled}, or if
+         *                overridden by {@link NettyTransportSettings#getSslContext()}.
          * @return this
          * @since 3.5
          */

driver-core/src/main/com/mongodb/connection/netty/package-info.java

@@ -23,7 +23,6 @@
 import com.mongodb.ServerAddress;
 import com.mongodb.connection.AsyncCompletionHandler;
 import com.mongodb.connection.SocketSettings;
-import com.mongodb.connection.Stream;
 import com.mongodb.lang.Nullable;
 import org.bson.ByteBuf;
 
@@ -43,7 +42,6 @@
 /**
  * <p>This class is not part of the public API and may be removed or changed at any time</p>
  */
-@SuppressWarnings("deprecation")
 public abstract class AsynchronousChannelStream implements Stream {
     private final ServerAddress serverAddress;
     private final SocketSettings settings;

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

@@ -14,24 +14,21 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.ServerAddress;
-import com.mongodb.internal.connection.AsynchronousSocketChannelStream;
-import com.mongodb.internal.connection.PowerOfTwoBufferPool;
+import com.mongodb.connection.SocketSettings;
+import com.mongodb.connection.SslSettings;
 import com.mongodb.lang.Nullable;
 
 import java.nio.channels.AsynchronousChannelGroup;
 
+import static com.mongodb.assertions.Assertions.assertFalse;
 import static com.mongodb.assertions.Assertions.notNull;
 
 /**
  * Factory to create a Stream that's an AsynchronousSocketChannelStream. Throws an exception if SSL is enabled.
- *
- * @since 3.0
- * @deprecated There is no replacement for this class.
  */
-@Deprecated
 public class AsynchronousSocketChannelStreamFactory implements StreamFactory {
     private final PowerOfTwoBufferPool bufferProvider = PowerOfTwoBufferPool.DEFAULT;
     private final SocketSettings settings;
@@ -58,10 +55,7 @@ public AsynchronousSocketChannelStreamFactory(final SocketSettings settings, fin
      */
     public AsynchronousSocketChannelStreamFactory(final SocketSettings settings, final SslSettings sslSettings,
                                                   @Nullable final AsynchronousChannelGroup group) {
-        if (sslSettings.isEnabled()) {
-            throw new UnsupportedOperationException("No SSL support in java.nio.channels.AsynchronousSocketChannel. For SSL support use "
-                    + "com.mongodb.connection.TlsChannelStreamFactoryFactory");
-        }
+        assertFalse(sslSettings.isEnabled());
 
         this.settings = notNull("settings", settings);
         this.group = group;

driver-core/src/main/com/mongodb/connection/AsynchronousSocketChannelStreamFactory.java renamed to driver-core/src/main/com/mongodb/internal/connection/AsynchronousSocketChannelStreamFactory.java

@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
+
+import com.mongodb.connection.SocketSettings;
+import com.mongodb.connection.SslSettings;
 
 import java.nio.channels.AsynchronousChannelGroup;
 
 /**
  * A {@code StreamFactoryFactory} implementation for AsynchronousSocketChannel-based streams.
  *
  * @see java.nio.channels.AsynchronousSocketChannel
- * @since 3.1
- * @deprecated There is no replacement for this class.
  */
-@Deprecated
 public final class AsynchronousSocketChannelStreamFactoryFactory implements StreamFactoryFactory {
     private final AsynchronousChannelGroup group;
 

driver-core/src/main/com/mongodb/connection/AsynchronousSocketChannelStreamFactoryFactory.java renamed to driver-core/src/main/com/mongodb/internal/connection/AsynchronousSocketChannelStreamFactoryFactory.java

@@ -14,18 +14,14 @@
  * limitations under the License.
  */
 
-package com.mongodb.connection;
+package com.mongodb.internal.connection;
 
 import com.mongodb.annotations.ThreadSafe;
 import org.bson.ByteBuf;
 
 /**
  * A provider of instances of ByteBuf.
- *
- * @since 3.0
- * @deprecated There is no replacement for this interface.
  */
-@Deprecated
 @ThreadSafe
 public interface BufferProvider {
     /**

driver-core/src/main/com/mongodb/connection/BufferProvider.java renamed to driver-core/src/main/com/mongodb/internal/connection/BufferProvider.java

@@ -16,7 +16,6 @@
 
 package com.mongodb.internal.connection;
 
-import com.mongodb.connection.BufferProvider;
 import org.bson.ByteBuf;
 import org.bson.io.OutputBuffer;
 
@@ -31,7 +30,6 @@
 /**
  * <p>This class is not part of the public API and may be removed or changed at any time</p>
  */
-@SuppressWarnings("deprecation")
 public class ByteBufferBsonOutput extends OutputBuffer {
 
     private static final int MAX_SHIFT = 31;

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

@@ -27,7 +27,6 @@
 import com.mongodb.connection.ClusterSettings;
 import com.mongodb.connection.ConnectionPoolSettings;
 import com.mongodb.connection.ServerSettings;
-import com.mongodb.connection.StreamFactory;
 import com.mongodb.event.ClusterListener;
 import com.mongodb.event.CommandListener;
 import com.mongodb.event.ServerListener;
@@ -56,7 +55,6 @@
  *
  * <p>This class is not part of the public API and may be removed or changed at any time</p>
  */
-@SuppressWarnings("deprecation")
 public final class DefaultClusterFactory {
     private static final Logger LOGGER = Loggers.getLogger("client");
 

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

@@ -26,7 +26,6 @@
 import com.mongodb.connection.ConnectionPoolSettings;
 import com.mongodb.connection.ServerId;
 import com.mongodb.connection.ServerSettings;
-import com.mongodb.connection.StreamFactory;
 import com.mongodb.event.CommandListener;
 import com.mongodb.event.ServerListener;
 import com.mongodb.internal.inject.SameObjectProvider;
@@ -41,7 +40,6 @@
 /**
  * <p>This class is not part of the public API and may be removed or changed at any time</p>
  */
-@SuppressWarnings("deprecation")
 public class DefaultClusterableServerFactory implements ClusterableServerFactory {
     private final ServerSettings serverSettings;
     private final ConnectionPoolSettings connectionPoolSettings;

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

@@ -17,7 +17,6 @@
 package com.mongodb.internal.connection;
 
 import com.mongodb.RequestContext;
-import com.mongodb.connection.BufferProvider;
 import com.mongodb.connection.ConnectionDescription;
 import com.mongodb.connection.ServerDescription;
 import com.mongodb.internal.async.SingleResultCallback;
@@ -31,7 +30,6 @@
 /**
  * <p>This class is not part of the public API and may be removed or changed at any time</p>
  */
-@SuppressWarnings("deprecation")
 public interface InternalConnection extends BufferProvider {
 
     int NOT_INITIALIZED_GENERATION = -1;

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

@@ -39,8 +39,6 @@
 import com.mongodb.connection.ServerDescription;
 import com.mongodb.connection.ServerId;
 import com.mongodb.connection.ServerType;
-import com.mongodb.connection.Stream;
-import com.mongodb.connection.StreamFactory;
 import com.mongodb.event.CommandListener;
 import com.mongodb.internal.ResourceUtil;
 import com.mongodb.internal.VisibleForTesting;
@@ -94,7 +92,6 @@
  * <p>This class is not part of the public API and may be removed or changed at any time</p>
  */
 @NotThreadSafe
-@SuppressWarnings("deprecation")
 public class InternalStreamConnection implements InternalConnection {
 
     private static final Set<String> SECURITY_SENSITIVE_COMMANDS = new HashSet<>(asList(

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

@@ -22,7 +22,6 @@
 import com.mongodb.ServerApi;
 import com.mongodb.connection.ClusterConnectionMode;
 import com.mongodb.connection.ServerId;
-import com.mongodb.connection.StreamFactory;
 import com.mongodb.event.CommandListener;
 import com.mongodb.lang.Nullable;
 import com.mongodb.spi.dns.InetAddressResolver;
@@ -34,7 +33,6 @@
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.internal.connection.ClientMetadataHelper.createClientMetadataDocument;
 
-@SuppressWarnings("deprecation")
 class InternalStreamConnectionFactory implements InternalConnectionFactory {
     private final ClusterConnectionMode clusterConnectionMode;
     private final boolean isMonitoringConnection;

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

@@ -27,7 +27,6 @@
 import com.mongodb.connection.ConnectionPoolSettings;
 import com.mongodb.connection.ServerId;
 import com.mongodb.connection.ServerSettings;
-import com.mongodb.connection.StreamFactory;
 import com.mongodb.event.CommandListener;
 import com.mongodb.internal.inject.EmptyProvider;
 import com.mongodb.lang.Nullable;
@@ -41,7 +40,6 @@
  * <p>This class is not part of the public API and may be removed or changed at any time</p>
  */
 @ThreadSafe
-@SuppressWarnings("deprecation")
 public class LoadBalancedClusterableServerFactory implements ClusterableServerFactory {
     private final ServerSettings serverSettings;
     private final ConnectionPoolSettings connectionPoolSettings;