Dragonestia/RoomPicker
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renames package

Browse Source
This commit is contained in:
Andrey Terentev 2023-12-27 21:11:25 +07:00
parent f4e04de2bd
commit a8348dcd3d
79 changed files with 243 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketInfoResponse.java
View File

@ -1,5 +0,0 @@
package ru.dragonestia.loadbalancer.controller.response;
import ru.dragonestia.loadbalancer.model.Bucket;
public record BucketInfoResponse(Bucket bucket) {}

5
app/src/main/java/ru/dragonestia/loadbalancer/controller/response/NodeDetailsResponse.java
View File

@ -1,5 +0,0 @@
package ru.dragonestia.loadbalancer.controller.response;
import ru.dragonestia.loadbalancer.model.Node;
public record NodeDetailsResponse(Node node) {}

7
app/src/main/java/ru/dragonestia/loadbalancer/controller/response/NodeListResponse.java
View File

@ -1,7 +0,0 @@
package ru.dragonestia.loadbalancer.controller.response;
import ru.dragonestia.loadbalancer.model.Node;
import java.util.List;
public record NodeListResponse(List<Node> nodes) {}

2
app/src/main/java/ru/dragonestia/loadbalancer/LoadBalancerApplication.java → app/src/main/java/ru/dragonestia/picker/LoadBalancerApplication.java
View File

@ -1,4 +1,4 @@
package ru.dragonestia.loadbalancer; package ru.dragonestia.picker;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;

2
app/src/main/java/ru/dragonestia/loadbalancer/config/SecurityConfig.java → app/src/main/java/ru/dragonestia/picker/config/SecurityConfig.java
View File

@ -1,4 +1,4 @@
package ru.dragonestia.loadbalancer.config; package ru.dragonestia.picker.config;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;

21
app/src/main/java/ru/dragonestia/loadbalancer/config/TestConfig.java → app/src/main/java/ru/dragonestia/picker/config/TestConfig.java
View File

@ -1,4 +1,4 @@
package ru.dragonestia.loadbalancer.config; package ru.dragonestia.picker.config;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
@ -7,17 +7,16 @@ import org.springframework.context.annotation.Profile;
import org.springframework.lang.NonNull; import org.springframework.lang.NonNull;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import ru.dragonestia.loadbalancer.interceptor.DebugInterceptor; import ru.dragonestia.picker.interceptor.DebugInterceptor;
import ru.dragonestia.loadbalancer.model.Bucket; import ru.dragonestia.picker.model.Bucket;
import ru.dragonestia.loadbalancer.model.Node; import ru.dragonestia.picker.model.Node;
import ru.dragonestia.loadbalancer.model.User; import ru.dragonestia.picker.model.User;
import ru.dragonestia.loadbalancer.model.type.LoadBalancingMethod; import ru.dragonestia.picker.model.type.LoadBalancingMethod;
import ru.dragonestia.loadbalancer.model.type.SlotLimit; import ru.dragonestia.picker.model.type.SlotLimit;
import ru.dragonestia.loadbalancer.repository.BucketRepository; import ru.dragonestia.picker.repository.BucketRepository;
import ru.dragonestia.loadbalancer.repository.NodeRepository; import ru.dragonestia.picker.repository.NodeRepository;
import ru.dragonestia.loadbalancer.repository.UserRepository; import ru.dragonestia.picker.repository.UserRepository;
import java.security.SecureRandom;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import java.util.UUID; import java.util.UUID;

18
app/src/main/java/ru/dragonestia/loadbalancer/controller/BucketController.java → app/src/main/java/ru/dragonestia/picker/controller/BucketController.java
View File

@ -1,17 +1,17 @@
package ru.dragonestia.loadbalancer.controller; package ru.dragonestia.picker.controller;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import ru.dragonestia.loadbalancer.controller.response.BucketInfoResponse; import ru.dragonestia.picker.controller.response.BucketInfoResponse;
import ru.dragonestia.loadbalancer.controller.response.BucketListResponse; import ru.dragonestia.picker.controller.response.BucketListResponse;
import ru.dragonestia.loadbalancer.controller.response.BucketRegisterResponse; import ru.dragonestia.picker.controller.response.BucketRegisterResponse;
import ru.dragonestia.loadbalancer.model.Bucket; import ru.dragonestia.picker.model.Bucket;
import ru.dragonestia.loadbalancer.model.type.SlotLimit; import ru.dragonestia.picker.model.type.SlotLimit;
import ru.dragonestia.loadbalancer.service.BucketService; import ru.dragonestia.picker.service.BucketService;
import ru.dragonestia.loadbalancer.service.NodeService; import ru.dragonestia.picker.service.NodeService;
import ru.dragonestia.loadbalancer.util.NamingValidator; import ru.dragonestia.picker.util.NamingValidator;
import java.util.Objects; import java.util.Objects;

16
app/src/main/java/ru/dragonestia/loadbalancer/controller/NodeController.java → app/src/main/java/ru/dragonestia/picker/controller/NodeController.java
View File

