resolved conflicts
This commit is contained in:
@@ -11,11 +11,10 @@ import java.io.InputStream;
|
||||
@Component
|
||||
public interface AmazonS3Service {
|
||||
|
||||
public String upload(String fileName, String s3Folder, MultipartFile file) throws IOException;
|
||||
|
||||
public Boolean delete(String s3Folder, String fileName);
|
||||
|
||||
UploadFileOnAmazonS3Response uploadFileOnAmazonS3(String s3Folder, MultipartFile file);
|
||||
|
||||
Boolean delete(String s3Folder, String filePath);
|
||||
|
||||
InputStream getFile(String s3Folder, String filePath) throws IOException;
|
||||
|
||||
public UploadFileOnAmazonS3Response uploadFileOnAmazonS3(String s3Folder, MultipartFile file);
|
||||
}
|
||||
Reference in New Issue
Block a user