From 4a315e06b47803f80b54282c98db8aa52e3cc585 Mon Sep 17 00:00:00 2001
From: Kate Hsuan <kate.hsuan@qct.io>
Date: Mon, 15 Apr 2019 13:31:54 +0800
Subject: Fix Mongo connection method

Address and credential must be a list.

Issue-ID: DCAEGEN2-1411

Change-Id: I5705d4086476ea02d9eb54c0cf4c329c1848f5cf
Signed-off-by: Kate Hsuan <kate.hsuan@qct.io>
---
 .../datalake/feeder/service/MongodbService.java    | 31 ++++++++++++++++++----
 1 file changed, 26 insertions(+), 5 deletions(-)

(limited to 'components/datalake-handler/feeder/src/main/java/org')

diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/MongodbService.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/MongodbService.java
index 35426afb..fb3f806c 100644
--- a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/MongodbService.java
+++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/MongodbService.java
@@ -48,6 +48,7 @@ import com.mongodb.MongoCredential;
 import com.mongodb.ServerAddress;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
+import com.mongodb.DB;
 
 /**
  * Service for using MongoDB
@@ -62,6 +63,7 @@ public class MongodbService {
 
 	@Autowired
 	private ApplicationConfiguration config;
+        private boolean dbReady = false;
 
 	@Autowired
 	private DbService dbService;
@@ -98,13 +100,30 @@ public class MongodbService {
 			builder.sslEnabled(Boolean.TRUE.equals(mongodb.getEncrypt()));// getEncrypt() can be null
 		}
 		MongoClientOptions options = builder.build();
+		List<ServerAddress> addrs = new ArrayList<ServerAddress>();
 
-		if (credential == null) {
-			mongoClient = new MongoClient(new ServerAddress(host, port), options);
-		} else {
-			mongoClient = new MongoClient(new ServerAddress(host, port), credential, options);
+		addrs.add(new ServerAddress(host, port)); // FIXME should be a list of address
+
+
+		try {
+			if(StringUtils.isNoneBlank(userName) && StringUtils.isNoneBlank(password))
+			{
+				credential = MongoCredential.createCredential(userName, databaseName, password.toCharArray());
+				List<MongoCredential> credentialList = new ArrayList<MongoCredential>();
+				credentialList.add(credential);
+				mongoClient = new MongoClient(addrs, credentialList, options);
+			}else
+			{
+				mongoClient = new MongoClient(addrs, options);
+			}
+		}catch(Exception ex){
+			dbReady = false;
+			log.error("Fail to initiate MongoDB" + mongodb.getHost());
+			return;
 		}
-		database = mongoClient.getDatabase(databaseName);
+		database = mongoClient.getDatabase(mongodb.getDatabase());
+		dbReady = true;
+
 	}
 
 	@PreDestroy
@@ -113,6 +132,8 @@ public class MongodbService {
 	}
 
 	public void saveJsons(Topic topic, List<JSONObject> jsons) {
+		if(dbReady == false)
+			return;
 		List<Document> documents = new ArrayList<>(jsons.size());
 		for (JSONObject json : jsons) {
 			//convert org.json JSONObject to MongoDB Document
-- 
cgit 1.2.3-korg