diff --git a/src/main/java/ru/micord/ervu/av/s3/S3Service.java b/src/main/java/ru/micord/ervu/av/s3/S3Service.java index 1cd1425..09531ad 100644 --- a/src/main/java/ru/micord/ervu/av/s3/S3Service.java +++ b/src/main/java/ru/micord/ervu/av/s3/S3Service.java @@ -1,6 +1,6 @@ package ru.micord.ervu.av.s3; -import java.nio.file.Paths; +import java.nio.file.Path; import jakarta.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; @@ -43,12 +43,12 @@ public class S3Service { } } - public void putFile(String filePath, String key) throws FileUploadException { + public void putFile(Path filePath, String key) throws FileUploadException { PutObjectRequest objectRequest = PutObjectRequest.builder() .bucket(bucketName) .key(generateResourceName(bucketName, key)) .build(); - s3Client.putObject(objectRequest, Paths.get(filePath)); + s3Client.putObject(objectRequest, filePath); } private static String generateResourceName(String bucketName, String key) { diff --git a/src/main/java/ru/micord/ervu/av/service/FileUploadService.java b/src/main/java/ru/micord/ervu/av/service/FileUploadService.java index 380cca8..7d81ea7 100644 --- a/src/main/java/ru/micord/ervu/av/service/FileUploadService.java +++ b/src/main/java/ru/micord/ervu/av/service/FileUploadService.java @@ -3,6 +3,7 @@ package ru.micord.ervu.av.service; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; +import java.nio.file.Paths; import java.util.Arrays; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; @@ -100,7 +101,7 @@ public class FileUploadService { fileStatusService.setStatus(fileId, FileStatus.FILE_STATUS_02.status()); } else { - s3Service.putFile(filePath, fileUrl.fileName()); + s3Service.putFile(Paths.get(filePath), fileUrl.fileName()); downloadRequest.fileInfo().setFileUrl(fileUrl.fileName()); downloadRequest.fileInfo().setFileStatus(FileStatus.FILE_STATUS_03);