diff --git a/app-api/src/main/java/com/sikdorok/appapi/infrastructure/aws/S3Provider.java b/app-api/src/main/java/com/sikdorok/appapi/infrastructure/aws/S3Provider.java index cc5ea61..f458b81 100644 --- a/app-api/src/main/java/com/sikdorok/appapi/infrastructure/aws/S3Provider.java +++ b/app-api/src/main/java/com/sikdorok/appapi/infrastructure/aws/S3Provider.java @@ -69,8 +69,6 @@ public FileInfoDTO uploadFile(String path, MultipartFile uploadFile) { final ObjectMetadata objectMetadata = new ObjectMetadata(); objectMetadata.setContentType(uploadFile.getContentType()); objectMetadata.setContentLength(uploadFile.getSize()); - - TransferManager transferManager = TransferManagerBuilder.standard().withS3Client(amazonS3).build(); try { final String uploadPath = DEFAULT_UPLOAD_PATH + "/" + path; final String uploadFileName = createUploadFileName(uploadFile); @@ -79,23 +77,13 @@ public FileInfoDTO uploadFile(String path, MultipartFile uploadFile) { final String ext = FileUtil.getFileExt(uploadFile); final long size = uploadFile.getSize(); - PutObjectRequest request = new PutObjectRequest(bucketName, uploadPath + "/" + uploadFileName, uploadFile.getInputStream(), objectMetadata); - Upload upload = transferManager.upload(request); - - try { - upload.waitForCompletion(); - } catch (AmazonClientException | InterruptedException e) { - log.error(e.getMessage()); - } - + amazonS3.putObject(new PutObjectRequest(bucketName, uploadPath + "/" + uploadFileName, uploadFile.getInputStream(), objectMetadata)); final String uploadFullPath = endpoint + uploadPath + "/" + uploadFileName; return new FileInfoDTO(uploadPath, uploadFileName, originFileName, uploadFullPath, contentType, ext, size); } catch (IOException e) { log.error(e.getMessage()); throw new FileUploadException(); - } finally { - transferManager.shutdownNow(); } }