Repository: metamodel Updated Branches: refs/heads/mongodb-upgrade [created] 21e43fd22
Upgraded to MongoDB 3.x All changes should be backwards compatible Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/21e43fd2 Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/21e43fd2 Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/21e43fd2 Branch: refs/heads/mongodb-upgrade Commit: 21e43fd22a4c322caf605419dea0c07e8f69e0b5 Parents: 60989cc Author: Kasper Sørensen <[email protected]> Authored: Fri Oct 23 16:35:04 2015 +0200 Committer: Kasper Sørensen <[email protected]> Committed: Fri Oct 23 16:35:04 2015 +0200 ---------------------------------------------------------------------- mongodb/pom.xml | 2 +- .../metamodel/mongodb/MongoDbUpdateCallback.java | 3 ++- .../metamodel/mongodb/MongoDbDataContextTest.java | 16 ++++++++-------- 3 files changed, 11 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/21e43fd2/mongodb/pom.xml ---------------------------------------------------------------------- diff --git a/mongodb/pom.xml b/mongodb/pom.xml index 6b80df4..d8dad70 100644 --- a/mongodb/pom.xml +++ b/mongodb/pom.xml @@ -35,7 +35,7 @@ under the License. <dependency> <groupId>org.mongodb</groupId> <artifactId>mongo-java-driver</artifactId> - <version>2.9.1</version> + <version>3.1.0</version> </dependency> <!-- Test dependencies --> http://git-wip-us.apache.org/repos/asf/metamodel/blob/21e43fd2/mongodb/src/main/java/org/apache/metamodel/mongodb/MongoDbUpdateCallback.java ---------------------------------------------------------------------- diff --git a/mongodb/src/main/java/org/apache/metamodel/mongodb/MongoDbUpdateCallback.java b/mongodb/src/main/java/org/apache/metamodel/mongodb/MongoDbUpdateCallback.java index 16d74a4..0558898 100644 --- a/mongodb/src/main/java/org/apache/metamodel/mongodb/MongoDbUpdateCallback.java +++ b/mongodb/src/main/java/org/apache/metamodel/mongodb/MongoDbUpdateCallback.java @@ -31,6 +31,7 @@ import org.apache.metamodel.insert.RowInsertionBuilder; import org.apache.metamodel.schema.Schema; import org.apache.metamodel.schema.Table; +import com.mongodb.BasicDBObject; import com.mongodb.DBCollection; final class MongoDbUpdateCallback extends AbstractUpdateCallback implements UpdateCallback, Closeable { @@ -67,7 +68,7 @@ final class MongoDbUpdateCallback extends AbstractUpdateCallback implements Upda } protected void createCollection(String name) { - DBCollection collection = _dataContext.getMongoDb().createCollection(name, null); + DBCollection collection = _dataContext.getMongoDb().createCollection(name, new BasicDBObject()); _collections.put(name, collection); } http://git-wip-us.apache.org/repos/asf/metamodel/blob/21e43fd2/mongodb/src/test/java/org/apache/metamodel/mongodb/MongoDbDataContextTest.java ---------------------------------------------------------------------- diff --git a/mongodb/src/test/java/org/apache/metamodel/mongodb/MongoDbDataContextTest.java b/mongodb/src/test/java/org/apache/metamodel/mongodb/MongoDbDataContextTest.java index 1a4a3af..da89bb1 100644 --- a/mongodb/src/test/java/org/apache/metamodel/mongodb/MongoDbDataContextTest.java +++ b/mongodb/src/test/java/org/apache/metamodel/mongodb/MongoDbDataContextTest.java @@ -69,12 +69,12 @@ public class MongoDbDataContextTest extends MongoDbTestCase { return; } - DBCollection col = db.createCollection(getCollectionName(), null); + DBCollection col = db.createCollection(getCollectionName(), new BasicDBObject()); // delete if already exists { col.drop(); - col = db.createCollection(getCollectionName(), null); + col = db.createCollection(getCollectionName(), new BasicDBObject()); } final BasicDBList list = new BasicDBList(); @@ -110,12 +110,12 @@ public class MongoDbDataContextTest extends MongoDbTestCase { return; } - DBCollection col = db.createCollection(getCollectionName(), null); + DBCollection col = db.createCollection(getCollectionName(), new BasicDBObject()); // delete if already exists { col.drop(); - col = db.createCollection(getCollectionName(), null); + col = db.createCollection(getCollectionName(), new BasicDBObject()); } // create 3 records @@ -160,12 +160,12 @@ public class MongoDbDataContextTest extends MongoDbTestCase { return; } - DBCollection col = db.createCollection(getCollectionName(), null); + DBCollection col = db.createCollection(getCollectionName(), new BasicDBObject()); // delete if already exists { col.drop(); - col = db.createCollection(getCollectionName(), null); + col = db.createCollection(getCollectionName(), new BasicDBObject()); } // create 1000 records @@ -497,12 +497,12 @@ public class MongoDbDataContextTest extends MongoDbTestCase { return; } - DBCollection col = db.createCollection(getCollectionName(), null); + DBCollection col = db.createCollection(getCollectionName(), new BasicDBObject()); // delete if already exists { col.drop(); - col = db.createCollection(getCollectionName(), null); + col = db.createCollection(getCollectionName(), new BasicDBObject()); } final BasicDBObject dbRow = new BasicDBObject();
