From 53a52fdc31a84c96cc3694aed092c8866ce42bb3 Mon Sep 17 00:00:00 2001
From: Roberto Cirillo <roberto.cirillo@isti.cnr.it>
Date: Fri, 12 Mar 2021 17:24:49 +0100
Subject: [PATCH] removed close method for mongo client. Now the connection
 pool is managed by java driver, upgrade mongo-java-driver to 3.12. Deprecated
 getUrl method

---
 CHANGELOG.md                                  |  2 ++
 pom.xml                                       |  2 +-
 .../blobstorage/service/IClient.java          |  1 +
 .../transport/backend/MongoIOManager.java     | 25 +++++++++++--------
 .../backend/util/MongoInputStream.java        |  4 +--
 .../backend/util/MongoOutputStream.java       |  4 +--
 6 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 337c613..d25d550 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [v3.1.0-SNAPSHOT]
   * upgrade mongo-java-client to version 3.12.0
+  * removed close method for mongo client. Now the connection pool is managed by java driver
+  * deprecated getUrl method
 
 
 ## [v3.0.1-SNAPSHOT]
diff --git a/pom.xml b/pom.xml
index 26c2364..187439b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
 	</parent>
   <groupId>org.gcube.contentmanagement</groupId>
   <artifactId>storage-manager-core</artifactId>
-  <version>3.0.1-SNAPSHOT</version>
+  <version>3.1.0-SNAPSHOT</version>
   <scm>
 		<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
 		<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/service/IClient.java b/src/main/java/org/gcube/contentmanagement/blobstorage/service/IClient.java
index 6397198..0b975f0 100644
--- a/src/main/java/org/gcube/contentmanagement/blobstorage/service/IClient.java
+++ b/src/main/java/org/gcube/contentmanagement/blobstorage/service/IClient.java
@@ -96,6 +96,7 @@ public RemoteResourceInfo renewTTL(String key);
  * 
  * @return RemoteResource object
  */
+@Deprecated
 RemoteResource getUrl();
 
 /**
diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/transport/backend/MongoIOManager.java b/src/main/java/org/gcube/contentmanagement/blobstorage/transport/backend/MongoIOManager.java
index 6e47b96..8df6c03 100644
--- a/src/main/java/org/gcube/contentmanagement/blobstorage/transport/backend/MongoIOManager.java
+++ b/src/main/java/org/gcube/contentmanagement/blobstorage/transport/backend/MongoIOManager.java
@@ -779,6 +779,9 @@ public class MongoIOManager {
 	}
 	
 	public BasicDBObject findMetaCollectionObject(String source) throws UnknownHostException {
+//set to null in order to perform a query as BasicDBObject and not GridFSObject		
+		db=null;
+		mongo=null;
 		DBCollection fileCollection=getConnectionDB(dbName, false).getCollection(Costants.DEFAULT_META_COLLECTION);
 		BasicDBObject query = new BasicDBObject();
 		BasicDBObject obj=null;
@@ -1048,11 +1051,11 @@ public class MongoIOManager {
 	 * the old close method
 	 */
 	protected void clean() {
-		if(mongo!=null)
-			mongo.close();
-		mongo=null;
-		if(db!=null)
-			db=null;
+//		if(mongo!=null)
+//			mongo.close();
+//		mongo=null;
+//		if(db!=null)
+//			db=null;
 	}
 	
 	/**
@@ -1062,12 +1065,12 @@ public class MongoIOManager {
 	 */
 	
 	public void close() {
-		if(mongo!=null)
-			mongo.close();
-		logger.info("Mongo has been closed");
-		mongo=null;
-		gfs=null;
-		db=null;
+//		if(mongo!=null)
+//			mongo.close();
+//		logger.info("Mongo has been closed");
+//		mongo=null;
+//		gfs=null;
+//		db=null;
 	}
 	
 	public void removeGFSFile(GridFSDBFile f, ObjectId idF){
diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/transport/backend/util/MongoInputStream.java b/src/main/java/org/gcube/contentmanagement/blobstorage/transport/backend/util/MongoInputStream.java
index fa86be1..87c2499 100644
--- a/src/main/java/org/gcube/contentmanagement/blobstorage/transport/backend/util/MongoInputStream.java
+++ b/src/main/java/org/gcube/contentmanagement/blobstorage/transport/backend/util/MongoInputStream.java
@@ -31,8 +31,8 @@ public class MongoInputStream extends ProxyInputStream{
 			} catch (IOException e) {
 				e.printStackTrace();
 			}
-			if (mongo!=null)
-				mongo.close();
+//			if (mongo!=null)
+//				mongo.close();
 			setClosed(true);
 		}
 	}
diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/transport/backend/util/MongoOutputStream.java b/src/main/java/org/gcube/contentmanagement/blobstorage/transport/backend/util/MongoOutputStream.java
index ada9466..1e7ea02 100644
--- a/src/main/java/org/gcube/contentmanagement/blobstorage/transport/backend/util/MongoOutputStream.java
+++ b/src/main/java/org/gcube/contentmanagement/blobstorage/transport/backend/util/MongoOutputStream.java
@@ -66,8 +66,8 @@ public class MongoOutputStream extends ProxyOutputStream {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
-			mongo.close();
-			setClosed(true);
+//			mongo.close();
+//			setClosed(true);
 		}
     }