From de54a8590e6c4e0e49b29393a28b0547e81373c4 Mon Sep 17 00:00:00 2001 From: ScarletRedMan Date: Fri, 10 May 2024 11:08:10 +0700 Subject: [PATCH] moved models to new package --- .../picker/aspect/UserMetricsAspect.java | 14 +++++++------- .../ru/dragonestia/picker/config/TestConfig.java | 6 ++---- .../controller/graphql/GraphqlController.java | 2 +- .../controller/graphql/entity/EntityNode.java | 2 +- .../controller/graphql/entity/EntityRoom.java | 2 +- .../controller/graphql/entity/EntityUser.java | 2 +- .../picker/event/UpdateRoomLockStateEvent.java | 2 +- .../picker/model/{ => account}/Account.java | 3 +-- .../picker/model/{ => account}/Permission.java | 2 +- .../picker/model/factory/RoomFactory.java | 5 ++--- .../dragonestia/picker/model/{ => node}/Node.java | 2 +- .../dragonestia/picker/model/{ => room}/Room.java | 4 ++-- .../picker/model/{ => room}/type/SlotLimit.java | 2 +- .../dragonestia/picker/model/{ => user}/User.java | 2 +- .../picker/repository/NodeRepository.java | 2 +- .../picker/repository/RoomRepository.java | 6 +++--- .../picker/repository/UserRepository.java | 5 ++--- .../repository/impl/ContainerRepository.java | 3 +-- .../picker/repository/impl/NodeRepositoryImpl.java | 3 +-- .../picker/repository/impl/RoomRepositoryImpl.java | 7 +++---- .../picker/repository/impl/UserRepositoryImpl.java | 4 ++-- .../repository/impl/container/NodeContainer.java | 6 +++--- .../repository/impl/container/RoomContainer.java | 4 ++-- .../picker/repository/impl/picker/ItemWrapper.java | 2 +- .../repository/impl/picker/LeastPickedPicker.java | 5 ++--- .../picker/repository/impl/picker/RoomPicker.java | 2 +- .../repository/impl/picker/RoundRobinPicker.java | 2 +- .../impl/picker/SequentialFillingPicker.java | 2 +- .../repository/impl/type/UserTransaction.java | 4 ++-- .../dragonestia/picker/service/AccountService.java | 2 +- .../ru/dragonestia/picker/service/NodeService.java | 5 +---- .../ru/dragonestia/picker/service/RoomService.java | 9 +++------ .../ru/dragonestia/picker/service/UserService.java | 4 ++-- .../picker/service/impl/AccountServiceImpl.java | 4 ++-- .../picker/service/impl/NodeServiceImpl.java | 2 +- .../picker/service/impl/RoomServiceImpl.java | 6 +++--- .../picker/service/impl/UserServiceImpl.java | 4 ++-- .../picker/storage/NodeAndRoomStorage.java | 4 ++-- .../picker/storage/impl/FileStorageImpl.java | 4 ++-- .../picker/storage/impl/NullStorageImpl.java | 4 ++-- .../dragonestia/picker/util/NamingValidator.java | 3 +-- .../picker/config/FillingNodesConfig.java | 5 ++--- .../picker/picker/LeastPickedTests.java | 2 +- .../dragonestia/picker/picker/RoundRobinTests.java | 2 +- .../picker/picker/SequentialFillingTests.java | 2 +- .../picker/service/NodeServiceTests.java | 2 +- .../picker/service/RoomServiceTests.java | 6 ++---- .../ru/dragonestia/picker/util/UserFiller.java | 2 +- 48 files changed, 80 insertions(+), 99 deletions(-) rename server/src/main/java/ru/dragonestia/picker/model/{ => account}/Account.java (97%) rename server/src/main/java/ru/dragonestia/picker/model/{ => account}/Permission.java (86%) rename server/src/main/java/ru/dragonestia/picker/model/{ => node}/Node.java (97%) rename server/src/main/java/ru/dragonestia/picker/model/{ => room}/Room.java (96%) rename server/src/main/java/ru/dragonestia/picker/model/{ => room}/type/SlotLimit.java (92%) rename server/src/main/java/ru/dragonestia/picker/model/{ => user}/User.java (96%) diff --git a/server/src/main/java/ru/dragonestia/picker/aspect/UserMetricsAspect.java b/server/src/main/java/ru/dragonestia/picker/aspect/UserMetricsAspect.java index db9fd7c..9710882 100644 --- a/server/src/main/java/ru/dragonestia/picker/aspect/UserMetricsAspect.java +++ b/server/src/main/java/ru/dragonestia/picker/aspect/UserMetricsAspect.java @@ -11,8 +11,8 @@ import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.Aspect; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import ru.dragonestia.picker.model.Node; -import ru.dragonestia.picker.model.Room; +import ru.dragonestia.picker.model.node.Node; +import ru.dragonestia.picker.model.room.Room; import ru.dragonestia.picker.repository.RoomRepository; import ru.dragonestia.picker.repository.UserRepository; import ru.dragonestia.picker.repository.impl.ContainerRepository; @@ -41,12 +41,12 @@ public class UserMetricsAspect { meterRegistry.gauge("roompicker_total_users", totalUsers); } - @After(value = "execution(* ru.dragonestia.picker.repository.UserRepository.linkWithRoom(ru.dragonestia.picker.model.Room, ..)) && args(room, ..)", argNames = "room") + @After(value = "execution(* ru.dragonestia.picker.repository.UserRepository.linkWithRoom(ru.dragonestia.picker.model.room.Room, ..)) && args(room, ..)", argNames = "room") void onLinkUsers(Room room) { countAllUsers(room); } - @After(value = "execution(void ru.dragonestia.picker.repository.UserRepository.unlinkWithRoom(ru.dragonestia.picker.model.Room, ..)) && args(room, ..)", argNames = "room") + @After(value = "execution(void ru.dragonestia.picker.repository.UserRepository.unlinkWithRoom(ru.dragonestia.picker.model.room.Room, ..)) && args(room, ..)", argNames = "room") void onUnlinkUsers(Room room) { countAllUsers(room); } @@ -55,7 +55,7 @@ public class UserMetricsAspect { totalUsers.set(userRepository.countAllUsers()); } - @After(value = "execution(void ru.dragonestia.picker.repository.NodeRepository.create(ru.dragonestia.picker.model.Node)) && args(node)", argNames = "node") + @After(value = "execution(void ru.dragonestia.picker.repository.NodeRepository.create(ru.dragonestia.picker.model.node.Node)) && args(node)", argNames = "node") void onCreateNode(Node node) { var nodeId = node.getIdentifier(); var gauge = Gauge.builder("roompicker_node_users_total", () -> data.get(nodeId).users()) @@ -78,7 +78,7 @@ public class UserMetricsAspect { data.put(nodeId, new NodeData(gauge, new AtomicInteger(0), counter, new AtomicInteger(0), lockedGauge, roomsGauge)); } - @After(value = "execution(* ru.dragonestia.picker.repository.NodeRepository.delete(ru.dragonestia.picker.model.Node)) && args(node)", argNames = "node") + @After(value = "execution(* ru.dragonestia.picker.repository.NodeRepository.delete(ru.dragonestia.picker.model.node.Node)) && args(node)", argNames = "node") void onDeleteNode(Node node) { var data = this.data.remove(node.getIdentifier()); @@ -88,7 +88,7 @@ public class UserMetricsAspect { meterRegistry.remove(data.roomsGauge()); } - @AfterReturning(value = "execution(* ru.dragonestia.picker.repository.RoomRepository.pick(ru.dragonestia.picker.model.Node, *)) && args(node, ..)", argNames = "node") + @AfterReturning(value = "execution(* ru.dragonestia.picker.repository.RoomRepository.pick(ru.dragonestia.picker.model.node.Node, *)) && args(node, ..)", argNames = "node") void onPickRoom(Node node) { data.get(node.getIdentifier()).picksPerMinute().increment(); } diff --git a/server/src/main/java/ru/dragonestia/picker/config/TestConfig.java b/server/src/main/java/ru/dragonestia/picker/config/TestConfig.java index 7a52b0d..64e8085 100644 --- a/server/src/main/java/ru/dragonestia/picker/config/TestConfig.java +++ b/server/src/main/java/ru/dragonestia/picker/config/TestConfig.java @@ -16,11 +16,9 @@ import ru.dragonestia.picker.api.repository.type.NodeIdentifier; import ru.dragonestia.picker.api.repository.type.RoomIdentifier; import ru.dragonestia.picker.api.repository.type.UserIdentifier; import ru.dragonestia.picker.interceptor.DebugInterceptor; -import ru.dragonestia.picker.model.Room; -import ru.dragonestia.picker.model.Node; -import ru.dragonestia.picker.model.User; +import ru.dragonestia.picker.model.node.Node; +import ru.dragonestia.picker.model.user.User; import ru.dragonestia.picker.model.factory.RoomFactory; -import ru.dragonestia.picker.model.type.SlotLimit; import ru.dragonestia.picker.repository.RoomRepository; import ru.dragonestia.picker.repository.NodeRepository; import ru.dragonestia.picker.repository.UserRepository; diff --git a/server/src/main/java/ru/dragonestia/picker/controller/graphql/GraphqlController.java b/server/src/main/java/ru/dragonestia/picker/controller/graphql/GraphqlController.java index b9c72c0..c07c44c 100644 --- a/server/src/main/java/ru/dragonestia/picker/controller/graphql/GraphqlController.java +++ b/server/src/main/java/ru/dragonestia/picker/controller/graphql/GraphqlController.java @@ -9,7 +9,7 @@ import ru.dragonestia.picker.controller.graphql.entity.EntityNode; import ru.dragonestia.picker.controller.graphql.entity.EntityRoom; import ru.dragonestia.picker.controller.graphql.entity.EntityUser; import ru.dragonestia.picker.controller.graphql.entity.type.DataProvider; -import ru.dragonestia.picker.model.User; +import ru.dragonestia.picker.model.user.User; import ru.dragonestia.picker.service.NodeService; import ru.dragonestia.picker.service.RoomService; import ru.dragonestia.picker.service.UserService; diff --git a/server/src/main/java/ru/dragonestia/picker/controller/graphql/entity/EntityNode.java b/server/src/main/java/ru/dragonestia/picker/controller/graphql/entity/EntityNode.java index 48a5c09..acbedea 100644 --- a/server/src/main/java/ru/dragonestia/picker/controller/graphql/entity/EntityNode.java +++ b/server/src/main/java/ru/dragonestia/picker/controller/graphql/entity/EntityNode.java @@ -2,7 +2,7 @@ package ru.dragonestia.picker.controller.graphql.entity; import lombok.RequiredArgsConstructor; import ru.dragonestia.picker.controller.graphql.entity.type.DataProvider; -import ru.dragonestia.picker.model.Node; +import ru.dragonestia.picker.model.node.Node; import java.util.List; diff --git a/server/src/main/java/ru/dragonestia/picker/controller/graphql/entity/EntityRoom.java b/server/src/main/java/ru/dragonestia/picker/controller/graphql/entity/EntityRoom.java index 61bfd53..9d4588b 100644 --- a/server/src/main/java/ru/dragonestia/picker/controller/graphql/entity/EntityRoom.java +++ b/server/src/main/java/ru/dragonestia/picker/controller/graphql/entity/EntityRoom.java @@ -2,7 +2,7 @@ package ru.dragonestia.picker.controller.graphql.entity; import lombok.RequiredArgsConstructor; import ru.dragonestia.picker.controller.graphql.entity.type.DataProvider; -import ru.dragonestia.picker.model.Room; +import ru.dragonestia.picker.model.room.Room; import java.util.List; diff --git a/server/src/main/java/ru/dragonestia/picker/controller/graphql/entity/EntityUser.java b/server/src/main/java/ru/dragonestia/picker/controller/graphql/entity/EntityUser.java index 76287f9..abb0f37 100644 --- a/server/src/main/java/ru/dragonestia/picker/controller/graphql/entity/EntityUser.java +++ b/server/src/main/java/ru/dragonestia/picker/controller/graphql/entity/EntityUser.java @@ -3,7 +3,7 @@ package ru.dragonestia.picker.controller.graphql.entity; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; import ru.dragonestia.picker.controller.graphql.entity.type.DataProvider; -import ru.dragonestia.picker.model.User; +import ru.dragonestia.picker.model.user.User; import java.util.List; diff --git a/server/src/main/java/ru/dragonestia/picker/event/UpdateRoomLockStateEvent.java b/server/src/main/java/ru/dragonestia/picker/event/UpdateRoomLockStateEvent.java index afb453a..9439878 100644 --- a/server/src/main/java/ru/dragonestia/picker/event/UpdateRoomLockStateEvent.java +++ b/server/src/main/java/ru/dragonestia/picker/event/UpdateRoomLockStateEvent.java @@ -1,7 +1,7 @@ package ru.dragonestia.picker.event; import org.jetbrains.annotations.NotNull; -import ru.dragonestia.picker.model.Room; +import ru.dragonestia.picker.model.room.Room; import java.util.function.Consumer; diff --git a/server/src/main/java/ru/dragonestia/picker/model/Account.java b/server/src/main/java/ru/dragonestia/picker/model/account/Account.java similarity index 97% rename from server/src/main/java/ru/dragonestia/picker/model/Account.java rename to server/src/main/java/ru/dragonestia/picker/model/account/Account.java index dd6ae15..4bd8b6d 100644 --- a/server/src/main/java/ru/dragonestia/picker/model/Account.java +++ b/server/src/main/java/ru/dragonestia/picker/model/account/Account.java @@ -1,4 +1,4 @@ -package ru.dragonestia.picker.model; +package ru.dragonestia.picker.model.account; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; @@ -6,7 +6,6 @@ import org.springframework.security.core.userdetails.UserDetails; import ru.dragonestia.picker.api.model.account.IAccount; import ru.dragonestia.picker.api.model.account.ResponseAccount; -import java.beans.Transient; import java.util.Collection; import java.util.HashSet; import java.util.Set; diff --git a/server/src/main/java/ru/dragonestia/picker/model/Permission.java b/server/src/main/java/ru/dragonestia/picker/model/account/Permission.java similarity index 86% rename from server/src/main/java/ru/dragonestia/picker/model/Permission.java rename to server/src/main/java/ru/dragonestia/picker/model/account/Permission.java index 2b485fd..ed039f1 100644 --- a/server/src/main/java/ru/dragonestia/picker/model/Permission.java +++ b/server/src/main/java/ru/dragonestia/picker/model/account/Permission.java @@ -1,4 +1,4 @@ -package ru.dragonestia.picker.model; +package ru.dragonestia.picker.model.account; import org.springframework.security.core.GrantedAuthority; diff --git a/server/src/main/java/ru/dragonestia/picker/model/factory/RoomFactory.java b/server/src/main/java/ru/dragonestia/picker/model/factory/RoomFactory.java index 7fee26e..9b29267 100644 --- a/server/src/main/java/ru/dragonestia/picker/model/factory/RoomFactory.java +++ b/server/src/main/java/ru/dragonestia/picker/model/factory/RoomFactory.java @@ -3,11 +3,10 @@ package ru.dragonestia.picker.model.factory; import lombok.RequiredArgsConstructor; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; -import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Component; import ru.dragonestia.picker.api.repository.type.RoomIdentifier; -import ru.dragonestia.picker.model.Node; -import ru.dragonestia.picker.model.Room; +import ru.dragonestia.picker.model.node.Node; +import ru.dragonestia.picker.model.room.Room; @Component @RequiredArgsConstructor diff --git a/server/src/main/java/ru/dragonestia/picker/model/Node.java b/server/src/main/java/ru/dragonestia/picker/model/node/Node.java similarity index 97% rename from server/src/main/java/ru/dragonestia/picker/model/Node.java rename to server/src/main/java/ru/dragonestia/picker/model/node/Node.java index ab49bdd..f4f009d 100644 --- a/server/src/main/java/ru/dragonestia/picker/model/Node.java +++ b/server/src/main/java/ru/dragonestia/picker/model/node/Node.java @@ -1,4 +1,4 @@ -package ru.dragonestia.picker.model; +package ru.dragonestia.picker.model.node; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/server/src/main/java/ru/dragonestia/picker/model/Room.java b/server/src/main/java/ru/dragonestia/picker/model/room/Room.java similarity index 96% rename from server/src/main/java/ru/dragonestia/picker/model/Room.java rename to server/src/main/java/ru/dragonestia/picker/model/room/Room.java index 5404fc5..950c4b9 100644 --- a/server/src/main/java/ru/dragonestia/picker/model/Room.java +++ b/server/src/main/java/ru/dragonestia/picker/model/room/Room.java @@ -1,4 +1,4 @@ -package ru.dragonestia.picker.model; +package ru.dragonestia.picker.model.room; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -7,7 +7,7 @@ import ru.dragonestia.picker.api.model.room.ResponseRoom; import ru.dragonestia.picker.api.model.room.RoomDetails; import ru.dragonestia.picker.api.model.room.ShortResponseRoom; import ru.dragonestia.picker.api.repository.type.RoomIdentifier; -import ru.dragonestia.picker.event.UpdateRoomLockStateEvent; +import ru.dragonestia.picker.model.node.Node; import java.util.Objects; diff --git a/server/src/main/java/ru/dragonestia/picker/model/type/SlotLimit.java b/server/src/main/java/ru/dragonestia/picker/model/room/type/SlotLimit.java similarity index 92% rename from server/src/main/java/ru/dragonestia/picker/model/type/SlotLimit.java rename to server/src/main/java/ru/dragonestia/picker/model/room/type/SlotLimit.java index 45269d0..96c3d1d 100644 --- a/server/src/main/java/ru/dragonestia/picker/model/type/SlotLimit.java +++ b/server/src/main/java/ru/dragonestia/picker/model/room/type/SlotLimit.java @@ -1,4 +1,4 @@ -package ru.dragonestia.picker.model.type; +package ru.dragonestia.picker.model.room.type; import lombok.Getter; diff --git a/server/src/main/java/ru/dragonestia/picker/model/User.java b/server/src/main/java/ru/dragonestia/picker/model/user/User.java similarity index 96% rename from server/src/main/java/ru/dragonestia/picker/model/User.java rename to server/src/main/java/ru/dragonestia/picker/model/user/User.java index 83ef361..fd8606c 100644 --- a/server/src/main/java/ru/dragonestia/picker/model/User.java +++ b/server/src/main/java/ru/dragonestia/picker/model/user/User.java @@ -1,4 +1,4 @@ -package ru.dragonestia.picker.model; +package ru.dragonestia.picker.model.user; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/server/src/main/java/ru/dragonestia/picker/repository/NodeRepository.java b/server/src/main/java/ru/dragonestia/picker/repository/NodeRepository.java index 86b4183..245afb8 100644 --- a/server/src/main/java/ru/dragonestia/picker/repository/NodeRepository.java +++ b/server/src/main/java/ru/dragonestia/picker/repository/NodeRepository.java @@ -1,7 +1,7 @@ package ru.dragonestia.picker.repository; import ru.dragonestia.picker.api.exception.NodeAlreadyExistException; -import ru.dragonestia.picker.model.Node; +import ru.dragonestia.picker.model.node.Node; import java.util.List; import java.util.Optional; diff --git a/server/src/main/java/ru/dragonestia/picker/repository/RoomRepository.java b/server/src/main/java/ru/dragonestia/picker/repository/RoomRepository.java index 0b17c3a..353ca7f 100644 --- a/server/src/main/java/ru/dragonestia/picker/repository/RoomRepository.java +++ b/server/src/main/java/ru/dragonestia/picker/repository/RoomRepository.java @@ -2,9 +2,9 @@ package ru.dragonestia.picker.repository; import ru.dragonestia.picker.api.exception.NoRoomsAvailableException; import ru.dragonestia.picker.api.exception.RoomAlreadyExistException; -import ru.dragonestia.picker.model.Room; -import ru.dragonestia.picker.model.Node; -import ru.dragonestia.picker.model.User; +import ru.dragonestia.picker.model.room.Room; +import ru.dragonestia.picker.model.node.Node; +import ru.dragonestia.picker.model.user.User; import java.util.Collection; import java.util.Optional; diff --git a/server/src/main/java/ru/dragonestia/picker/repository/UserRepository.java b/server/src/main/java/ru/dragonestia/picker/repository/UserRepository.java index 88d75d1..3c16f26 100644 --- a/server/src/main/java/ru/dragonestia/picker/repository/UserRepository.java +++ b/server/src/main/java/ru/dragonestia/picker/repository/UserRepository.java @@ -1,11 +1,10 @@ package ru.dragonestia.picker.repository; import ru.dragonestia.picker.api.exception.RoomAreFullException; -import ru.dragonestia.picker.model.Room; -import ru.dragonestia.picker.model.User; +import ru.dragonestia.picker.model.room.Room; +import ru.dragonestia.picker.model.user.User; import java.util.Collection; -import java.util.List; import java.util.Map; public interface UserRepository { diff --git a/server/src/main/java/ru/dragonestia/picker/repository/impl/ContainerRepository.java b/server/src/main/java/ru/dragonestia/picker/repository/impl/ContainerRepository.java index 5d9e02c..325e556 100644 --- a/server/src/main/java/ru/dragonestia/picker/repository/impl/ContainerRepository.java +++ b/server/src/main/java/ru/dragonestia/picker/repository/impl/ContainerRepository.java @@ -1,10 +1,9 @@ package ru.dragonestia.picker.repository.impl; -import lombok.extern.log4j.Log4j2; import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Component; import ru.dragonestia.picker.api.exception.NodeAlreadyExistException; -import ru.dragonestia.picker.model.Node; +import ru.dragonestia.picker.model.node.Node; import ru.dragonestia.picker.repository.impl.container.NodeContainer; import ru.dragonestia.picker.repository.impl.type.UserTransaction; diff --git a/server/src/main/java/ru/dragonestia/picker/repository/impl/NodeRepositoryImpl.java b/server/src/main/java/ru/dragonestia/picker/repository/impl/NodeRepositoryImpl.java index 8503c01..4a2faea 100644 --- a/server/src/main/java/ru/dragonestia/picker/repository/impl/NodeRepositoryImpl.java +++ b/server/src/main/java/ru/dragonestia/picker/repository/impl/NodeRepositoryImpl.java @@ -1,10 +1,9 @@ package ru.dragonestia.picker.repository.impl; import lombok.RequiredArgsConstructor; -import lombok.extern.log4j.Log4j2; import org.springframework.stereotype.Component; import ru.dragonestia.picker.api.exception.NodeAlreadyExistException; -import ru.dragonestia.picker.model.Node; +import ru.dragonestia.picker.model.node.Node; import ru.dragonestia.picker.repository.NodeRepository; import ru.dragonestia.picker.repository.impl.container.NodeContainer; diff --git a/server/src/main/java/ru/dragonestia/picker/repository/impl/RoomRepositoryImpl.java b/server/src/main/java/ru/dragonestia/picker/repository/impl/RoomRepositoryImpl.java index fe570a0..b377f24 100644 --- a/server/src/main/java/ru/dragonestia/picker/repository/impl/RoomRepositoryImpl.java +++ b/server/src/main/java/ru/dragonestia/picker/repository/impl/RoomRepositoryImpl.java @@ -5,11 +5,10 @@ import org.springframework.stereotype.Component; import ru.dragonestia.picker.api.exception.NoRoomsAvailableException; import ru.dragonestia.picker.api.exception.NodeNotFoundException; import ru.dragonestia.picker.api.exception.RoomAlreadyExistException; -import ru.dragonestia.picker.model.Node; -import ru.dragonestia.picker.model.Room; -import ru.dragonestia.picker.model.User; +import ru.dragonestia.picker.model.node.Node; +import ru.dragonestia.picker.model.room.Room; +import ru.dragonestia.picker.model.user.User; import ru.dragonestia.picker.repository.RoomRepository; -import ru.dragonestia.picker.repository.impl.container.NodeContainer; import ru.dragonestia.picker.repository.impl.container.RoomContainer; import java.util.Collection; diff --git a/server/src/main/java/ru/dragonestia/picker/repository/impl/UserRepositoryImpl.java b/server/src/main/java/ru/dragonestia/picker/repository/impl/UserRepositoryImpl.java index 951f32d..c1fad86 100644 --- a/server/src/main/java/ru/dragonestia/picker/repository/impl/UserRepositoryImpl.java +++ b/server/src/main/java/ru/dragonestia/picker/repository/impl/UserRepositoryImpl.java @@ -6,8 +6,8 @@ import org.springframework.stereotype.Component; import ru.dragonestia.picker.api.exception.NodeNotFoundException; import ru.dragonestia.picker.api.exception.RoomAreFullException; import ru.dragonestia.picker.api.exception.RoomNotFoundException; -import ru.dragonestia.picker.model.Room; -import ru.dragonestia.picker.model.User; +import ru.dragonestia.picker.model.room.Room; +import ru.dragonestia.picker.model.user.User; import ru.dragonestia.picker.repository.UserRepository; import ru.dragonestia.picker.repository.impl.container.RoomContainer; diff --git a/server/src/main/java/ru/dragonestia/picker/repository/impl/container/NodeContainer.java b/server/src/main/java/ru/dragonestia/picker/repository/impl/container/NodeContainer.java index 76716a2..3e35d31 100644 --- a/server/src/main/java/ru/dragonestia/picker/repository/impl/container/NodeContainer.java +++ b/server/src/main/java/ru/dragonestia/picker/repository/impl/container/NodeContainer.java @@ -3,9 +3,9 @@ package ru.dragonestia.picker.repository.impl.container; import lombok.Getter; import org.jetbrains.annotations.NotNull; import ru.dragonestia.picker.api.exception.RoomAlreadyExistException; -import ru.dragonestia.picker.model.Node; -import ru.dragonestia.picker.model.Room; -import ru.dragonestia.picker.model.User; +import ru.dragonestia.picker.model.node.Node; +import ru.dragonestia.picker.model.room.Room; +import ru.dragonestia.picker.model.user.User; import ru.dragonestia.picker.repository.impl.picker.LeastPickedPicker; import ru.dragonestia.picker.repository.impl.picker.RoomPicker; import ru.dragonestia.picker.repository.impl.picker.RoundRobinPicker; diff --git a/server/src/main/java/ru/dragonestia/picker/repository/impl/container/RoomContainer.java b/server/src/main/java/ru/dragonestia/picker/repository/impl/container/RoomContainer.java index 098409f..cff5151 100644 --- a/server/src/main/java/ru/dragonestia/picker/repository/impl/container/RoomContainer.java +++ b/server/src/main/java/ru/dragonestia/picker/repository/impl/container/RoomContainer.java @@ -3,8 +3,8 @@ package ru.dragonestia.picker.repository.impl.container; import lombok.Getter; import org.jetbrains.annotations.NotNull; import ru.dragonestia.picker.api.exception.RoomAreFullException; -import ru.dragonestia.picker.model.Room; -import ru.dragonestia.picker.model.User; +import ru.dragonestia.picker.model.room.Room; +import ru.dragonestia.picker.model.user.User; import ru.dragonestia.picker.repository.impl.picker.LeastPickedPicker; import java.util.*; diff --git a/server/src/main/java/ru/dragonestia/picker/repository/impl/picker/ItemWrapper.java b/server/src/main/java/ru/dragonestia/picker/repository/impl/picker/ItemWrapper.java index d516dd2..ff47d5b 100644 --- a/server/src/main/java/ru/dragonestia/picker/repository/impl/picker/ItemWrapper.java +++ b/server/src/main/java/ru/dragonestia/picker/repository/impl/picker/ItemWrapper.java @@ -1,6 +1,6 @@ package ru.dragonestia.picker.repository.impl.picker; -import ru.dragonestia.picker.model.type.SlotLimit; +import ru.dragonestia.picker.model.room.type.SlotLimit; public interface ItemWrapper { diff --git a/server/src/main/java/ru/dragonestia/picker/repository/impl/picker/LeastPickedPicker.java b/server/src/main/java/ru/dragonestia/picker/repository/impl/picker/LeastPickedPicker.java index aa6863c..a0de3f1 100644 --- a/server/src/main/java/ru/dragonestia/picker/repository/impl/picker/LeastPickedPicker.java +++ b/server/src/main/java/ru/dragonestia/picker/repository/impl/picker/LeastPickedPicker.java @@ -3,9 +3,8 @@ package ru.dragonestia.picker.repository.impl.picker; import lombok.RequiredArgsConstructor; import ru.dragonestia.picker.api.exception.NoRoomsAvailableException; import ru.dragonestia.picker.api.model.node.PickingMethod; -import ru.dragonestia.picker.model.Room; -import ru.dragonestia.picker.model.User; -import ru.dragonestia.picker.repository.UserRepository; +import ru.dragonestia.picker.model.room.Room; +import ru.dragonestia.picker.model.user.User; import ru.dragonestia.picker.repository.impl.collection.DynamicSortedMap; import ru.dragonestia.picker.repository.impl.container.NodeContainer; import ru.dragonestia.picker.repository.impl.container.RoomContainer; diff --git a/server/src/main/java/ru/dragonestia/picker/repository/impl/picker/RoomPicker.java b/server/src/main/java/ru/dragonestia/picker/repository/impl/picker/RoomPicker.java index 4e2d2a5..c5e3371 100644 --- a/server/src/main/java/ru/dragonestia/picker/repository/impl/picker/RoomPicker.java +++ b/server/src/main/java/ru/dragonestia/picker/repository/impl/picker/RoomPicker.java @@ -1,7 +1,7 @@ package ru.dragonestia.picker.repository.impl.picker; import ru.dragonestia.picker.api.model.node.PickingMethod; -import ru.dragonestia.picker.model.User; +import ru.dragonestia.picker.model.user.User; import ru.dragonestia.picker.repository.impl.container.RoomContainer; public interface RoomPicker extends Picker { diff --git a/server/src/main/java/ru/dragonestia/picker/repository/impl/picker/RoundRobinPicker.java b/server/src/main/java/ru/dragonestia/picker/repository/impl/picker/RoundRobinPicker.java index f423cb0..4476fb9 100644 --- a/server/src/main/java/ru/dragonestia/picker/repository/impl/picker/RoundRobinPicker.java +++ b/server/src/main/java/ru/dragonestia/picker/repository/impl/picker/RoundRobinPicker.java @@ -3,7 +3,7 @@ package ru.dragonestia.picker.repository.impl.picker; import lombok.RequiredArgsConstructor; import ru.dragonestia.picker.api.exception.NoRoomsAvailableException; import ru.dragonestia.picker.api.model.node.PickingMethod; -import ru.dragonestia.picker.model.User; +import ru.dragonestia.picker.model.user.User; import ru.dragonestia.picker.repository.impl.collection.QueuedLinkedList; import ru.dragonestia.picker.repository.impl.container.NodeContainer; import ru.dragonestia.picker.repository.impl.container.RoomContainer; diff --git a/server/src/main/java/ru/dragonestia/picker/repository/impl/picker/SequentialFillingPicker.java b/server/src/main/java/ru/dragonestia/picker/repository/impl/picker/SequentialFillingPicker.java index ca954f5..33f57e2 100644 --- a/server/src/main/java/ru/dragonestia/picker/repository/impl/picker/SequentialFillingPicker.java +++ b/server/src/main/java/ru/dragonestia/picker/repository/impl/picker/SequentialFillingPicker.java @@ -3,7 +3,7 @@ package ru.dragonestia.picker.repository.impl.picker; import lombok.RequiredArgsConstructor; import ru.dragonestia.picker.api.exception.NoRoomsAvailableException; import ru.dragonestia.picker.api.model.node.PickingMethod; -import ru.dragonestia.picker.model.User; +import ru.dragonestia.picker.model.user.User; import ru.dragonestia.picker.repository.impl.container.NodeContainer; import ru.dragonestia.picker.repository.impl.container.RoomContainer; diff --git a/server/src/main/java/ru/dragonestia/picker/repository/impl/type/UserTransaction.java b/server/src/main/java/ru/dragonestia/picker/repository/impl/type/UserTransaction.java index 1ef9473..46d9cd8 100644 --- a/server/src/main/java/ru/dragonestia/picker/repository/impl/type/UserTransaction.java +++ b/server/src/main/java/ru/dragonestia/picker/repository/impl/type/UserTransaction.java @@ -1,8 +1,8 @@ package ru.dragonestia.picker.repository.impl.type; import org.jetbrains.annotations.NotNull; -import ru.dragonestia.picker.model.Room; -import ru.dragonestia.picker.model.User; +import ru.dragonestia.picker.model.room.Room; +import ru.dragonestia.picker.model.user.User; import java.util.Collection; import java.util.function.Consumer; diff --git a/server/src/main/java/ru/dragonestia/picker/service/AccountService.java b/server/src/main/java/ru/dragonestia/picker/service/AccountService.java index 83f4500..5a34655 100644 --- a/server/src/main/java/ru/dragonestia/picker/service/AccountService.java +++ b/server/src/main/java/ru/dragonestia/picker/service/AccountService.java @@ -4,7 +4,7 @@ import org.jetbrains.annotations.NotNull; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; -import ru.dragonestia.picker.model.Account; +import ru.dragonestia.picker.model.account.Account; import java.util.Collection; import java.util.Optional; diff --git a/server/src/main/java/ru/dragonestia/picker/service/NodeService.java b/server/src/main/java/ru/dragonestia/picker/service/NodeService.java index e28e8ad..ec83305 100644 --- a/server/src/main/java/ru/dragonestia/picker/service/NodeService.java +++ b/server/src/main/java/ru/dragonestia/picker/service/NodeService.java @@ -3,13 +3,10 @@ package ru.dragonestia.picker.service; import org.springframework.security.access.prepost.PreAuthorize; import ru.dragonestia.picker.api.exception.InvalidNodeIdentifierException; import ru.dragonestia.picker.api.exception.NodeAlreadyExistException; -import ru.dragonestia.picker.api.model.node.NodeDetails; -import ru.dragonestia.picker.api.model.node.ResponseNode; -import ru.dragonestia.picker.model.Node; +import ru.dragonestia.picker.model.node.Node; import java.util.List; import java.util.Optional; -import java.util.Set; public interface NodeService { diff --git a/server/src/main/java/ru/dragonestia/picker/service/RoomService.java b/server/src/main/java/ru/dragonestia/picker/service/RoomService.java index a7eef45..d3c8cc4 100644 --- a/server/src/main/java/ru/dragonestia/picker/service/RoomService.java +++ b/server/src/main/java/ru/dragonestia/picker/service/RoomService.java @@ -2,15 +2,12 @@ package ru.dragonestia.picker.service; import ru.dragonestia.picker.api.exception.InvalidRoomIdentifierException; import ru.dragonestia.picker.api.exception.RoomAlreadyExistException; -import ru.dragonestia.picker.api.model.room.RoomDetails; -import ru.dragonestia.picker.api.model.room.ShortResponseRoom; import ru.dragonestia.picker.api.repository.response.PickedRoomResponse; -import ru.dragonestia.picker.model.Room; -import ru.dragonestia.picker.model.Node; -import ru.dragonestia.picker.model.User; +import ru.dragonestia.picker.model.room.Room; +import ru.dragonestia.picker.model.node.Node; +import ru.dragonestia.picker.model.user.User; import java.util.Collection; -import java.util.List; import java.util.Optional; import java.util.Set; diff --git a/server/src/main/java/ru/dragonestia/picker/service/UserService.java b/server/src/main/java/ru/dragonestia/picker/service/UserService.java index 7dcf07e..dfdf79c 100644 --- a/server/src/main/java/ru/dragonestia/picker/service/UserService.java +++ b/server/src/main/java/ru/dragonestia/picker/service/UserService.java @@ -2,8 +2,8 @@ package ru.dragonestia.picker.service; import ru.dragonestia.picker.api.exception.RoomAreFullException; import ru.dragonestia.picker.api.model.user.ResponseUser; -import ru.dragonestia.picker.model.Room; -import ru.dragonestia.picker.model.User; +import ru.dragonestia.picker.model.room.Room; +import ru.dragonestia.picker.model.user.User; import java.util.Collection; import java.util.List; diff --git a/server/src/main/java/ru/dragonestia/picker/service/impl/AccountServiceImpl.java b/server/src/main/java/ru/dragonestia/picker/service/impl/AccountServiceImpl.java index 43d4106..e97b2ed 100644 --- a/server/src/main/java/ru/dragonestia/picker/service/impl/AccountServiceImpl.java +++ b/server/src/main/java/ru/dragonestia/picker/service/impl/AccountServiceImpl.java @@ -8,8 +8,8 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import ru.dragonestia.picker.api.exception.ConstantAdminParamsException; import ru.dragonestia.picker.config.RoomPickerServerConfig; -import ru.dragonestia.picker.model.Account; -import ru.dragonestia.picker.model.Permission; +import ru.dragonestia.picker.model.account.Account; +import ru.dragonestia.picker.model.account.Permission; import ru.dragonestia.picker.service.AccountService; import java.util.Arrays; diff --git a/server/src/main/java/ru/dragonestia/picker/service/impl/NodeServiceImpl.java b/server/src/main/java/ru/dragonestia/picker/service/impl/NodeServiceImpl.java index cf08785..473f903 100644 --- a/server/src/main/java/ru/dragonestia/picker/service/impl/NodeServiceImpl.java +++ b/server/src/main/java/ru/dragonestia/picker/service/impl/NodeServiceImpl.java @@ -4,7 +4,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import ru.dragonestia.picker.api.exception.InvalidNodeIdentifierException; import ru.dragonestia.picker.api.exception.NodeAlreadyExistException; -import ru.dragonestia.picker.model.Node; +import ru.dragonestia.picker.model.node.Node; import ru.dragonestia.picker.repository.NodeRepository; import ru.dragonestia.picker.repository.RoomRepository; import ru.dragonestia.picker.service.NodeService; diff --git a/server/src/main/java/ru/dragonestia/picker/service/impl/RoomServiceImpl.java b/server/src/main/java/ru/dragonestia/picker/service/impl/RoomServiceImpl.java index cbf489a..8622ba6 100644 --- a/server/src/main/java/ru/dragonestia/picker/service/impl/RoomServiceImpl.java +++ b/server/src/main/java/ru/dragonestia/picker/service/impl/RoomServiceImpl.java @@ -8,9 +8,9 @@ import ru.dragonestia.picker.api.exception.NodeNotFoundException; import ru.dragonestia.picker.api.exception.NotPersistedNodeException; import ru.dragonestia.picker.api.exception.RoomAlreadyExistException; import ru.dragonestia.picker.api.repository.response.PickedRoomResponse; -import ru.dragonestia.picker.model.Room; -import ru.dragonestia.picker.model.Node; -import ru.dragonestia.picker.model.User; +import ru.dragonestia.picker.model.room.Room; +import ru.dragonestia.picker.model.node.Node; +import ru.dragonestia.picker.model.user.User; import ru.dragonestia.picker.repository.NodeRepository; import ru.dragonestia.picker.repository.RoomRepository; import ru.dragonestia.picker.repository.UserRepository; diff --git a/server/src/main/java/ru/dragonestia/picker/service/impl/UserServiceImpl.java b/server/src/main/java/ru/dragonestia/picker/service/impl/UserServiceImpl.java index 15e1641..e928ccd 100644 --- a/server/src/main/java/ru/dragonestia/picker/service/impl/UserServiceImpl.java +++ b/server/src/main/java/ru/dragonestia/picker/service/impl/UserServiceImpl.java @@ -3,8 +3,8 @@ package ru.dragonestia.picker.service.impl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import ru.dragonestia.picker.api.model.user.ResponseUser; -import ru.dragonestia.picker.model.Room; -import ru.dragonestia.picker.model.User; +import ru.dragonestia.picker.model.room.Room; +import ru.dragonestia.picker.model.user.User; import ru.dragonestia.picker.repository.UserRepository; import ru.dragonestia.picker.service.UserService; diff --git a/server/src/main/java/ru/dragonestia/picker/storage/NodeAndRoomStorage.java b/server/src/main/java/ru/dragonestia/picker/storage/NodeAndRoomStorage.java index c16b9f0..27e5ddd 100644 --- a/server/src/main/java/ru/dragonestia/picker/storage/NodeAndRoomStorage.java +++ b/server/src/main/java/ru/dragonestia/picker/storage/NodeAndRoomStorage.java @@ -1,7 +1,7 @@ package ru.dragonestia.picker.storage; -import ru.dragonestia.picker.model.Node; -import ru.dragonestia.picker.model.Room; +import ru.dragonestia.picker.model.node.Node; +import ru.dragonestia.picker.model.room.Room; public interface NodeAndRoomStorage { diff --git a/server/src/main/java/ru/dragonestia/picker/storage/impl/FileStorageImpl.java b/server/src/main/java/ru/dragonestia/picker/storage/impl/FileStorageImpl.java index dbb8f1e..81e967b 100644 --- a/server/src/main/java/ru/dragonestia/picker/storage/impl/FileStorageImpl.java +++ b/server/src/main/java/ru/dragonestia/picker/storage/impl/FileStorageImpl.java @@ -8,8 +8,8 @@ import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import ru.dragonestia.picker.model.Node; -import ru.dragonestia.picker.model.Room; +import ru.dragonestia.picker.model.node.Node; +import ru.dragonestia.picker.model.room.Room; import ru.dragonestia.picker.repository.NodeRepository; import ru.dragonestia.picker.repository.RoomRepository; import ru.dragonestia.picker.storage.NodeAndRoomStorage; diff --git a/server/src/main/java/ru/dragonestia/picker/storage/impl/NullStorageImpl.java b/server/src/main/java/ru/dragonestia/picker/storage/impl/NullStorageImpl.java index b51c9b2..a015ca1 100644 --- a/server/src/main/java/ru/dragonestia/picker/storage/impl/NullStorageImpl.java +++ b/server/src/main/java/ru/dragonestia/picker/storage/impl/NullStorageImpl.java @@ -2,8 +2,8 @@ package ru.dragonestia.picker.storage.impl; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import ru.dragonestia.picker.model.Node; -import ru.dragonestia.picker.model.Room; +import ru.dragonestia.picker.model.node.Node; +import ru.dragonestia.picker.model.room.Room; import ru.dragonestia.picker.storage.NodeAndRoomStorage; @Profile("test") diff --git a/server/src/main/java/ru/dragonestia/picker/util/NamingValidator.java b/server/src/main/java/ru/dragonestia/picker/util/NamingValidator.java index 52783a2..9b97805 100644 --- a/server/src/main/java/ru/dragonestia/picker/util/NamingValidator.java +++ b/server/src/main/java/ru/dragonestia/picker/util/NamingValidator.java @@ -6,11 +6,10 @@ import ru.dragonestia.picker.api.exception.InvalidRoomIdentifierException; import ru.dragonestia.picker.api.exception.InvalidUsernamesException; import ru.dragonestia.picker.api.repository.type.UserIdentifier; import ru.dragonestia.picker.api.util.IdentifierValidator; -import ru.dragonestia.picker.model.User; +import ru.dragonestia.picker.model.user.User; import java.util.Collection; import java.util.LinkedList; -import java.util.List; @Component public class NamingValidator { diff --git a/server/src/test/java/ru/dragonestia/picker/config/FillingNodesConfig.java b/server/src/test/java/ru/dragonestia/picker/config/FillingNodesConfig.java index d55f491..1b43b74 100644 --- a/server/src/test/java/ru/dragonestia/picker/config/FillingNodesConfig.java +++ b/server/src/test/java/ru/dragonestia/picker/config/FillingNodesConfig.java @@ -7,9 +7,8 @@ import ru.dragonestia.picker.api.model.node.PickingMethod; import ru.dragonestia.picker.api.repository.type.NodeIdentifier; import ru.dragonestia.picker.api.repository.type.RoomIdentifier; import ru.dragonestia.picker.api.repository.type.UserIdentifier; -import ru.dragonestia.picker.model.Node; -import ru.dragonestia.picker.model.Room; -import ru.dragonestia.picker.model.User; +import ru.dragonestia.picker.model.node.Node; +import ru.dragonestia.picker.model.user.User; import ru.dragonestia.picker.model.factory.RoomFactory; import ru.dragonestia.picker.repository.NodeRepository; import ru.dragonestia.picker.repository.RoomRepository; diff --git a/server/src/test/java/ru/dragonestia/picker/picker/LeastPickedTests.java b/server/src/test/java/ru/dragonestia/picker/picker/LeastPickedTests.java index bbdbca6..a3b0f0c 100644 --- a/server/src/test/java/ru/dragonestia/picker/picker/LeastPickedTests.java +++ b/server/src/test/java/ru/dragonestia/picker/picker/LeastPickedTests.java @@ -12,7 +12,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Import; import ru.dragonestia.picker.api.exception.NoRoomsAvailableException; import ru.dragonestia.picker.config.FillingNodesConfig; -import ru.dragonestia.picker.model.Node; +import ru.dragonestia.picker.model.node.Node; import ru.dragonestia.picker.repository.RoomRepository; import ru.dragonestia.picker.repository.UserRepository; import ru.dragonestia.picker.util.UserFiller; diff --git a/server/src/test/java/ru/dragonestia/picker/picker/RoundRobinTests.java b/server/src/test/java/ru/dragonestia/picker/picker/RoundRobinTests.java index 5ab780d..86920c3 100644 --- a/server/src/test/java/ru/dragonestia/picker/picker/RoundRobinTests.java +++ b/server/src/test/java/ru/dragonestia/picker/picker/RoundRobinTests.java @@ -10,7 +10,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Import; import ru.dragonestia.picker.api.exception.NoRoomsAvailableException; import ru.dragonestia.picker.config.FillingNodesConfig; -import ru.dragonestia.picker.model.Node; +import ru.dragonestia.picker.model.node.Node; import ru.dragonestia.picker.repository.RoomRepository; import ru.dragonestia.picker.repository.UserRepository; import ru.dragonestia.picker.util.UserFiller; diff --git a/server/src/test/java/ru/dragonestia/picker/picker/SequentialFillingTests.java b/server/src/test/java/ru/dragonestia/picker/picker/SequentialFillingTests.java index 4dde327..824dace 100644 --- a/server/src/test/java/ru/dragonestia/picker/picker/SequentialFillingTests.java +++ b/server/src/test/java/ru/dragonestia/picker/picker/SequentialFillingTests.java @@ -12,7 +12,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Import; import ru.dragonestia.picker.api.exception.NoRoomsAvailableException; import ru.dragonestia.picker.config.FillingNodesConfig; -import ru.dragonestia.picker.model.Node; +import ru.dragonestia.picker.model.node.Node; import ru.dragonestia.picker.repository.RoomRepository; import ru.dragonestia.picker.repository.UserRepository; import ru.dragonestia.picker.util.UserFiller; diff --git a/server/src/test/java/ru/dragonestia/picker/service/NodeServiceTests.java b/server/src/test/java/ru/dragonestia/picker/service/NodeServiceTests.java index bbe18f8..ec0034f 100644 --- a/server/src/test/java/ru/dragonestia/picker/service/NodeServiceTests.java +++ b/server/src/test/java/ru/dragonestia/picker/service/NodeServiceTests.java @@ -8,7 +8,7 @@ import org.springframework.security.test.context.support.WithMockUser; import ru.dragonestia.picker.api.exception.NodeAlreadyExistException; import ru.dragonestia.picker.api.model.node.PickingMethod; import ru.dragonestia.picker.api.repository.type.NodeIdentifier; -import ru.dragonestia.picker.model.Node; +import ru.dragonestia.picker.model.node.Node; import java.util.List; diff --git a/server/src/test/java/ru/dragonestia/picker/service/RoomServiceTests.java b/server/src/test/java/ru/dragonestia/picker/service/RoomServiceTests.java index 8d8b7da..42dea0f 100644 --- a/server/src/test/java/ru/dragonestia/picker/service/RoomServiceTests.java +++ b/server/src/test/java/ru/dragonestia/picker/service/RoomServiceTests.java @@ -15,11 +15,9 @@ import ru.dragonestia.picker.api.model.room.IRoom; import ru.dragonestia.picker.api.repository.type.NodeIdentifier; import ru.dragonestia.picker.api.repository.type.RoomIdentifier; import ru.dragonestia.picker.api.repository.type.UserIdentifier; -import ru.dragonestia.picker.model.Node; -import ru.dragonestia.picker.model.Room; -import ru.dragonestia.picker.model.User; +import ru.dragonestia.picker.model.node.Node; +import ru.dragonestia.picker.model.user.User; import ru.dragonestia.picker.model.factory.RoomFactory; -import ru.dragonestia.picker.model.type.SlotLimit; import java.util.List; import java.util.Set; diff --git a/server/src/test/java/ru/dragonestia/picker/util/UserFiller.java b/server/src/test/java/ru/dragonestia/picker/util/UserFiller.java index 1f6f53f..cc24ea2 100644 --- a/server/src/test/java/ru/dragonestia/picker/util/UserFiller.java +++ b/server/src/test/java/ru/dragonestia/picker/util/UserFiller.java @@ -2,7 +2,7 @@ package ru.dragonestia.picker.util; import org.springframework.boot.test.context.TestComponent; import ru.dragonestia.picker.api.repository.type.UserIdentifier; -import ru.dragonestia.picker.model.User; +import ru.dragonestia.picker.model.user.User; import java.util.*;