Skip to content

Commit 0cd28a3

Browse files
ankonankon
committed
Use non-null "options" when creating collections
The 3.x MongoDB driver throws an NPE with a null object.
1 parent c99d941 commit 0cd28a3

27 files changed

+47
-31
lines changed

‎src/test/java/org/elasticsearch/river/mongodb/advanced/RiverMongoAdvancedTransformationGroovyScriptTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.testng.annotations.Factory;
3535
import org.testng.annotations.Test;
3636

37+
import com.mongodb.BasicDBObject;
3738
import com.mongodb.DB;
3839
import com.mongodb.DBCollection;
3940
import com.mongodb.DBObject;
@@ -62,7 +63,7 @@ public void createDatabase() {
6263
mongoDB.setWriteConcern(WriteConcern.REPLICAS_SAFE);
6364

6465
logger.info("Start createCollection");
65-
mongoCollection = mongoDB.createCollection(getCollection(), null);
66+
mongoCollection = mongoDB.createCollection(getCollection(), new BasicDBObject());
6667
Assert.assertNotNull(mongoCollection);
6768
} catch (Throwable t) {
6869
logger.error("createDatabase failed.", t);

‎src/test/java/org/elasticsearch/river/mongodb/gridfs/RiverMongoGridFSBulkImportTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import org.testng.annotations.BeforeClass;
3636
import org.testng.annotations.Test;
3737

38+
import com.mongodb.BasicDBObject;
3839
import com.mongodb.DB;
3940
import com.mongodb.DBCollection;
4041
import com.mongodb.WriteConcern;
@@ -83,7 +84,7 @@ public void createDatabase() {
8384
mongoDB.setWriteConcern(WriteConcern.REPLICAS_SAFE);
8485
super.createRiver(TEST_MONGODB_RIVER_GRIDFS_JSON);
8586
logger.info("Start createCollection");
86-
mongoCollection = mongoDB.createCollection(getCollection(), null);
87+
mongoCollection = mongoDB.createCollection(getCollection(), new BasicDBObject());
8788
Assert.assertNotNull(mongoCollection);
8889
} catch (Throwable t) {
8990
logger.error("createDatabase failed.", t);

‎src/test/java/org/elasticsearch/river/mongodb/gridfs/RiverMongoGridFSWithAliasTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import org.testng.annotations.BeforeClass;
3636
import org.testng.annotations.Test;
3737

38+
import com.mongodb.BasicDBObject;
3839
import com.mongodb.DB;
3940
import com.mongodb.DBCollection;
4041
import com.mongodb.WriteConcern;
@@ -61,7 +62,7 @@ public void createDatabase() {
6162
mongoDB = getMongo().getDB(getDatabase());
6263
mongoDB.setWriteConcern(WriteConcern.REPLICAS_SAFE);
6364
logger.info("Start createCollection");
64-
mongoCollection = mongoDB.createCollection(getCollection(), null);
65+
mongoCollection = mongoDB.createCollection(getCollection(), new BasicDBObject());
6566
Assert.assertNotNull(mongoCollection);
6667
} catch (Throwable t) {
6768
logger.error("createDatabase failed.", t);

‎src/test/java/org/elasticsearch/river/mongodb/gridfs/RiverMongoWithGridFSInitialImportTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.testng.Assert;
3333
import org.testng.annotations.Test;
3434

35+
import com.mongodb.BasicDBObject;
3536
import com.mongodb.DB;
3637
import com.mongodb.DBCollection;
3738
import com.mongodb.DBCursor;
@@ -53,7 +54,7 @@ public void createDatabase() {
5354
mongoDB = getMongo().getDB(getDatabase());
5455
mongoDB.setWriteConcern(WriteConcern.REPLICAS_SAFE);
5556
logger.info("Start createCollection");
56-
mongoCollection = mongoDB.createCollection(getCollection(), null);
57+
mongoCollection = mongoDB.createCollection(getCollection(), new BasicDBObject());
5758
Assert.assertNotNull(mongoCollection);
5859
Thread.sleep(wait);
5960
} catch (Throwable t) {

‎src/test/java/org/elasticsearch/river/mongodb/gridfs/RiverMongoWithGridFSTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void createDatabase() {
5858
super.createRiver(TEST_MONGODB_RIVER_GRIDFS_JSON);
5959
Thread.sleep(wait);
6060
logger.info("Start createCollection");
61-
mongoCollection = mongoDB.createCollection(getCollection(), null);
61+
mongoCollection = mongoDB.createCollection(getCollection(), new BasicDBObject());
6262
Assert.assertNotNull(mongoCollection);
6363
} catch (Throwable t) {
6464
logger.error("createDatabase failed.", t);

‎src/test/java/org/elasticsearch/river/mongodb/script/RiverMongoGroovyScriptTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import org.testng.annotations.Factory;
3737
import org.testng.annotations.Test;
3838

39+
import com.mongodb.BasicDBObject;
3940
import com.mongodb.DB;
4041
import com.mongodb.DBCollection;
4142
import com.mongodb.DBObject;
@@ -74,7 +75,7 @@ public void cleanUp() {
7475

7576
@BeforeMethod
7677
public void createCollection() {
77-
mongoCollection = mongoDB.createCollection(getCollection(), null);
78+
mongoCollection = mongoDB.createCollection(getCollection(), new BasicDBObject());
7879
Assert.assertNotNull(mongoCollection);
7980
}
8081

‎src/test/java/org/elasticsearch/river/mongodb/script/RiverMongoParentChildScriptTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.testng.annotations.Factory;
3535
import org.testng.annotations.Test;
3636

37+
import com.mongodb.BasicDBObject;
3738
import com.mongodb.DB;
3839
import com.mongodb.DBCollection;
3940
import com.mongodb.DBObject;
@@ -82,9 +83,9 @@ private void createDatabase() {
8283
mongoDB = getMongo().getDB(DATABASE_NAME);
8384
mongoDB.setWriteConcern(WriteConcern.REPLICAS_SAFE);
8485
logger.info("Start createCollection");
85-
mongoAuthorsCollection = mongoDB.createCollection(AUTHORS_COLLECTION, null);
86+
mongoAuthorsCollection = mongoDB.createCollection(AUTHORS_COLLECTION, new BasicDBObject());
8687
Assert.assertNotNull(mongoAuthorsCollection);
87-
mongoBooksCollection = mongoDB.createCollection(BOOKS_COLLECTION, null);
88+
mongoBooksCollection = mongoDB.createCollection(BOOKS_COLLECTION, new BasicDBObject());
8889
Assert.assertNotNull(mongoBooksCollection);
8990
} catch (Throwable t) {
9091
logger.error("createDatabase failed.", t);

‎src/test/java/org/elasticsearch/river/mongodb/script/RiverMongoScriptTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import org.testng.annotations.Factory;
3737
import org.testng.annotations.Test;
3838

39+
import com.mongodb.BasicDBObject;
3940
import com.mongodb.DB;
4041
import com.mongodb.DBCollection;
4142
import com.mongodb.DBObject;
@@ -62,7 +63,7 @@ public void createDatabase() {
6263
mongoDB = getMongo().getDB(getDatabase());
6364
mongoDB.setWriteConcern(WriteConcern.REPLICAS_SAFE);
6465
logger.info("Start createCollection");
65-
mongoCollection = mongoDB.createCollection(getCollection(), null);
66+
mongoCollection = mongoDB.createCollection(getCollection(), new BasicDBObject());
6667
Assert.assertNotNull(mongoCollection);
6768
} catch (Throwable t) {
6869
logger.error("createDatabase failed.", t);

‎src/test/java/org/elasticsearch/river/mongodb/script/RiverMongoTwoGroovyScriptTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import org.testng.annotations.Factory;
3737
import org.testng.annotations.Test;
3838

39+
import com.mongodb.BasicDBObject;
3940
import com.mongodb.DB;
4041
import com.mongodb.DBCollection;
4142
import com.mongodb.DBObject;
@@ -63,7 +64,7 @@ public void createDatabase() {
6364
mongoDB.setWriteConcern(WriteConcern.REPLICAS_SAFE);
6465

6566
logger.info("Start createCollection");
66-
mongoCollection = mongoDB.createCollection(getCollection(), null);
67+
mongoCollection = mongoDB.createCollection(getCollection(), new BasicDBObject());
6768
Assert.assertNotNull(mongoCollection);
6869
} catch (Throwable t) {
6970
logger.error("createDatabase failed.", t);

‎src/test/java/org/elasticsearch/river/mongodb/simple/RiverMongoCannotStopTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.testng.annotations.Factory;
3838
import org.testng.annotations.Test;
3939

40+
import com.mongodb.BasicDBObject;
4041
import com.mongodb.DB;
4142
import com.mongodb.DBCollection;
4243
import com.mongodb.DBObject;
@@ -62,7 +63,7 @@ public void createDatabase() {
6263
mongoDB = getMongo().getDB(getDatabase());
6364
mongoDB.setWriteConcern(WriteConcern.REPLICAS_SAFE);
6465
logger.info("Start createCollection");
65-
mongoCollection = mongoDB.createCollection(getCollection(), null);
66+
mongoCollection = mongoDB.createCollection(getCollection(), new BasicDBObject());
6667
Assert.assertNotNull(mongoCollection);
6768
} catch (Throwable t) {
6869
logger.error("createDatabase failed.", t);

0 commit comments

Comments
 (0)