diff --git a/mirror-core/src/integrationTest/java/ru/di9/mirror/core/service/MinioServiceIntTest.java b/mirror-core/src/integrationTest/java/ru/di9/mirror/core/service/MinioServiceIntTest.java index 43aedbe..379b59f 100644 --- a/mirror-core/src/integrationTest/java/ru/di9/mirror/core/service/MinioServiceIntTest.java +++ b/mirror-core/src/integrationTest/java/ru/di9/mirror/core/service/MinioServiceIntTest.java @@ -4,7 +4,7 @@ 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.ItemRecord2; +import ru.di9.mirror.core.domain.ItemRecord; import java.io.InputStream; import java.util.List; @@ -35,7 +35,7 @@ class MinioServiceIntTest { @Test void list() { - List list = minioService.list("/local/ghast/ghast-tools/"); + List list = minioService.list("/local/ghast/ghast-tools/"); assertNotNull(list); assertFalse(list.isEmpty()); diff --git a/mirror-core/src/main/java/ru/di9/mirror/core/Utils.java b/mirror-core/src/main/java/ru/di9/mirror/core/Utils.java index 4cadcdb..bc6a6a0 100644 --- a/mirror-core/src/main/java/ru/di9/mirror/core/Utils.java +++ b/mirror-core/src/main/java/ru/di9/mirror/core/Utils.java @@ -1,16 +1,15 @@ package ru.di9.mirror.core; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; +import lombok.experimental.UtilityClass; -@NoArgsConstructor(access = AccessLevel.PRIVATE) +@UtilityClass public final class Utils { - public static boolean isEmptyString(String string) { + public boolean isEmptyString(String string) { return string == null || string.isEmpty() || string.isBlank(); } - public static boolean isNotEmptyString(String string) { + public boolean isNotEmptyString(String string) { return !isEmptyString(string); } } diff --git a/mirror-core/src/main/java/ru/di9/mirror/core/domain/ItemRecord2.java b/mirror-core/src/main/java/ru/di9/mirror/core/domain/ItemRecord.java similarity index 90% rename from mirror-core/src/main/java/ru/di9/mirror/core/domain/ItemRecord2.java rename to mirror-core/src/main/java/ru/di9/mirror/core/domain/ItemRecord.java index 9617232..22bcdf2 100644 --- a/mirror-core/src/main/java/ru/di9/mirror/core/domain/ItemRecord2.java +++ b/mirror-core/src/main/java/ru/di9/mirror/core/domain/ItemRecord.java @@ -4,7 +4,7 @@ import io.minio.Result; import io.minio.messages.Item; import lombok.SneakyThrows; -public record ItemRecord2(Result itemResult, String prefix) { +public record ItemRecord(Result itemResult, String prefix) { @SneakyThrows public boolean isDir() { diff --git a/mirror-core/src/main/java/ru/di9/mirror/core/domain/MavenHandlerGetFileResponse.java b/mirror-core/src/main/java/ru/di9/mirror/core/domain/MavenHandlerGetFileResponse.java deleted file mode 100644 index 00e2818..0000000 --- a/mirror-core/src/main/java/ru/di9/mirror/core/domain/MavenHandlerGetFileResponse.java +++ /dev/null @@ -1,6 +0,0 @@ -package ru.di9.mirror.core.domain; - -import java.io.InputStream; - -public record MavenHandlerGetFileResponse(String name, InputStream inputStream) { -} diff --git a/mirror-core/src/main/java/ru/di9/mirror/core/domain/WalkerResult.java b/mirror-core/src/main/java/ru/di9/mirror/core/domain/WalkerResult.java deleted file mode 100644 index 08db874..0000000 --- a/mirror-core/src/main/java/ru/di9/mirror/core/domain/WalkerResult.java +++ /dev/null @@ -1,5 +0,0 @@ -package ru.di9.mirror.core.domain; - -public record WalkerResult(PathType type) { - -} 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 5c26518..c98e986 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 @@ -1,7 +1,7 @@ package ru.di9.mirror.core.handler; import lombok.RequiredArgsConstructor; -import ru.di9.mirror.core.domain.ItemRecord2; +import ru.di9.mirror.core.domain.ItemRecord; import ru.di9.mirror.core.service.MinioService; import java.util.List; @@ -11,7 +11,7 @@ public class IndexOfHandler { private final MinioService minioService; - public List walker(String path) { + public List walker(String path) { return minioService.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 c6f41e8..b566592 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 @@ -1,7 +1,7 @@ package ru.di9.mirror.core.handler; import lombok.RequiredArgsConstructor; -import ru.di9.mirror.core.domain.MavenHandlerGetFileResponse; +import ru.di9.mirror.core.handler.response.GetFileResponse; import ru.di9.mirror.core.service.ExternalMavenService; import ru.di9.mirror.core.service.MinioService; @@ -15,13 +15,13 @@ public class MavenHandler { private final MinioService minioService; private final List externalMavenServices; - public Optional getFile(String path) { + public Optional getFile(String path) { final String fileName = path.substring(path.lastIndexOf("/") + 1); Optional optionalInputStream = minioService.get("/local/" + path); if (optionalInputStream.isPresent()) { return optionalInputStream - .map(inputStream -> new MavenHandlerGetFileResponse(fileName, inputStream)); + .map(inputStream -> new GetFileResponse(fileName, inputStream)); } else { for (ExternalMavenService externalMavenService : externalMavenServices) { final String nameForStore = "/" + externalMavenService.getId() + "/" + path; @@ -29,13 +29,13 @@ public class MavenHandler { optionalInputStream = minioService.get(nameForStore); if (optionalInputStream.isPresent()) { return optionalInputStream - .map(inputStream -> new MavenHandlerGetFileResponse(fileName, inputStream)); + .map(inputStream -> new GetFileResponse(fileName, inputStream)); } else { optionalInputStream = externalMavenService.getFile(path); if (optionalInputStream.isPresent()) { minioService.put(nameForStore, optionalInputStream.get()); return minioService.get(nameForStore) - .map(inputStream -> new MavenHandlerGetFileResponse(fileName, inputStream)); + .map(inputStream -> new GetFileResponse(fileName, inputStream)); } } } diff --git a/mirror-core/src/main/java/ru/di9/mirror/core/handler/response/GetFileResponse.java b/mirror-core/src/main/java/ru/di9/mirror/core/handler/response/GetFileResponse.java new file mode 100644 index 0000000..bd21f8a --- /dev/null +++ b/mirror-core/src/main/java/ru/di9/mirror/core/handler/response/GetFileResponse.java @@ -0,0 +1,6 @@ +package ru.di9.mirror.core.handler.response; + +import java.io.InputStream; + +public record GetFileResponse(String name, InputStream inputStream) { +} diff --git a/mirror-core/src/main/java/ru/di9/mirror/core/service/MinioService.java b/mirror-core/src/main/java/ru/di9/mirror/core/service/MinioService.java index 43a6100..16e332b 100644 --- a/mirror-core/src/main/java/ru/di9/mirror/core/service/MinioService.java +++ b/mirror-core/src/main/java/ru/di9/mirror/core/service/MinioService.java @@ -5,12 +5,9 @@ import io.minio.errors.*; import io.minio.messages.Item; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; -import ru.di9.mirror.core.domain.ItemRecord2; +import ru.di9.mirror.core.domain.ItemRecord; -import java.io.IOException; import java.io.InputStream; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -48,7 +45,7 @@ public class MinioService { } } - public List list(String prefix) { + public List list(String prefix) { if (!prefix.endsWith("/")) { prefix = prefix + "/"; } @@ -58,9 +55,9 @@ public class MinioService { .prefix(prefix) .build()); - List list = new ArrayList<>(); + List list = new ArrayList<>(); for (Result result : results) { - list.add(new ItemRecord2(result, prefix)); + list.add(new ItemRecord(result, prefix)); } return list; diff --git a/mirror-core/src/test/java/ru/di9/mirror/core/service/MinioServiceTest.java b/mirror-core/src/test/java/ru/di9/mirror/core/service/MinioServiceTest.java index 1855c57..00c7e88 100644 --- a/mirror-core/src/test/java/ru/di9/mirror/core/service/MinioServiceTest.java +++ b/mirror-core/src/test/java/ru/di9/mirror/core/service/MinioServiceTest.java @@ -7,7 +7,7 @@ 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.ItemRecord2; +import ru.di9.mirror.core.domain.ItemRecord; import java.util.List; @@ -32,7 +32,7 @@ class MinioServiceTest { @Test void list() { MinioService minioService = new MinioService(mockMinioClient, bucket); - List list = minioService.list("/ghast/ghast-tools/"); + List list = minioService.list("/ghast/ghast-tools/"); assertNotNull(list); assertFalse(list.isEmpty()); diff --git a/mirror-web/src/main/java/ru/di9/mirror/web/controller/IndexOfMavenController.java b/mirror-web/src/main/java/ru/di9/mirror/web/controller/IndexOfMavenController.java index 056ea51..af3eeff 100644 --- a/mirror-web/src/main/java/ru/di9/mirror/web/controller/IndexOfMavenController.java +++ b/mirror-web/src/main/java/ru/di9/mirror/web/controller/IndexOfMavenController.java @@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import ru.di9.mirror.core.Utils; -import ru.di9.mirror.core.domain.ItemRecord2; +import ru.di9.mirror.core.domain.ItemRecord; import ru.di9.mirror.core.handler.IndexOfHandler; import java.util.ArrayList; @@ -28,7 +28,7 @@ public class IndexOfMavenController { @ModelAttribute("model") ModelMap model) { String path = correctingHttpPath(httpPath); - List walker = indexOfHandler.walker(path); + List walker = indexOfHandler.walker(path); List links = new ArrayList<>(); StringBuilder sb = new StringBuilder("/maven"); @@ -46,13 +46,13 @@ public class IndexOfMavenController { sb.setLength(resetLength); sb.append("/"); resetLength = sb.length(); - for (ItemRecord2 itemRecord2 : walker) { + for (ItemRecord itemRecord : walker) { if (Utils.isNotEmptyString(path)) { sb.append(path).append("/"); } - sb.append(itemRecord2.name()); + sb.append(itemRecord.name()); - links.add(new ModelLink(itemRecord2.name() + (itemRecord2.isDir() ? "/" : ""), sb.toString())); + links.add(new ModelLink(itemRecord.name() + (itemRecord.isDir() ? "/" : ""), sb.toString())); sb.setLength(resetLength); }