diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/FileSets.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/FileSets.java index cc63df5..a25b415 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/FileSets.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/FileSets.java @@ -31,13 +31,18 @@ public class FileSets { return this; } - public RequestBuilder setFieldPath(String path){ - theRequest.setDestinationPath(path); + public RequestBuilder setFieldDefinitionPath(String path){ + theRequest.setFieldDefinitionPath(path); return this; } - public RequestBuilder setFieldDescriptionPath(String path){ - theRequest.setFieldPath(path); + public RequestBuilder setParentPath(String path){ + theRequest.setParentPath(path); + return this; + } + + public RequestBuilder setFieldName(String fieldName){ + theRequest.setFieldName(fieldName); return this; } @@ -55,12 +60,12 @@ public class FileSets { } - public static RequestBuilder build(String path) { - return new RequestBuilder().setFieldPath(path); + public static RequestBuilder build(String parent,String fieldName, String fieldDefinition) { + return new RequestBuilder().setParentPath(parent).setFieldDefinitionPath(fieldDefinition).setFieldName(fieldName); } - public static RequestBuilder build(String path, TempFile...files) { - return new RequestBuilder().setFieldPath(path).add(files); + public static RequestBuilder build(String parent,String fieldName, String fieldDefinition, TempFile...files) { + return build(parent,fieldName,fieldDefinition).add(files); } public static TempFile asTemp(StorageUtils storage,InputStreamDescriptor descriptor) throws RemoteBackendException, FileNotFoundException { @@ -74,17 +79,19 @@ public class FileSets { return toReturn.toArray(new TempFile[toReturn.size()]); } - public static RegisterFileSetRequest prepareRequestFromFolder(StorageUtils storage, String path, File directory) throws FileNotFoundException { + public static RegisterFileSetRequest prepareRequestFromFolder(StorageUtils storage, + String parentPath,String fieldName,String fieldDefinition, File directory) throws FileNotFoundException { File[] children =directory.listFiles(); InputStreamDescriptor[] iss=new InputStreamDescriptor[children.length]; - return prepareRequest(storage,path,children); + return prepareRequest(storage,parentPath,fieldName,fieldDefinition,children); } - public static RegisterFileSetRequest prepareRequest(StorageUtils storage, String path, File... toUpload) throws FileNotFoundException { + public static RegisterFileSetRequest prepareRequest(StorageUtils storage, + String parentPath,String fieldName,String fieldDefinition, File... toUpload) throws FileNotFoundException { - FileSets.RequestBuilder builder = FileSets.build(path); + FileSets.RequestBuilder builder = FileSets.build(parentPath,fieldName,fieldDefinition); for (File f : toUpload) { if(!f.isDirectory()) builder.add(FileSets.asTemp(storage, new InputStreamDescriptor(new FileInputStream(f), f.getName())));