From c3fde07fc88660eeabe02ebd06d0f61add812509 Mon Sep 17 00:00:00 2001 From: roberto cirillo Date: Mon, 9 Nov 2020 16:13:18 +0100 Subject: [PATCH] update to version 2.10.0-SNAPSHOT added new input parameter to getSize method, for compatibility with s3 client plugin --- CHANGELOG.md | 3 +++ pom.xml | 2 +- .../blobstorage/service/operation/GetMetaFile.java | 2 +- .../blobstorage/service/operation/GetSize.java | 2 +- .../blobstorage/transport/backend/MongoOperationManager.java | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8706a97..5894fd0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog for storage-manager-core +## [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 5b9d0c1..1f2ef65 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.gcube.contentmanagement storage-manager-core - 2.9.0 + 2.10.0-SNAPSHOT diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetMetaFile.java b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetMetaFile.java index 10a1710..93bfb39 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetMetaFile.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetMetaFile.java @@ -37,7 +37,7 @@ public class GetMetaFile extends Operation{ String id=null; String mime=null; try { - dim = tm.getSize(bucket); + dim = tm.getSize(bucket, myFile); id=tm.getId(bucket, false); mime=tm.getFileProperty(bucket, "mimetype"); myFile.setOwner(tm.getFileProperty(bucket, "owner")); diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetSize.java b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetSize.java index a1d0e4d..6a56a96 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetSize.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetSize.java @@ -32,7 +32,7 @@ public class GetSize extends Operation{ TransportManager tm=tmf.getTransport(backendType, myFile.getGcubeMemoryType(), dbNames, myFile.getWriteConcern(), myFile.getReadPreference()); long dim=0; try { - dim = tm.getSize(bucket); + dim = tm.getSize(bucket, myFile); } catch (Exception e) { tm.close(); throw new RemoteBackendException(" Error in GetSize operation ", e.getCause()); } diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/transport/backend/MongoOperationManager.java b/src/main/java/org/gcube/contentmanagement/blobstorage/transport/backend/MongoOperationManager.java index e4d7524..6e9562b 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/transport/backend/MongoOperationManager.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/transport/backend/MongoOperationManager.java @@ -290,7 +290,7 @@ public class MongoOperationManager extends TransportManager{ } @Override - public long getSize(String remotePath){ + public long getSize(String remotePath, MyFile file){ long length=-1; if(logger.isDebugEnabled()) logger.debug("MongoDB - get Size for pathServer: "+remotePath);