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

отделили реализацию minio в отлдельный модуль

Browse Source
This commit is contained in:
DmitriyMX
2022-05-09 19:14:23 +03:00
parent 8e05d49198
commit f476c81f4e
18 changed files with 187 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
mirror-core/src/integrationTest/java/ru/di9/mirror/core/service/MinioServiceIntTest.java
View File

@@ -1,68 +0,0 @@
package ru.di9.mirror.core.service;
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.ItemRecord;
import java.io.InputStream;
import java.util.List;
import java.util.Optional;
import static org.junit.jupiter.api.Assertions.*;
class MinioServiceIntTest {
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;
MinioService minioService;
@BeforeAll
static void beforeAll() {
minioClient = MinioClient.builder()
.endpoint(url)
.credentials(accessKey, secretKey)
.build();
}
@BeforeEach
void setUp() {
minioService = new MinioService(minioClient, bucket);
}
@Test
void list() {
List<ItemRecord> list = minioService.list("/local/ghast/ghast-tools/");
assertNotNull(list);
assertFalse(list.isEmpty());
assertTrue(list.stream()
.anyMatch(itemRecord2 -> itemRecord2.name().equals("maven-metadata.xml")
&& !itemRecord2.isDir()
&& itemRecord2.size() == 320));
assertTrue(list.stream()
.anyMatch(itemRecord2 -> itemRecord2.name().equals("1.13")
&& itemRecord2.isDir()
&& itemRecord2.size() == 0));
}
@Test
void notExists() {
Optional<InputStream> optional = minioService.get("/not/exists/path/to/object");
assertNotNull(optional);
assertTrue(optional.isEmpty());
}
@Test
void exists() {
Optional<InputStream> optional = minioService.get("/local/ghast/ghast-tools/maven-metadata.xml");
assertNotNull(optional);
assertTrue(optional.isPresent());
}
}

10
mirror-core/src/main/java/ru/di9/mirror/core/domain/FileItem.java Normal file
View File

@@ -0,0 +1,10 @@
package ru.di9.mirror.core.domain;
public interface FileItem {
boolean isDir();
String name();
long size();
}

28
mirror-core/src/main/java/ru/di9/mirror/core/domain/ItemRecord.java
View File

@@ -1,28 +0,0 @@
package ru.di9.mirror.core.domain;
import io.minio.Result;
import io.minio.messages.Item;
import lombok.SneakyThrows;
public record ItemRecord(Result<Item> itemResult, String prefix) {
@SneakyThrows
public boolean isDir() {
return itemResult.get().isDir();
}
@SneakyThrows
public String name() {
String objectName = itemResult.get().objectName();
if (isDir()) {
return objectName.substring(prefix.length() - 1, objectName.length() - 1);
} else {
return objectName.substring(prefix.length() - 1);
}
}
@SneakyThrows
public long size() {
return itemResult.get().size();
}
}

10
mirror-core/src/main/java/ru/di9/mirror/core/handler/IndexOfHandler.java
View File