@ -1,16 +1,16 @@
package ru.dragonestia.loadbalancer.controller; package ru.dragonestia.picker.controller;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatusCode; import org.springframework.http.HttpStatusCode;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import ru.dragonestia.loadbalancer.controller.response.NodeDetailsResponse; import ru.dragonestia.picker.controller.response.NodeDetailsResponse;
import ru.dragonestia.loadbalancer.controller.response.NodeListResponse; import ru.dragonestia.picker.controller.response.NodeListResponse;
import ru.dragonestia.loadbalancer.controller.response.NodeRegisterResponse; import ru.dragonestia.picker.controller.response.NodeRegisterResponse;
import ru.dragonestia.loadbalancer.model.Node; import ru.dragonestia.picker.model.Node;
import ru.dragonestia.loadbalancer.model.type.LoadBalancingMethod; import ru.dragonestia.picker.model.type.LoadBalancingMethod;
import ru.dragonestia.loadbalancer.service.NodeService; import ru.dragonestia.picker.service.NodeService;
import ru.dragonestia.loadbalancer.util.NamingValidator; import ru.dragonestia.picker.util.NamingValidator;
@RestController @RestController
@RequestMapping("/nodes") @RequestMapping("/nodes")

23
app/src/main/java/ru/dragonestia/loadbalancer/controller/UserBucketController.java → app/src/main/java/ru/dragonestia/picker/controller/UserBucketController.java
View File

@ -1,22 +1,19 @@
package ru.dragonestia.loadbalancer.controller; package ru.dragonestia.picker.controller;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.function.EntityResponse; import ru.dragonestia.picker.controller.response.BucketUserListResponse;
import ru.dragonestia.loadbalancer.controller.response.BucketUserListResponse; import ru.dragonestia.picker.controller.response.LinkUsersWithBucketResponse;
import ru.dragonestia.loadbalancer.controller.response.LinkUsersWithBucketResponse; import ru.dragonestia.picker.model.Bucket;
import ru.dragonestia.loadbalancer.model.Bucket; import ru.dragonestia.picker.model.Node;
import ru.dragonestia.loadbalancer.model.Node; import ru.dragonestia.picker.model.User;
import ru.dragonestia.loadbalancer.model.User; import ru.dragonestia.picker.service.BucketService;
import ru.dragonestia.loadbalancer.service.BucketService; import ru.dragonestia.picker.service.NodeService;
import ru.dragonestia.loadbalancer.service.NodeService; import ru.dragonestia.picker.service.UserService;
import ru.dragonestia.loadbalancer.service.UserService; import ru.dragonestia.picker.util.NamingValidator;
import ru.dragonestia.loadbalancer.util.NamingValidator;
import java.util.Collection;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List;
import java.util.Objects; import java.util.Objects;
@RequiredArgsConstructor @RequiredArgsConstructor

5
app/src/main/java/ru/dragonestia/picker/controller/response/BucketInfoResponse.java Normal file
View File

@ -0,0 +1,5 @@
package ru.dragonestia.picker.controller.response;
import ru.dragonestia.picker.model.Bucket;
public record BucketInfoResponse(Bucket bucket) {}

2
app/src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketListResponse.java → app/src/main/java/ru/dragonestia/picker/controller/response/BucketListResponse.java
View File

@ -1,4 +1,4 @@
package ru.dragonestia.loadbalancer.controller.response; package ru.dragonestia.picker.controller.response;
import java.util.List; import java.util.List;

2
app/src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketRegisterResponse.java → app/src/main/java/ru/dragonestia/picker/controller/response/BucketRegisterResponse.java
View File

@ -1,3 +1,3 @@
package ru.dragonestia.loadbalancer.controller.response; package ru.dragonestia.picker.controller.response;
public record BucketRegisterResponse(boolean success, String message) {} public record BucketRegisterResponse(boolean success, String message) {}

4
app/src/main/java/ru/dragonestia/loadbalancer/controller/response/BucketUserListResponse.java → app/src/main/java/ru/dragonestia/picker/controller/response/BucketUserListResponse.java
View File

@ -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; import java.util.List;

2
app/src/main/java/ru/dragonestia/loadbalancer/controller/response/LinkUsersWithBucketResponse.java → app/src/main/java/ru/dragonestia/picker/controller/response/LinkUsersWithBucketResponse.java
View File

@ -1,3 +1,3 @@
package ru.dragonestia.loadbalancer.controller.response; package ru.dragonestia.picker.controller.response;
public record LinkUsersWithBucketResponse(boolean success, String message) {} public record LinkUsersWithBucketResponse(boolean success, String message) {}

5
app/src/main/java/ru/dragonestia/picker/controller/response/NodeDetailsResponse.java Normal file
View File

@ -0,0 +1,5 @@
package ru.dragonestia.picker.controller.response;
import ru.dragonestia.picker.model.Node;
public record NodeDetailsResponse(Node node) {}

7
app/src/main/java/ru/dragonestia/picker/controller/response/NodeListResponse.java Normal file
View File

@ -0,0 +1,7 @@
package ru.dragonestia.picker.controller.response;
import ru.dragonestia.picker.model.Node;
import java.util.List;
public record NodeListResponse(List<Node> nodes) {}

