From 8f2e416678e902c3e928417251ffe63ebde847f1 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Tue, 10 May 2022 23:42:25 +0300 Subject: [PATCH] refactory --- .../ArtifactDao.java} | 4 ++-- .../mirror/core/handler/IndexOfHandler.java | 6 +++--- .../di9/mirror/core/handler/MavenHandler.java | 18 +++++++++--------- .../FileStorage.java} | 4 ++-- .../storage/MinioStorageIntegrationTest.java} | 9 ++++----- .../MinioStorage.java} | 6 +++--- .../storage/MinioStorageTest.java} | 7 +++---- .../MongoArtifactDao.java} | 6 +++--- .../ru/di9/mirror/web/config/MinioConfig.java | 10 +++++----- .../ru/di9/mirror/web/config/MongoConfig.java | 8 ++++---- .../ru/di9/mirror/web/config/WebConfig.java | 14 +++++++------- 11 files changed, 45 insertions(+), 47 deletions(-) rename mirror-core/src/main/java/ru/di9/mirror/core/{repository/ArtifactRepository.java => dao/ArtifactDao.java} (58%) rename mirror-core/src/main/java/ru/di9/mirror/core/{repository/FileStorageRepository.java => storage/FileStorage.java} (77%) rename mirror-minio/src/integrationTest/java/ru/di9/mirror/{core/service/MinioServiceIntTest.java => minio/storage/MinioStorageIntegrationTest.java} (89%) rename mirror-minio/src/main/java/ru/di9/mirror/minio/{service/MinioRepository.java => storage/MinioStorage.java} (93%) rename mirror-minio/src/test/java/ru/di9/mirror/{core/service/MinioServiceTest.java => minio/storage/MinioStorageTest.java} (90%) rename mirror-mongo/src/main/java/ru/di9/mirror/mongo/{repository/MongoArtifactRepository.java => dao/MongoArtifactDao.java} (84%) diff --git a/mirror-core/src/main/java/ru/di9/mirror/core/repository/ArtifactRepository.java b/mirror-core/src/main/java/ru/di9/mirror/core/dao/ArtifactDao.java similarity index 58% rename from mirror-core/src/main/java/ru/di9/mirror/core/repository/ArtifactRepository.java rename to mirror-core/src/main/java/ru/di9/mirror/core/dao/ArtifactDao.java index 51b6167..d1e4895 100644 --- a/mirror-core/src/main/java/ru/di9/mirror/core/repository/ArtifactRepository.java +++ b/mirror-core/src/main/java/ru/di9/mirror/core/dao/ArtifactDao.java @@ -1,8 +1,8 @@ -package ru.di9.mirror.core.repository; +package ru.di9.mirror.core.dao; import ru.di9.mirror.core.entity.ArtifactEntity; -public interface ArtifactRepository { +public interface ArtifactDao { ArtifactEntity save(ArtifactEntity artifactEntity); } diff --git a/mirror-core/src/main/java/ru/di9/mirror/core/handler/IndexOfHandler.java b/mirror-core/src/main/java/ru/di9/mirror/core/handler/IndexOfHandler.java index e166be7..c1d9dc3 100644 --- a/mirror-core/src/main/java/ru/di9/mirror/core/handler/IndexOfHandler.java +++ b/mirror-core/src/main/java/ru/di9/mirror/core/handler/IndexOfHandler.java @@ -2,17 +2,17 @@ package ru.di9.mirror.core.handler; 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 java.util.List; @RequiredArgsConstructor public class IndexOfHandler { - private final FileStorageRepository fileStorageRepository; + private final FileStorage fileStorage; public List walker(String path) { - return fileStorageRepository.list("/local/" + path); + return fileStorage.list("/local/" + path); } } diff --git a/mirror-core/src/main/java/ru/di9/mirror/core/handler/MavenHandler.java b/mirror-core/src/main/java/ru/di9/mirror/core/handler/MavenHandler.java index 40e7517..0fc735b 100644 --- a/mirror-core/src/main/java/ru/di9/mirror/core/handler/MavenHandler.java +++ b/mirror-core/src/main/java/ru/di9/mirror/core/handler/MavenHandler.java @@ -5,8 +5,8 @@ import lombok.extern.slf4j.Slf4j; import ru.di9.mirror.core.domain.FileInfo; 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.repository.FileStorageRepository; +import ru.di9.mirror.core.dao.ArtifactDao; +import ru.di9.mirror.core.storage.FileStorage; import ru.di9.mirror.core.service.ExternalMavenService; import java.io.InputStream; @@ -17,9 +17,9 @@ import java.util.Optional; @RequiredArgsConstructor public class MavenHandler { - private final FileStorageRepository fileStorageRepository; + private final FileStorage fileStorage; private final List externalMavenServices; - private final ArtifactRepository repository; + private final ArtifactDao repository; public Optional getFile(String path) { var fileInfo = FileInfo.of(path.substring(path.lastIndexOf("/") + 1)); @@ -32,7 +32,7 @@ public class MavenHandler { log.info(artifactEntity.toString()); } - Optional optionalInputStream = fileStorageRepository.findByName("/local/" + path); + Optional optionalInputStream = fileStorage.findByName("/local/" + path); if (optionalInputStream.isPresent()) { return optionalInputStream .map(inputStream -> new GetFileResponse(fileInfo.name(), inputStream)); @@ -46,7 +46,7 @@ public class MavenHandler { for (ExternalMavenService externalMavenService : externalMavenServices) { final String nameForStore = "/" + externalMavenService.getId() + "/" + path; - result = fileStorageRepository.findByName(nameForStore); + result = fileStorage.findByName(nameForStore); if (result.isPresent()) { return result .map(inputStream -> new GetFileResponse(fileName, inputStream)); @@ -57,8 +57,8 @@ public class MavenHandler { repository.save(artifactEntity); } - fileStorageRepository.save(nameForStore, result.get()); - return fileStorageRepository.findByName(nameForStore) + fileStorage.save(nameForStore, result.get()); + return fileStorage.findByName(nameForStore) .map(inputStream -> new GetFileResponse(fileName, inputStream)); } } @@ -77,6 +77,6 @@ public class MavenHandler { log.info(artifactEntity.toString()); } - fileStorageRepository.save("/local/" + path, inputStream); + fileStorage.save("/local/" + path, inputStream); } } diff --git a/mirror-core/src/main/java/ru/di9/mirror/core/repository/FileStorageRepository.java b/mirror-core/src/main/java/ru/di9/mirror/core/storage/FileStorage.java similarity index 77% rename from mirror-core/src/main/java/ru/di9/mirror/core/repository/FileStorageRepository.java rename to mirror-core/src/main/java/ru/di9/mirror/core/storage/FileStorage.java index c6fb9a4..875e69d 100644 --- a/mirror-core/src/main/java/ru/di9/mirror/core/repository/FileStorageRepository.java +++ b/mirror-core/src/main/java/ru/di9/mirror/core/storage/FileStorage.java @@ -1,4 +1,4 @@ -package ru.di9.mirror.core.repository; +package ru.di9.mirror.core.storage; import ru.di9.mirror.core.domain.FileItem; @@ -6,7 +6,7 @@ import java.io.InputStream; import java.util.List; import java.util.Optional; -public interface FileStorageRepository { +public interface FileStorage { Optional findByName(String name); diff --git a/mirror-minio/src/integrationTest/java/ru/di9/mirror/core/service/MinioServiceIntTest.java b/mirror-minio/src/integrationTest/java/ru/di9/mirror/minio/storage/MinioStorageIntegrationTest.java similarity index 89% rename from mirror-minio/src/integrationTest/java/ru/di9/mirror/core/service/MinioServiceIntTest.java rename to mirror-minio/src/integrationTest/java/ru/di9/mirror/minio/storage/MinioStorageIntegrationTest.java index a4470b1..32d4c20 100644 --- a/mirror-minio/src/integrationTest/java/ru/di9/mirror/core/service/MinioServiceIntTest.java +++ b/mirror-minio/src/integrationTest/java/ru/di9/mirror/minio/storage/MinioStorageIntegrationTest.java @@ -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 diff --git a/mirror-minio/src/main/java/ru/di9/mirror/minio/service/MinioRepository.java b/mirror-minio/src/main/java/ru/di9/mirror/minio/storage/MinioStorage.java similarity index 93% rename from mirror-minio/src/main/java/ru/di9/mirror/minio/service/MinioRepository.java rename to mirror-minio/src/main/java/ru/di9/mirror/minio/storage/MinioStorage.java index aa85fea..2fc736a 100644 --- a/mirror-minio/src/main/java/ru/di9/mirror/minio/service/MinioRepository.java +++ b/mirror-minio/src/main/java/ru/di9/mirror/minio/storage/MinioStorage.java @@ -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 diff --git a/mirror-minio/src/test/java/ru/di9/mirror/core/service/MinioServiceTest.java b/mirror-minio/src/test/java/ru/di9/mirror/minio/storage/MinioStorageTest.java similarity index 90% rename from mirror-minio/src/test/java/ru/di9/mirror/core/service/MinioServiceTest.java rename to mirror-minio/src/test/java/ru/di9/mirror/minio/storage/MinioStorageTest.java index 89729db..c88bdff 100644 --- a/mirror-minio/src/test/java/ru/di9/mirror/core/service/MinioServiceTest.java +++ b/mirror-minio/src/test/java/ru/di9/mirror/minio/storage/MinioStorageTest.java @@ -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 list = minioService.list("/ghast/ghast-tools/"); assertNotNull(list); diff --git a/mirror-mongo/src/main/java/ru/di9/mirror/mongo/repository/MongoArtifactRepository.java b/mirror-mongo/src/main/java/ru/di9/mirror/mongo/dao/MongoArtifactDao.java similarity index 84% rename from mirror-mongo/src/main/java/ru/di9/mirror/mongo/repository/MongoArtifactRepository.java rename to mirror-mongo/src/main/java/ru/di9/mirror/mongo/dao/MongoArtifactDao.java index 7930646..6422926 100644 --- a/mirror-mongo/src/main/java/ru/di9/mirror/mongo/repository/MongoArtifactRepository.java +++ b/mirror-mongo/src/main/java/ru/di9/mirror/mongo/dao/MongoArtifactDao.java @@ -1,4 +1,4 @@ -package ru.di9.mirror.mongo.repository; +package ru.di9.mirror.mongo.dao; import com.mongodb.client.MongoCollection; import com.mongodb.client.result.InsertOneResult; @@ -7,11 +7,11 @@ import lombok.extern.slf4j.Slf4j; import org.bson.Document; import org.bson.types.ObjectId; import ru.di9.mirror.core.entity.ArtifactEntity; -import ru.di9.mirror.core.repository.ArtifactRepository; +import ru.di9.mirror.core.dao.ArtifactDao; @Slf4j @RequiredArgsConstructor -public class MongoArtifactRepository implements ArtifactRepository { +public class MongoArtifactDao implements ArtifactDao { private final MongoCollection collection; @Override diff --git a/mirror-web/src/main/java/ru/di9/mirror/web/config/MinioConfig.java b/mirror-web/src/main/java/ru/di9/mirror/web/config/MinioConfig.java index d1169a8..a8d6964 100644 --- a/mirror-web/src/main/java/ru/di9/mirror/web/config/MinioConfig.java +++ b/mirror-web/src/main/java/ru/di9/mirror/web/config/MinioConfig.java @@ -4,16 +4,16 @@ import io.minio.MinioClient; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import ru.di9.mirror.core.repository.FileStorageRepository; -import ru.di9.mirror.minio.service.MinioRepository; +import ru.di9.mirror.core.storage.FileStorage; +import ru.di9.mirror.minio.storage.MinioStorage; @Configuration public class MinioConfig { @Bean - public FileStorageRepository fileStorageRepository(MinioClient minioClient, - @Value("${minio.bucket}") String bucket) { - return new MinioRepository(minioClient, bucket); + public FileStorage fileStorage(MinioClient minioClient, + @Value("${minio.bucket}") String bucket) { + return new MinioStorage(minioClient, bucket); } @Bean diff --git a/mirror-web/src/main/java/ru/di9/mirror/web/config/MongoConfig.java b/mirror-web/src/main/java/ru/di9/mirror/web/config/MongoConfig.java index 531eddd..cf5e77e 100644 --- a/mirror-web/src/main/java/ru/di9/mirror/web/config/MongoConfig.java +++ b/mirror-web/src/main/java/ru/di9/mirror/web/config/MongoConfig.java @@ -10,8 +10,8 @@ import org.bson.Document; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import ru.di9.mirror.core.repository.ArtifactRepository; -import ru.di9.mirror.mongo.repository.MongoArtifactRepository; +import ru.di9.mirror.core.dao.ArtifactDao; +import ru.di9.mirror.mongo.dao.MongoArtifactDao; import java.util.List; @@ -38,7 +38,7 @@ public class MongoConfig { } @Bean - public ArtifactRepository artifactRepository(MongoCollection artifactCollection) { - return new MongoArtifactRepository(artifactCollection); + public ArtifactDao artifactDao(MongoCollection artifactCollection) { + return new MongoArtifactDao(artifactCollection); } } diff --git a/mirror-web/src/main/java/ru/di9/mirror/web/config/WebConfig.java b/mirror-web/src/main/java/ru/di9/mirror/web/config/WebConfig.java index 22740a9..9efdfb4 100644 --- a/mirror-web/src/main/java/ru/di9/mirror/web/config/WebConfig.java +++ b/mirror-web/src/main/java/ru/di9/mirror/web/config/WebConfig.java @@ -5,8 +5,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import ru.di9.mirror.core.handler.IndexOfHandler; import ru.di9.mirror.core.handler.MavenHandler; -import ru.di9.mirror.core.repository.ArtifactRepository; -import ru.di9.mirror.core.repository.FileStorageRepository; +import ru.di9.mirror.core.dao.ArtifactDao; +import ru.di9.mirror.core.storage.FileStorage; import ru.di9.mirror.core.service.ExternalMavenService; import java.util.List; @@ -15,15 +15,15 @@ import java.util.List; public class WebConfig { @Bean - public MavenHandler mavenHandler(FileStorageRepository fileStorageRepository, + public MavenHandler mavenHandler(FileStorage fileStorage, List externalMavenServices, - ArtifactRepository artifactRepository) { - return new MavenHandler(fileStorageRepository, externalMavenServices, artifactRepository); + ArtifactDao artifactDao) { + return new MavenHandler(fileStorage, externalMavenServices, artifactDao); } @Bean - public IndexOfHandler indexOfHandler(FileStorageRepository fileStorageRepository) { - return new IndexOfHandler(fileStorageRepository); + public IndexOfHandler indexOfHandler(FileStorage fileStorage) { + return new IndexOfHandler(fileStorage); } @Bean