From eb74e06cdfa0a2fd250150c0c8629c0b18e6b367 Mon Sep 17 00:00:00 2001
From: Roberto Cirillo <roberto.cirillo@isti.cnr.it>
Date: Thu, 1 Apr 2021 10:15:03 +0200
Subject: [PATCH] 2.12.0-SNAP: static operation class, bypassed mongo close

---
 .classpath                                    | 13 ++--------
 .gitignore                                    |  1 +
 .settings/org.eclipse.jdt.core.prefs          |  7 +++---
 CHANGELOG.md                                  |  8 +++++-
 pom.xml                                       |  2 +-
 .../transport/backend/MongoIOManager.java     | 11 ++++----
 .../backend/util/MongoInputStream.java        |  4 +--
 .../backend/util/MongoOutputStream.java       |  2 +-
 target/profile.xml                            | 25 -------------------
 9 files changed, 24 insertions(+), 49 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 target/profile.xml

diff --git a/.classpath b/.classpath
index e43402f..5e8a55f 100644
--- a/.classpath
+++ b/.classpath
@@ -6,23 +6,14 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 6249222..8445b6b 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,13 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5894fd0..cadb3ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,14 @@
 # Changelog for storage-manager-core
 
+## [v2.12.0-SNAPSHOT]
+  * One pool for every operation: static Operation class; no mongo close operation
+
+## [v2.10.0-SNAPSHOT]
+  * upgrade mongo-java-driver to 3.12.0
+
 ## [v2.10.0-SNAPSHOT]
   * added input parameter to getSize method in order to be compatible with the needed of s3 client
 
 ## [v2.9.0] 2019-10-19
   * SSL enabled
-  
\ No newline at end of file
+  
diff --git a/pom.xml b/pom.xml
index 91e16c6..70260e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
 	</parent>
   <groupId>org.gcube.contentmanagement</groupId>
   <artifactId>storage-manager-core</artifactId>
-  <version>2.11.0-SNAPSHOT</version>
+  <version>2.12.0-SNAPSHOT</version>
 <!--   <properties> -->
 <!--   		<distroDirectory>${project.basedir}/distro</distroDirectory> -->
 <!--   </properties> -->
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 b6f3e1e..70f050d 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
@@ -1062,12 +1062,13 @@ public class MongoIOManager {
 	 */
 	
 	public void close() {
-		if(mongo!=null)
-			mongo.close();
+//		if(mongo!=null)
+//			mongo.close();
+		logger.info(" no close()");
 		logger.info("Mongo has been closed");
-		mongo=null;
-		gfs=null;
-		db=null;
+//		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..bda7726 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,7 +66,7 @@ public class MongoOutputStream extends ProxyOutputStream {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
-			mongo.close();
+//			mongo.close();
 			setClosed(true);
 		}
     }
diff --git a/target/profile.xml b/target/profile.xml
deleted file mode 100644
index a41eb3b..0000000
--- a/target/profile.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<ID />
-	<Type>Service</Type>
-	<Profile>
-		<Description>${description}</Description>
-		<Class>ContentManagement</Class>
-		<Name>storage-manager-core</Name>
-		<Version>1.0.0</Version>
-		<Packages>
-			<Software>
-				<Name>storage-manager-core</Name>
-				<Version>2.9.0-SNAPSHOT</Version>
-				<MavenCoordinates>
-					<groupId>org.gcube.contentmanagement</groupId>
-					<artifactId>storage-manager-core</artifactId>
-					<version>2.9.0-SNAPSHOT</version>
-				</MavenCoordinates>
-				<Files>
-					<File>storage-manager-core-2.9.0-SNAPSHOT.jar</File>
-				</Files>
-			</Software>
-		</Packages>
-	</Profile>
-</Resource>