From 763b30fa0450a8c9ab82b02a94200dc62fa1b8be Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Fri, 14 May 2021 17:06:24 +0200 Subject: [PATCH] fix merge conflicts --- .../blobstorage/service/operation/Operation.java | 2 +- .../blobstorage/transport/TransportManager.java | 2 +- .../blobstorage/transport/TransportManagerFactory.java | 8 ++++---- .../blobstorage/transport/backend/MongoIOManager.java | 2 +- .../transport/backend/MongoOperationManager.java | 4 ++-- .../transport/backend/operation/MoveOperator.java | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) 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 8857b4e..33b1a1e 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 @@ -381,7 +381,7 @@ public abstract class Operation { this.user = user; } - protected TransportManager getTransport(MyFile myFile) { + protected TransportManager getTransport(RequestObject myFile) { // if(Objects.isNull(transport)) { TransportManagerFactory tmf= new TransportManagerFactory(server, user, password); transport=tmf.getTransport(transport, backendType, myFile.getGcubeMemoryType(), dbNames, myFile.getWriteConcern(), myFile.getReadPreference()); diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/transport/TransportManager.java b/src/main/java/org/gcube/contentmanagement/blobstorage/transport/TransportManager.java index c4e4dac..a5b9267 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/transport/TransportManager.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/transport/TransportManager.java @@ -38,7 +38,7 @@ public abstract class TransportManager { * @param user * @param token api token if is required by backend */ - public abstract void initBackend(String[] server, String user, String pass, MemoryType memoryType, String[] dbNames, String writeConcern, String readConcern, String token, String region); + public abstract void initBackend(String[] server, String user, String pass, MemoryType memoryType, String[] dbNames, String writeConcern, String readConcern); /** diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/transport/TransportManagerFactory.java b/src/main/java/org/gcube/contentmanagement/blobstorage/transport/TransportManagerFactory.java index c1afe15..30825dd 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/transport/TransportManagerFactory.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/transport/TransportManagerFactory.java @@ -57,7 +57,7 @@ public class TransportManagerFactory { return transport; } - private TransportManager load(String backendType, MemoryType memoryType, String[] dbNames, String writeConcern, String readConcern, String token, String region){ + private TransportManager load(String backendType, MemoryType memoryType, String[] dbNames, String writeConcern, String readConcern){ ServiceLoader loader = ServiceLoader.load(TransportManager.class); Iterator iterator = loader.iterator(); List impls = new ArrayList(); @@ -69,11 +69,11 @@ public class TransportManagerFactory { // System.out.println("size: "+implementationCounted); 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, null, null); + return new MongoOperationManager(server, user, password, memoryType, dbNames, writeConcern, readConcern); }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); + tm.initBackend(server, user, password, memoryType, dbNames, writeConcern, readConcern); return tm; }else{ logger.info("found "+implementationCounted+" implementations of TransportManager"); @@ -81,7 +81,7 @@ public class TransportManagerFactory { for(TransportManager tm : impls){ if(tm.getName().equalsIgnoreCase(backendType)){ logger.info("Found implementation "+backendType); - tm.initBackend(server, user, password, memoryType, dbNames, writeConcern, readConcern, token, region); + tm.initBackend(server, user, password, memoryType, dbNames, writeConcern, readConcern); return tm; } } 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 e8b241a..e4d35cb 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 @@ -547,7 +547,7 @@ public class MongoIOManager { destinationFile.put("creationTime", DateUtils.now("dd MM yyyy 'at' hh:mm:ss z")); } - public DBObject setGenericMoveProperties(MyFile resource, String filename, String dir, + public DBObject setGenericMoveProperties(RequestObject resource, String filename, String dir, String name, DBObject sourcePathMetaCollection) { sourcePathMetaCollection.put("filename", filename); sourcePathMetaCollection.put("type", "file"); 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 d2b43d6..210999a 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 @@ -49,8 +49,8 @@ public class MongoOperationManager extends TransportManager{ protected static String[] dbNames; - public MongoOperationManager(String[] server, String user, String password, MemoryType memoryType, String[] dbNames,String writeConcern, String readConcern, String token, String region){ - initBackend(server,user,password, memoryType,dbNames, writeConcern, readConcern, token, region); + public MongoOperationManager(String[] server, String user, String password, MemoryType memoryType, String[] dbNames,String writeConcern, String readConcern){ + initBackend(server,user,password, memoryType,dbNames, writeConcern, readConcern); } diff --git a/src/main/java/org/gcube/contentmanagement/blobstorage/transport/backend/operation/MoveOperator.java b/src/main/java/org/gcube/contentmanagement/blobstorage/transport/backend/operation/MoveOperator.java index 287f0a7..22f908f 100644 --- a/src/main/java/org/gcube/contentmanagement/blobstorage/transport/backend/operation/MoveOperator.java +++ b/src/main/java/org/gcube/contentmanagement/blobstorage/transport/backend/operation/MoveOperator.java @@ -175,7 +175,7 @@ public class MoveOperator extends Move { } - private DBObject setCommonFields(DBObject sourcePathMetaCollection, MyFile resource, OPERATION op) { + private DBObject setCommonFields(DBObject sourcePathMetaCollection, RequestObject resource, OPERATION op) { String owner=resource.getOwner(); if(op == null){ op=resource.getOperationDefinition().getOperation();