2
app/src/main/java/ru/dragonestia/loadbalancer/controller/response/NodeRegisterResponse.java → app/src/main/java/ru/dragonestia/picker/controller/response/NodeRegisterResponse.java
View File

@ -1,3 +1,3 @@
package ru.dragonestia.loadbalancer.controller.response; package ru.dragonestia.picker.controller.response;
public record NodeRegisterResponse(boolean success, String message) {} public record NodeRegisterResponse(boolean success, String message) {}

2
app/src/main/java/ru/dragonestia/loadbalancer/interceptor/DebugInterceptor.java → app/src/main/java/ru/dragonestia/picker/interceptor/DebugInterceptor.java
View File

@ -1,4 +1,4 @@
package ru.dragonestia.loadbalancer.interceptor; package ru.dragonestia.picker.interceptor;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;

4
app/src/main/java/ru/dragonestia/loadbalancer/model/Bucket.java → app/src/main/java/ru/dragonestia/picker/model/Bucket.java
View File

@ -1,9 +1,9 @@
package ru.dragonestia.loadbalancer.model; package ru.dragonestia.picker.model;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import ru.dragonestia.loadbalancer.model.type.SlotLimit; import ru.dragonestia.picker.model.type.SlotLimit;
@Getter @Getter
@RequiredArgsConstructor(access = AccessLevel.PRIVATE) @RequiredArgsConstructor(access = AccessLevel.PRIVATE)

4
app/src/main/java/ru/dragonestia/loadbalancer/model/Node.java → app/src/main/java/ru/dragonestia/picker/model/Node.java
View File

