Skip to content

Commit 1d2e6fa

Browse files
jyeminjyemin
committed
JAVA-725: Removing use of deprecated methods/constructors, mostly in tests
1 parent 093a2cb commit 1d2e6fa

Some content is hidden

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

47 files changed

+288
-311
lines changed

‎src/main/com/mongodb/ConnectionStatus.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ abstract class ConnectionStatus {
4141

4242
protected static int updaterIntervalMS;
4343
protected static int updaterIntervalNoMasterMS;
44+
@SuppressWarnings("deprecation")
4445
protected static final MongoOptions mongoOptionsDefaults = new MongoOptions();
4546
protected static final float latencySmoothFactor;
4647
protected static final DBObject isMasterCmd = new BasicDBObject("ismaster", 1);

‎src/main/com/mongodb/DBPort.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public class DBPort {
6767
* creates a new DBPort
6868
* @param addr the server address
6969
*/
70+
@SuppressWarnings("deprecation")
7071
public DBPort( ServerAddress addr ){
7172
this( addr , null , new MongoOptions() );
7273
}

‎src/main/com/mongodb/MongoClient.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ public MongoClient(ServerAddress addr, MongoClientOptions options) {
163163
* @see com.mongodb.ServerAddress
164164
* @since 2.11.0
165165
*/
166+
@SuppressWarnings("deprecation")
166167
public MongoClient(ServerAddress addr, List<MongoCredential> credentialsList, MongoClientOptions options) {
167168
super(MongoAuthority.direct(addr, new MongoCredentialsStore(credentialsList)), new MongoOptions(options));
168169
this.options = options;
@@ -247,6 +248,7 @@ public MongoClient(List<ServerAddress> seeds, MongoClientOptions options) {
247248
* @see com.mongodb.ServerAddress
248249
* @since 2.11.0
249250
*/
251+
@SuppressWarnings("deprecation")
250252
public MongoClient(List<ServerAddress> seeds, List<MongoCredential> credentialsList, MongoClientOptions options) {
251253
super(MongoAuthority.dynamicSet(seeds, new MongoCredentialsStore(credentialsList)), new MongoOptions(options));
252254
this.options = options;
@@ -262,6 +264,7 @@ public MongoClient(List<ServerAddress> seeds, List<MongoCredential> credentialsL
262264
* @see MongoURI
263265
* @dochub connections
264266
*/
267+
@SuppressWarnings("deprecation")
265268
public MongoClient(MongoClientURI uri) throws UnknownHostException {
266269
super(new MongoURI(uri));
267270
this.options = uri.getOptions();

‎src/main/com/mongodb/MongoURI.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ public MongoOptions getOptions(){
215215
* @throws MongoException
216216
* @throws UnknownHostException
217217
*/
218+
@SuppressWarnings("deprecation")
218219
public Mongo connect()
219220
throws UnknownHostException {
220221
// TODO caching?

‎src/main/com/mongodb/gridfs/CLI.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,15 @@
1818

1919
package com.mongodb.gridfs;
2020

21-
import java.io.File;
22-
import java.security.DigestInputStream;
23-
import java.security.MessageDigest;
24-
2521
import com.mongodb.DBObject;
2622
import com.mongodb.Mongo;
23+
import com.mongodb.MongoClient;
2724
import com.mongodb.util.Util;
2825

26+
import java.io.File;
27+
import java.security.DigestInputStream;
28+
import java.security.MessageDigest;
29+
2930

3031
/**
3132
* a simple CLI for Gridfs
@@ -48,10 +49,12 @@ private static void printUsage() {
4849
private static String db = "test";
4950

5051
private static Mongo _mongo = null;
52+
53+
@SuppressWarnings("deprecation")
5154
private static Mongo getMongo()
5255
throws Exception {
5356
if ( _mongo == null )
54-
_mongo = new Mongo( host );
57+
_mongo = new MongoClient( host );
5558
return _mongo;
5659
}
5760

‎src/test/com/mongodb/ByteTest.java‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@
1616

1717
package com.mongodb;
1818

19+
import com.mongodb.util.TestCase;
20+
import org.bson.BSON;
21+
import org.bson.BSONDecoder;
22+
import org.bson.BSONObject;
23+
import org.bson.BasicBSONDecoder;
24+
import org.bson.types.ObjectId;
25+
import org.testng.annotations.Test;
26+
1927
import java.io.ByteArrayInputStream;
2028
import java.io.ByteArrayOutputStream;
2129
import java.io.IOException;
@@ -28,22 +36,12 @@
2836
import java.util.Set;
2937
import java.util.regex.Pattern;
3038

31-
import org.bson.BSON;
32-
import org.bson.BSONDecoder;
33-
import org.bson.BSONObject;
34-
import org.bson.BasicBSONDecoder;
35-
import org.bson.types.ObjectId;
36-
import org.testng.annotations.Test;
37-
38-
import com.mongodb.util.TestCase;
39-
4039

4140
@SuppressWarnings({"unchecked", "rawtypes"})
4241
public class ByteTest extends TestCase {
4342

4443
public ByteTest() throws IOException , MongoException {
4544
super();
46-
cleanupMongo = new Mongo( "127.0.0.1" );
4745
cleanupDB = "com_mongodb_unittest_ByteTest";
4846
_db = cleanupMongo.getDB( cleanupDB );
4947
}

‎src/test/com/mongodb/DBCollectionTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ public class DBCollectionTest extends TestCase {
3030
public DBCollectionTest()
3131
throws IOException , MongoException {
3232
super();
33-
cleanupMongo = new Mongo( "127.0.0.1" );
3433
cleanupDB = "com_mongodb_unittest_DBCollectionTest";
3534
_db = cleanupMongo.getDB( cleanupDB );
3635
}
@@ -166,7 +165,7 @@ public void testFindOneSort(){
166165
*/
167166
@Test
168167
public void testDropDatabase() throws Exception {
169-
final Mongo mongo = new Mongo( "127.0.0.1" );
168+
final Mongo mongo = new MongoClient( "127.0.0.1" );
170169
mongo.getDB("com_mongodb_unittest_dropDatabaseTest").dropDatabase();
171170
mongo.close();
172171
}

‎src/test/com/mongodb/DBCursorTest.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,8 @@ public class DBCursorTest extends TestCase {
3535

3636
public DBCursorTest() throws IOException , MongoException {
3737
super();
38-
cleanupMongo = new Mongo( "127.0.0.1" );
39-
cleanupDB = "com_mongodb_unittest_DBCursorTest";
40-
_db = cleanupMongo.getDB( cleanupDB );
38+
cleanupDB = "com_mongodb_unittest_DBCursorTest";
39+
_db = cleanupMongo.getDB(cleanupDB);
4140
}
4241

4342
@Test(groups = {"basic"})
@@ -502,9 +501,8 @@ public void testHasFinalizer() throws UnknownHostException {
502501
cursor.close();
503502

504503
// finally, no finalizer if disabled in mongo options
505-
MongoOptions mongoOptions = new MongoOptions();
506-
mongoOptions.cursorFinalizerEnabled = false;
507-
Mongo m = new Mongo("127.0.0.1", mongoOptions);
504+
MongoClientOptions mongoOptions = new MongoClientOptions.Builder().cursorFinalizerEnabled(false).build();
505+
Mongo m = new MongoClient("127.0.0.1", mongoOptions);
508506
try {
509507
c = m.getDB(cleanupDB).getCollection("HasFinalizerTest");
510508
cursor = c.find();

‎src/test/com/mongodb/DBObjectTest.java‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,23 @@
1616

1717
package com.mongodb;
1818

19-
import java.net.*;
20-
import java.util.*;
21-
22-
19+
import com.mongodb.util.TestCase;
20+
import org.bson.types.BasicBSONList;
21+
import org.bson.types.ObjectId;
2322
import org.testng.annotations.Test;
2423

25-
import com.mongodb.util.*;
26-
27-
import org.bson.*;
28-
import org.bson.types.*;
24+
import java.util.ArrayList;
25+
import java.util.HashMap;
26+
import java.util.List;
27+
import java.util.Map;
2928

3029
@SuppressWarnings({"unchecked", "deprecation"})
3130
public class DBObjectTest extends TestCase {
3231

3332
public DBObjectTest() {
3433
super();
35-
try {
36-
cleanupMongo = new Mongo( "127.0.0.1" );
37-
cleanupDB = "com_monogodb_unittest_DBObjectTest";
38-
_db = cleanupMongo.getDB( cleanupDB );
39-
}
40-
catch(UnknownHostException e) {
41-
throw new MongoException("couldn't connect");
42-
}
34+
cleanupDB = "com_monogodb_unittest_DBObjectTest";
35+
_db = cleanupMongo.getDB(cleanupDB);
4336
}
4437

4538
@Test(groups = {"basic"})

‎src/test/com/mongodb/DBPortPoolTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
public class DBPortPoolTest extends com.mongodb.util.TestCase {
3434

3535
@Test
36+
@SuppressWarnings("deprecation")
3637
public void testReuse() throws Exception {
3738
MongoOptions options = new MongoOptions();
3839
options.connectionsPerHost = 10;
@@ -85,6 +86,7 @@ public void run(){
8586
}
8687

8788
@Test
89+
@SuppressWarnings("deprecation")
8890
public void testInterruptedException() throws UnknownHostException, InterruptedException {
8991
MongoOptions options = new MongoOptions();
9092
options.connectionsPerHost = 1;

0 commit comments

Comments
 (0)