[gora] branch master updated: GORA-649 Remove usage of com.mongodb.MongoClient in test code

[dr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

drazzib pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/gora.git


The following commit(s) were added to refs/heads/master by this push:
     new d65aa1f  GORA-649 Remove usage of com.mongodb.MongoClient in test code
d65aa1f is described below

commit d65aa1f3333467cb5a79029f585d76cf25797f94
Author: Damien Raude-Morvan <dr...@drazzib.com>
AuthorDate: Sun Mar 29 17:56:19 2020 +0200

    GORA-649 Remove usage of com.mongodb.MongoClient in test code
---
 .../java/org/apache/gora/mongodb/GoraMongodbTestDriver.java | 13 -------------
 .../org/apache/gora/mongodb/filters/DefaultFactoryTest.java |  4 ++--
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/gora-mongodb/src/test/java/org/apache/gora/mongodb/GoraMongodbTestDriver.java b/gora-mongodb/src/test/java/org/apache/gora/mongodb/GoraMongodbTestDriver.java
index df6e4ed..73a60bb 100644
--- a/gora-mongodb/src/test/java/org/apache/gora/mongodb/GoraMongodbTestDriver.java
+++ b/gora-mongodb/src/test/java/org/apache/gora/mongodb/GoraMongodbTestDriver.java
@@ -17,7 +17,6 @@
  */
 package org.apache.gora.mongodb;
 
-import com.mongodb.Mongo;
 import com.mongodb.MongoClient;
 import com.mongodb.ServerAddress;
 import org.apache.gora.GoraTestDriver;
@@ -58,14 +57,6 @@ public class GoraMongodbTestDriver extends GoraTestDriver {
     // Store Mongo server "host:port" in Hadoop configuration
     // so that MongoStore will be able to get it latter
     conf.set(MongoStoreParameters.PROP_MONGO_SERVERS, host + ":" + port);
-
-    log.info("Starting embedded Mongodb server on {} port.", port);
-    try {
-      _mongo = new MongoClient(address);
-    } catch (Exception e) {
-      log.error("Error starting embedded Mongodb server... tearing down test driver.");
-      tearDownClass();
-    }
   }
 
   /**
@@ -77,8 +68,4 @@ public class GoraMongodbTestDriver extends GoraTestDriver {
     _container.stop();
   }
 
-  public Mongo getMongo() {
-    return _mongo;
-  }
-
 }
diff --git a/gora-mongodb/src/test/java/org/apache/gora/mongodb/filters/DefaultFactoryTest.java b/gora-mongodb/src/test/java/org/apache/gora/mongodb/filters/DefaultFactoryTest.java
index 966f9be..10258ba 100644
--- a/gora-mongodb/src/test/java/org/apache/gora/mongodb/filters/DefaultFactoryTest.java
+++ b/gora-mongodb/src/test/java/org/apache/gora/mongodb/filters/DefaultFactoryTest.java
@@ -17,7 +17,7 @@
  */
 package org.apache.gora.mongodb.filters;
 
-import com.mongodb.MongoClient;
+import com.mongodb.MongoClientSettings;
 import org.apache.avro.util.Utf8;
 import org.apache.gora.examples.generated.WebPage;
 import org.apache.gora.filter.FilterList;
@@ -153,7 +153,7 @@ public class DefaultFactoryTest {
   }
 
   private static String asJson(Bson bson) {
-    BsonDocument bsonDocument = bson.toBsonDocument(BsonDocument.class, MongoClient.getDefaultCodecRegistry());
+    BsonDocument bsonDocument = bson.toBsonDocument(BsonDocument.class, MongoClientSettings.getDefaultCodecRegistry());
     return bsonDocument.toString();
   }