From 136b4e5fc008c3dbdd0586313520806dc60ac8b6 Mon Sep 17 00:00:00 2001
From: "roberto.cirillo" <roberto.cirillo>
Date: Tue, 2 Oct 2018 08:35:31 +0000
Subject: [PATCH] ssl enabled upgrade to version 1.8.0

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/content-management/storage-manager-trigger@171812 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 distro/changelog.xml                                           | 3 +++
 .../org/gcube/contentmanager/storageserver/store/MongoDB.java  | 2 +-
 .../storageserver/startup/ConfigurationTest.java               | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/distro/changelog.xml b/distro/changelog.xml
index 3614a51..b9d9557 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,7 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.content-management.storage-manager-trigger.1-8-0" date="2018-10-01">
+		<Change>enabled ssl connection to mongodb</Change>
+	</Changeset>
 	<Changeset component="org.gcube.content-management.storage-manager-trigger.1-7-0" date="2018-06-15">
 		<Change>upgraded mongo-java-driver-library to 3.6.0</Change>
 		<Change>managed internal "SOFT_COPY" operation</Change>
diff --git a/src/main/java/org/gcube/contentmanager/storageserver/store/MongoDB.java b/src/main/java/org/gcube/contentmanager/storageserver/store/MongoDB.java
index a24c4c9..3dcc003 100644
--- a/src/main/java/org/gcube/contentmanager/storageserver/store/MongoDB.java
+++ b/src/main/java/org/gcube/contentmanager/storageserver/store/MongoDB.java
@@ -123,7 +123,7 @@ public class MongoDB {
 			}
 			if(mongo==null){		
 					logger.debug(" open mongo connection ");
-					MongoClientOptions options=MongoClientOptions.builder().connectionsPerHost(10).connectTimeout(30000).readPreference(READ_PREFERENCE).build();
+					MongoClientOptions options=MongoClientOptions.builder().sslEnabled(true).connectionsPerHost(10).connectTimeout(30000).readPreference(READ_PREFERENCE).build();
 					if(((pwd != null) && (pwd.length() >0))  && ((user != null) && (user.length() > 0))){
 						MongoCredential credential = MongoCredential.createMongoCRCredential(user, ACCOUNTING_DB, pwd.toCharArray());
 						mongo = new MongoClient(srvList, Arrays.asList(credential), options);
diff --git a/src/test/java/org/gcube/contentmanager/storageserver/startup/ConfigurationTest.java b/src/test/java/org/gcube/contentmanager/storageserver/startup/ConfigurationTest.java
index 6b41f6a..c517de7 100644
--- a/src/test/java/org/gcube/contentmanager/storageserver/startup/ConfigurationTest.java
+++ b/src/test/java/org/gcube/contentmanager/storageserver/startup/ConfigurationTest.java
@@ -7,7 +7,7 @@ import org.junit.Test;
 
 public class ConfigurationTest {
 
-	static String scope="/d4science.research-infrastructures.eu/FARM";
+	static String scope="/d4science.research-infrastructures.eu";
 	static String user=null;
 	static String password=null;
 	static String serviceClass="DataTransformation";