Skip to content

Commit 6aa2434

Browse files
committed
feat: remove legacy topology types
NODE-2318
1 parent ade9a62 commit 6aa2434

File tree

143 files changed

+171
-10094
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+171
-10094
lines changed

index.js

-4
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ connect.Admin = require('./lib/admin');
2222
connect.MongoClient = require('./lib/mongo_client');
2323
connect.Db = require('./lib/db');
2424
connect.Collection = require('./lib/collection');
25-
connect.Server = require('./lib/topologies/server');
26-
connect.ReplSet = require('./lib/topologies/replset');
27-
connect.Mongos = require('./lib/topologies/mongos');
2825
connect.ReadPreference = core.ReadPreference;
2926
connect.GridStore = require('./lib/gridfs/grid_store');
3027
connect.Chunk = require('./lib/gridfs/chunk');
@@ -34,7 +31,6 @@ connect.CommandCursor = require('./lib/command_cursor');
3431
connect.Cursor = require('./lib/cursor');
3532
connect.GridFSBucket = require('./lib/gridfs-stream');
3633
// Exported to be used in tests not to be used anywhere else
37-
connect.CoreServer = core.Server;
3834
connect.CoreConnection = core.Connection;
3935

4036
// BSON types exported

lib/core/uri_parser.js renamed to lib/connection_string.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
const URL = require('url');
33
const qs = require('querystring');
44
const dns = require('dns');
5-
const MongoParseError = require('./error').MongoParseError;
6-
const ReadPreference = require('./topologies/read_preference');
5+
const MongoParseError = require('./core/error').MongoParseError;
6+
const ReadPreference = require('./core/topologies/read_preference');
77

88
/**
99
* The following regular expression validates a connection string and breaks the
@@ -698,4 +698,6 @@ function parseConnectionString(uri, options, callback) {
698698
callback(null, result);
699699
}
700700

701-
module.exports = parseConnectionString;
701+
module.exports = {
702+
parseConnectionString
703+
};

lib/core/cursor.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ const MongoNetworkError = require('./error').MongoNetworkError;
77
const mongoErrorContextSymbol = require('./error').mongoErrorContextSymbol;
88
const collationNotSupported = require('./utils').collationNotSupported;
99
const ReadPreference = require('./topologies/read_preference');
10-
const isUnifiedTopology = require('./utils').isUnifiedTopology;
1110
const executeOperation = require('../operations/execute_operation');
1211
const Readable = require('stream').Readable;
1312
const SUPPORTS = require('../utils').SUPPORTS;
@@ -428,7 +427,7 @@ class CoreCursor extends Readable {
428427
const cursor = this;
429428

430429
// NOTE: this goes away once cursors use `executeOperation`
431-
if (isUnifiedTopology(cursor.topology) && cursor.topology.shouldCheckForSessionSupport()) {
430+
if (cursor.topology.shouldCheckForSessionSupport()) {
432431
cursor.topology.selectServer(ReadPreference.primaryPreferred, err => {
433432
if (err) {
434433
callback(err);

lib/core/index.js

+1-6
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ module.exports = {
2525
mongoErrorContextSymbol: require('./error').mongoErrorContextSymbol,
2626
// Core
2727
Connection: require('./connection/connection'),
28-
Server: require('./topologies/server'),
29-
ReplSet: require('./topologies/replset'),
30-
Mongos: require('./topologies/mongos'),
3128
Logger: require('./connection/logger'),
3229
Cursor: require('./cursor').CoreCursor,
3330
ReadPreference: require('./topologies/read_preference'),
@@ -45,7 +42,5 @@ module.exports = {
4542
Plain: require('./auth/plain'),
4643
GSSAPI: require('./auth/gssapi'),
4744
ScramSHA1: require('./auth/scram').ScramSHA1,
48-
ScramSHA256: require('./auth/scram').ScramSHA256,
49-
// Utilities
50-
parseConnectionString: require('./uri_parser')
45+
ScramSHA256: require('./auth/scram').ScramSHA256
5146
};

0 commit comments

Comments
 (0)