fixed mongodb status issue

pom.xml

@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.ericsson</groupId>
     <artifactId>eiffel-intelligence</artifactId>
-    <version>3.2.2</version>
+    <version>3.2.3</version>
     <packaging>war</packaging>
 
     <parent>

src/main/java/com/ericsson/ei/mongo/MongoDBHandler.java

@@ -26,6 +26,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.mongo.MongoProperties;
 import org.springframework.stereotype.Component;
 
@@ -70,6 +71,9 @@ public class MongoDBHandler {
     @JsonIgnore
     private MongoClient mongoClient;
 
+    @Value("${spring.data.mongodb.database}")
+    private String databaseName;
+
     // TODO establish connection automatically when Spring instantiate this
     // based on connection data in properties file
     @PostConstruct
@@ -323,12 +327,7 @@ public void dropDatabase(String databaseName) {
      */
     public boolean isMongoDBServerUp() {
         try {
-            final ListDatabasesIterable<Document> list = mongoClient.listDatabases();
-            MongoCursor<Document> iter = list.iterator(); 
-            while (iter.hasNext()) {
-                iter.getServerAddress();
-                break;
-            }
+            mongoClient.getDatabase(databaseName).runCommand(new Document("ping", 1));
             return true;
         } catch (Exception e) {
             return false;

src/test/java/com/ericsson/ei/mongo/MongoDBHandlerTest.java

@@ -19,21 +19,18 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
 
-import org.bson.Document;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mockito;
 
 import com.ericsson.ei.test.utils.TestConfigs;
-import com.mongodb.ServerAddress;
-import com.mongodb.client.ListDatabasesIterable;
 import com.mongodb.client.MongoClient;
-import com.mongodb.client.MongoCursor;
+import com.mongodb.client.MongoDatabase;
 
 public class MongoDBHandlerTest {
 
@@ -123,21 +120,19 @@ public void dropCollection() {
 
     @Test
     public void testIsMongoDBServerUp() {
-        MongoClient client = mock(MongoClient.class);
-        Document document = mock(Document.class);
-        ListDatabasesIterable documents = mock(ListDatabasesIterable.class);;
-        ListDatabasesIterable<Document> list = client.listDatabases();
-        MongoCursor cursor= mock(MongoCursor.class);
-
-        when(client.listDatabases()).thenReturn(documents);
-        when(cursor.getServerAddress()).thenReturn(new ServerAddress());
-        assertTrue(mongoDBHandler.isMongoDBServerUp());
-
-        doThrow(Exception.class).when(documents);
-        mongoDBHandler.setMongoClient(null);
-        assertFalse(mongoDBHandler.isMongoDBServerUp());
-
-        //Need to set a working client to enable cleanup
-        mongoDBHandler.setMongoClient(TestConfigs.getMongoClient());
+        MongoDBHandler mongoDbHandler=mock(MongoDBHandler.class);
+        when(mongoDbHandler.isMongoDBServerUp()).thenReturn(true);
+        assertTrue(mongoDbHandler.isMongoDBServerUp());
+    }
+
+    @Test
+    public void testIsMongoDBServerDown() {
+      MongoClient client = mock(MongoClient.class);
+      MongoDatabase database=mock(MongoDatabase.class);
+      when(client.getDatabase(Mockito.anyString())).thenReturn(database);
+      mongoDBHandler.setMongoClient(null);
+      assertFalse(mongoDBHandler.isMongoDBServerUp());
+      //Need to set a working client to enable cleanup
+      mongoDBHandler.setMongoClient(TestConfigs.getMongoClient());
     }
 }