deprecated some old classes

parameters region and token passed to TransportManager layer

src/main/java/org/gcube/contentmanagement/blobstorage/service/directoryOperation/DirectoryBucket.java

@@ -28,9 +28,13 @@ public class DirectoryBucket {
 	String fileName;
 	String path;
 	String[] server;
-	String user, password;
+	protected String user, password;
+	protected String region;
+	protected String token;
 	TransportManager tm;
-	public DirectoryBucket(String[] server, String user, String password, String path, String author){
+	
+	
+	public DirectoryBucket(String[] server, String user, String password, String path, String author, String region, String token){
 		if(logger.isDebugEnabled())
 			logger.debug("DirectoryBucket PATH: "+path);
 	//coding the path	
@@ -39,6 +43,8 @@ public class DirectoryBucket {
 		this.server=server;
 		this.user=user;
 		this.password=password;
+		this.region=region;
+		this.token=token;
 	}
 
 
@@ -91,7 +97,7 @@ public class DirectoryBucket {
 			logger.debug("CHECK REMOVE: "+bucket);
 		String[] bucketList=null;
 		bucketList=retrieveBucketsName(path, rootArea);
-		TransportManagerFactory tmf=new TransportManagerFactory(server, user, password);
+		TransportManagerFactory tmf=new TransportManagerFactory(server, user, password, null, null);
 		tm=tmf.getTransport(tm, backendType, resource.getGcubeMemoryType(), dbNames, resource.getWriteConcern(), resource.getReadPreference());
 //		TerrastoreClient client=new TerrastoreClient( new OrderedHostManager(Arrays.asList(server)), new HTTPConnectionFactory());
 		for(int i=0;i<bucketList.length;i++){
@@ -124,7 +130,7 @@ public class DirectoryBucket {
 		if(logger.isDebugEnabled())
 			logger.debug("bucketDir Coded: "+bucketDirCoded);
 		bucketList=retrieveBucketsName(bucket, rootArea);
-		TransportManagerFactory tmf=new TransportManagerFactory(server, user, password);
+		TransportManagerFactory tmf=new TransportManagerFactory(server, user, password, region, token);
 		tm=tmf.getTransport(tm, backendType, resource.getGcubeMemoryType(), dbNames, resource.getWriteConcern(),resource.getReadPreference());
 		for(int i=0;i<bucketList.length;i++){
 			if(logger.isDebugEnabled())

src/main/java/org/gcube/contentmanagement/blobstorage/service/impl/RemoteResource.java

@@ -111,7 +111,7 @@ public class RemoteResource extends Resource{
 	  getMyFile().setOwner(engine.owner);
 	  if(engine.getCurrentOperation().equalsIgnoreCase("showdir")){
 		  dir = new BucketCoding().bucketDirCoding(dir, engine.getContext());
-		  TransportManagerFactory tmf= new TransportManagerFactory(engine.primaryBackend, engine.getBackendUser(), engine.getBackendPassword());
+		  TransportManagerFactory tmf= new TransportManagerFactory(engine.primaryBackend, engine.getBackendUser(), engine.getBackendPassword(), engine.getRegion(), engine.getToken());
 		  tm=tmf.getTransport(tm, engine.getBackendType(), engine.getGcubeMemoryType(), engine.getDbNames(), engine.getWriteConcern(), engine.getReadConcern());
 		  Map<String, StorageObject> mapDirs=null;
 		  try {
@@ -128,11 +128,11 @@ public class RemoteResource extends Resource{
 		  return dirs;
 	  }else if(engine.getCurrentOperation().equalsIgnoreCase("removedir")){
 			if((dir != null) && (engine.owner != null)){
-				DirectoryBucket dirBuc=new DirectoryBucket(engine.primaryBackend, engine.getBackendUser(), engine.getBackendPassword(), dir, engine.owner);
+				DirectoryBucket dirBuc=new DirectoryBucket(engine.primaryBackend, engine.getBackendUser(), engine.getBackendPassword(), dir, engine.owner, engine.getRegion(), engine.getToken());
 				if(!Costants.CLIENT_TYPE.equalsIgnoreCase("mongo"))
 					dirBuc.removeDirBucket(getMyFile(), dir, engine.getContext(), engine.getBackendType(), engine.getDbNames());
 				else{
-					TransportManagerFactory tmf=new TransportManagerFactory(engine.primaryBackend, engine.getBackendUser(), engine.getBackendPassword());
+					TransportManagerFactory tmf=new TransportManagerFactory(engine.primaryBackend, engine.getBackendUser(), engine.getBackendPassword(), engine.getRegion(),engine.getToken());
 					tm=tmf.getTransport(tm, Costants.CLIENT_TYPE, engine.getGcubeMemoryType(), engine.getDbNames(), engine.getWriteConcern(), engine.getReadConcern());
 					dir=new BucketCoding().bucketFileCoding(dir, engine.getContext());
 					try {

src/main/java/org/gcube/contentmanagement/blobstorage/service/impl/Resource.java

@@ -125,7 +125,7 @@ public class Resource {
 	protected Object retrieveRemoteObject(RequestObject file, String[] backend) throws RemoteBackendException {
 		Object obj=null;
 			if(((file.getInputStream() != null) || (file.getOutputStream()!=null)) || ((file.getLocalPath() != null) || (file.getRemotePath() != null)))
-				obj=engine.service.startOperation(file,file.getRemotePath(), file.getOwner(), backend, Costants.DEFAULT_CHUNK_OPTION, file.getRootPath(), file.isReplace());
+				obj=engine.service.startOperation(file,file.getRemotePath(), file.getOwner(), backend, Costants.DEFAULT_CHUNK_OPTION, file.getRootPath(), file.isReplace(), engine.getRegion(), engine.getToken());
 			else{
 				logger.error("parameters incompatible ");
 			}

src/main/java/org/gcube/contentmanagement/blobstorage/service/impl/ServiceEngine.java

@@ -277,7 +277,7 @@ public class ServiceEngine implements IClient {
 		Object info=null;
 		try {
 			if(((file.getInputStream() != null) || (file.getOutputStream()!=null)) || ((file.getLocalPath() != null) || (file.getRemotePath() != null)))
-				info=(String)service.startOperation(file,file.getRemotePath(), owner, primaryBackend, Costants.DEFAULT_CHUNK_OPTION, getContext(), isReplaceOption());
+				info=(String)service.startOperation(file,file.getRemotePath(), owner, primaryBackend, Costants.DEFAULT_CHUNK_OPTION, getContext(), isReplaceOption(),getRegion(), getToken());
 			else{
 				logger.error("parameters incompatible ");
 			}
@@ -309,7 +309,7 @@ public class ServiceEngine implements IClient {
 		Object info=null;
 		try {
 			if(((file.getInputStream() != null) || (file.getOutputStream()!=null)) || ((file.getLocalPath() != null) || (file.getRemotePath() != null)))
-				info=(String)service.startOperation(file,file.getRemotePath(), owner, primaryBackend, Costants.DEFAULT_CHUNK_OPTION, getContext(), isReplaceOption());
+				info=(String)service.startOperation(file,file.getRemotePath(), owner, primaryBackend, Costants.DEFAULT_CHUNK_OPTION, getContext(), isReplaceOption(), getRegion(),getToken());
 			else{
 				logger.error("parameters incompatible ");
 			}
@@ -920,7 +920,7 @@ public class ServiceEngine implements IClient {
 		service.setTypeOperation("forceclose");
 		try {
 			if(((file.getInputStream() != null) || (file.getOutputStream()!=null)) || ((file.getLocalPath() != null) || (file.getRemotePath() != null)))
-				service.startOperation(file,file.getRemotePath(), owner, primaryBackend, Costants.DEFAULT_CHUNK_OPTION, getContext(), isReplaceOption());
+				service.startOperation(file,file.getRemotePath(), owner, primaryBackend, Costants.DEFAULT_CHUNK_OPTION, getContext(), isReplaceOption(),getRegion(),getToken());
 			else{
 				logger.error("parameters incompatible ");
 			}

src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/ChunkConsumer.java

@@ -13,6 +13,7 @@ import org.slf4j.LoggerFactory;
  * @author rcirillo
  *
  */
+@Deprecated
 public class ChunkConsumer implements Runnable {
 	/**
 	 * Logger for this class
@@ -116,7 +117,7 @@ public class ChunkConsumer implements Runnable {
 			start=System.currentTimeMillis();
 			synchronized(ChunkConsumer.class){
 				String [] randomServer=randomizeServer(server);
-				TransportManagerFactory tmf=new TransportManagerFactory(randomServer, null, null);
+				TransportManagerFactory tmf=new TransportManagerFactory(randomServer, null, null, null, null);
 				client.set(tmf.getTransport(null, Costants.CLIENT_TYPE, null, null, myFile.getWriteConcern(), myFile.getReadPreference()));
 			}
 			if(logger.isDebugEnabled()){

src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetFolderCount.java

@@ -49,7 +49,7 @@ public class GetFolderCount extends Operation {
 		if(!Costants.CLIENT_TYPE.equalsIgnoreCase("mongo")){
 			buck=buck.replaceAll(Costants.FILE_SEPARATOR, Costants.SEPARATOR);
 		//remove directory bucket		
-			DirectoryBucket dirBuc=new DirectoryBucket(server,user, password, remotePath, author);
+			DirectoryBucket dirBuc=new DirectoryBucket(server,user, password, remotePath, author, getRegion(), getToken());
 			dirBuc.removeKeysOnDirBucket(file, buck, rootArea, backendType, dbNames);
 		}
 		return bucket=buck;

src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetFolderLastUpdate.java

@@ -35,7 +35,7 @@ public class GetFolderLastUpdate extends Operation {
 		if(!Costants.CLIENT_TYPE.equalsIgnoreCase("mongo")){
 			buck=buck.replaceAll(Costants.FILE_SEPARATOR, Costants.SEPARATOR);
 		//remove directory bucket		
-			DirectoryBucket dirBuc=new DirectoryBucket(server,user, password, remotePath, author);
+			DirectoryBucket dirBuc=new DirectoryBucket(server,user, password, remotePath, author, getRegion(), getToken());
 			dirBuc.removeKeysOnDirBucket(file, buck, rootArea, backendType, dbNames);
 		}
 		return bucket=buck;

src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetFolderSize.java

@@ -49,7 +49,7 @@ public class GetFolderSize extends Operation {
 		if(!Costants.CLIENT_TYPE.equalsIgnoreCase("mongo")){
 			buck=buck.replaceAll(Costants.FILE_SEPARATOR, Costants.SEPARATOR);
 		//remove directory bucket		
-			DirectoryBucket dirBuc=new DirectoryBucket(server,user, password, remotePath, author);
+			DirectoryBucket dirBuc=new DirectoryBucket(server,user, password, remotePath, author, getRegion(), getToken());
 			dirBuc.removeKeysOnDirBucket(file, buck, rootArea, backendType, dbNames);
 //			String bucketName=null;
 		}

src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetHttpUrl.java

@@ -74,7 +74,7 @@ public class GetHttpUrl extends Operation {
 	
 	private String getId(String path, boolean forceCreation, MemoryType memoryType, String writeConcern, String readPreference){
 		String id=null;
-		TransportManagerFactory tmf= new TransportManagerFactory(server, user, password);
+		TransportManagerFactory tmf= new TransportManagerFactory(server, user, password, getRegion(), getToken());
 		tm=tmf.getTransport(tm, backendType, memoryType, dbNames, writeConcern, readPreference);
 		try {
 			id = tm.getId(bucket, forceCreation);

src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetHttpsUrl.java

@@ -75,7 +75,7 @@ public class GetHttpsUrl extends Operation {
 	
 	private String getId(String path, boolean forceCreation, MemoryType memoryType, String writeConcern, String readPreference){
 		String id=null;
-		TransportManagerFactory tmf= new TransportManagerFactory(server, user, password);
+		TransportManagerFactory tmf= new TransportManagerFactory(server, user, password, getRegion(), getToken());
 		tm=tmf.getTransport(tm, backendType, memoryType, dbNames, writeConcern, readPreference);
 		try {
 			id = tm.getId(bucket, forceCreation);

src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetUrl.java

@@ -58,7 +58,7 @@ public class GetUrl  extends Operation{
 	
 	private String getId(String path, boolean forceCreation, MemoryType memoryType, String writeConcern, String readPreference){
 		String id=null;
-		TransportManagerFactory tmf= new TransportManagerFactory(server, user, password);
+		TransportManagerFactory tmf= new TransportManagerFactory(server, user, password, getRegion(), getToken());
 		tm=tmf.getTransport(tm, backendType, memoryType, dbNames, writeConcern, readPreference);
 		try {
 			id = tm.getId(bucket, forceCreation);

src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetUserTotalItems.java

@@ -51,7 +51,7 @@ public class GetUserTotalItems extends Operation {
 			if(!Costants.CLIENT_TYPE.equalsIgnoreCase("mongo")){
 				buck=buck.replaceAll(Costants.FILE_SEPARATOR, Costants.SEPARATOR);
 			//remove directory bucket		
-				DirectoryBucket dirBuc=new DirectoryBucket(server,user, password, remotePath, author);
+				DirectoryBucket dirBuc=new DirectoryBucket(server,user, password, remotePath, author, getRegion(), getToken());
 				dirBuc.removeKeysOnDirBucket(file, buck, rootArea, backendType, dbNames);
 //				String bucketName=null;
 			}

src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/GetUserTotalVolume.java

@@ -51,7 +51,7 @@ public class GetUserTotalVolume extends Operation {
 			if(!Costants.CLIENT_TYPE.equalsIgnoreCase("mongo")){
 				buck=buck.replaceAll(Costants.FILE_SEPARATOR, Costants.SEPARATOR);
 			//remove directory bucket		
-				DirectoryBucket dirBuc=new DirectoryBucket(server,user, password, remotePath, author);
+				DirectoryBucket dirBuc=new DirectoryBucket(server,user, password, remotePath, author, getRegion(), getToken());
 				dirBuc.removeKeysOnDirBucket(file, buck, rootArea, backendType, dbNames);
 			}
 			return bucket=buck;

src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/Operation.java

@@ -33,14 +33,16 @@ public abstract class Operation {
 	final Logger logger=LoggerFactory.getLogger(Operation.class);
 
 	String[] server;
-	String user;
+	protected String user;
 	private String owner;
-	String password;
+	protected String password;
 	String bucket;
 	String[] dbNames;
 	private Monitor monitor;
 	private boolean isChunk;
 	String backendType;
+	private String region;
+	private String token;
 	protected static TransportManager transport;
 
 	public Operation(String[] server, String user, String pwd,  String bucket, Monitor monitor, boolean isChunk, String backendType, String[] dbs){
@@ -372,6 +374,22 @@ public abstract class Operation {
 	public void setServer(String[] server) {
 		this.server = server;
 	}
+	
+	protected  String getRegion() {
+		return region;
+	}
+
+	protected void setRegion(String region) {
+		this.region = region;
+	}
+	
+	protected String getToken() {
+		return token;
+	}
+
+	protected void setToken(String token) {
+		this.token = token;
+	}
 
 	public String getUser() {
 		return user;
@@ -383,7 +401,7 @@ public abstract class Operation {
 	
 	protected TransportManager getTransport(RequestObject myFile) {
 //		if(Objects.isNull(transport)) {
-			TransportManagerFactory tmf= new TransportManagerFactory(server, user, password);
+			TransportManagerFactory tmf= new TransportManagerFactory(server, user, password, region, token);
 			transport=tmf.getTransport(transport, backendType, myFile.getGcubeMemoryType(), dbNames, myFile.getWriteConcern(), myFile.getReadPreference());
 //		}
 		return transport;

src/main/java/org/gcube/contentmanagement/blobstorage/service/operation/OperationManager.java

@@ -45,7 +45,7 @@ public class OperationManager {
 		
 	}
 	
-	public Object startOperation(RequestObject file, String remotePath, String author, String[] server, boolean chunkOpt, String rootArea, boolean replaceOption) throws RemoteBackendException{
+	public Object startOperation(RequestObject file, String remotePath, String author, String[] server, boolean chunkOpt, String rootArea, boolean replaceOption, String region, String token) throws RemoteBackendException{
 //		setUser(author);
 		if (logger.isDebugEnabled()) {
 			logger.debug("connection(boolean) - start");
@@ -55,6 +55,8 @@ public class OperationManager {
 	    Monitor monitor = new Monitor();
 	    OperationFactory of=new OperationFactory(server, getUser(), getPassword(), getBucketName(), monitor, chunkOpt, getBackendType(), getDbNames());
 	    Operation op=of.getOperation(getTypeOperation());
+	    op.setRegion(region);
+	    op.setToken(token);
 	//start specific operation    
 	    setBucketName(op.initOperation(file, remotePath, author, server, rootArea, replaceOption));
 	    Object object=op.doIt(getResource());

src/main/java/org/gcube/contentmanagement/blobstorage/transport/TransportManagerFactory.java

@@ -36,10 +36,12 @@ public class TransportManagerFactory {
 	private String region;
 	TransportManager transport;
 	
-	public TransportManagerFactory(String server[], String user, String password){
+	public TransportManagerFactory(String server[], String user, String password, String region, String token){
 		this.server=server;
 		this.user=user;
 		this.password=password;
+		this.region=region;
+		this.token=token;
 	}
 	
 	public TransportManager getTransport(TransportManager tm, String backendType, MemoryType memoryType, String[] dbNames, String writeConcern, String readConcern){
@@ -72,7 +74,7 @@ public class TransportManagerFactory {
 		 if((implementationCounted==0) || backendType.equals(Costants.DEFAULT_TRANSPORT_MANAGER)){
 			 logger.info(" 0 implementation found. Load default implementation of TransportManager");
 			 return new MongoOperationManager(server, user, password, memoryType, dbNames, writeConcern, readConcern);
-		 }else if((implementationCounted==1) && Objects.isNull(backendType)){
+		 }else if((implementationCounted==1) && (!Objects.isNull(backendType))){
 			 TransportManager tm = impls.get(0);
 			 logger.info("1 implementation of TransportManager found. Load it. "+tm.getName());
 			 tm.initBackend(server, user, password, memoryType, dbNames, writeConcern, readConcern, token, region);