[incubator-dlab] branch develop updated: Resolved merge conflicts

[ofuks]

This is an automated email from the ASF dual-hosted git repository.

ofuks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/develop by this push:
     new c747d7c  Resolved merge conflicts
c747d7c is described below

commit c747d7cc1a226e7e788cc54a972539756ed121f3
Author: Oleh Fuks <olegfuk...@gmail.com>
AuthorDate: Wed Jul 1 10:47:49 2020 +0300

    Resolved merge conflicts
---
 .../java/com/epam/dlab/backendapi/resources/BucketResource.java    | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/BucketResource.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/BucketResource.java
index 9aa58b6..2ba5a8d 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/BucketResource.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/BucketResource.java
@@ -52,11 +52,8 @@ import java.nio.file.Paths;
 @Path("/bucket")
 @Slf4j
 public class BucketResource {
-  
-    private static final String AUDIT_UPLOAD_MESSAGE = "File(s): %s";
+    private static final String AUDIT_UPLOAD_FOLDER_MESSAGE = "Folder: %s";
     private static final String AUDIT_MESSAGE = "File(s): %s";
-    private static final String AUDIT_UPLOAD_FOLDER_MESSAGE = "Folder(s): %s.";
-
     private static final String OBJECT_FORM_FIELD = "object";
     private static final String BUCKET_FORM_FIELD = "bucket";
     private static final String ENDPOINT_FORM_FIELD = "endpoint";
@@ -149,7 +146,7 @@ public class BucketResource {
                             fileSize = 
Long.parseLong(Streams.asString(stream));
                         }
                     } else {
-                        bucketService.uploadObject(userInfo, bucket, object, 
endpoint, stream, item.getContentType(), fileSize, 
String.format(AUDIT_UPLOAD_OBJECT_MESSAGE, object, fileSize));
+                        bucketService.uploadObject(userInfo, bucket, object, 
endpoint, stream, item.getContentType(), fileSize, String.format(AUDIT_MESSAGE, 
object));
                     }
                 } catch (Exception e) {
                     log.error("Cannot upload object {} to bucket {}. {}", 
object, bucket, e.getMessage(), e);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org