micord/ervu-lkrp-av
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SUPPORT-8566: pass Path in method

Browse source
This commit is contained in:
gulnaz 2024-09-26 15:49:25 +03:00
parent a08441d8b0
commit ebc3bd4da8
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/ru/micord/ervu/av/s3/S3Service.java
View file

@ -1,6 +1,6 @@
package ru.micord.ervu.av.s3; package ru.micord.ervu.av.s3;
import java.nio.file.Paths; import java.nio.file.Path;
import jakarta.annotation.PostConstruct; import jakarta.annotation.PostConstruct;
import org.springframework.beans.factory.annotation.Autowired; 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() PutObjectRequest objectRequest = PutObjectRequest.builder()
.bucket(bucketName) .bucket(bucketName)
.key(generateResourceName(bucketName, key)) .key(generateResourceName(bucketName, key))
.build(); .build();
s3Client.putObject(objectRequest, Paths.get(filePath)); s3Client.putObject(objectRequest, filePath);
} }
private static String generateResourceName(String bucketName, String key) { private static String generateResourceName(String bucketName, String key) {

3
src/main/java/ru/micord/ervu/av/service/FileUploadService.java
View file

@ -3,6 +3,7 @@ package ru.micord.ervu.av.service;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Paths;
import java.util.Arrays; import java.util.Arrays;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -100,7 +101,7 @@ public class FileUploadService {
fileStatusService.setStatus(fileId, FileStatus.FILE_STATUS_02.status()); fileStatusService.setStatus(fileId, FileStatus.FILE_STATUS_02.status());
} }
else { else {
s3Service.putFile(filePath, fileUrl.fileName()); s3Service.putFile(Paths.get(filePath), fileUrl.fileName());
downloadRequest.fileInfo().setFileUrl(fileUrl.fileName()); downloadRequest.fileInfo().setFileUrl(fileUrl.fileName());
downloadRequest.fileInfo().setFileStatus(FileStatus.FILE_STATUS_03); downloadRequest.fileInfo().setFileStatus(FileStatus.FILE_STATUS_03);