diff --git a/CHANGELOG.md b/CHANGELOG.md index 00568e8..e0ac2dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog for storage-manager-core ## [v3.0.0] 2021-09-10 + * fix #22164 * fix #21980 * update gcube-bom version * add close operation on IClient interface diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Copy.java b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Copy.java index 453f8ff..9071033 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Copy.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Copy.java @@ -38,8 +38,6 @@ public abstract class Copy extends Operation{ } public String doIt(MyFile myFile) throws RemoteBackendException{ -// TransportManagerFactory tmf= new TransportManagerFactory(server, user, password); -// TransportManager tm=tmf.getTransport(backendType, myFile.getGcubeMemoryType(), dbNames, myFile.getWriteConcern(), myFile.getReadPreference()); TransportManager tm=getTransport(myFile); String id=null; try { diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/DownloadAndLock.java b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/DownloadAndLock.java index 5810efc..57f8aaf 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/DownloadAndLock.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/DownloadAndLock.java @@ -4,7 +4,6 @@ import java.io.OutputStream; import org.gcube.contentmanagement.blobstorage.resource.MyFile; import org.gcube.contentmanagement.blobstorage.transport.TransportManager; -import org.gcube.contentmanagement.blobstorage.transport.TransportManagerFactory; import org.gcube.contentmanagement.blobstorage.transport.backend.RemoteBackendException; import org.gcube.contentmanagement.blobstorage.transport.backend.operation.DownloadOperator; import org.slf4j.Logger; @@ -40,8 +39,6 @@ public class DownloadAndLock extends Operation { //TODO add field for file lock get(download,myFile, true); } catch (Exception e) { -// TransportManagerFactory tmf=new TransportManagerFactory(getServer(), getUser(), getPassword()); -// TransportManager tm=tmf.getTransport(getBackendType(), myFile.getGcubeMemoryType(), getDbNames(), myFile.getWriteConcern(), myFile.getReadPreference()); TransportManager tm=getTransport(myFile); tm.close(); throw new RemoteBackendException(" Error in downloadAndLock operation ", e.getCause()); diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/DuplicateFile.java b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/DuplicateFile.java index 2f8515d..24a1eae 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/DuplicateFile.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/DuplicateFile.java @@ -7,7 +7,6 @@ import org.bson.types.ObjectId; import org.gcube.contentmanagement.blobstorage.resource.MyFile; import org.gcube.contentmanagement.blobstorage.service.directoryOperation.BucketCoding; import org.gcube.contentmanagement.blobstorage.transport.TransportManager; -import org.gcube.contentmanagement.blobstorage.transport.TransportManagerFactory; import org.gcube.contentmanagement.blobstorage.transport.backend.MongoIOManager; import org.gcube.contentmanagement.blobstorage.transport.backend.RemoteBackendException; import org.slf4j.Logger; @@ -31,8 +30,6 @@ public abstract class DuplicateFile extends Operation { } public String doIt(MyFile myFile) throws RemoteBackendException{ -// TransportManagerFactory tmf= new TransportManagerFactory(server, user, password); -// TransportManager tm=tmf.getTransport(backendType, myFile.getGcubeMemoryType(), dbNames, myFile.getWriteConcern(), myFile.getReadPreference()); TransportManager tm=getTransport(myFile); String id=null; try { diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Exist.java b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Exist.java index 24ef823..3cdda09 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Exist.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Exist.java @@ -31,8 +31,6 @@ public class Exist extends Operation{ } public String doIt(MyFile myFile) throws RemoteBackendException{ -// TransportManagerFactory tmf= new TransportManagerFactory(server, user, password); -// TransportManager tm=tmf.getTransport(backendType, myFile.getGcubeMemoryType(), dbNames, myFile.getWriteConcern(), myFile.getReadPreference()); TransportManager tm=getTransport(myFile); boolean isPresent=false; try { diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/FileWriter.java b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/FileWriter.java index 5341488..2d5ad8b 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/FileWriter.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/FileWriter.java @@ -23,12 +23,7 @@ public class FileWriter extends Thread{ final Logger logger=LoggerFactory.getLogger(FileWriter.class); private Monitor monitor; private int id; -// private MyFile myFile; -// private byte[] encode; -// private int offset; -// private static int len=0; private OutputStream out; -// private String path; private byte[] full; diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/ForceClose.java b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/ForceClose.java index 34802e0..6618e0b 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/ForceClose.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/ForceClose.java @@ -13,15 +13,12 @@ public class ForceClose extends Operation{ * Logger for this class */ final Logger logger=LoggerFactory.getLogger(GetSize.class); -// public String file_separator = ServiceEngine.FILE_SEPARATOR;//System.getProperty("file.separator"); public ForceClose(String[] server, String user, String pwd, String bucket, Monitor monitor, boolean isChunk, String backendType, String[] dbs) { super(server, user, pwd, bucket, monitor, isChunk, backendType, dbs); } public String doIt(MyFile myFile) throws RemoteBackendException{ -// TransportManagerFactory tmf= new TransportManagerFactory(server, user, password); -// TransportManager tm=tmf.getTransport(backendType, myFile.getGcubeMemoryType(), dbNames, myFile.getWriteConcern(), myFile.getReadPreference()); TransportManager tm=getTransport(myFile); try { tm.forceClose(); diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetFolderCount.java b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetFolderCount.java index 12bd6f7..7fa7243 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetFolderCount.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetFolderCount.java @@ -23,8 +23,6 @@ public class GetFolderCount extends Operation { } public String doIt(MyFile myFile) throws RemoteBackendException{ -// TransportManagerFactory tmf= new TransportManagerFactory(server, user, password); -// TransportManager tm=tmf.getTransport(backendType, myFile.getGcubeMemoryType(), dbNames, myFile.getWriteConcern(), myFile.getReadPreference()); TransportManager tm=getTransport(myFile); long dim=0; try { diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetFolderSize.java b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetFolderSize.java index 8bc9230..eaa1783 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetFolderSize.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetFolderSize.java @@ -22,8 +22,6 @@ public class GetFolderSize extends Operation { } public String doIt(MyFile myFile) throws RemoteBackendException{ -// TransportManagerFactory tmf= new TransportManagerFactory(server, user, password); -// TransportManager tm=tmf.getTransport(backendType, myFile.getGcubeMemoryType(), dbNames, myFile.getWriteConcern(), myFile.getReadPreference()); TransportManager tm=getTransport(myFile); long dim=0; try { diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetHttpUrl.java b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetHttpUrl.java index 179de51..8f5b1cd 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetHttpUrl.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetHttpUrl.java @@ -11,6 +11,12 @@ import org.gcube.contentmanagement.blobstorage.transport.TransportManager; import org.gcube.contentmanagement.blobstorage.transport.TransportManagerFactory; import org.gcube.contentmanagement.blobstorage.transport.backend.RemoteBackendException; import org.gcube.contentmanagement.blobstorage.transport.backend.util.Costants; + +/** + * this class is replaced by getHttpsUrl + * @author roberto + * + */ @Deprecated public class GetHttpUrl extends Operation { @@ -46,7 +52,8 @@ public class GetHttpUrl extends Operation { String urlBase="smp://"+resolverHost+Costants.URL_SEPARATOR; String urlParam=""; try { - String id=getId(myFile.getAbsoluteRemotePath(), myFile.isForceCreation(), myFile.getGcubeMemoryType(), myFile.getWriteConcern(), myFile.getReadPreference()); +// String id=getId(myFile.getAbsoluteRemotePath(), myFile.isForceCreation(), myFile.getGcubeMemoryType(), myFile.getWriteConcern(), myFile.getReadPreference()); + String id=getId(myFile); String phrase=myFile.getPassPhrase(); // urlParam =new StringEncrypter("DES", phrase).encrypt(id); urlParam = new Encrypter("DES", phrase).encrypt(id); @@ -71,7 +78,7 @@ public class GetHttpUrl extends Operation { return httpUrl.toString(); } - + @Deprecated private String getId(String path, boolean forceCreation, MemoryType memoryType, String writeConcern, String readPreference){ String id=null; TransportManagerFactory tmf= new TransportManagerFactory(server, user, password); @@ -87,6 +94,21 @@ public class GetHttpUrl extends Operation { return id; } + private String getId(MyFile myFile){ + String id=null; + TransportManager tm=getTransport(myFile); + try { + id = tm.getId(bucket, myFile.isForceCreation()); + } catch (Exception e) { + tm.close(); + throw new RemoteBackendException(" Error in GetUrl operation. Problem to discover remote file:"+bucket+" "+ e.getMessage(), e.getCause()); } + if (logger.isDebugEnabled()) { + logger.debug(" PATH " + bucket); + } + return id; + } + + private URL translate(URL url) throws IOException { logger.debug("translating: "+url); String urlString=url.toString(); diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetHttpsUrl.java b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetHttpsUrl.java index 7c3a296..afcab5e 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetHttpsUrl.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetHttpsUrl.java @@ -48,7 +48,8 @@ public class GetHttpsUrl extends Operation { String urlBase="smp://"+resolverHost+Costants.URL_SEPARATOR; String urlParam=""; try { - String id=getId(myFile.getAbsoluteRemotePath(), myFile.isForceCreation(), myFile.getGcubeMemoryType(), myFile.getWriteConcern(), myFile.getReadPreference()); +// String id=getId(myFile.getAbsoluteRemotePath(), myFile.isForceCreation(), myFile.getGcubeMemoryType(), myFile.getWriteConcern(), myFile.getReadPreference()); + String id=getId(myFile); String phrase=myFile.getPassPhrase(); // urlParam =new StringEncrypter("DES", phrase).encrypt(id); urlParam = new Encrypter("DES", phrase).encrypt(id); @@ -73,6 +74,21 @@ public class GetHttpsUrl extends Operation { return httpsUrl.toString(); } + private String getId(MyFile myFile){ + String id=null; + TransportManager tm=getTransport(myFile); + try { + id = tm.getId(bucket, myFile.isForceCreation()); + } catch (Exception e) { + tm.close(); + throw new RemoteBackendException(" Error in GetUrl operation. Problem to discover remote file:"+bucket+" "+ e.getMessage(), e.getCause()); } + if (logger.isDebugEnabled()) { + logger.debug(" PATH " + bucket); + } + return id; + } + + @Deprecated private String getId(String path, boolean forceCreation, MemoryType memoryType, String writeConcern, String readPreference){ String id=null; TransportManagerFactory tmf= new TransportManagerFactory(server, user, password); 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 534537f..c2e49c6 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 @@ -31,8 +31,6 @@ public class GetMetaFile extends Operation{ * */ public MyFile doIt(MyFile myFile) throws RemoteBackendException{ -// TransportManagerFactory tmf= new TransportManagerFactory(server, user, password); -// TransportManager tm=tmf.getTransport(backendType, myFile.getGcubeMemoryType(), dbNames, myFile.getWriteConcern(), myFile.getReadPreference()); TransportManager tm=getTransport(myFile); long dim=0; String id=null; diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetMetaInfo.java b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetMetaInfo.java index f6fd044..43b50f8 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetMetaInfo.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetMetaInfo.java @@ -21,8 +21,6 @@ public class GetMetaInfo extends Operation { } public String doIt(MyFile myFile) throws RemoteBackendException{ -// TransportManagerFactory tmf= new TransportManagerFactory(server, user, password); -// TransportManager tm=tmf.getTransport(backendType, myFile.getGcubeMemoryType(), dbNames, myFile.getWriteConcern(), myFile.getReadPreference()); TransportManager tm=getTransport(myFile); String value=null; try { diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetRemotePath.java b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetRemotePath.java index 7ead65d..f2d2b1d 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetRemotePath.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetRemotePath.java @@ -21,8 +21,6 @@ public class GetRemotePath extends Operation{ } public String doIt(MyFile myFile) throws RemoteBackendException{ -// TransportManagerFactory tmf= new TransportManagerFactory(server, user, password); -// TransportManager tm=tmf.getTransport(backendType, myFile.getGcubeMemoryType(), dbNames, myFile.getWriteConcern(), myFile.getReadPreference()); TransportManager tm=getTransport(myFile); String path=null; try { 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 3267c01..157c397 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 @@ -28,8 +28,6 @@ public class GetSize extends Operation{ } public String doIt(MyFile myFile) throws RemoteBackendException{ -// TransportManagerFactory tmf= new TransportManagerFactory(server, user, password); -// TransportManager tm=tmf.getTransport(backendType, myFile.getGcubeMemoryType(), dbNames, myFile.getWriteConcern(), myFile.getReadPreference()); TransportManager tm=getTransport(myFile); long dim=0; try { diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetTTL.java b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetTTL.java index 778eae6..6ba4101 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetTTL.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetTTL.java @@ -36,8 +36,6 @@ public class GetTTL extends Operation { TransportManager tm=null; try { //aggiungere field per il lock del file -// TransportManagerFactory tmf=new TransportManagerFactory(server, user, password); -// tm=tmf.getTransport(backendType, myFile.getGcubeMemoryType(), dbNames, myFile.getWriteConcern(), myFile.getReadPreference()); tm=getTransport(myFile); currentTTL=tm.getTTL(bucket); } catch (Exception e) { diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetUrl.java b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetUrl.java index 200d39b..5e894d3 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetUrl.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetUrl.java @@ -9,8 +9,12 @@ import org.gcube.contentmanagement.blobstorage.transport.TransportManagerFactory import org.gcube.contentmanagement.blobstorage.transport.backend.RemoteBackendException; import org.gcube.contentmanagement.blobstorage.transport.backend.util.Costants; - - +/** + * this class is replaced by getHttpsUrl + * @author roberto + * + */ +@Deprecated public class GetUrl extends Operation{ // private OutputStream os; @@ -40,11 +44,10 @@ public class GetUrl extends Operation{ String urlBase="smp://"+resolverHost+Costants.URL_SEPARATOR; String urlParam=""; try { - String id=getId(myFile.getAbsoluteRemotePath(), myFile.isForceCreation(), myFile.getGcubeMemoryType(), myFile.getWriteConcern(), myFile.getReadPreference()); +// String id=getId(myFile.getAbsoluteRemotePath(), myFile.isForceCreation(), myFile.getGcubeMemoryType(), myFile.getWriteConcern(), myFile.getReadPreference()); + String id=getId(myFile); String phrase=myFile.getPassPhrase(); -// urlParam =new StringEncrypter("DES", phrase).encrypt(id); urlParam = new Encrypter("DES", phrase).encrypt(id); -// String urlEncoded=URLEncoder.encode(urlParam, "UTF-8"); } catch (EncryptionException e) { throw new RemoteBackendException(" Error in getUrl operation problem to encrypt the string", e.getCause()); } @@ -56,6 +59,7 @@ public class GetUrl extends Operation{ return url; } + @Deprecated private String getId(String path, boolean forceCreation, MemoryType memoryType, String writeConcern, String readPreference){ String id=null; TransportManagerFactory tmf= new TransportManagerFactory(server, user, password); @@ -71,4 +75,18 @@ public class GetUrl extends Operation{ return id; } + private String getId(MyFile myFile){ + String id=null; + TransportManager tm=getTransport(myFile); + try { + id = tm.getId(bucket, myFile.isForceCreation()); + } catch (Exception e) { + tm.close(); + throw new RemoteBackendException(" Error in GetUrl operation. Problem to discover remote file:"+bucket+" "+ e.getMessage(), e.getCause()); } + if (logger.isDebugEnabled()) { + logger.debug(" PATH " + bucket); + } + return id; + } + } diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetUserTotalItems.java b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetUserTotalItems.java index 6ca51e5..acb155f 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetUserTotalItems.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetUserTotalItems.java @@ -20,8 +20,6 @@ public class GetUserTotalItems extends Operation { } public String doIt(MyFile myFile) throws RemoteBackendException{ -// TransportManagerFactory tmf= new TransportManagerFactory(server, user, password); -// TransportManager tm=tmf.getTransport(backendType, myFile.getGcubeMemoryType(), dbNames, myFile.getWriteConcern(), myFile.getReadPreference()); TransportManager tm=getTransport(myFile); String dim=null; logger.info("check user total items for user: "+getOwner()+ " user is "+user); diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetUserTotalVolume.java b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetUserTotalVolume.java index 1bf91a0..9177a1a 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetUserTotalVolume.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetUserTotalVolume.java @@ -13,15 +13,12 @@ import org.slf4j.LoggerFactory; public class GetUserTotalVolume extends Operation { final Logger logger=LoggerFactory.getLogger(GetUserTotalVolume.class); -// public String file_separator = ServiceEngine.FILE_SEPARATOR;//System.getProperty("file.separator"); public GetUserTotalVolume(String[] server, String user, String pwd, String bucket, Monitor monitor, boolean isChunk, String backendType, String[] dbs) { super(server, user, pwd, bucket, monitor, isChunk, backendType, dbs); } public String doIt(MyFile myFile) throws RemoteBackendException{ -// TransportManagerFactory tmf= new TransportManagerFactory(server, user, password); -// TransportManager tm=tmf.getTransport(backendType, myFile.getGcubeMemoryType(), dbNames, myFile.getWriteConcern(), myFile.getReadPreference()); TransportManager tm=getTransport(myFile); String dim=null; logger.info("check user total volume for user: "+getOwner()+ " user is "+user); diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Link.java b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Link.java index 7ce01d4..dd7f06c 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Link.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Link.java @@ -37,8 +37,6 @@ public abstract class Link extends Operation{ } public String doIt(MyFile myFile) throws RemoteBackendException{ -// TransportManagerFactory tmf= new TransportManagerFactory(server, user, password); -// TransportManager tm=tmf.getTransport(backendType, myFile.getGcubeMemoryType(), dbNames, myFile.getWriteConcern(), myFile.getReadPreference()); TransportManager tm=getTransport(myFile); String id=null; try { diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Lock.java b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Lock.java index c0395bd..01ac820 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Lock.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Lock.java @@ -44,8 +44,6 @@ public abstract class Lock extends Operation { Download download = new DownloadOperator(getServer(), getUser(), getPassword(), getBucket(), getMonitor(), isChunk(), getBackendType(), getDbNames()); unlockKey=get(download, myFile, true); } catch (Exception e) { -// TransportManagerFactory tmf=new TransportManagerFactory(getServer(), getUser(), getPassword()); -// TransportManager tm=tmf.getTransport(getBackendType(), myFile.getGcubeMemoryType(), getDbNames(), myFile.getWriteConcern(), myFile.getReadPreference()); TransportManager tm=getTransport(myFile); tm.close(); throw new RemoteBackendException(" Error in lock operation ", e.getCause()); diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Move.java b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Move.java index ff93223..f2dc55a 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Move.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Move.java @@ -40,12 +40,9 @@ public abstract class Move extends Operation{ } public String doIt(MyFile myFile) throws RemoteBackendException{ -// TransportManagerFactory tmf= new TransportManagerFactory(server, user, password); -// TransportManager tm=tmf.getTransport(backendType, myFile.getGcubeMemoryType(), dbNames, myFile.getWriteConcern(), myFile.getReadPreference()); TransportManager tm=getTransport(myFile); String id=null; try { -// id=tm.move(myFile, sourcePath, destinationPath); id=tm.move(this); } catch (UnknownHostException e) { tm.close(); diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/MoveDir.java b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/MoveDir.java index 137b2a7..482932b 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/MoveDir.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/MoveDir.java @@ -39,8 +39,6 @@ public abstract class MoveDir extends Operation{ } public String doIt(MyFile myFile) throws RemoteBackendException{ -// TransportManagerFactory tmf= new TransportManagerFactory(server, user, password); -// TransportManager tm=tmf.getTransport(backendType, myFile.getGcubeMemoryType(), dbNames, myFile.getWriteConcern(), myFile.getReadPreference()); TransportManager tm=getTransport(myFile); Listids=null; try { diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Operation.java b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Operation.java index 037f1b6..d95bf2d 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Operation.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Operation.java @@ -161,8 +161,6 @@ public abstract class Operation { }else{ if(logger.isDebugEnabled()) logger.debug("NO THREAD POOL USED"); -// TransportManagerFactory tmf=new TransportManagerFactory(server, user, password); -// TransportManager tm=tmf.getTransport(backendType, resource.getGcubeMemoryType(), dbNames, resource.getWriteConcern(), resource.getReadPreference()); TransportManager tm=getTransport(resource); String objectId=tm.uploadManager(upload, resource, bucket, bucket+"_1", replaceOption); return objectId; @@ -180,9 +178,6 @@ public abstract class Operation { logger.debug("get(String) - start"); } String unlocKey=null; -// TransportManagerFactory tmf=null; -// tmf=new TransportManagerFactory(server, user, password); -// TransportManager tm=tmf.getTransport(backendType, myFile.getGcubeMemoryType(), dbNames, myFile.getWriteConcern(), myFile.getReadPreference()); TransportManager tm=getTransport(myFile); long start=System.currentTimeMillis(); String path=myFile.getLocalPath(); @@ -382,10 +377,8 @@ public abstract class Operation { } protected TransportManager getTransport(MyFile myFile) { -// if(Objects.isNull(transport)) { - TransportManagerFactory tmf= new TransportManagerFactory(server, user, password); - transport=tmf.getTransport(transport, backendType, myFile.getGcubeMemoryType(), dbNames, myFile.getWriteConcern(), myFile.getReadPreference()); -// } + TransportManagerFactory tmf= new TransportManagerFactory(server, user, password); + transport=tmf.getTransport(transport, backendType, myFile.getGcubeMemoryType(), dbNames, myFile.getWriteConcern(), myFile.getReadPreference()); return transport; } diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Remove.java b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Remove.java index 3f0ac0c..9052bb2 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Remove.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Remove.java @@ -25,8 +25,6 @@ public class Remove extends Operation{ } public String doIt(MyFile myFile) throws RemoteBackendException{ -// TransportManagerFactory tmf= new TransportManagerFactory(server, user, password); -// TransportManager tm=tmf.getTransport(backendType, myFile.getGcubeMemoryType(), dbNames, myFile.getWriteConcern(), myFile.getReadPreference()); TransportManager tm=getTransport(myFile); removeBucket(tm, bucket, myFile); if (logger.isDebugEnabled()) { diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/RenewTTL.java b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/RenewTTL.java index 6ba9614..28db0da 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/RenewTTL.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/RenewTTL.java @@ -30,8 +30,6 @@ public class RenewTTL extends Operation { @Override public String doIt(MyFile myFile) throws RemoteBackendException { -// TransportManagerFactory tmf= new TransportManagerFactory(server, user, password); -// TransportManager tm=tmf.getTransport(backendType, myFile.getGcubeMemoryType(), dbNames, myFile.getWriteConcern(), myFile.getReadPreference()); TransportManager tm=getTransport(myFile); long ttl=-1; try { diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/SetMetaInfo.java b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/SetMetaInfo.java index 644469e..29db02b 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/SetMetaInfo.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/SetMetaInfo.java @@ -21,8 +21,6 @@ public class SetMetaInfo extends Operation { } public String doIt(MyFile myFile) throws RemoteBackendException{ -// TransportManagerFactory tmf= new TransportManagerFactory(server, user, password); -// TransportManager tm=tmf.getTransport(backendType, myFile.getGcubeMemoryType(), dbNames, myFile.getWriteConcern(), myFile.getReadPreference()); TransportManager tm=getTransport(myFile); try { tm.setFileProperty(bucket, myFile.getGenericPropertyField(), myFile.getGenericPropertyValue()); diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/SoftCopy.java b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/SoftCopy.java index 537f715..79ed912 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/SoftCopy.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/SoftCopy.java @@ -5,11 +5,9 @@ package org.gcube.contentmanagement.blobstorage.service.operation; import java.net.UnknownHostException; -import org.bson.types.ObjectId; import org.gcube.contentmanagement.blobstorage.resource.MyFile; import org.gcube.contentmanagement.blobstorage.service.directoryOperation.BucketCoding; import org.gcube.contentmanagement.blobstorage.transport.TransportManager; -import org.gcube.contentmanagement.blobstorage.transport.TransportManagerFactory; import org.gcube.contentmanagement.blobstorage.transport.backend.MongoIOManager; import org.gcube.contentmanagement.blobstorage.transport.backend.RemoteBackendException; import org.slf4j.Logger; @@ -35,21 +33,6 @@ public abstract class SoftCopy extends Operation { } public String initOperation(MyFile file, String remotePath, String author, String[] server, String rootArea, boolean replaceOption) { -// if(remotePath != null){ -// boolean isId=ObjectId.isValid(remotePath); -// setResource(file); -// if(!isId){ -//// String[] dirs= remotePath.split(file_separator); -// if(logger.isDebugEnabled()) -// logger.debug("remotePath: "+remotePath); -// String buck=null; -// buck = new BucketCoding().bucketFileCoding(remotePath, rootArea); -// return bucket=buck; -// }else{ -// return bucket=remotePath; -// } -// }return bucket=null;//else throw new RemoteBackendException("argument cannot be null"); - this.sourcePath=file.getLocalPath(); this.destinationPath=remotePath; sourcePath = new BucketCoding().bucketFileCoding(file.getLocalPath(), rootArea); @@ -60,8 +43,6 @@ public abstract class SoftCopy extends Operation { } public String doIt(MyFile myFile) throws RemoteBackendException{ -// TransportManagerFactory tmf= new TransportManagerFactory(server, user, password); -// TransportManager tm=tmf.getTransport(backendType, myFile.getGcubeMemoryType(), dbNames, myFile.getWriteConcern(), myFile.getReadPreference()); TransportManager tm=getTransport(myFile); String id=null; try { @@ -84,20 +65,6 @@ public abstract class SoftCopy extends Operation { destinationPath = new BucketCoding().bucketFileCoding(resource.getRemotePath(), rootArea); setResource(resource); return bucket=destinationPath; -// if(remotePath != null){ -// boolean isId=ObjectId.isValid(remotePath); -// setResource(resource); -// if(!isId){ -//// String[] dirs= remotePath.split(file_separator); -// if(logger.isDebugEnabled()) -// logger.debug("remotePath: "+remotePath); -// String buck=null; -// buck = new BucketCoding().bucketFileCoding(remotePath, rootArea); -// return bucket=buck; -// }else{ -// return bucket=remotePath; -// } -// }return bucket=null;//else throw new RemoteBackendException("argument cannot be null"); } public abstract String execute(MongoIOManager mongoPrimaryInstance, MyFile resource, String sourcePath, String destinationPath) throws UnknownHostException; diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Unlock.java b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Unlock.java index 9054950..e029bac 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Unlock.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Unlock.java @@ -43,8 +43,6 @@ public abstract class Unlock extends Operation { //inserire parametro per il lock objectId=put(upload, myFile, isChunk(), false, false, true); } catch (Exception e) { -// TransportManagerFactory tmf=new TransportManagerFactory(server, user, password); -// TransportManager tm=tmf.getTransport(backendType, myFile.getGcubeMemoryType(), dbNames, myFile.getWriteConcern(), myFile.getReadPreference()); TransportManager tm=getTransport(myFile); tm.close(); throw new RemoteBackendException(" Error in unlock operation ", e.getCause()); diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Upload.java b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Upload.java index 099c806..e2ffaeb 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Upload.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Upload.java @@ -49,8 +49,6 @@ public abstract class Upload extends Operation { try { objectId=put(this, myFile, isChunk(), false, replaceOption, false); } catch (Throwable e) { -// TransportManagerFactory tmf=new TransportManagerFactory(server, user, password); -// TransportManager tm=tmf.getTransport(backendType, myFile.getGcubeMemoryType(), dbNames, myFile.getWriteConcern(), myFile.getReadPreference()); e.printStackTrace(); TransportManager tm=getTransport(myFile); tm.close(); 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 d48f38c..878fcc8 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 @@ -119,7 +119,7 @@ public class MongoIOManager { logger.error("Problem to open the DB connection for gridfs file "); throw new RemoteBackendException("Problem to open the DB connection: "+ e.getMessage()); } - logger.info("new mongo connection pool opened"); + logger.info("mongo connection ready"); } return db;