From 7b0a294ee9dbfa0fdfac9dc802aa282739611eed Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Fri, 11 Aug 2023 12:21:41 +0200 Subject: [PATCH] CLI: Fix CustomFilesCommandExecutor upload problems #4843 --- .../app/cli/main/custom/CustomFilesCommandExecutor.java | 4 ++-- .../org/opencb/opencga/client/rest/AbstractParentClient.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/custom/CustomFilesCommandExecutor.java b/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/custom/CustomFilesCommandExecutor.java index 719d9999d96..5f245961409 100644 --- a/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/custom/CustomFilesCommandExecutor.java +++ b/opencga-app/src/main/java/org/opencb/opencga/app/cli/main/custom/CustomFilesCommandExecutor.java @@ -38,8 +38,8 @@ public CustomFilesCommandExecutor(ObjectMap options, String token, ClientConfigu public RestResponse upload() throws Exception { // ObjectMap params = new ObjectMap() - options.append("fileFormat", ParamUtils.defaultString(String.valueOf(options.get("fileFormat")), File.Format.UNKNOWN.toString())) - .append("bioformat", ParamUtils.defaultString(String.valueOf(options.get("bioformat")), File.Bioformat.UNKNOWN.toString())); + options.append("fileFormat", options.getString("fileFormat", File.Format.UNKNOWN.toString())) + .append("bioformat", options.getString("bioformat", File.Bioformat.UNKNOWN.toString())); // //If the DEPRECATED parameter fileFormat has set we only override it if the new parameter format is also set // params.append("fileFormat", ParamUtils.defaultString(commandOptions.format, params.getString("fileFormat"))); // params.putIfNotEmpty("study", commandOptions.study); diff --git a/opencga-client/src/main/java/org/opencb/opencga/client/rest/AbstractParentClient.java b/opencga-client/src/main/java/org/opencb/opencga/client/rest/AbstractParentClient.java index 58d37b4caf6..007c5f7f2e5 100644 --- a/opencga-client/src/main/java/org/opencb/opencga/client/rest/AbstractParentClient.java +++ b/opencga-client/src/main/java/org/opencb/opencga/client/rest/AbstractParentClient.java @@ -456,6 +456,7 @@ protected RestResponse callUploadRest(WebTarget path, Map client.property(ClientProperties.READ_TIMEOUT, DEFAULT_UPLOAD_TIMEOUT); path.register(MultiPartFeature.class); path.property(ClientProperties.REQUEST_ENTITY_PROCESSING, RequestEntityProcessing.CHUNKED); + final FileDataBodyPart filePart = new FileDataBodyPart("file", new File(filePath)); FormDataMultiPart formDataMultiPart = new FormDataMultiPart(); // Add the rest of the parameters to the form