diff --git a/client-api/src/main/java/ru/dragonestia/picker/api/repository/NodeRepository.java b/client-api/src/main/java/ru/dragonestia/picker/api/repository/NodeRepository.java index 4009f74..503b1ba 100644 --- a/client-api/src/main/java/ru/dragonestia/picker/api/repository/NodeRepository.java +++ b/client-api/src/main/java/ru/dragonestia/picker/api/repository/NodeRepository.java @@ -3,9 +3,9 @@ package ru.dragonestia.picker.api.repository; import org.jetbrains.annotations.NotNull; import ru.dragonestia.picker.api.model.node.INode; import ru.dragonestia.picker.api.model.node.NodeDefinition; -import ru.dragonestia.picker.api.repository.request.node.FindNodeById; -import ru.dragonestia.picker.api.repository.request.node.GetAllNodes; -import ru.dragonestia.picker.api.repository.request.node.RemoveNodesByIds; +import ru.dragonestia.picker.api.repository.query.node.FindNodeById; +import ru.dragonestia.picker.api.repository.query.node.GetAllNodes; +import ru.dragonestia.picker.api.repository.query.node.RemoveNodesByIds; import ru.dragonestia.picker.api.repository.response.PickedRoomResponse; import ru.dragonestia.picker.api.repository.type.NodeIdentifier; import ru.dragonestia.picker.api.repository.type.UserIdentifier; diff --git a/client-api/src/main/java/ru/dragonestia/picker/api/repository/RoomRepository.java b/client-api/src/main/java/ru/dragonestia/picker/api/repository/RoomRepository.java index 9c9d2d2..84887b5 100644 --- a/client-api/src/main/java/ru/dragonestia/picker/api/repository/RoomRepository.java +++ b/client-api/src/main/java/ru/dragonestia/picker/api/repository/RoomRepository.java @@ -5,9 +5,9 @@ import ru.dragonestia.picker.api.model.room.IRoom; import ru.dragonestia.picker.api.model.room.ResponseRoom; import ru.dragonestia.picker.api.model.room.RoomDefinition; import ru.dragonestia.picker.api.model.room.ShortResponseRoom; -import ru.dragonestia.picker.api.repository.request.room.FindRoomById; -import ru.dragonestia.picker.api.repository.request.room.GetAllRooms; -import ru.dragonestia.picker.api.repository.request.room.RemoveRoomsByIds; +import ru.dragonestia.picker.api.repository.query.room.FindRoomById; +import ru.dragonestia.picker.api.repository.query.room.GetAllRooms; +import ru.dragonestia.picker.api.repository.query.room.RemoveRoomsByIds; import ru.dragonestia.picker.api.repository.type.RoomPath; import java.util.List; diff --git a/client-api/src/main/java/ru/dragonestia/picker/api/repository/UserRepository.java b/client-api/src/main/java/ru/dragonestia/picker/api/repository/UserRepository.java index 29b42a6..570eb99 100644 --- a/client-api/src/main/java/ru/dragonestia/picker/api/repository/UserRepository.java +++ b/client-api/src/main/java/ru/dragonestia/picker/api/repository/UserRepository.java @@ -3,7 +3,7 @@ package ru.dragonestia.picker.api.repository; import org.jetbrains.annotations.NotNull; import ru.dragonestia.picker.api.model.room.ShortResponseRoom; import ru.dragonestia.picker.api.model.user.ResponseUser; -import ru.dragonestia.picker.api.repository.request.user.*; +import ru.dragonestia.picker.api.repository.query.user.*; import java.util.List; diff --git a/client-api/src/main/java/ru/dragonestia/picker/api/repository/request/node/FindNodeById.java b/client-api/src/main/java/ru/dragonestia/picker/api/repository/query/node/FindNodeById.java similarity index 97% rename from client-api/src/main/java/ru/dragonestia/picker/api/repository/request/node/FindNodeById.java rename to client-api/src/main/java/ru/dragonestia/picker/api/repository/query/node/FindNodeById.java index 9ae7dfd..b92033f 100644 --- a/client-api/src/main/java/ru/dragonestia/picker/api/repository/request/node/FindNodeById.java +++ b/client-api/src/main/java/ru/dragonestia/picker/api/repository/query/node/FindNodeById.java @@ -1,4 +1,4 @@ -package ru.dragonestia.picker.api.repository.request.node; +package ru.dragonestia.picker.api.repository.query.node; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; diff --git a/client-api/src/main/java/ru/dragonestia/picker/api/repository/request/node/GetAllNodes.java b/client-api/src/main/java/ru/dragonestia/picker/api/repository/query/node/GetAllNodes.java similarity index 96% rename from client-api/src/main/java/ru/dragonestia/picker/api/repository/request/node/GetAllNodes.java rename to client-api/src/main/java/ru/dragonestia/picker/api/repository/query/node/GetAllNodes.java index c2512db..accd889 100644 --- a/client-api/src/main/java/ru/dragonestia/picker/api/repository/request/node/GetAllNodes.java +++ b/client-api/src/main/java/ru/dragonestia/picker/api/repository/query/node/GetAllNodes.java @@ -1,4 +1,4 @@ -package ru.dragonestia.picker.api.repository.request.node; +package ru.dragonestia.picker.api.repository.query.node; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; diff --git a/client-api/src/main/java/ru/dragonestia/picker/api/repository/request/node/RemoveNodesByIds.java b/client-api/src/main/java/ru/dragonestia/picker/api/repository/query/node/RemoveNodesByIds.java similarity index 96% rename from client-api/src/main/java/ru/dragonestia/picker/api/repository/request/node/RemoveNodesByIds.java rename to client-api/src/main/java/ru/dragonestia/picker/api/repository/query/node/RemoveNodesByIds.java index 98b7d5f..1970f0c 100644 --- a/client-api/src/main/java/ru/dragonestia/picker/api/repository/request/node/RemoveNodesByIds.java +++ b/client-api/src/main/java/ru/dragonestia/picker/api/repository/query/node/RemoveNodesByIds.java @@ -1,4 +1,4 @@ -package ru.dragonestia.picker.api.repository.request.node; +package ru.dragonestia.picker.api.repository.query.node; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; diff --git a/client-api/src/main/java/ru/dragonestia/picker/api/repository/request/room/FindRoomById.java b/client-api/src/main/java/ru/dragonestia/picker/api/repository/query/room/FindRoomById.java similarity index 98% rename from client-api/src/main/java/ru/dragonestia/picker/api/repository/request/room/FindRoomById.java rename to client-api/src/main/java/ru/dragonestia/picker/api/repository/query/room/FindRoomById.java index 23ab37f..cb0e94f 100644 --- a/client-api/src/main/java/ru/dragonestia/picker/api/repository/request/room/FindRoomById.java +++ b/client-api/src/main/java/ru/dragonestia/picker/api/repository/query/room/FindRoomById.java @@ -1,4 +1,4 @@ -package ru.dragonestia.picker.api.repository.request.room; +package ru.dragonestia.picker.api.repository.query.room; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; diff --git a/client-api/src/main/java/ru/dragonestia/picker/api/repository/request/room/GetAllRooms.java b/client-api/src/main/java/ru/dragonestia/picker/api/repository/query/room/GetAllRooms.java similarity index 97% rename from client-api/src/main/java/ru/dragonestia/picker/api/repository/request/room/GetAllRooms.java rename to client-api/src/main/java/ru/dragonestia/picker/api/repository/query/room/GetAllRooms.java index af4497f..27e4a93 100644 --- a/client-api/src/main/java/ru/dragonestia/picker/api/repository/request/room/GetAllRooms.java +++ b/client-api/src/main/java/ru/dragonestia/picker/api/repository/query/room/GetAllRooms.java @@ -1,4 +1,4 @@ -package ru.dragonestia.picker.api.repository.request.room; +package ru.dragonestia.picker.api.repository.query.room; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; diff --git a/client-api/src/main/java/ru/dragonestia/picker/api/repository/request/room/RemoveRoomsByIds.java b/client-api/src/main/java/ru/dragonestia/picker/api/repository/query/room/RemoveRoomsByIds.java similarity index 93% rename from client-api/src/main/java/ru/dragonestia/picker/api/repository/request/room/RemoveRoomsByIds.java rename to client-api/src/main/java/ru/dragonestia/picker/api/repository/query/room/RemoveRoomsByIds.java index c026f36..513d209 100644 --- a/client-api/src/main/java/ru/dragonestia/picker/api/repository/request/room/RemoveRoomsByIds.java +++ b/client-api/src/main/java/ru/dragonestia/picker/api/repository/query/room/RemoveRoomsByIds.java @@ -1,12 +1,10 @@ -package ru.dragonestia.picker.api.repository.request.room; +package ru.dragonestia.picker.api.repository.query.room; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import ru.dragonestia.picker.api.repository.type.NodeIdentifier; import ru.dragonestia.picker.api.repository.type.RoomIdentifier; -import ru.dragonestia.picker.api.repository.type.RoomPath; -import java.util.Collections; import java.util.Set; import java.util.stream.Collectors; diff --git a/client-api/src/main/java/ru/dragonestia/picker/api/repository/request/user/FindRoomsLinkedWithUser.java b/client-api/src/main/java/ru/dragonestia/picker/api/repository/query/user/FindRoomsLinkedWithUser.java similarity index 97% rename from client-api/src/main/java/ru/dragonestia/picker/api/repository/request/user/FindRoomsLinkedWithUser.java rename to client-api/src/main/java/ru/dragonestia/picker/api/repository/query/user/FindRoomsLinkedWithUser.java index 5b6d16a..a88bfbd 100644 --- a/client-api/src/main/java/ru/dragonestia/picker/api/repository/request/user/FindRoomsLinkedWithUser.java +++ b/client-api/src/main/java/ru/dragonestia/picker/api/repository/query/user/FindRoomsLinkedWithUser.java @@ -1,4 +1,4 @@ -package ru.dragonestia.picker.api.repository.request.user; +package ru.dragonestia.picker.api.repository.query.user; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; diff --git a/client-api/src/main/java/ru/dragonestia/picker/api/repository/request/user/FindUserById.java b/client-api/src/main/java/ru/dragonestia/picker/api/repository/query/user/FindUserById.java similarity index 97% rename from client-api/src/main/java/ru/dragonestia/picker/api/repository/request/user/FindUserById.java rename to client-api/src/main/java/ru/dragonestia/picker/api/repository/query/user/FindUserById.java index 48a0941..31cf783 100644 --- a/client-api/src/main/java/ru/dragonestia/picker/api/repository/request/user/FindUserById.java +++ b/client-api/src/main/java/ru/dragonestia/picker/api/repository/query/user/FindUserById.java @@ -1,4 +1,4 @@ -package ru.dragonestia.picker.api.repository.request.user; +package ru.dragonestia.picker.api.repository.query.user; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; diff --git a/client-api/src/main/java/ru/dragonestia/picker/api/repository/request/user/GetAllUsersFromRoom.java b/client-api/src/main/java/ru/dragonestia/picker/api/repository/query/user/GetAllUsersFromRoom.java similarity index 98% rename from client-api/src/main/java/ru/dragonestia/picker/api/repository/request/user/GetAllUsersFromRoom.java rename to client-api/src/main/java/ru/dragonestia/picker/api/repository/query/user/GetAllUsersFromRoom.java index 13ed54d..6a83527 100644 --- a/client-api/src/main/java/ru/dragonestia/picker/api/repository/request/user/GetAllUsersFromRoom.java +++ b/client-api/src/main/java/ru/dragonestia/picker/api/repository/query/user/GetAllUsersFromRoom.java @@ -1,4 +1,4 @@ -package ru.dragonestia.picker.api.repository.request.user; +package ru.dragonestia.picker.api.repository.query.user; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; diff --git a/client-api/src/main/java/ru/dragonestia/picker/api/repository/request/user/LinkUsersWithRoom.java b/client-api/src/main/java/ru/dragonestia/picker/api/repository/query/user/LinkUsersWithRoom.java similarity index 97% rename from client-api/src/main/java/ru/dragonestia/picker/api/repository/request/user/LinkUsersWithRoom.java rename to client-api/src/main/java/ru/dragonestia/picker/api/repository/query/user/LinkUsersWithRoom.java index 8e889d2..d4ed255 100644 --- a/client-api/src/main/java/ru/dragonestia/picker/api/repository/request/user/LinkUsersWithRoom.java +++ b/client-api/src/main/java/ru/dragonestia/picker/api/repository/query/user/LinkUsersWithRoom.java @@ -1,4 +1,4 @@ -package ru.dragonestia.picker.api.repository.request.user; +package ru.dragonestia.picker.api.repository.query.user; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; diff --git a/client-api/src/main/java/ru/dragonestia/picker/api/repository/request/user/SearchUsers.java b/client-api/src/main/java/ru/dragonestia/picker/api/repository/query/user/SearchUsers.java similarity index 97% rename from client-api/src/main/java/ru/dragonestia/picker/api/repository/request/user/SearchUsers.java rename to client-api/src/main/java/ru/dragonestia/picker/api/repository/query/user/SearchUsers.java index f6fa71f..3b50b0b 100644 --- a/client-api/src/main/java/ru/dragonestia/picker/api/repository/request/user/SearchUsers.java +++ b/client-api/src/main/java/ru/dragonestia/picker/api/repository/query/user/SearchUsers.java @@ -1,4 +1,4 @@ -package ru.dragonestia.picker.api.repository.request.user; +package ru.dragonestia.picker.api.repository.query.user; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; diff --git a/client-api/src/main/java/ru/dragonestia/picker/api/repository/request/user/UnlinkUsersFromRoom.java b/client-api/src/main/java/ru/dragonestia/picker/api/repository/query/user/UnlinkUsersFromRoom.java similarity index 97% rename from client-api/src/main/java/ru/dragonestia/picker/api/repository/request/user/UnlinkUsersFromRoom.java rename to client-api/src/main/java/ru/dragonestia/picker/api/repository/query/user/UnlinkUsersFromRoom.java index 46a7151..660f8a8 100644 --- a/client-api/src/main/java/ru/dragonestia/picker/api/repository/request/user/UnlinkUsersFromRoom.java +++ b/client-api/src/main/java/ru/dragonestia/picker/api/repository/query/user/UnlinkUsersFromRoom.java @@ -1,4 +1,4 @@ -package ru.dragonestia.picker.api.repository.request.user; +package ru.dragonestia.picker.api.repository.query.user; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; diff --git a/client-impl/src/main/java/ru/dragonestia/picker/api/impl/repository/NodeRepositoryImpl.java b/client-impl/src/main/java/ru/dragonestia/picker/api/impl/repository/NodeRepositoryImpl.java index cc26fa2..08034a3 100644 --- a/client-impl/src/main/java/ru/dragonestia/picker/api/impl/repository/NodeRepositoryImpl.java +++ b/client-impl/src/main/java/ru/dragonestia/picker/api/impl/repository/NodeRepositoryImpl.java @@ -10,9 +10,9 @@ import ru.dragonestia.picker.api.impl.util.type.HttpMethod; import ru.dragonestia.picker.api.model.node.INode; import ru.dragonestia.picker.api.model.node.NodeDefinition; import ru.dragonestia.picker.api.repository.NodeRepository; -import ru.dragonestia.picker.api.repository.request.node.FindNodeById; -import ru.dragonestia.picker.api.repository.request.node.GetAllNodes; -import ru.dragonestia.picker.api.repository.request.node.RemoveNodesByIds; +import ru.dragonestia.picker.api.repository.query.node.FindNodeById; +import ru.dragonestia.picker.api.repository.query.node.GetAllNodes; +import ru.dragonestia.picker.api.repository.query.node.RemoveNodesByIds; import ru.dragonestia.picker.api.repository.response.NodeDetailsResponse; import ru.dragonestia.picker.api.repository.response.NodeListResponse; import ru.dragonestia.picker.api.repository.response.PickedRoomResponse; diff --git a/client-impl/src/main/java/ru/dragonestia/picker/api/impl/repository/RoomRepositoryImpl.java b/client-impl/src/main/java/ru/dragonestia/picker/api/impl/repository/RoomRepositoryImpl.java index a70b7e9..c40a557 100644 --- a/client-impl/src/main/java/ru/dragonestia/picker/api/impl/repository/RoomRepositoryImpl.java +++ b/client-impl/src/main/java/ru/dragonestia/picker/api/impl/repository/RoomRepositoryImpl.java @@ -12,9 +12,9 @@ import ru.dragonestia.picker.api.model.room.ResponseRoom; import ru.dragonestia.picker.api.model.room.RoomDefinition; import ru.dragonestia.picker.api.model.room.ShortResponseRoom; import ru.dragonestia.picker.api.repository.RoomRepository; -import ru.dragonestia.picker.api.repository.request.room.FindRoomById; -import ru.dragonestia.picker.api.repository.request.room.GetAllRooms; -import ru.dragonestia.picker.api.repository.request.room.RemoveRoomsByIds; +import ru.dragonestia.picker.api.repository.query.room.FindRoomById; +import ru.dragonestia.picker.api.repository.query.room.GetAllRooms; +import ru.dragonestia.picker.api.repository.query.room.RemoveRoomsByIds; import ru.dragonestia.picker.api.repository.response.RoomInfoResponse; import ru.dragonestia.picker.api.repository.response.RoomListResponse; import ru.dragonestia.picker.api.repository.type.RoomPath; diff --git a/client-impl/src/main/java/ru/dragonestia/picker/api/impl/repository/UserRepositoryImpl.java b/client-impl/src/main/java/ru/dragonestia/picker/api/impl/repository/UserRepositoryImpl.java index 7a04046..b939d96 100644 --- a/client-impl/src/main/java/ru/dragonestia/picker/api/impl/repository/UserRepositoryImpl.java +++ b/client-impl/src/main/java/ru/dragonestia/picker/api/impl/repository/UserRepositoryImpl.java @@ -9,7 +9,7 @@ import ru.dragonestia.picker.api.impl.util.type.HttpMethod; import ru.dragonestia.picker.api.model.room.ShortResponseRoom; import ru.dragonestia.picker.api.model.user.ResponseUser; import ru.dragonestia.picker.api.repository.UserRepository; -import ru.dragonestia.picker.api.repository.request.user.*; +import ru.dragonestia.picker.api.repository.query.user.*; import ru.dragonestia.picker.api.repository.response.LinkedRoomsWithUserResponse; import ru.dragonestia.picker.api.repository.response.RoomUserListResponse; import ru.dragonestia.picker.api.repository.response.SearchUserResponse; diff --git a/control-panel/src/main/java/ru/dragonestia/picker/cp/component/NodeList.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/component/NodeList.java index 604674b..72bb552 100644 --- a/control-panel/src/main/java/ru/dragonestia/picker/cp/component/NodeList.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/component/NodeList.java @@ -17,7 +17,7 @@ import com.vaadin.flow.data.value.ValueChangeMode; import ru.dragonestia.picker.api.model.node.INode; import ru.dragonestia.picker.api.model.node.NodeDetails; import ru.dragonestia.picker.api.repository.NodeRepository; -import ru.dragonestia.picker.api.repository.request.node.GetAllNodes; +import ru.dragonestia.picker.api.repository.query.node.GetAllNodes; import java.util.Comparator; import java.util.List; diff --git a/control-panel/src/main/java/ru/dragonestia/picker/cp/component/RoomList.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/component/RoomList.java index 54b9853..271acbf 100644 --- a/control-panel/src/main/java/ru/dragonestia/picker/cp/component/RoomList.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/component/RoomList.java @@ -19,7 +19,7 @@ import ru.dragonestia.picker.api.model.node.INode; import ru.dragonestia.picker.api.model.room.RoomDetails; import ru.dragonestia.picker.api.model.room.ShortResponseRoom; import ru.dragonestia.picker.api.repository.RoomRepository; -import ru.dragonestia.picker.api.repository.request.room.GetAllRooms; +import ru.dragonestia.picker.api.repository.query.room.GetAllRooms; import java.util.List; diff --git a/control-panel/src/main/java/ru/dragonestia/picker/cp/component/UserList.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/component/UserList.java index eb2ee49..fa94c54 100644 --- a/control-panel/src/main/java/ru/dragonestia/picker/cp/component/UserList.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/component/UserList.java @@ -13,8 +13,8 @@ import ru.dragonestia.picker.api.model.room.IRoom; import ru.dragonestia.picker.api.model.user.IUser; import ru.dragonestia.picker.api.model.user.UserDetails; import ru.dragonestia.picker.api.repository.UserRepository; -import ru.dragonestia.picker.api.repository.request.user.GetAllUsersFromRoom; -import ru.dragonestia.picker.api.repository.request.user.UnlinkUsersFromRoom; +import ru.dragonestia.picker.api.repository.query.user.GetAllUsersFromRoom; +import ru.dragonestia.picker.api.repository.query.user.UnlinkUsersFromRoom; import java.util.ArrayList; import java.util.List; diff --git a/control-panel/src/main/java/ru/dragonestia/picker/cp/page/RoomDetailsPage.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/page/RoomDetailsPage.java index 2a7f319..b26b0ef 100644 --- a/control-panel/src/main/java/ru/dragonestia/picker/cp/page/RoomDetailsPage.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/page/RoomDetailsPage.java @@ -19,7 +19,7 @@ import ru.dragonestia.picker.api.model.node.INode; import ru.dragonestia.picker.api.model.room.IRoom; import ru.dragonestia.picker.api.model.room.ResponseRoom; import ru.dragonestia.picker.api.model.user.IUser; -import ru.dragonestia.picker.api.repository.request.user.LinkUsersWithRoom; +import ru.dragonestia.picker.api.repository.query.user.LinkUsersWithRoom; import ru.dragonestia.picker.cp.component.AddUsers; import ru.dragonestia.picker.cp.component.NavPath; import ru.dragonestia.picker.cp.component.Notifications; diff --git a/control-panel/src/main/java/ru/dragonestia/picker/cp/page/UserDetailsPage.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/page/UserDetailsPage.java index a3fcdd1..d376fdc 100644 --- a/control-panel/src/main/java/ru/dragonestia/picker/cp/page/UserDetailsPage.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/page/UserDetailsPage.java @@ -17,7 +17,7 @@ import ru.dragonestia.picker.api.impl.RoomPickerClient; import ru.dragonestia.picker.api.model.room.RoomDetails; import ru.dragonestia.picker.api.model.room.ShortResponseRoom; import ru.dragonestia.picker.api.model.user.IUser; -import ru.dragonestia.picker.api.repository.request.user.FindRoomsLinkedWithUser; +import ru.dragonestia.picker.api.repository.query.user.FindRoomsLinkedWithUser; import ru.dragonestia.picker.cp.component.RefreshableTable; import ru.dragonestia.picker.cp.util.RouteParamsExtractor; diff --git a/control-panel/src/main/java/ru/dragonestia/picker/cp/page/UserSearchPage.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/page/UserSearchPage.java index 6680e02..a1d5e47 100644 --- a/control-panel/src/main/java/ru/dragonestia/picker/cp/page/UserSearchPage.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/page/UserSearchPage.java @@ -18,7 +18,7 @@ import ru.dragonestia.picker.api.impl.RoomPickerClient; import ru.dragonestia.picker.api.model.user.IUser; import ru.dragonestia.picker.api.model.user.UserDetails; import ru.dragonestia.picker.api.repository.UserRepository; -import ru.dragonestia.picker.api.repository.request.user.SearchUsers; +import ru.dragonestia.picker.api.repository.query.user.SearchUsers; import ru.dragonestia.picker.api.repository.type.UserIdentifier; import ru.dragonestia.picker.cp.component.RefreshableTable; diff --git a/control-panel/src/main/java/ru/dragonestia/picker/cp/util/RouteParamsExtractor.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/util/RouteParamsExtractor.java index 2843421..e0205a8 100644 --- a/control-panel/src/main/java/ru/dragonestia/picker/cp/util/RouteParamsExtractor.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/util/RouteParamsExtractor.java @@ -9,9 +9,9 @@ import ru.dragonestia.picker.api.impl.RoomPickerClient; import ru.dragonestia.picker.api.model.node.INode; import ru.dragonestia.picker.api.model.room.IRoom; import ru.dragonestia.picker.api.model.user.IUser; -import ru.dragonestia.picker.api.repository.request.node.FindNodeById; -import ru.dragonestia.picker.api.repository.request.room.FindRoomById; -import ru.dragonestia.picker.api.repository.request.user.FindUserById; +import ru.dragonestia.picker.api.repository.query.node.FindNodeById; +import ru.dragonestia.picker.api.repository.query.room.FindRoomById; +import ru.dragonestia.picker.api.repository.query.user.FindUserById; import ru.dragonestia.picker.api.repository.type.NodeIdentifier; import ru.dragonestia.picker.api.repository.type.RoomIdentifier; import ru.dragonestia.picker.api.repository.type.UserIdentifier;