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
commit 78847d259dc42ea0332082a65d24388d24abdcf3 Merge: 845aed5 7e4d3d9 Author: Oleh Fuks <[email protected]> AuthorDate: Tue May 26 12:17:21 2020 +0300 Merge branch 'bucket-browser-azure' into develop # Conflicts: # services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/aws/BucketServiceAwsImpl.java services/provisioning-service/pom.xml | 11 +++- .../dlab/backendapi/resources/BucketResource.java | 5 +- .../dlab/backendapi/service/BucketService.java | 2 +- .../service/impl/aws/BucketServiceAwsImpl.java | 13 +++-- .../service/impl/azure/BucketServiceAzureImpl.java | 67 +++++++++++++++++++++- .../service/impl/gcp/BucketServiceGcpImpl.java | 3 +- .../dlab/backendapi/resources/BucketResource.java | 5 +- .../dlab/backendapi/service/BucketService.java | 2 +- .../backendapi/service/impl/BucketServiceImpl.java | 7 ++- .../bucket-browser/bucket-browser.component.ts | 1 + 10 files changed, 96 insertions(+), 20 deletions(-) diff --cc services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/aws/BucketServiceAwsImpl.java index c46305b,0e62ca7..347543c --- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/aws/BucketServiceAwsImpl.java +++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/aws/BucketServiceAwsImpl.java @@@ -23,8 -23,7 +23,6 @@@ import com.epam.dlab.backendapi.service import com.epam.dlab.dto.bucket.BucketDTO; import com.epam.dlab.exceptions.DlabException; import lombok.extern.slf4j.Slf4j; - import org.apache.commons.io.IOUtils; - import software.amazon.awssdk.awscore.exception.AwsServiceException; -import org.apache.commons.io.FileUtils; import software.amazon.awssdk.core.sync.RequestBody; import software.amazon.awssdk.core.sync.ResponseTransformer; import software.amazon.awssdk.services.s3.S3Client; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