@ -1,7 +1,7 @@
package ru.dragonestia.loadbalancer.model; package ru.dragonestia.picker.model;
import lombok.NonNull; 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) { public record Node(@NonNull String identifier, @NonNull LoadBalancingMethod method) {

2
app/src/main/java/ru/dragonestia/loadbalancer/model/User.java → app/src/main/java/ru/dragonestia/picker/model/User.java
View File

@ -1,4 +1,4 @@
package ru.dragonestia.loadbalancer.model; package ru.dragonestia.picker.model;
import lombok.NonNull; import lombok.NonNull;

2
app/src/main/java/ru/dragonestia/loadbalancer/model/type/LoadBalancingMethod.java → app/src/main/java/ru/dragonestia/picker/model/type/LoadBalancingMethod.java
View File

@ -1,4 +1,4 @@
package ru.dragonestia.loadbalancer.model.type; package ru.dragonestia.picker.model.type;
public enum LoadBalancingMethod { public enum LoadBalancingMethod {
SEQUENTIAL_FILLING, SEQUENTIAL_FILLING,

2
app/src/main/java/ru/dragonestia/loadbalancer/model/type/SlotLimit.java → app/src/main/java/ru/dragonestia/picker/model/type/SlotLimit.java
View File

@ -1,4 +1,4 @@
package ru.dragonestia.loadbalancer.model.type; package ru.dragonestia.picker.model.type;
import lombok.Getter; import lombok.Getter;

8
app/src/main/java/ru/dragonestia/loadbalancer/repository/BucketRepository.java → app/src/main/java/ru/dragonestia/picker/repository/BucketRepository.java
View File

@ -1,8 +1,8 @@
package ru.dragonestia.loadbalancer.repository; package ru.dragonestia.picker.repository;
import ru.dragonestia.loadbalancer.model.Bucket; import ru.dragonestia.picker.model.Bucket;
import ru.dragonestia.loadbalancer.model.Node; import ru.dragonestia.picker.model.Node;
import ru.dragonestia.loadbalancer.model.User; import ru.dragonestia.picker.model.User;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;

4
app/src/main/java/ru/dragonestia/loadbalancer/repository/NodeRepository.java → app/src/main/java/ru/dragonestia/picker/repository/NodeRepository.java
View File

@ -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.List;
import java.util.Optional; import java.util.Optional;

6
app/src/main/java/ru/dragonestia/loadbalancer/repository/UserRepository.java → app/src/main/java/ru/dragonestia/picker/repository/UserRepository.java
View File

@ -1,7 +1,7 @@
package ru.dragonestia.loadbalancer.repository; package ru.dragonestia.picker.repository;
import ru.dragonestia.loadbalancer.model.Bucket; import ru.dragonestia.picker.model.Bucket;
import ru.dragonestia.loadbalancer.model.User; import ru.dragonestia.picker.model.User;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;

12
app/src/main/java/ru/dragonestia/loadbalancer/repository/impl/BucketRepositoryImpl.java → app/src/main/java/ru/dragonestia/picker/repository/impl/BucketRepositoryImpl.java
View File

@ -1,12 +1,12 @@
package ru.dragonestia.loadbalancer.repository.impl; package ru.dragonestia.picker.repository.impl;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import ru.dragonestia.loadbalancer.model.Bucket; import ru.dragonestia.picker.model.Bucket;
import ru.dragonestia.loadbalancer.model.Node; import ru.dragonestia.picker.model.Node;
import ru.dragonestia.loadbalancer.model.User; import ru.dragonestia.picker.model.User;
import ru.dragonestia.loadbalancer.repository.BucketRepository; import ru.dragonestia.picker.repository.BucketRepository;
import ru.dragonestia.loadbalancer.repository.UserRepository; import ru.dragonestia.picker.repository.UserRepository;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;

8
app/src/main/java/ru/dragonestia/loadbalancer/repository/impl/NodeRepositoryImpl.java → app/src/main/java/ru/dragonestia/picker/repository/impl/NodeRepositoryImpl.java
View File

@ -1,10 +1,10 @@
package ru.dragonestia.loadbalancer.repository.impl; package ru.dragonestia.picker.repository.impl;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import ru.dragonestia.loadbalancer.model.Node; import ru.dragonestia.picker.model.Node;
import ru.dragonestia.loadbalancer.repository.BucketRepository; import ru.dragonestia.picker.repository.BucketRepository;
import ru.dragonestia.loadbalancer.repository.NodeRepository; import ru.dragonestia.picker.repository.NodeRepository;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

8
app/src/main/java/ru/dragonestia/loadbalancer/repository/impl/UserRepositoryImpl.java → app/src/main/java/ru/dragonestia/picker/repository/impl/UserRepositoryImpl.java
View File

@ -1,9 +1,9 @@
package ru.dragonestia.loadbalancer.repository.impl; package ru.dragonestia.picker.repository.impl;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import ru.dragonestia.loadbalancer.model.Bucket; import ru.dragonestia.picker.model.Bucket;
import ru.dragonestia.loadbalancer.model.User; import ru.dragonestia.picker.model.User;
import ru.dragonestia.loadbalancer.repository.UserRepository; import ru.dragonestia.picker.repository.UserRepository;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;

8
app/src/main/java/ru/dragonestia/loadbalancer/service/BucketService.java → app/src/main/java/ru/dragonestia/picker/service/BucketService.java
View File

@ -1,8 +1,8 @@
package ru.dragonestia.loadbalancer.service; package ru.dragonestia.picker.service;
import ru.dragonestia.loadbalancer.model.Bucket; import ru.dragonestia.picker.model.Bucket;
import ru.dragonestia.loadbalancer.model.Node; import ru.dragonestia.picker.model.Node;
import ru.dragonestia.loadbalancer.model.User; import ru.dragonestia.picker.model.User;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;

4
app/src/main/java/ru/dragonestia/loadbalancer/service/NodeService.java → app/src/main/java/ru/dragonestia/picker/service/NodeService.java
View File

@ -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.List;
import java.util.Optional; import java.util.Optional;

6
app/src/main/java/ru/dragonestia/loadbalancer/service/UserService.java → app/src/main/java/ru/dragonestia/picker/service/UserService.java
View File

@ -1,7 +1,7 @@
package ru.dragonestia.loadbalancer.service; package ru.dragonestia.picker.service;
import ru.dragonestia.loadbalancer.model.Bucket; import ru.dragonestia.picker.model.Bucket;
import ru.dragonestia.loadbalancer.model.User; import ru.dragonestia.picker.model.User;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;

14
app/src/main/java/ru/dragonestia/loadbalancer/service/impl/BucketServiceImpl.java → app/src/main/java/ru/dragonestia/picker/service/impl/BucketServiceImpl.java
View File

@ -1,13 +1,13 @@
package ru.dragonestia.loadbalancer.service.impl; package ru.dragonestia.picker.service.impl;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import ru.dragonestia.loadbalancer.model.Bucket; import ru.dragonestia.picker.model.Bucket;
import ru.dragonestia.loadbalancer.model.Node; import ru.dragonestia.picker.model.Node;
import ru.dragonestia.loadbalancer.model.User; import ru.dragonestia.picker.model.User;
import ru.dragonestia.loadbalancer.repository.BucketRepository; import ru.dragonestia.picker.repository.BucketRepository;
import ru.dragonestia.loadbalancer.service.BucketService; import ru.dragonestia.picker.service.BucketService;
import ru.dragonestia.loadbalancer.util.NamingValidator; import ru.dragonestia.picker.util.NamingValidator;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;

10
app/src/main/java/ru/dragonestia/loadbalancer/service/impl/NodeServiceImpl.java → app/src/main/java/ru/dragonestia/picker/service/impl/NodeServiceImpl.java
View File

@ -1,11 +1,11 @@
package ru.dragonestia.loadbalancer.service.impl; package ru.dragonestia.picker.service.impl;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import ru.dragonestia.loadbalancer.model.Node; import ru.dragonestia.picker.model.Node;
import ru.dragonestia.loadbalancer.repository.NodeRepository; import ru.dragonestia.picker.repository.NodeRepository;
import ru.dragonestia.loadbalancer.service.NodeService; import ru.dragonestia.picker.service.NodeService;
import ru.dragonestia.loadbalancer.util.NamingValidator; import ru.dragonestia.picker.util.NamingValidator;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;

10
app/src/main/java/ru/dragonestia/loadbalancer/service/impl/UserServiceImpl.java → app/src/main/java/ru/dragonestia/picker/service/impl/UserServiceImpl.java
View File

@ -1,11 +1,11 @@
package ru.dragonestia.loadbalancer.service.impl; package ru.dragonestia.picker.service.impl;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import ru.dragonestia.loadbalancer.model.Bucket; import ru.dragonestia.picker.model.Bucket;
import ru.dragonestia.loadbalancer.model.User; import ru.dragonestia.picker.model.User;
import ru.dragonestia.loadbalancer.repository.UserRepository; import ru.dragonestia.picker.repository.UserRepository;
import ru.dragonestia.loadbalancer.service.UserService; import ru.dragonestia.picker.service.UserService;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;

2
app/src/main/java/ru/dragonestia/loadbalancer/util/NamingValidator.java → app/src/main/java/ru/dragonestia/picker/util/NamingValidator.java
View File

@ -1,4 +1,4 @@
package ru.dragonestia.loadbalancer.util; package ru.dragonestia.picker.util;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;

2
app/src/test/java/ru/dragonestia/loadbalancer/LoadBalancerApplicationTests.java → app/src/test/java/ru/dragonestia/picker/LoadBalancerApplicationTests.java
View File

@ -1,4 +1,4 @@
package ru.dragonestia.loadbalancer; package ru.dragonestia.picker;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;

10
app/src/test/java/ru/dragonestia/loadbalancer/service/BucketServiceTest.java → app/src/test/java/ru/dragonestia/picker/service/BucketServiceTest.java
View File

@ -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.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.mockito.Mockito; import org.mockito.Mockito;
import ru.dragonestia.loadbalancer.model.Bucket; import ru.dragonestia.picker.model.Bucket;
import ru.dragonestia.loadbalancer.model.Node; import ru.dragonestia.picker.model.Node;
import ru.dragonestia.loadbalancer.model.type.LoadBalancingMethod; import ru.dragonestia.picker.model.type.LoadBalancingMethod;
import ru.dragonestia.loadbalancer.model.type.SlotLimit; import ru.dragonestia.picker.model.type.SlotLimit;
import java.util.HashMap; import java.util.HashMap;

5
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/BucketInfoResponse.java
View File

@ -1,5 +0,0 @@
package ru.dragonestia.loadbalancer.cp.repository.impl.response;
import ru.dragonestia.loadbalancer.cp.model.Bucket;
public record BucketInfoResponse(Bucket bucket) {}

7
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/BucketListResponse.java
View File

@ -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<BucketDTO> buckets) {}

7
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/BucketUserListResponse.java
View File

@ -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<User> users) {}

5
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/NodeDetailsResponse.java
View File

@ -1,5 +0,0 @@
package ru.dragonestia.loadbalancer.cp.repository.impl.response;
import ru.dragonestia.loadbalancer.cp.model.Node;
public record NodeDetailsResponse(Node node) {}

7
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/NodeListResponse.java
View File

@ -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<Node> nodes) {}

2
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/LoadBalancerControlPanelApplication.java → control-panel/src/main/java/ru/dragonestia/picker/cp/LoadBalancerControlPanelApplication.java
View File

@ -1,4 +1,4 @@
package ru.dragonestia.loadbalancer.cp; package ru.dragonestia.picker.cp;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;

6
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/AddUsers.java → control-panel/src/main/java/ru/dragonestia/picker/cp/component/AddUsers.java
View File

@ -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.Unit;
import com.vaadin.flow.component.button.Button; 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.orderedlayout.VerticalLayout;
import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.component.textfield.TextField;
import lombok.Getter; import lombok.Getter;
import ru.dragonestia.loadbalancer.cp.model.Bucket; import ru.dragonestia.picker.cp.model.Bucket;
import ru.dragonestia.loadbalancer.cp.model.User; import ru.dragonestia.picker.cp.model.User;
import java.util.List; import java.util.List;

4
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/BucketList.java → control-panel/src/main/java/ru/dragonestia/picker/cp/component/BucketList.java
View File

@ -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.Button;
import com.vaadin.flow.component.button.ButtonVariant; 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.orderedlayout.VerticalLayout;
import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.component.textfield.TextField;
import lombok.Setter; 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.List;
import java.util.function.Consumer; import java.util.function.Consumer;

2
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/NavPath.java → control-panel/src/main/java/ru/dragonestia/picker/cp/component/NavPath.java
View File

@ -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.Component;
import com.vaadin.flow.component.button.Button; import com.vaadin.flow.component.button.Button;

4
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/NodeList.java → control-panel/src/main/java/ru/dragonestia/picker/cp/component/NodeList.java
View File

@ -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.Button;
import com.vaadin.flow.component.button.ButtonVariant; 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.orderedlayout.VerticalLayout;
import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.component.textfield.TextField;
import lombok.Setter; import lombok.Setter;
import ru.dragonestia.loadbalancer.cp.model.Node; import ru.dragonestia.picker.cp.model.Node;
import java.util.List; import java.util.List;
import java.util.function.Consumer; import java.util.function.Consumer;

8
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/RegisterBucket.java → control-panel/src/main/java/ru/dragonestia/picker/cp/component/RegisterBucket.java
View File

@ -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.Unit;
import com.vaadin.flow.component.button.Button; 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.TextArea;
import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.component.textfield.TextField;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
import ru.dragonestia.loadbalancer.cp.model.Bucket; import ru.dragonestia.picker.cp.model.Bucket;
import ru.dragonestia.loadbalancer.cp.model.Node; import ru.dragonestia.picker.cp.model.Node;
import ru.dragonestia.loadbalancer.cp.model.type.SlotLimit; import ru.dragonestia.picker.cp.model.type.SlotLimit;
import java.util.function.Function; import java.util.function.Function;

6
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/RegisterNode.java → control-panel/src/main/java/ru/dragonestia/picker/cp/component/RegisterNode.java
View File

@ -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.Component;
import com.vaadin.flow.component.Unit; 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.component.textfield.TextField;
import com.vaadin.flow.data.renderer.ComponentRenderer; import com.vaadin.flow.data.renderer.ComponentRenderer;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
import ru.dragonestia.loadbalancer.cp.model.Node; import ru.dragonestia.picker.cp.model.Node;
import ru.dragonestia.loadbalancer.cp.model.type.LoadBalancingMethod; import ru.dragonestia.picker.cp.model.type.LoadBalancingMethod;
import java.util.function.Function; import java.util.function.Function;

6
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/component/UserList.java → control-panel/src/main/java/ru/dragonestia/picker/cp/component/UserList.java
View File

@ -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.ColumnTextAlign;
import com.vaadin.flow.component.grid.Grid; import com.vaadin.flow.component.grid.Grid;
import com.vaadin.flow.component.html.Span; import com.vaadin.flow.component.html.Span;
import com.vaadin.flow.component.orderedlayout.VerticalLayout; import com.vaadin.flow.component.orderedlayout.VerticalLayout;
import ru.dragonestia.loadbalancer.cp.model.Bucket; import ru.dragonestia.picker.cp.model.Bucket;
import ru.dragonestia.loadbalancer.cp.model.User; import ru.dragonestia.picker.cp.model.User;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

2
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/config/RestApiConfig.java → control-panel/src/main/java/ru/dragonestia/picker/cp/config/RestApiConfig.java
View File

@ -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.beans.factory.annotation.Autowired;
import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.boot.web.client.RestTemplateBuilder;

2
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/config/ServerConfig.java → control-panel/src/main/java/ru/dragonestia/picker/cp/config/ServerConfig.java
View File

@ -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.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;

4
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/Bucket.java → control-panel/src/main/java/ru/dragonestia/picker/cp/model/Bucket.java
View File

@ -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.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter; import lombok.Getter;
import ru.dragonestia.loadbalancer.cp.model.type.SlotLimit; import ru.dragonestia.picker.cp.model.type.SlotLimit;
import java.net.URI; import java.net.URI;

4
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/Node.java → control-panel/src/main/java/ru/dragonestia/picker/cp/model/Node.java
View File

@ -1,7 +1,7 @@
package ru.dragonestia.loadbalancer.cp.model; package ru.dragonestia.picker.cp.model;
import lombok.NonNull; import lombok.NonNull;
import ru.dragonestia.loadbalancer.cp.model.type.LoadBalancingMethod; import ru.dragonestia.picker.cp.model.type.LoadBalancingMethod;
import java.io.Serializable; import java.io.Serializable;

2
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/User.java → control-panel/src/main/java/ru/dragonestia/picker/cp/model/User.java
View File

@ -1,4 +1,4 @@
package ru.dragonestia.loadbalancer.cp.model; package ru.dragonestia.picker.cp.model;
import lombok.NonNull; import lombok.NonNull;

4
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/dto/BucketDTO.java → control-panel/src/main/java/ru/dragonestia/picker/cp/model/dto/BucketDTO.java
View File

@ -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; import java.net.URI;

2
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/type/LoadBalancingMethod.java → control-panel/src/main/java/ru/dragonestia/picker/cp/model/type/LoadBalancingMethod.java
View File

@ -1,4 +1,4 @@
package ru.dragonestia.loadbalancer.cp.model.type; package ru.dragonestia.picker.cp.model.type;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;

2
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/model/type/SlotLimit.java → control-panel/src/main/java/ru/dragonestia/picker/cp/model/type/SlotLimit.java
View File

@ -1,4 +1,4 @@
package ru.dragonestia.loadbalancer.cp.model.type; package ru.dragonestia.picker.cp.model.type;
import java.beans.Transient; import java.beans.Transient;

18
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/page/BucketDetailsPage.java → control-panel/src/main/java/ru/dragonestia/picker/cp/page/BucketDetailsPage.java
View File

@ -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;
import com.vaadin.flow.component.Unit; 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.BeforeEnterObserver;
import com.vaadin.flow.router.Route; import com.vaadin.flow.router.Route;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import ru.dragonestia.loadbalancer.cp.component.AddUsers; import ru.dragonestia.picker.cp.component.AddUsers;
import ru.dragonestia.loadbalancer.cp.component.NavPath; import ru.dragonestia.picker.cp.component.NavPath;
import ru.dragonestia.loadbalancer.cp.component.UserList; import ru.dragonestia.picker.cp.component.UserList;
import ru.dragonestia.loadbalancer.cp.model.Bucket; import ru.dragonestia.picker.cp.model.Bucket;
import ru.dragonestia.loadbalancer.cp.model.Node; import ru.dragonestia.picker.cp.model.Node;
import ru.dragonestia.loadbalancer.cp.repository.BucketRepository; import ru.dragonestia.picker.cp.repository.BucketRepository;
import ru.dragonestia.loadbalancer.cp.repository.NodeRepository; import ru.dragonestia.picker.cp.repository.NodeRepository;
import ru.dragonestia.loadbalancer.cp.repository.UserRepository; import ru.dragonestia.picker.cp.repository.UserRepository;
@Route("/nodes/:nodeId/buckets/:bucketId") @Route("/nodes/:nodeId/buckets/:bucketId")
public class BucketDetailsPage extends VerticalLayout implements BeforeEnterObserver { public class BucketDetailsPage extends VerticalLayout implements BeforeEnterObserver {

2
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/page/HomePage.java → control-panel/src/main/java/ru/dragonestia/picker/cp/page/HomePage.java
View File

@ -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.H1;
import com.vaadin.flow.component.html.Paragraph; import com.vaadin.flow.component.html.Paragraph;

16
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/page/NodeDetailsPage.java → control-panel/src/main/java/ru/dragonestia/picker/cp/page/NodeDetailsPage.java
View File

@ -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;
import com.vaadin.flow.component.html.H2; import com.vaadin.flow.component.html.H2;
@ -13,13 +13,13 @@ import com.vaadin.flow.router.PageTitle;
import com.vaadin.flow.router.Route; import com.vaadin.flow.router.Route;
import lombok.Getter; import lombok.Getter;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import ru.dragonestia.loadbalancer.cp.component.BucketList; import ru.dragonestia.picker.cp.component.BucketList;
import ru.dragonestia.loadbalancer.cp.component.NavPath; import ru.dragonestia.picker.cp.component.NavPath;
import ru.dragonestia.loadbalancer.cp.component.RegisterBucket; import ru.dragonestia.picker.cp.component.RegisterBucket;
import ru.dragonestia.loadbalancer.cp.model.Node; import ru.dragonestia.picker.cp.model.Node;
import ru.dragonestia.loadbalancer.cp.model.dto.BucketDTO; import ru.dragonestia.picker.cp.model.dto.BucketDTO;
import ru.dragonestia.loadbalancer.cp.repository.BucketRepository; import ru.dragonestia.picker.cp.repository.BucketRepository;
import ru.dragonestia.loadbalancer.cp.repository.NodeRepository; import ru.dragonestia.picker.cp.repository.NodeRepository;
import java.util.List; import java.util.List;

10
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/page/NodesPage.java → control-panel/src/main/java/ru/dragonestia/picker/cp/page/NodesPage.java
View File

@ -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.html.Hr;
import com.vaadin.flow.component.orderedlayout.VerticalLayout; import com.vaadin.flow.component.orderedlayout.VerticalLayout;
@ -7,10 +7,10 @@ import com.vaadin.flow.router.Route;
import lombok.Getter; import lombok.Getter;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import ru.dragonestia.loadbalancer.cp.component.NavPath; import ru.dragonestia.picker.cp.component.NavPath;
import ru.dragonestia.loadbalancer.cp.component.NodeList; import ru.dragonestia.picker.cp.component.NodeList;
import ru.dragonestia.loadbalancer.cp.component.RegisterNode; import ru.dragonestia.picker.cp.component.RegisterNode;
import ru.dragonestia.loadbalancer.cp.repository.NodeRepository; import ru.dragonestia.picker.cp.repository.NodeRepository;
@Log4j2 @Log4j2
@Getter @Getter

8
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/BucketRepository.java → control-panel/src/main/java/ru/dragonestia/picker/cp/repository/BucketRepository.java
View File

@ -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.picker.cp.model.Bucket;
import ru.dragonestia.loadbalancer.cp.model.Node; import ru.dragonestia.picker.cp.model.Node;
import ru.dragonestia.loadbalancer.cp.model.dto.BucketDTO; import ru.dragonestia.picker.cp.model.dto.BucketDTO;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;

4
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/NodeRepository.java → control-panel/src/main/java/ru/dragonestia/picker/cp/repository/NodeRepository.java
View File

@ -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.List;
import java.util.Optional; import java.util.Optional;

6
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/UserRepository.java → control-panel/src/main/java/ru/dragonestia/picker/cp/repository/UserRepository.java
View File

@ -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.picker.cp.model.Bucket;
import ru.dragonestia.loadbalancer.cp.model.User; import ru.dragonestia.picker.cp.model.User;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;

16
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/BucketRepositoryImpl.java → control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/BucketRepositoryImpl.java
View File

@ -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 com.vaadin.flow.spring.annotation.SpringComponent;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.HttpClientErrorException;
import ru.dragonestia.loadbalancer.cp.model.Bucket; import ru.dragonestia.picker.cp.model.Bucket;
import ru.dragonestia.loadbalancer.cp.model.Node; import ru.dragonestia.picker.cp.model.Node;
import ru.dragonestia.loadbalancer.cp.model.dto.BucketDTO; import ru.dragonestia.picker.cp.model.dto.BucketDTO;
import ru.dragonestia.loadbalancer.cp.repository.BucketRepository; import ru.dragonestia.picker.cp.repository.BucketRepository;
import ru.dragonestia.loadbalancer.cp.repository.impl.response.BucketInfoResponse; import ru.dragonestia.picker.cp.repository.impl.response.BucketInfoResponse;
import ru.dragonestia.loadbalancer.cp.repository.impl.response.BucketListResponse; import ru.dragonestia.picker.cp.repository.impl.response.BucketListResponse;
import ru.dragonestia.loadbalancer.cp.repository.impl.response.BucketRegisterResponse; import ru.dragonestia.picker.cp.repository.impl.response.BucketRegisterResponse;
import java.net.URI; import java.net.URI;
import java.util.List; import java.util.List;

12
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/NodeRepositoryImpl.java → control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/NodeRepositoryImpl.java
View File

@ -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 com.vaadin.flow.spring.annotation.SpringComponent;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import ru.dragonestia.loadbalancer.cp.model.Node; import ru.dragonestia.picker.cp.model.Node;
import ru.dragonestia.loadbalancer.cp.repository.NodeRepository; import ru.dragonestia.picker.cp.repository.NodeRepository;
import ru.dragonestia.loadbalancer.cp.repository.impl.response.NodeDetailsResponse; import ru.dragonestia.picker.cp.repository.impl.response.NodeDetailsResponse;
import ru.dragonestia.loadbalancer.cp.repository.impl.response.NodeListResponse; import ru.dragonestia.picker.cp.repository.impl.response.NodeListResponse;
import ru.dragonestia.loadbalancer.cp.repository.impl.response.NodeRegisterResponse; import ru.dragonestia.picker.cp.repository.impl.response.NodeRegisterResponse;
import java.net.URI; import java.net.URI;
import java.util.List; import java.util.List;

2
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/RestUtil.java → control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/RestUtil.java
View File

@ -1,4 +1,4 @@
package ru.dragonestia.loadbalancer.cp.repository.impl; package ru.dragonestia.picker.cp.repository.impl;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;

10
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/UserRepositoryImpl.java → control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/UserRepositoryImpl.java
View File

@ -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 com.vaadin.flow.spring.annotation.SpringComponent;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import ru.dragonestia.loadbalancer.cp.model.Bucket; import ru.dragonestia.picker.cp.model.Bucket;
import ru.dragonestia.loadbalancer.cp.model.User; import ru.dragonestia.picker.cp.model.User;
import ru.dragonestia.loadbalancer.cp.repository.UserRepository; import ru.dragonestia.picker.cp.repository.UserRepository;
import ru.dragonestia.loadbalancer.cp.repository.impl.response.BucketUserListResponse; import ru.dragonestia.picker.cp.repository.impl.response.BucketUserListResponse;
import java.net.URI; import java.net.URI;
import java.util.Collection; import java.util.Collection;

5
control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/response/BucketInfoResponse.java Normal file
View File

@ -0,0 +1,5 @@
package ru.dragonestia.picker.cp.repository.impl.response;
import ru.dragonestia.picker.cp.model.Bucket;
public record BucketInfoResponse(Bucket bucket) {}

7
control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/response/BucketListResponse.java Normal file
View File

@ -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<BucketDTO> buckets) {}

2
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/BucketRegisterResponse.java → control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/response/BucketRegisterResponse.java
View File

@ -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) {} public record BucketRegisterResponse(boolean success, String message) {}

7
control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/response/BucketUserListResponse.java Normal file
View File

@ -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<User> users) {}

5
control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/response/NodeDetailsResponse.java Normal file
View File

@ -0,0 +1,5 @@
package ru.dragonestia.picker.cp.repository.impl.response;
import ru.dragonestia.picker.cp.model.Node;
public record NodeDetailsResponse(Node node) {}

7
control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/response/NodeListResponse.java Normal file
View File

@ -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<Node> nodes) {}

2
control-panel/src/main/java/ru/dragonestia/loadbalancer/cp/repository/impl/response/NodeRegisterResponse.java → control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/response/NodeRegisterResponse.java
View File

@ -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) {} public record NodeRegisterResponse(boolean success, String message) {}

2
control-panel/src/test/java/ru/dragonestia/loadbalancer/cp/LoadBalancerControlPanelApplicationTests.java → control-panel/src/test/java/ru/dragonestia/picker/cp/LoadBalancerControlPanelApplicationTests.java
View File

@ -1,4 +1,4 @@
package ru.dragonestia.loadbalancer.cp; package ru.dragonestia.picker.cp;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;

2
settings.gradle
View File

@ -1,4 +1,4 @@
rootProject.name = 'LoadBalancer' rootProject.name = 'RoomPicker'
include 'app' include 'app'
include 'control-panel' include 'control-panel'