@@ -1,18 +1,18 @@
package ru.di9.mirror.core.handler;
import lombok.RequiredArgsConstructor;
import ru.di9.mirror.core.domain.ItemRecord;
import ru.di9.mirror.core.service.MinioService;
import ru.di9.mirror.core.domain.FileItem;
import ru.di9.mirror.core.repository.FileStorageRepository;
import java.util.List;
@RequiredArgsConstructor
public class IndexOfHandler {
private final MinioService minioService;
private final FileStorageRepository fileStorageRepository;
public List<ItemRecord> walker(String path) {
return minioService.list("/local/" + path);
public List<FileItem> walker(String path) {
return fileStorageRepository.list("/local/" + path);
}
}

14
mirror-core/src/main/java/ru/di9/mirror/core/handler/MavenHandler.java
View File

@@ -8,7 +8,7 @@ import ru.di9.mirror.core.entity.ArtifactEntity;
import ru.di9.mirror.core.handler.response.GetFileResponse;
import ru.di9.mirror.core.repository.ArtifactRepository;
import ru.di9.mirror.core.service.ExternalMavenService;
import ru.di9.mirror.core.service.MinioService;
import ru.di9.mirror.core.repository.FileStorageRepository;
import java.io.InputStream;
import java.util.List;
@@ -18,7 +18,7 @@ import java.util.Optional;
@RequiredArgsConstructor
public class MavenHandler {
private final MinioService minioService;
private final FileStorageRepository fileStorageRepository;
private final List<ExternalMavenService> externalMavenServices;
private final ArtifactRepository repository;
@@ -33,7 +33,7 @@ public class MavenHandler {
log.info(artifactRecord.toString());
}
Optional<InputStream> optionalInputStream = minioService.get("/local/" + path);
Optional<InputStream> optionalInputStream = fileStorageRepository.findByName("/local/" + path);
if (optionalInputStream.isPresent()) {
return optionalInputStream
.map(inputStream -> new GetFileResponse(fileInfo.name(), inputStream));
@@ -47,7 +47,7 @@ public class MavenHandler {
for (ExternalMavenService externalMavenService : externalMavenServices) {
final String nameForStore = "/" + externalMavenService.getId() + "/" + path;
result = minioService.get(nameForStore);
result = fileStorageRepository.findByName(nameForStore);
if (result.isPresent()) {
return result
.map(inputStream -> new GetFileResponse(fileName, inputStream));
@@ -58,8 +58,8 @@ public class MavenHandler {
repository.save(ArtifactEntity.fromRecord(artifactRecord));
}
minioService.put(nameForStore, result.get());
return minioService.get(nameForStore)
fileStorageRepository.save(nameForStore, result.get());
return fileStorageRepository.findByName(nameForStore)
.map(inputStream -> new GetFileResponse(fileName, inputStream));
}
}
@@ -78,6 +78,6 @@ public class MavenHandler {
log.info(artifactRecord.toString());
}
minioService.put("/local/" + path, inputStream);
fileStorageRepository.save("/local/" + path, inputStream);
}
}

16
mirror-core/src/main/java/ru/di9/mirror/core/repository/FileStorageRepository.java Normal file
View File

@@ -0,0 +1,16 @@
package ru.di9.mirror.core.repository;
import ru.di9.mirror.core.domain.FileItem;
import java.io.InputStream;
import java.util.List;
import java.util.Optional;
public interface FileStorageRepository {
Optional<InputStream> findByName(String name);
void save(String name, InputStream inputStream);
List<FileItem> list(String prefix);
}

65
mirror-core/src/main/java/ru/di9/mirror/core/service/MinioService.java
View File

@@ -1,65 +0,0 @@
package ru.di9.mirror.core.service;
import io.minio.*;
import io.minio.errors.*;
import io.minio.messages.Item;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import ru.di9.mirror.core.domain.ItemRecord;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
@RequiredArgsConstructor
public class MinioService {
private static final long UNKNOWN_SIZE = -1L;
private static final long PART_SIZE = (5 * 1024 * 1024); // 5 MB
private final MinioClient minioClient;
private final String bucket;
@SneakyThrows
public void put(String name, InputStream inputStream) {
minioClient.putObject(PutObjectArgs.builder()
.bucket(bucket)
.object(name)
.stream(inputStream, UNKNOWN_SIZE, PART_SIZE)
.build());
}
@SneakyThrows
public Optional<InputStream> get(String name) {
try {
return Optional.of(minioClient.getObject(GetObjectArgs.builder()
.bucket(bucket)
.object(name)
.build()));
} catch (ErrorResponseException e) {
if (e.errorResponse().code().equalsIgnoreCase("NoSuchKey")) {
return Optional.empty();
} else {
throw e;
}
}
}
public List<ItemRecord> list(String prefix) {
if (!prefix.endsWith("/")) {
prefix = prefix + "/";
}
Iterable<Result<Item>> results = minioClient.listObjects(ListObjectsArgs.builder()
.bucket(bucket)
.prefix(prefix)
.build());
List<ItemRecord> list = new ArrayList<>();
for (Result<Item> result : results) {
list.add(new ItemRecord(result, prefix));
}
return list;
}
}

63
mirror-core/src/test/java/ru/di9/mirror/core/service/MinioServiceTest.java
View File

@@ -1,63 +0,0 @@
package ru.di9.mirror.core.service;
import io.minio.ListObjectsArgs;
import io.minio.MinioClient;
import io.minio.Result;
import io.minio.messages.Item;
import lombok.SneakyThrows;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import ru.di9.mirror.core.domain.ItemRecord;
import java.util.List;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
class MinioServiceTest {
static final String bucket = "mirror";
static MinioClient mockMinioClient;
@BeforeAll
static void beforeAll() {
mockMinioClient = mock(MinioClient.class);
Iterable<Result<Item>> listObjects = List.of(
mockResult("ghast/ghast-tools/maven-metadata.xml", 320, false),
mockResult("ghast/ghast-tools/1.13/", 0, true)
);
when(mockMinioClient.listObjects(any(ListObjectsArgs.class))).thenReturn(listObjects);
}
@Test
void list() {
MinioService minioService = new MinioService(mockMinioClient, bucket);
List<ItemRecord> list = minioService.list("/ghast/ghast-tools/");
assertNotNull(list);
assertFalse(list.isEmpty());
assertTrue(list.stream()
.anyMatch(itemRecord2 -> itemRecord2.name().equals("maven-metadata.xml")
&& !itemRecord2.isDir()
&& itemRecord2.size() == 320));
assertTrue(list.stream()
.anyMatch(itemRecord2 -> itemRecord2.name().equals("1.13")
&& itemRecord2.isDir()
&& itemRecord2.size() == 0));
}
@SuppressWarnings("unchecked")
@SneakyThrows
private static Result<Item> mockResult(String name, long size, boolean isDir) {
Item item = mock(Item.class);
when(item.objectName()).thenReturn(name);
when(item.size()).thenReturn(size);
when(item.isDir()).thenReturn(isDir);
Result<Item> result = mock(Result.class);
when(result.get()).thenReturn(item);
return result;
}
}