diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketInfoResponse.java b/app/src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketInfoResponse.java deleted file mode 100644 index 05e343c..0000000 --- a/app/src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketInfoResponse.java +++ /dev/null @@ -1,5 +0,0 @@ -package ru.dragonestia.loadbalancer.controller.response; - -import ru.dragonestia.loadbalancer.model.Bucket; - -public record BucketInfoResponse(Bucket bucket) {} diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/controller/response/NodeDetailsResponse.java b/app/src/main/java/ru/dragonestia/loadbalancer/controller/response/NodeDetailsResponse.java deleted file mode 100644 index 1906844..0000000 --- a/app/src/main/java/ru/dragonestia/loadbalancer/controller/response/NodeDetailsResponse.java +++ /dev/null @@ -1,5 +0,0 @@ -package ru.dragonestia.loadbalancer.controller.response; - -import ru.dragonestia.loadbalancer.model.Node; - -public record NodeDetailsResponse(Node node) {} diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/controller/response/NodeListResponse.java b/app/src/main/java/ru/dragonestia/loadbalancer/controller/response/NodeListResponse.java deleted file mode 100644 index 673eba2..0000000 --- a/app/src/main/java/ru/dragonestia/loadbalancer/controller/response/NodeListResponse.java +++ /dev/null @@ -1,7 +0,0 @@ -package ru.dragonestia.loadbalancer.controller.response; - -import ru.dragonestia.loadbalancer.model.Node; - -import java.util.List; - -public record NodeListResponse(List nodes) {} diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/LoadBalancerApplication.java b/app/src/main/java/ru/dragonestia/picker/LoadBalancerApplication.java similarity index 90% rename from app/src/main/java/ru/dragonestia/loadbalancer/LoadBalancerApplication.java rename to app/src/main/java/ru/dragonestia/picker/LoadBalancerApplication.java index ff6624a..b4ec39d 100644 --- a/app/src/main/java/ru/dragonestia/loadbalancer/LoadBalancerApplication.java +++ b/app/src/main/java/ru/dragonestia/picker/LoadBalancerApplication.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer; +package ru.dragonestia.picker; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/config/SecurityConfig.java b/app/src/main/java/ru/dragonestia/picker/config/SecurityConfig.java similarity index 96% rename from app/src/main/java/ru/dragonestia/loadbalancer/config/SecurityConfig.java rename to app/src/main/java/ru/dragonestia/picker/config/SecurityConfig.java index 6a84575..3d5b1b8 100644 --- a/app/src/main/java/ru/dragonestia/loadbalancer/config/SecurityConfig.java +++ b/app/src/main/java/ru/dragonestia/picker/config/SecurityConfig.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.config; +package ru.dragonestia.picker.config; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/config/TestConfig.java b/app/src/main/java/ru/dragonestia/picker/config/TestConfig.java similarity index 78% rename from app/src/main/java/ru/dragonestia/loadbalancer/config/TestConfig.java rename to app/src/main/java/ru/dragonestia/picker/config/TestConfig.java index 88315c0..cdafbf0 100644 --- a/app/src/main/java/ru/dragonestia/loadbalancer/config/TestConfig.java +++ b/app/src/main/java/ru/dragonestia/picker/config/TestConfig.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.config; +package ru.dragonestia.picker.config; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; @@ -7,17 +7,16 @@ import org.springframework.context.annotation.Profile; import org.springframework.lang.NonNull; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import ru.dragonestia.loadbalancer.interceptor.DebugInterceptor; -import ru.dragonestia.loadbalancer.model.Bucket; -import ru.dragonestia.loadbalancer.model.Node; -import ru.dragonestia.loadbalancer.model.User; -import ru.dragonestia.loadbalancer.model.type.LoadBalancingMethod; -import ru.dragonestia.loadbalancer.model.type.SlotLimit; -import ru.dragonestia.loadbalancer.repository.BucketRepository; -import ru.dragonestia.loadbalancer.repository.NodeRepository; -import ru.dragonestia.loadbalancer.repository.UserRepository; +import ru.dragonestia.picker.interceptor.DebugInterceptor; +import ru.dragonestia.picker.model.Bucket; +import ru.dragonestia.picker.model.Node; +import ru.dragonestia.picker.model.User; +import ru.dragonestia.picker.model.type.LoadBalancingMethod; +import ru.dragonestia.picker.model.type.SlotLimit; +import ru.dragonestia.picker.repository.BucketRepository; +import ru.dragonestia.picker.repository.NodeRepository; +import ru.dragonestia.picker.repository.UserRepository; -import java.security.SecureRandom; import java.util.List; import java.util.Random; import java.util.UUID; diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/controller/BucketController.java b/app/src/main/java/ru/dragonestia/picker/controller/BucketController.java similarity index 89% rename from app/src/main/java/ru/dragonestia/loadbalancer/controller/BucketController.java rename to app/src/main/java/ru/dragonestia/picker/controller/BucketController.java index e4f6f3f..6756fe2 100644 --- a/app/src/main/java/ru/dragonestia/loadbalancer/controller/BucketController.java +++ b/app/src/main/java/ru/dragonestia/picker/controller/BucketController.java @@ -1,17 +1,17 @@ -package ru.dragonestia.loadbalancer.controller; +package ru.dragonestia.picker.controller; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import ru.dragonestia.loadbalancer.controller.response.BucketInfoResponse; -import ru.dragonestia.loadbalancer.controller.response.BucketListResponse; -import ru.dragonestia.loadbalancer.controller.response.BucketRegisterResponse; -import ru.dragonestia.loadbalancer.model.Bucket; -import ru.dragonestia.loadbalancer.model.type.SlotLimit; -import ru.dragonestia.loadbalancer.service.BucketService; -import ru.dragonestia.loadbalancer.service.NodeService; -import ru.dragonestia.loadbalancer.util.NamingValidator; +import ru.dragonestia.picker.controller.response.BucketInfoResponse; +import ru.dragonestia.picker.controller.response.BucketListResponse; +import ru.dragonestia.picker.controller.response.BucketRegisterResponse; +import ru.dragonestia.picker.model.Bucket; +import ru.dragonestia.picker.model.type.SlotLimit; +import ru.dragonestia.picker.service.BucketService; +import ru.dragonestia.picker.service.NodeService; +import ru.dragonestia.picker.util.NamingValidator; import java.util.Objects; diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/controller/NodeController.java b/app/src/main/java/ru/dragonestia/picker/controller/NodeController.java similarity index 79% rename from app/src/main/java/ru/dragonestia/loadbalancer/controller/NodeController.java rename to app/src/main/java/ru/dragonestia/picker/controller/NodeController.java index 04334a1..48a3915 100644 --- a/app/src/main/java/ru/dragonestia/loadbalancer/controller/NodeController.java +++ b/app/src/main/java/ru/dragonestia/picker/controller/NodeController.java @@ -1,16 +1,16 @@ -package ru.dragonestia.loadbalancer.controller; +package ru.dragonestia.picker.controller; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatusCode; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import ru.dragonestia.loadbalancer.controller.response.NodeDetailsResponse; -import ru.dragonestia.loadbalancer.controller.response.NodeListResponse; -import ru.dragonestia.loadbalancer.controller.response.NodeRegisterResponse; -import ru.dragonestia.loadbalancer.model.Node; -import ru.dragonestia.loadbalancer.model.type.LoadBalancingMethod; -import ru.dragonestia.loadbalancer.service.NodeService; -import ru.dragonestia.loadbalancer.util.NamingValidator; +import ru.dragonestia.picker.controller.response.NodeDetailsResponse; +import ru.dragonestia.picker.controller.response.NodeListResponse; +import ru.dragonestia.picker.controller.response.NodeRegisterResponse; +import ru.dragonestia.picker.model.Node; +import ru.dragonestia.picker.model.type.LoadBalancingMethod; +import ru.dragonestia.picker.service.NodeService; +import ru.dragonestia.picker.util.NamingValidator; @RestController @RequestMapping("/nodes") diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/controller/UserBucketController.java b/app/src/main/java/ru/dragonestia/picker/controller/UserBucketController.java similarity index 84% rename from app/src/main/java/ru/dragonestia/loadbalancer/controller/UserBucketController.java rename to app/src/main/java/ru/dragonestia/picker/controller/UserBucketController.java index e06547d..3e2b564 100644 --- a/app/src/main/java/ru/dragonestia/loadbalancer/controller/UserBucketController.java +++ b/app/src/main/java/ru/dragonestia/picker/controller/UserBucketController.java @@ -1,22 +1,19 @@ -package ru.dragonestia.loadbalancer.controller; +package ru.dragonestia.picker.controller; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.function.EntityResponse; -import ru.dragonestia.loadbalancer.controller.response.BucketUserListResponse; -import ru.dragonestia.loadbalancer.controller.response.LinkUsersWithBucketResponse; -import ru.dragonestia.loadbalancer.model.Bucket; -import ru.dragonestia.loadbalancer.model.Node; -import ru.dragonestia.loadbalancer.model.User; -import ru.dragonestia.loadbalancer.service.BucketService; -import ru.dragonestia.loadbalancer.service.NodeService; -import ru.dragonestia.loadbalancer.service.UserService; -import ru.dragonestia.loadbalancer.util.NamingValidator; +import ru.dragonestia.picker.controller.response.BucketUserListResponse; +import ru.dragonestia.picker.controller.response.LinkUsersWithBucketResponse; +import ru.dragonestia.picker.model.Bucket; +import ru.dragonestia.picker.model.Node; +import ru.dragonestia.picker.model.User; +import ru.dragonestia.picker.service.BucketService; +import ru.dragonestia.picker.service.NodeService; +import ru.dragonestia.picker.service.UserService; +import ru.dragonestia.picker.util.NamingValidator; -import java.util.Collection; import java.util.LinkedList; -import java.util.List; import java.util.Objects; @RequiredArgsConstructor diff --git a/app/src/main/java/ru/dragonestia/picker/controller/response/BucketInfoResponse.java b/app/src/main/java/ru/dragonestia/picker/controller/response/BucketInfoResponse.java new file mode 100644 index 0000000..dbadee9 --- /dev/null +++ b/app/src/main/java/ru/dragonestia/picker/controller/response/BucketInfoResponse.java @@ -0,0 +1,5 @@ +package ru.dragonestia.picker.controller.response; + +import ru.dragonestia.picker.model.Bucket; + +public record BucketInfoResponse(Bucket bucket) {} diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketListResponse.java b/app/src/main/java/ru/dragonestia/picker/controller/response/BucketListResponse.java similarity index 75% rename from app/src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketListResponse.java rename to app/src/main/java/ru/dragonestia/picker/controller/response/BucketListResponse.java index 60c3728..6fbfe17 100644 --- a/app/src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketListResponse.java +++ b/app/src/main/java/ru/dragonestia/picker/controller/response/BucketListResponse.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.controller.response; +package ru.dragonestia.picker.controller.response; import java.util.List; diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketRegisterResponse.java b/app/src/main/java/ru/dragonestia/picker/controller/response/BucketRegisterResponse.java similarity index 56% rename from app/src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketRegisterResponse.java rename to app/src/main/java/ru/dragonestia/picker/controller/response/BucketRegisterResponse.java index f6c392b..7929707 100644 --- a/app/src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketRegisterResponse.java +++ b/app/src/main/java/ru/dragonestia/picker/controller/response/BucketRegisterResponse.java @@ -1,3 +1,3 @@ -package ru.dragonestia.loadbalancer.controller.response; +package ru.dragonestia.picker.controller.response; public record BucketRegisterResponse(boolean success, String message) {} diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketUserListResponse.java b/app/src/main/java/ru/dragonestia/picker/controller/response/BucketUserListResponse.java similarity index 51% rename from app/src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketUserListResponse.java rename to app/src/main/java/ru/dragonestia/picker/controller/response/BucketUserListResponse.java index da0b124..663d200 100644 --- a/app/src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketUserListResponse.java +++ b/app/src/main/java/ru/dragonestia/picker/controller/response/BucketUserListResponse.java @@ -1,6 +1,6 @@ -package ru.dragonestia.loadbalancer.controller.response; +package ru.dragonestia.picker.controller.response; -import ru.dragonestia.loadbalancer.model.User; +import ru.dragonestia.picker.model.User; import java.util.List; diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/controller/response/LinkUsersWithBucketResponse.java b/app/src/main/java/ru/dragonestia/picker/controller/response/LinkUsersWithBucketResponse.java similarity index 58% rename from app/src/main/java/ru/dragonestia/loadbalancer/controller/response/LinkUsersWithBucketResponse.java rename to app/src/main/java/ru/dragonestia/picker/controller/response/LinkUsersWithBucketResponse.java index db453cf..a434733 100644 --- a/app/src/main/java/ru/dragonestia/loadbalancer/controller/response/LinkUsersWithBucketResponse.java +++ b/app/src/main/java/ru/dragonestia/picker/controller/response/LinkUsersWithBucketResponse.java @@ -1,3 +1,3 @@ -package ru.dragonestia.loadbalancer.controller.response; +package ru.dragonestia.picker.controller.response; public record LinkUsersWithBucketResponse(boolean success, String message) {} diff --git a/app/src/main/java/ru/dragonestia/picker/controller/response/NodeDetailsResponse.java b/app/src/main/java/ru/dragonestia/picker/controller/response/NodeDetailsResponse.java new file mode 100644 index 0000000..8be98b2 --- /dev/null +++ b/app/src/main/java/ru/dragonestia/picker/controller/response/NodeDetailsResponse.java @@ -0,0 +1,5 @@ +package ru.dragonestia.picker.controller.response; + +import ru.dragonestia.picker.model.Node; + +public record NodeDetailsResponse(Node node) {} diff --git a/app/src/main/java/ru/dragonestia/picker/controller/response/NodeListResponse.java b/app/src/main/java/ru/dragonestia/picker/controller/response/NodeListResponse.java new file mode 100644 index 0000000..f85b04c --- /dev/null +++ b/app/src/main/java/ru/dragonestia/picker/controller/response/NodeListResponse.java @@ -0,0 +1,7 @@ +package ru.dragonestia.picker.controller.response; + +import ru.dragonestia.picker.model.Node; + +import java.util.List; + +public record NodeListResponse(List nodes) {} diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/controller/response/NodeRegisterResponse.java b/app/src/main/java/ru/dragonestia/picker/controller/response/NodeRegisterResponse.java similarity index 55% rename from app/src/main/java/ru/dragonestia/loadbalancer/controller/response/NodeRegisterResponse.java rename to app/src/main/java/ru/dragonestia/picker/controller/response/NodeRegisterResponse.java index 62d843c..3f30dd6 100644 --- a/app/src/main/java/ru/dragonestia/loadbalancer/controller/response/NodeRegisterResponse.java +++ b/app/src/main/java/ru/dragonestia/picker/controller/response/NodeRegisterResponse.java @@ -1,3 +1,3 @@ -package ru.dragonestia.loadbalancer.controller.response; +package ru.dragonestia.picker.controller.response; public record NodeRegisterResponse(boolean success, String message) {} diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/interceptor/DebugInterceptor.java b/app/src/main/java/ru/dragonestia/picker/interceptor/DebugInterceptor.java similarity index 94% rename from app/src/main/java/ru/dragonestia/loadbalancer/interceptor/DebugInterceptor.java rename to app/src/main/java/ru/dragonestia/picker/interceptor/DebugInterceptor.java index 1acbb1b..9484031 100644 --- a/app/src/main/java/ru/dragonestia/loadbalancer/interceptor/DebugInterceptor.java +++ b/app/src/main/java/ru/dragonestia/picker/interceptor/DebugInterceptor.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.interceptor; +package ru.dragonestia.picker.interceptor; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/model/Bucket.java b/app/src/main/java/ru/dragonestia/picker/model/Bucket.java similarity index 92% rename from app/src/main/java/ru/dragonestia/loadbalancer/model/Bucket.java rename to app/src/main/java/ru/dragonestia/picker/model/Bucket.java index 2f00b41..abc04a1 100644 --- a/app/src/main/java/ru/dragonestia/loadbalancer/model/Bucket.java +++ b/app/src/main/java/ru/dragonestia/picker/model/Bucket.java @@ -1,9 +1,9 @@ -package ru.dragonestia.loadbalancer.model; +package ru.dragonestia.picker.model; import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; -import ru.dragonestia.loadbalancer.model.type.SlotLimit; +import ru.dragonestia.picker.model.type.SlotLimit; @Getter @RequiredArgsConstructor(access = AccessLevel.PRIVATE) diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/model/Node.java b/app/src/main/java/ru/dragonestia/picker/model/Node.java similarity index 81% rename from app/src/main/java/ru/dragonestia/loadbalancer/model/Node.java rename to app/src/main/java/ru/dragonestia/picker/model/Node.java index a7085a0..ff945d4 100644 --- a/app/src/main/java/ru/dragonestia/loadbalancer/model/Node.java +++ b/app/src/main/java/ru/dragonestia/picker/model/Node.java @@ -1,7 +1,7 @@ -package ru.dragonestia.loadbalancer.model; +package ru.dragonestia.picker.model; import lombok.NonNull; -import ru.dragonestia.loadbalancer.model.type.LoadBalancingMethod; +import ru.dragonestia.picker.model.type.LoadBalancingMethod; public record Node(@NonNull String identifier, @NonNull LoadBalancingMethod method) { diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/model/User.java b/app/src/main/java/ru/dragonestia/picker/model/User.java similarity index 91% rename from app/src/main/java/ru/dragonestia/loadbalancer/model/User.java rename to app/src/main/java/ru/dragonestia/picker/model/User.java index 7ba7bef..72deadd 100644 --- a/app/src/main/java/ru/dragonestia/loadbalancer/model/User.java +++ b/app/src/main/java/ru/dragonestia/picker/model/User.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.model; +package ru.dragonestia.picker.model; import lombok.NonNull; diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/model/type/LoadBalancingMethod.java b/app/src/main/java/ru/dragonestia/picker/model/type/LoadBalancingMethod.java similarity index 66% rename from app/src/main/java/ru/dragonestia/loadbalancer/model/type/LoadBalancingMethod.java rename to app/src/main/java/ru/dragonestia/picker/model/type/LoadBalancingMethod.java index 682cc28..7053704 100644 --- a/app/src/main/java/ru/dragonestia/loadbalancer/model/type/LoadBalancingMethod.java +++ b/app/src/main/java/ru/dragonestia/picker/model/type/LoadBalancingMethod.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.model.type; +package ru.dragonestia.picker.model.type; public enum LoadBalancingMethod { SEQUENTIAL_FILLING, diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/model/type/SlotLimit.java b/app/src/main/java/ru/dragonestia/picker/model/type/SlotLimit.java similarity index 91% rename from app/src/main/java/ru/dragonestia/loadbalancer/model/type/SlotLimit.java rename to app/src/main/java/ru/dragonestia/picker/model/type/SlotLimit.java index 0e448f5..62e419b 100644 --- a/app/src/main/java/ru/dragonestia/loadbalancer/model/type/SlotLimit.java +++ b/app/src/main/java/ru/dragonestia/picker/model/type/SlotLimit.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.model.type; +package ru.dragonestia.picker.model.type; import lombok.Getter; diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/repository/BucketRepository.java b/app/src/main/java/ru/dragonestia/picker/repository/BucketRepository.java similarity index 76% rename from app/src/main/java/ru/dragonestia/loadbalancer/repository/BucketRepository.java rename to app/src/main/java/ru/dragonestia/picker/repository/BucketRepository.java index ee20e23..70e2987 100644 --- a/app/src/main/java/ru/dragonestia/loadbalancer/repository/BucketRepository.java +++ b/app/src/main/java/ru/dragonestia/picker/repository/BucketRepository.java @@ -1,8 +1,8 @@ -package ru.dragonestia.loadbalancer.repository; +package ru.dragonestia.picker.repository; -import ru.dragonestia.loadbalancer.model.Bucket; -import ru.dragonestia.loadbalancer.model.Node; -import ru.dragonestia.loadbalancer.model.User; +import ru.dragonestia.picker.model.Bucket; +import ru.dragonestia.picker.model.Node; +import ru.dragonestia.picker.model.User; import java.util.Collection; import java.util.List; diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/repository/NodeRepository.java b/app/src/main/java/ru/dragonestia/picker/repository/NodeRepository.java similarity index 70% rename from app/src/main/java/ru/dragonestia/loadbalancer/repository/NodeRepository.java rename to app/src/main/java/ru/dragonestia/picker/repository/NodeRepository.java index 7f9cec8..4a17467 100644 --- a/app/src/main/java/ru/dragonestia/loadbalancer/repository/NodeRepository.java +++ b/app/src/main/java/ru/dragonestia/picker/repository/NodeRepository.java @@ -1,6 +1,6 @@ -package ru.dragonestia.loadbalancer.repository; +package ru.dragonestia.picker.repository; -import ru.dragonestia.loadbalancer.model.Node; +import ru.dragonestia.picker.model.Node; import java.util.List; import java.util.Optional; diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/repository/UserRepository.java b/app/src/main/java/ru/dragonestia/picker/repository/UserRepository.java similarity index 73% rename from app/src/main/java/ru/dragonestia/loadbalancer/repository/UserRepository.java rename to app/src/main/java/ru/dragonestia/picker/repository/UserRepository.java index 3840460..a02c6ea 100644 --- a/app/src/main/java/ru/dragonestia/loadbalancer/repository/UserRepository.java +++ b/app/src/main/java/ru/dragonestia/picker/repository/UserRepository.java @@ -1,7 +1,7 @@ -package ru.dragonestia.loadbalancer.repository; +package ru.dragonestia.picker.repository; -import ru.dragonestia.loadbalancer.model.Bucket; -import ru.dragonestia.loadbalancer.model.User; +import ru.dragonestia.picker.model.Bucket; +import ru.dragonestia.picker.model.User; import java.util.Collection; import java.util.List; diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/repository/impl/BucketRepositoryImpl.java b/app/src/main/java/ru/dragonestia/picker/repository/impl/BucketRepositoryImpl.java similarity index 93% rename from app/src/main/java/ru/dragonestia/loadbalancer/repository/impl/BucketRepositoryImpl.java rename to app/src/main/java/ru/dragonestia/picker/repository/impl/BucketRepositoryImpl.java index 31a4769..c23d854 100644 --- a/app/src/main/java/ru/dragonestia/loadbalancer/repository/impl/BucketRepositoryImpl.java +++ b/app/src/main/java/ru/dragonestia/picker/repository/impl/BucketRepositoryImpl.java @@ -1,12 +1,12 @@ -package ru.dragonestia.loadbalancer.repository.impl; +package ru.dragonestia.picker.repository.impl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; -import ru.dragonestia.loadbalancer.model.Bucket; -import ru.dragonestia.loadbalancer.model.Node; -import ru.dragonestia.loadbalancer.model.User; -import ru.dragonestia.loadbalancer.repository.BucketRepository; -import ru.dragonestia.loadbalancer.repository.UserRepository; +import ru.dragonestia.picker.model.Bucket; +import ru.dragonestia.picker.model.Node; +import ru.dragonestia.picker.model.User; +import ru.dragonestia.picker.repository.BucketRepository; +import ru.dragonestia.picker.repository.UserRepository; import java.util.*; import java.util.concurrent.ConcurrentHashMap; diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/repository/impl/NodeRepositoryImpl.java b/app/src/main/java/ru/dragonestia/picker/repository/impl/NodeRepositoryImpl.java similarity index 85% rename from app/src/main/java/ru/dragonestia/loadbalancer/repository/impl/NodeRepositoryImpl.java rename to app/src/main/java/ru/dragonestia/picker/repository/impl/NodeRepositoryImpl.java index e3d5db1..b45a0ac 100644 --- a/app/src/main/java/ru/dragonestia/loadbalancer/repository/impl/NodeRepositoryImpl.java +++ b/app/src/main/java/ru/dragonestia/picker/repository/impl/NodeRepositoryImpl.java @@ -1,10 +1,10 @@ -package ru.dragonestia.loadbalancer.repository.impl; +package ru.dragonestia.picker.repository.impl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; -import ru.dragonestia.loadbalancer.model.Node; -import ru.dragonestia.loadbalancer.repository.BucketRepository; -import ru.dragonestia.loadbalancer.repository.NodeRepository; +import ru.dragonestia.picker.model.Node; +import ru.dragonestia.picker.repository.BucketRepository; +import ru.dragonestia.picker.repository.NodeRepository; import java.util.List; import java.util.Map; diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/repository/impl/UserRepositoryImpl.java b/app/src/main/java/ru/dragonestia/picker/repository/impl/UserRepositoryImpl.java similarity index 94% rename from app/src/main/java/ru/dragonestia/loadbalancer/repository/impl/UserRepositoryImpl.java rename to app/src/main/java/ru/dragonestia/picker/repository/impl/UserRepositoryImpl.java index ff91693..655134c 100644 --- a/app/src/main/java/ru/dragonestia/loadbalancer/repository/impl/UserRepositoryImpl.java +++ b/app/src/main/java/ru/dragonestia/picker/repository/impl/UserRepositoryImpl.java @@ -1,9 +1,9 @@ -package ru.dragonestia.loadbalancer.repository.impl; +package ru.dragonestia.picker.repository.impl; import org.springframework.stereotype.Repository; -import ru.dragonestia.loadbalancer.model.Bucket; -import ru.dragonestia.loadbalancer.model.User; -import ru.dragonestia.loadbalancer.repository.UserRepository; +import ru.dragonestia.picker.model.Bucket; +import ru.dragonestia.picker.model.User; +import ru.dragonestia.picker.repository.UserRepository; import java.util.*; import java.util.concurrent.ConcurrentHashMap; diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/service/BucketService.java b/app/src/main/java/ru/dragonestia/picker/service/BucketService.java similarity index 72% rename from app/src/main/java/ru/dragonestia/loadbalancer/service/BucketService.java rename to app/src/main/java/ru/dragonestia/picker/service/BucketService.java index e9a4f91..da0cfb6 100644 --- a/app/src/main/java/ru/dragonestia/loadbalancer/service/BucketService.java +++ b/app/src/main/java/ru/dragonestia/picker/service/BucketService.java @@ -1,8 +1,8 @@ -package ru.dragonestia.loadbalancer.service; +package ru.dragonestia.picker.service; -import ru.dragonestia.loadbalancer.model.Bucket; -import ru.dragonestia.loadbalancer.model.Node; -import ru.dragonestia.loadbalancer.model.User; +import ru.dragonestia.picker.model.Bucket; +import ru.dragonestia.picker.model.Node; +import ru.dragonestia.picker.model.User; import java.util.List; import java.util.Optional; diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/service/NodeService.java b/app/src/main/java/ru/dragonestia/picker/service/NodeService.java similarity index 71% rename from app/src/main/java/ru/dragonestia/loadbalancer/service/NodeService.java rename to app/src/main/java/ru/dragonestia/picker/service/NodeService.java index fac6745..33f125b 100644 --- a/app/src/main/java/ru/dragonestia/loadbalancer/service/NodeService.java +++ b/app/src/main/java/ru/dragonestia/picker/service/NodeService.java @@ -1,6 +1,6 @@ -package ru.dragonestia.loadbalancer.service; +package ru.dragonestia.picker.service; -import ru.dragonestia.loadbalancer.model.Node; +import ru.dragonestia.picker.model.Node; import java.util.List; import java.util.Optional; diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/service/UserService.java b/app/src/main/java/ru/dragonestia/picker/service/UserService.java similarity index 70% rename from app/src/main/java/ru/dragonestia/loadbalancer/service/UserService.java rename to app/src/main/java/ru/dragonestia/picker/service/UserService.java index 2ba4306..50425e9 100644 --- a/app/src/main/java/ru/dragonestia/loadbalancer/service/UserService.java +++ b/app/src/main/java/ru/dragonestia/picker/service/UserService.java @@ -1,7 +1,7 @@ -package ru.dragonestia.loadbalancer.service; +package ru.dragonestia.picker.service; -import ru.dragonestia.loadbalancer.model.Bucket; -import ru.dragonestia.loadbalancer.model.User; +import ru.dragonestia.picker.model.Bucket; +import ru.dragonestia.picker.model.User; import java.util.Collection; import java.util.List; diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/service/impl/BucketServiceImpl.java b/app/src/main/java/ru/dragonestia/picker/service/impl/BucketServiceImpl.java similarity index 76% rename from app/src/main/java/ru/dragonestia/loadbalancer/service/impl/BucketServiceImpl.java rename to app/src/main/java/ru/dragonestia/picker/service/impl/BucketServiceImpl.java index 7f349c4..0a795ce 100644 --- a/app/src/main/java/ru/dragonestia/loadbalancer/service/impl/BucketServiceImpl.java +++ b/app/src/main/java/ru/dragonestia/picker/service/impl/BucketServiceImpl.java @@ -1,13 +1,13 @@ -package ru.dragonestia.loadbalancer.service.impl; +package ru.dragonestia.picker.service.impl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import ru.dragonestia.loadbalancer.model.Bucket; -import ru.dragonestia.loadbalancer.model.Node; -import ru.dragonestia.loadbalancer.model.User; -import ru.dragonestia.loadbalancer.repository.BucketRepository; -import ru.dragonestia.loadbalancer.service.BucketService; -import ru.dragonestia.loadbalancer.util.NamingValidator; +import ru.dragonestia.picker.model.Bucket; +import ru.dragonestia.picker.model.Node; +import ru.dragonestia.picker.model.User; +import ru.dragonestia.picker.repository.BucketRepository; +import ru.dragonestia.picker.service.BucketService; +import ru.dragonestia.picker.util.NamingValidator; import java.util.List; import java.util.Optional; diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/service/impl/NodeServiceImpl.java b/app/src/main/java/ru/dragonestia/picker/service/impl/NodeServiceImpl.java similarity index 75% rename from app/src/main/java/ru/dragonestia/loadbalancer/service/impl/NodeServiceImpl.java rename to app/src/main/java/ru/dragonestia/picker/service/impl/NodeServiceImpl.java index 389cd7c..94fe864 100644 --- a/app/src/main/java/ru/dragonestia/loadbalancer/service/impl/NodeServiceImpl.java +++ b/app/src/main/java/ru/dragonestia/picker/service/impl/NodeServiceImpl.java @@ -1,11 +1,11 @@ -package ru.dragonestia.loadbalancer.service.impl; +package ru.dragonestia.picker.service.impl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import ru.dragonestia.loadbalancer.model.Node; -import ru.dragonestia.loadbalancer.repository.NodeRepository; -import ru.dragonestia.loadbalancer.service.NodeService; -import ru.dragonestia.loadbalancer.util.NamingValidator; +import ru.dragonestia.picker.model.Node; +import ru.dragonestia.picker.repository.NodeRepository; +import ru.dragonestia.picker.service.NodeService; +import ru.dragonestia.picker.util.NamingValidator; import java.util.List; import java.util.Optional; diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/service/impl/UserServiceImpl.java b/app/src/main/java/ru/dragonestia/picker/service/impl/UserServiceImpl.java similarity index 76% rename from app/src/main/java/ru/dragonestia/loadbalancer/service/impl/UserServiceImpl.java rename to app/src/main/java/ru/dragonestia/picker/service/impl/UserServiceImpl.java index 8879063..21e16d0 100644 --- a/app/src/main/java/ru/dragonestia/loadbalancer/service/impl/UserServiceImpl.java +++ b/app/src/main/java/ru/dragonestia/picker/service/impl/UserServiceImpl.java @@ -1,11 +1,11 @@ -package ru.dragonestia.loadbalancer.service.impl; +package ru.dragonestia.picker.service.impl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import ru.dragonestia.loadbalancer.model.Bucket; -import ru.dragonestia.loadbalancer.model.User; -import ru.dragonestia.loadbalancer.repository.UserRepository; -import ru.dragonestia.loadbalancer.service.UserService; +import ru.dragonestia.picker.model.Bucket; +import ru.dragonestia.picker.model.User; +import ru.dragonestia.picker.repository.UserRepository; +import ru.dragonestia.picker.service.UserService; import java.util.Collection; import java.util.List; diff --git a/app/src/main/java/ru/dragonestia/loadbalancer/util/NamingValidator.java b/app/src/main/java/ru/dragonestia/picker/util/NamingValidator.java similarity index 91% rename from app/src/main/java/ru/dragonestia/loadbalancer/util/NamingValidator.java rename to app/src/main/java/ru/dragonestia/picker/util/NamingValidator.java index cb644ce..4b83a2f 100644 --- a/app/src/main/java/ru/dragonestia/loadbalancer/util/NamingValidator.java +++ b/app/src/main/java/ru/dragonestia/picker/util/NamingValidator.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.util; +package ru.dragonestia.picker.util; import lombok.experimental.UtilityClass; diff --git a/app/src/test/java/ru/dragonestia/loadbalancer/LoadBalancerApplicationTests.java b/app/src/test/java/ru/dragonestia/picker/LoadBalancerApplicationTests.java similarity index 84% rename from app/src/test/java/ru/dragonestia/loadbalancer/LoadBalancerApplicationTests.java rename to app/src/test/java/ru/dragonestia/picker/LoadBalancerApplicationTests.java index dbe81de..6b9b6b8 100644 --- a/app/src/test/java/ru/dragonestia/loadbalancer/LoadBalancerApplicationTests.java +++ b/app/src/test/java/ru/dragonestia/picker/LoadBalancerApplicationTests.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer; +package ru.dragonestia.picker; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; diff --git a/app/src/test/java/ru/dragonestia/loadbalancer/service/BucketServiceTest.java b/app/src/test/java/ru/dragonestia/picker/service/BucketServiceTest.java similarity index 76% rename from app/src/test/java/ru/dragonestia/loadbalancer/service/BucketServiceTest.java rename to app/src/test/java/ru/dragonestia/picker/service/BucketServiceTest.java index 3b573f9..ab63647 100644 --- a/app/src/test/java/ru/dragonestia/loadbalancer/service/BucketServiceTest.java +++ b/app/src/test/java/ru/dragonestia/picker/service/BucketServiceTest.java @@ -1,12 +1,12 @@ -package ru.dragonestia.loadbalancer.service; +package ru.dragonestia.picker.service; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import ru.dragonestia.loadbalancer.model.Bucket; -import ru.dragonestia.loadbalancer.model.Node; -import ru.dragonestia.loadbalancer.model.type.LoadBalancingMethod; -import ru.dragonestia.loadbalancer.model.type.SlotLimit; +import ru.dragonestia.picker.model.Bucket; +import ru.dragonestia.picker.model.Node; +import ru.dragonestia.picker.model.type.LoadBalancingMethod; +import ru.dragonestia.picker.model.type.SlotLimit; import java.util.HashMap; diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/BucketInfoResponse.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/BucketInfoResponse.java deleted file mode 100644 index a886db8..0000000 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/BucketInfoResponse.java +++ /dev/null @@ -1,5 +0,0 @@ -package ru.dragonestia.loadbalancer.cp.repository.impl.response; - -import ru.dragonestia.loadbalancer.cp.model.Bucket; - -public record BucketInfoResponse(Bucket bucket) {} diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/BucketListResponse.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/BucketListResponse.java deleted file mode 100644 index 9c39d7d..0000000 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/BucketListResponse.java +++ /dev/null @@ -1,7 +0,0 @@ -package ru.dragonestia.loadbalancer.cp.repository.impl.response; - -import ru.dragonestia.loadbalancer.cp.model.dto.BucketDTO; - -import java.util.List; - -public record BucketListResponse(String node, List buckets) {} diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/BucketUserListResponse.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/BucketUserListResponse.java deleted file mode 100644 index 0b92d98..0000000 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/BucketUserListResponse.java +++ /dev/null @@ -1,7 +0,0 @@ -package ru.dragonestia.loadbalancer.cp.repository.impl.response; - -import ru.dragonestia.loadbalancer.cp.model.User; - -import java.util.List; - -public record BucketUserListResponse(int slots, int usedSlots, List users) {} diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/NodeDetailsResponse.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/NodeDetailsResponse.java deleted file mode 100644 index 78eff75..0000000 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/NodeDetailsResponse.java +++ /dev/null @@ -1,5 +0,0 @@ -package ru.dragonestia.loadbalancer.cp.repository.impl.response; - -import ru.dragonestia.loadbalancer.cp.model.Node; - -public record NodeDetailsResponse(Node node) {} diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/NodeListResponse.java b/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/NodeListResponse.java deleted file mode 100644 index 7d6073e..0000000 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/NodeListResponse.java +++ /dev/null @@ -1,7 +0,0 @@ -package ru.dragonestia.loadbalancer.cp.repository.impl.response; - -import ru.dragonestia.loadbalancer.cp.model.Node; - -import java.util.List; - -public record NodeListResponse(List nodes) {} diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/LoadBalancerControlPanelApplication.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/LoadBalancerControlPanelApplication.java similarity index 89% rename from control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/LoadBalancerControlPanelApplication.java rename to control-panel/src/main/java/ru/dragonestia/picker/cp/LoadBalancerControlPanelApplication.java index d8bdb2f..0c0b015 100644 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/LoadBalancerControlPanelApplication.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/LoadBalancerControlPanelApplication.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.cp; +package ru.dragonestia.picker.cp; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/AddUsers.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/component/AddUsers.java similarity index 95% rename from control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/AddUsers.java rename to control-panel/src/main/java/ru/dragonestia/picker/cp/component/AddUsers.java index 1bd6096..2a19dc9 100644 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/AddUsers.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/component/AddUsers.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.cp.component; +package ru.dragonestia.picker.cp.component; import com.vaadin.flow.component.Unit; import com.vaadin.flow.component.button.Button; @@ -12,8 +12,8 @@ import com.vaadin.flow.component.icon.VaadinIcon; import com.vaadin.flow.component.orderedlayout.VerticalLayout; import com.vaadin.flow.component.textfield.TextField; import lombok.Getter; -import ru.dragonestia.loadbalancer.cp.model.Bucket; -import ru.dragonestia.loadbalancer.cp.model.User; +import ru.dragonestia.picker.cp.model.Bucket; +import ru.dragonestia.picker.cp.model.User; import java.util.List; diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/BucketList.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/component/BucketList.java similarity index 98% rename from control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/BucketList.java rename to control-panel/src/main/java/ru/dragonestia/picker/cp/component/BucketList.java index bd83f6e..599eba0 100644 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/BucketList.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/component/BucketList.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.cp.component; +package ru.dragonestia.picker.cp.component; import com.vaadin.flow.component.button.Button; import com.vaadin.flow.component.button.ButtonVariant; @@ -16,7 +16,7 @@ import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.component.orderedlayout.VerticalLayout; import com.vaadin.flow.component.textfield.TextField; import lombok.Setter; -import ru.dragonestia.loadbalancer.cp.model.dto.BucketDTO; +import ru.dragonestia.picker.cp.model.dto.BucketDTO; import java.util.List; import java.util.function.Consumer; diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/NavPath.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/component/NavPath.java similarity index 97% rename from control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/NavPath.java rename to control-panel/src/main/java/ru/dragonestia/picker/cp/component/NavPath.java index 4e13138..7b1bba1 100644 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/NavPath.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/component/NavPath.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.cp.component; +package ru.dragonestia.picker.cp.component; import com.vaadin.flow.component.Component; import com.vaadin.flow.component.button.Button; diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/NodeList.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/component/NodeList.java similarity index 97% rename from control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/NodeList.java rename to control-panel/src/main/java/ru/dragonestia/picker/cp/component/NodeList.java index b730c02..6ef198a 100644 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/NodeList.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/component/NodeList.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.cp.component; +package ru.dragonestia.picker.cp.component; import com.vaadin.flow.component.button.Button; import com.vaadin.flow.component.button.ButtonVariant; @@ -14,7 +14,7 @@ import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.component.orderedlayout.VerticalLayout; import com.vaadin.flow.component.textfield.TextField; import lombok.Setter; -import ru.dragonestia.loadbalancer.cp.model.Node; +import ru.dragonestia.picker.cp.model.Node; import java.util.List; import java.util.function.Consumer; diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/RegisterBucket.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/component/RegisterBucket.java similarity index 95% rename from control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/RegisterBucket.java rename to control-panel/src/main/java/ru/dragonestia/picker/cp/component/RegisterBucket.java index 8d51e25..0d5bfee 100644 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/RegisterBucket.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/component/RegisterBucket.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.cp.component; +package ru.dragonestia.picker.cp.component; import com.vaadin.flow.component.Unit; import com.vaadin.flow.component.button.Button; @@ -13,9 +13,9 @@ import com.vaadin.flow.component.textfield.Autocomplete; import com.vaadin.flow.component.textfield.TextArea; import com.vaadin.flow.component.textfield.TextField; import org.springframework.lang.Nullable; -import ru.dragonestia.loadbalancer.cp.model.Bucket; -import ru.dragonestia.loadbalancer.cp.model.Node; -import ru.dragonestia.loadbalancer.cp.model.type.SlotLimit; +import ru.dragonestia.picker.cp.model.Bucket; +import ru.dragonestia.picker.cp.model.Node; +import ru.dragonestia.picker.cp.model.type.SlotLimit; import java.util.function.Function; diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/RegisterNode.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/component/RegisterNode.java similarity index 96% rename from control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/RegisterNode.java rename to control-panel/src/main/java/ru/dragonestia/picker/cp/component/RegisterNode.java index e0fa9c4..3cf7be4 100644 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/RegisterNode.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/component/RegisterNode.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.cp.component; +package ru.dragonestia.picker.cp.component; import com.vaadin.flow.component.Component; import com.vaadin.flow.component.Unit; @@ -16,8 +16,8 @@ import com.vaadin.flow.component.textfield.Autocomplete; import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.data.renderer.ComponentRenderer; import org.springframework.lang.Nullable; -import ru.dragonestia.loadbalancer.cp.model.Node; -import ru.dragonestia.loadbalancer.cp.model.type.LoadBalancingMethod; +import ru.dragonestia.picker.cp.model.Node; +import ru.dragonestia.picker.cp.model.type.LoadBalancingMethod; import java.util.function.Function; diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/UserList.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/component/UserList.java similarity index 90% rename from control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/UserList.java rename to control-panel/src/main/java/ru/dragonestia/picker/cp/component/UserList.java index 8671834..0f3d9f3 100644 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/UserList.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/component/UserList.java @@ -1,11 +1,11 @@ -package ru.dragonestia.loadbalancer.cp.component; +package ru.dragonestia.picker.cp.component; import com.vaadin.flow.component.grid.ColumnTextAlign; import com.vaadin.flow.component.grid.Grid; import com.vaadin.flow.component.html.Span; import com.vaadin.flow.component.orderedlayout.VerticalLayout; -import ru.dragonestia.loadbalancer.cp.model.Bucket; -import ru.dragonestia.loadbalancer.cp.model.User; +import ru.dragonestia.picker.cp.model.Bucket; +import ru.dragonestia.picker.cp.model.User; import java.util.ArrayList; import java.util.List; diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/config/RestApiConfig.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/config/RestApiConfig.java similarity index 92% rename from control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/config/RestApiConfig.java rename to control-panel/src/main/java/ru/dragonestia/picker/cp/config/RestApiConfig.java index 624f20b..51cf8ad 100644 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/config/RestApiConfig.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/config/RestApiConfig.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.cp.config; +package ru.dragonestia.picker.cp.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.web.client.RestTemplateBuilder; diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/config/ServerConfig.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/config/ServerConfig.java similarity index 89% rename from control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/config/ServerConfig.java rename to control-panel/src/main/java/ru/dragonestia/picker/cp/config/ServerConfig.java index cb8dba9..8800fd9 100644 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/config/ServerConfig.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/config/ServerConfig.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.cp.config; +package ru.dragonestia.picker.cp.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/Bucket.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/model/Bucket.java similarity index 95% rename from control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/Bucket.java rename to control-panel/src/main/java/ru/dragonestia/picker/cp/model/Bucket.java index 1f66e83..87cf600 100644 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/Bucket.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/model/Bucket.java @@ -1,9 +1,9 @@ -package ru.dragonestia.loadbalancer.cp.model; +package ru.dragonestia.picker.cp.model; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; -import ru.dragonestia.loadbalancer.cp.model.type.SlotLimit; +import ru.dragonestia.picker.cp.model.type.SlotLimit; import java.net.URI; diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/Node.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/model/Node.java similarity index 82% rename from control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/Node.java rename to control-panel/src/main/java/ru/dragonestia/picker/cp/model/Node.java index 6c23b1c..f6dc48d 100644 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/Node.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/model/Node.java @@ -1,7 +1,7 @@ -package ru.dragonestia.loadbalancer.cp.model; +package ru.dragonestia.picker.cp.model; import lombok.NonNull; -import ru.dragonestia.loadbalancer.cp.model.type.LoadBalancingMethod; +import ru.dragonestia.picker.cp.model.type.LoadBalancingMethod; import java.io.Serializable; diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/User.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/model/User.java similarity index 90% rename from control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/User.java rename to control-panel/src/main/java/ru/dragonestia/picker/cp/model/User.java index 1d2493a..4f47d18 100644 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/User.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/model/User.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.cp.model; +package ru.dragonestia.picker.cp.model; import lombok.NonNull; diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/dto/BucketDTO.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/model/dto/BucketDTO.java similarity index 75% rename from control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/dto/BucketDTO.java rename to control-panel/src/main/java/ru/dragonestia/picker/cp/model/dto/BucketDTO.java index 7f33a1d..1131576 100644 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/dto/BucketDTO.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/model/dto/BucketDTO.java @@ -1,6 +1,6 @@ -package ru.dragonestia.loadbalancer.cp.model.dto; +package ru.dragonestia.picker.cp.model.dto; -import ru.dragonestia.loadbalancer.cp.model.Node; +import ru.dragonestia.picker.cp.model.Node; import java.net.URI; diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/type/LoadBalancingMethod.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/model/type/LoadBalancingMethod.java similarity index 84% rename from control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/type/LoadBalancingMethod.java rename to control-panel/src/main/java/ru/dragonestia/picker/cp/model/type/LoadBalancingMethod.java index a99b583..51de23a 100644 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/type/LoadBalancingMethod.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/model/type/LoadBalancingMethod.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.cp.model.type; +package ru.dragonestia.picker.cp.model.type; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/type/SlotLimit.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/model/type/SlotLimit.java similarity index 88% rename from control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/type/SlotLimit.java rename to control-panel/src/main/java/ru/dragonestia/picker/cp/model/type/SlotLimit.java index 0184b62..ed74737 100644 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/type/SlotLimit.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/model/type/SlotLimit.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.cp.model.type; +package ru.dragonestia.picker.cp.model.type; import java.beans.Transient; diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/page/BucketDetailsPage.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/page/BucketDetailsPage.java similarity index 91% rename from control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/page/BucketDetailsPage.java rename to control-panel/src/main/java/ru/dragonestia/picker/cp/page/BucketDetailsPage.java index dd1a556..79abfb0 100644 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/page/BucketDetailsPage.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/page/BucketDetailsPage.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.cp.page; +package ru.dragonestia.picker.cp.page; import com.vaadin.flow.component.Html; import com.vaadin.flow.component.Unit; @@ -16,14 +16,14 @@ import com.vaadin.flow.router.BeforeEnterEvent; import com.vaadin.flow.router.BeforeEnterObserver; import com.vaadin.flow.router.Route; import org.springframework.beans.factory.annotation.Autowired; -import ru.dragonestia.loadbalancer.cp.component.AddUsers; -import ru.dragonestia.loadbalancer.cp.component.NavPath; -import ru.dragonestia.loadbalancer.cp.component.UserList; -import ru.dragonestia.loadbalancer.cp.model.Bucket; -import ru.dragonestia.loadbalancer.cp.model.Node; -import ru.dragonestia.loadbalancer.cp.repository.BucketRepository; -import ru.dragonestia.loadbalancer.cp.repository.NodeRepository; -import ru.dragonestia.loadbalancer.cp.repository.UserRepository; +import ru.dragonestia.picker.cp.component.AddUsers; +import ru.dragonestia.picker.cp.component.NavPath; +import ru.dragonestia.picker.cp.component.UserList; +import ru.dragonestia.picker.cp.model.Bucket; +import ru.dragonestia.picker.cp.model.Node; +import ru.dragonestia.picker.cp.repository.BucketRepository; +import ru.dragonestia.picker.cp.repository.NodeRepository; +import ru.dragonestia.picker.cp.repository.UserRepository; @Route("/nodes/:nodeId/buckets/:bucketId") public class BucketDetailsPage extends VerticalLayout implements BeforeEnterObserver { diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/page/HomePage.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/page/HomePage.java similarity index 89% rename from control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/page/HomePage.java rename to control-panel/src/main/java/ru/dragonestia/picker/cp/page/HomePage.java index 1be3732..981d68a 100644 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/page/HomePage.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/page/HomePage.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.cp.page; +package ru.dragonestia.picker.cp.page; import com.vaadin.flow.component.html.H1; import com.vaadin.flow.component.html.Paragraph; diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/page/NodeDetailsPage.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/page/NodeDetailsPage.java similarity index 87% rename from control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/page/NodeDetailsPage.java rename to control-panel/src/main/java/ru/dragonestia/picker/cp/page/NodeDetailsPage.java index ac9a7a1..92521eb 100644 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/page/NodeDetailsPage.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/page/NodeDetailsPage.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.cp.page; +package ru.dragonestia.picker.cp.page; import com.vaadin.flow.component.Html; import com.vaadin.flow.component.html.H2; @@ -13,13 +13,13 @@ import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import lombok.Getter; import org.springframework.beans.factory.annotation.Autowired; -import ru.dragonestia.loadbalancer.cp.component.BucketList; -import ru.dragonestia.loadbalancer.cp.component.NavPath; -import ru.dragonestia.loadbalancer.cp.component.RegisterBucket; -import ru.dragonestia.loadbalancer.cp.model.Node; -import ru.dragonestia.loadbalancer.cp.model.dto.BucketDTO; -import ru.dragonestia.loadbalancer.cp.repository.BucketRepository; -import ru.dragonestia.loadbalancer.cp.repository.NodeRepository; +import ru.dragonestia.picker.cp.component.BucketList; +import ru.dragonestia.picker.cp.component.NavPath; +import ru.dragonestia.picker.cp.component.RegisterBucket; +import ru.dragonestia.picker.cp.model.Node; +import ru.dragonestia.picker.cp.model.dto.BucketDTO; +import ru.dragonestia.picker.cp.repository.BucketRepository; +import ru.dragonestia.picker.cp.repository.NodeRepository; import java.util.List; diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/page/NodesPage.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/page/NodesPage.java similarity index 85% rename from control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/page/NodesPage.java rename to control-panel/src/main/java/ru/dragonestia/picker/cp/page/NodesPage.java index 48aa269..4f6c9a3 100644 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/page/NodesPage.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/page/NodesPage.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.cp.page; +package ru.dragonestia.picker.cp.page; import com.vaadin.flow.component.html.Hr; import com.vaadin.flow.component.orderedlayout.VerticalLayout; @@ -7,10 +7,10 @@ import com.vaadin.flow.router.Route; import lombok.Getter; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; -import ru.dragonestia.loadbalancer.cp.component.NavPath; -import ru.dragonestia.loadbalancer.cp.component.NodeList; -import ru.dragonestia.loadbalancer.cp.component.RegisterNode; -import ru.dragonestia.loadbalancer.cp.repository.NodeRepository; +import ru.dragonestia.picker.cp.component.NavPath; +import ru.dragonestia.picker.cp.component.NodeList; +import ru.dragonestia.picker.cp.component.RegisterNode; +import ru.dragonestia.picker.cp.repository.NodeRepository; @Log4j2 @Getter diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/BucketRepository.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/BucketRepository.java similarity index 62% rename from control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/BucketRepository.java rename to control-panel/src/main/java/ru/dragonestia/picker/cp/repository/BucketRepository.java index bf5c475..a66216c 100644 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/BucketRepository.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/BucketRepository.java @@ -1,8 +1,8 @@ -package ru.dragonestia.loadbalancer.cp.repository; +package ru.dragonestia.picker.cp.repository; -import ru.dragonestia.loadbalancer.cp.model.Bucket; -import ru.dragonestia.loadbalancer.cp.model.Node; -import ru.dragonestia.loadbalancer.cp.model.dto.BucketDTO; +import ru.dragonestia.picker.cp.model.Bucket; +import ru.dragonestia.picker.cp.model.Node; +import ru.dragonestia.picker.cp.model.dto.BucketDTO; import java.util.List; import java.util.Optional; diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/NodeRepository.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/NodeRepository.java similarity index 70% rename from control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/NodeRepository.java rename to control-panel/src/main/java/ru/dragonestia/picker/cp/repository/NodeRepository.java index 1f8ca3a..3d21b22 100644 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/NodeRepository.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/NodeRepository.java @@ -1,6 +1,6 @@ -package ru.dragonestia.loadbalancer.cp.repository; +package ru.dragonestia.picker.cp.repository; -import ru.dragonestia.loadbalancer.cp.model.Node; +import ru.dragonestia.picker.cp.model.Node; import java.util.List; import java.util.Optional; diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/UserRepository.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/UserRepository.java similarity index 62% rename from control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/UserRepository.java rename to control-panel/src/main/java/ru/dragonestia/picker/cp/repository/UserRepository.java index ce5711f..5a4a31a 100644 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/UserRepository.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/UserRepository.java @@ -1,7 +1,7 @@ -package ru.dragonestia.loadbalancer.cp.repository; +package ru.dragonestia.picker.cp.repository; -import ru.dragonestia.loadbalancer.cp.model.Bucket; -import ru.dragonestia.loadbalancer.cp.model.User; +import ru.dragonestia.picker.cp.model.Bucket; +import ru.dragonestia.picker.cp.model.User; import java.util.Collection; import java.util.List; diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/BucketRepositoryImpl.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/BucketRepositoryImpl.java similarity index 85% rename from control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/BucketRepositoryImpl.java rename to control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/BucketRepositoryImpl.java index 90e43b5..131fa24 100644 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/BucketRepositoryImpl.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/BucketRepositoryImpl.java @@ -1,16 +1,16 @@ -package ru.dragonestia.loadbalancer.cp.repository.impl; +package ru.dragonestia.picker.cp.repository.impl; import com.vaadin.flow.spring.annotation.SpringComponent; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springframework.web.client.HttpClientErrorException; -import ru.dragonestia.loadbalancer.cp.model.Bucket; -import ru.dragonestia.loadbalancer.cp.model.Node; -import ru.dragonestia.loadbalancer.cp.model.dto.BucketDTO; -import ru.dragonestia.loadbalancer.cp.repository.BucketRepository; -import ru.dragonestia.loadbalancer.cp.repository.impl.response.BucketInfoResponse; -import ru.dragonestia.loadbalancer.cp.repository.impl.response.BucketListResponse; -import ru.dragonestia.loadbalancer.cp.repository.impl.response.BucketRegisterResponse; +import ru.dragonestia.picker.cp.model.Bucket; +import ru.dragonestia.picker.cp.model.Node; +import ru.dragonestia.picker.cp.model.dto.BucketDTO; +import ru.dragonestia.picker.cp.repository.BucketRepository; +import ru.dragonestia.picker.cp.repository.impl.response.BucketInfoResponse; +import ru.dragonestia.picker.cp.repository.impl.response.BucketListResponse; +import ru.dragonestia.picker.cp.repository.impl.response.BucketRegisterResponse; import java.net.URI; import java.util.List; diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/NodeRepositoryImpl.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/NodeRepositoryImpl.java similarity index 78% rename from control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/NodeRepositoryImpl.java rename to control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/NodeRepositoryImpl.java index eb3c462..f7e4863 100644 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/NodeRepositoryImpl.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/NodeRepositoryImpl.java @@ -1,13 +1,13 @@ -package ru.dragonestia.loadbalancer.cp.repository.impl; +package ru.dragonestia.picker.cp.repository.impl; import com.vaadin.flow.spring.annotation.SpringComponent; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; -import ru.dragonestia.loadbalancer.cp.model.Node; -import ru.dragonestia.loadbalancer.cp.repository.NodeRepository; -import ru.dragonestia.loadbalancer.cp.repository.impl.response.NodeDetailsResponse; -import ru.dragonestia.loadbalancer.cp.repository.impl.response.NodeListResponse; -import ru.dragonestia.loadbalancer.cp.repository.impl.response.NodeRegisterResponse; +import ru.dragonestia.picker.cp.model.Node; +import ru.dragonestia.picker.cp.repository.NodeRepository; +import ru.dragonestia.picker.cp.repository.impl.response.NodeDetailsResponse; +import ru.dragonestia.picker.cp.repository.impl.response.NodeListResponse; +import ru.dragonestia.picker.cp.repository.impl.response.NodeRegisterResponse; import java.net.URI; import java.util.List; diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/RestUtil.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/RestUtil.java similarity index 98% rename from control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/RestUtil.java rename to control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/RestUtil.java index 3a81c55..bc27fe5 100644 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/RestUtil.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/RestUtil.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.cp.repository.impl; +package ru.dragonestia.picker.cp.repository.impl; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/UserRepositoryImpl.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/UserRepositoryImpl.java similarity index 76% rename from control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/UserRepositoryImpl.java rename to control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/UserRepositoryImpl.java index 68ccecd..bb1fd6e 100644 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/UserRepositoryImpl.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/UserRepositoryImpl.java @@ -1,12 +1,12 @@ -package ru.dragonestia.loadbalancer.cp.repository.impl; +package ru.dragonestia.picker.cp.repository.impl; import com.vaadin.flow.spring.annotation.SpringComponent; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; -import ru.dragonestia.loadbalancer.cp.model.Bucket; -import ru.dragonestia.loadbalancer.cp.model.User; -import ru.dragonestia.loadbalancer.cp.repository.UserRepository; -import ru.dragonestia.loadbalancer.cp.repository.impl.response.BucketUserListResponse; +import ru.dragonestia.picker.cp.model.Bucket; +import ru.dragonestia.picker.cp.model.User; +import ru.dragonestia.picker.cp.repository.UserRepository; +import ru.dragonestia.picker.cp.repository.impl.response.BucketUserListResponse; import java.net.URI; import java.util.Collection; diff --git a/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/response/BucketInfoResponse.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/response/BucketInfoResponse.java new file mode 100644 index 0000000..dcefcaf --- /dev/null +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/response/BucketInfoResponse.java @@ -0,0 +1,5 @@ +package ru.dragonestia.picker.cp.repository.impl.response; + +import ru.dragonestia.picker.cp.model.Bucket; + +public record BucketInfoResponse(Bucket bucket) {} diff --git a/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/response/BucketListResponse.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/response/BucketListResponse.java new file mode 100644 index 0000000..e9b1875 --- /dev/null +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/response/BucketListResponse.java @@ -0,0 +1,7 @@ +package ru.dragonestia.picker.cp.repository.impl.response; + +import ru.dragonestia.picker.cp.model.dto.BucketDTO; + +import java.util.List; + +public record BucketListResponse(String node, List buckets) {} diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/BucketRegisterResponse.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/response/BucketRegisterResponse.java similarity index 53% rename from control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/BucketRegisterResponse.java rename to control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/response/BucketRegisterResponse.java index 0c4f6a3..0cb548c 100644 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/BucketRegisterResponse.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/response/BucketRegisterResponse.java @@ -1,3 +1,3 @@ -package ru.dragonestia.loadbalancer.cp.repository.impl.response; +package ru.dragonestia.picker.cp.repository.impl.response; public record BucketRegisterResponse(boolean success, String message) {} diff --git a/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/response/BucketUserListResponse.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/response/BucketUserListResponse.java new file mode 100644 index 0000000..1abc033 --- /dev/null +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/response/BucketUserListResponse.java @@ -0,0 +1,7 @@ +package ru.dragonestia.picker.cp.repository.impl.response; + +import ru.dragonestia.picker.cp.model.User; + +import java.util.List; + +public record BucketUserListResponse(int slots, int usedSlots, List users) {} diff --git a/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/response/NodeDetailsResponse.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/response/NodeDetailsResponse.java new file mode 100644 index 0000000..92315fd --- /dev/null +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/response/NodeDetailsResponse.java @@ -0,0 +1,5 @@ +package ru.dragonestia.picker.cp.repository.impl.response; + +import ru.dragonestia.picker.cp.model.Node; + +public record NodeDetailsResponse(Node node) {} diff --git a/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/response/NodeListResponse.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/response/NodeListResponse.java new file mode 100644 index 0000000..1877b0b --- /dev/null +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/response/NodeListResponse.java @@ -0,0 +1,7 @@ +package ru.dragonestia.picker.cp.repository.impl.response; + +import ru.dragonestia.picker.cp.model.Node; + +import java.util.List; + +public record NodeListResponse(List nodes) {} diff --git a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/NodeRegisterResponse.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/response/NodeRegisterResponse.java similarity index 52% rename from control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/NodeRegisterResponse.java rename to control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/response/NodeRegisterResponse.java index 3aab40a..f5bbb34 100644 --- a/control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/NodeRegisterResponse.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/response/NodeRegisterResponse.java @@ -1,3 +1,3 @@ -package ru.dragonestia.loadbalancer.cp.repository.impl.response; +package ru.dragonestia.picker.cp.repository.impl.response; public record NodeRegisterResponse(boolean success, String message) {} diff --git a/control-panel/src/test/java/ru/dragonestia/loadbalancer/cp/LoadBalancerControlPanelApplicationTests.java b/control-panel/src/test/java/ru/dragonestia/picker/cp/LoadBalancerControlPanelApplicationTests.java similarity index 83% rename from control-panel/src/test/java/ru/dragonestia/loadbalancer/cp/LoadBalancerControlPanelApplicationTests.java rename to control-panel/src/test/java/ru/dragonestia/picker/cp/LoadBalancerControlPanelApplicationTests.java index 545af85..f3ba22f 100644 --- a/control-panel/src/test/java/ru/dragonestia/loadbalancer/cp/LoadBalancerControlPanelApplicationTests.java +++ b/control-panel/src/test/java/ru/dragonestia/picker/cp/LoadBalancerControlPanelApplicationTests.java @@ -1,4 +1,4 @@ -package ru.dragonestia.loadbalancer.cp; +package ru.dragonestia.picker.cp; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; diff --git a/settings.gradle b/settings.gradle index 75872e9..fca70a7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ -rootProject.name = 'LoadBalancer' +rootProject.name = 'RoomPicker' include 'app' include 'control-panel'