Voomra/Project-Mirror
0
Fork 0
Code Issues 2 Releases Activity

refactory

Browse Source
This commit is contained in:
DmitriyMX
2022-05-10 23:42:25 +03:00
parent 6bb083755c
commit 8f2e416678
11 changed files with 45 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mirror-minio/src/integrationTest/java/ru/di9/mirror/core/service/MinioServiceIntTest.java → mirror-minio/src/integrationTest/java/ru/di9/mirror/minio/storage/MinioStorageIntegrationTest.java
View File

@@ -1,11 +1,10 @@
package ru.di9.mirror.core.service;
package ru.di9.mirror.minio.storage;
import io.minio.MinioClient;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import ru.di9.mirror.core.domain.FileItem;
import ru.di9.mirror.minio.service.MinioRepository;
import java.io.InputStream;
import java.util.List;
@@ -13,13 +12,13 @@ import java.util.Optional;
import static org.junit.jupiter.api.Assertions.*;
class MinioServiceIntTest {
class MinioStorageIntegrationTest {
static final String url = "http://dev.di9.ru:9000";
static final String accessKey = "mirror";
static final String secretKey = "mirror123";
static final String bucket = "mirror";
static MinioClient minioClient;
MinioRepository minioService;
MinioStorage minioService;
@BeforeAll
static void beforeAll() {
@@ -31,7 +30,7 @@ class MinioServiceIntTest {
@BeforeEach
void setUp() {
minioService = new MinioRepository(minioClient, bucket);
minioService = new MinioStorage(minioClient, bucket);
}
@Test

6
mirror-minio/src/main/java/ru/di9/mirror/minio/service/MinioRepository.java → mirror-minio/src/main/java/ru/di9/mirror/minio/storage/MinioStorage.java
View File

@@ -1,11 +1,11 @@
package ru.di9.mirror.minio.service;
package ru.di9.mirror.minio.storage;
import io.minio.*;
import io.minio.errors.ErrorResponseException;
import io.minio.messages.Item;
import lombok.RequiredArgsConstructor;
import ru.di9.mirror.core.domain.FileItem;
import ru.di9.mirror.core.repository.FileStorageRepository;
import ru.di9.mirror.core.storage.FileStorage;
import ru.di9.mirror.minio.domain.MinioFileItem;
import ru.di9.mirror.minio.exception.MinioException;
@@ -15,7 +15,7 @@ import java.util.List;
import java.util.Optional;
@RequiredArgsConstructor
public class MinioRepository implements FileStorageRepository {
public class MinioStorage implements FileStorage {
private static final long UNKNOWN_SIZE = -1L;
private static final long PART_SIZE = (5 * 1024 * 1024); // 5 MB

7
mirror-minio/src/test/java/ru/di9/mirror/core/service/MinioServiceTest.java → mirror-minio/src/test/java/ru/di9/mirror/minio/storage/MinioStorageTest.java
View File

@@ -1,4 +1,4 @@
package ru.di9.mirror.core.service;
package ru.di9.mirror.minio.storage;
import io.minio.ListObjectsArgs;
import io.minio.MinioClient;
@@ -8,14 +8,13 @@ import lombok.SneakyThrows;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import ru.di9.mirror.core.domain.FileItem;
import ru.di9.mirror.minio.service.MinioRepository;
import java.util.List;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
class MinioServiceTest {
class MinioStorageTest {
static final String bucket = "mirror";
static MinioClient mockMinioClient;
@@ -32,7 +31,7 @@ class MinioServiceTest {
@Test
void list() {
MinioRepository minioService = new MinioRepository(mockMinioClient, bucket);
MinioStorage minioService = new MinioStorage(mockMinioClient, bucket);
List<FileItem> list = minioService.list("/ghast/ghast-tools/");
assertNotNull(list);