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

Renamed package 'request' -> 'query'

Browse Source
This commit is contained in:
Andrey Terentev 2024-03-13 13:58:01 +07:00 committed by Andrey Terentev
parent b407f291a8
commit c5b0d9ccf3
25 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client-api/src/main/java/ru/dragonestia/picker/api/repository/NodeRepository.java
View File

@ -3,9 +3,9 @@ package ru.dragonestia.picker.api.repository;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import ru.dragonestia.picker.api.model.node.INode; import ru.dragonestia.picker.api.model.node.INode;
import ru.dragonestia.picker.api.model.node.NodeDefinition; import ru.dragonestia.picker.api.model.node.NodeDefinition;
import ru.dragonestia.picker.api.repository.request.node.FindNodeById; import ru.dragonestia.picker.api.repository.query.node.FindNodeById;
import ru.dragonestia.picker.api.repository.request.node.GetAllNodes; import ru.dragonestia.picker.api.repository.query.node.GetAllNodes;
import ru.dragonestia.picker.api.repository.request.node.RemoveNodesByIds; import ru.dragonestia.picker.api.repository.query.node.RemoveNodesByIds;
import ru.dragonestia.picker.api.repository.response.PickedRoomResponse; import ru.dragonestia.picker.api.repository.response.PickedRoomResponse;
import ru.dragonestia.picker.api.repository.type.NodeIdentifier; import ru.dragonestia.picker.api.repository.type.NodeIdentifier;
import ru.dragonestia.picker.api.repository.type.UserIdentifier; import ru.dragonestia.picker.api.repository.type.UserIdentifier;

6
client-api/src/main/java/ru/dragonestia/picker/api/repository/RoomRepository.java
View File

@ -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.ResponseRoom;
import ru.dragonestia.picker.api.model.room.RoomDefinition; import ru.dragonestia.picker.api.model.room.RoomDefinition;
import ru.dragonestia.picker.api.model.room.ShortResponseRoom; import ru.dragonestia.picker.api.model.room.ShortResponseRoom;
import ru.dragonestia.picker.api.repository.request.room.FindRoomById; import ru.dragonestia.picker.api.repository.query.room.FindRoomById;
import ru.dragonestia.picker.api.repository.request.room.GetAllRooms; import ru.dragonestia.picker.api.repository.query.room.GetAllRooms;
import ru.dragonestia.picker.api.repository.request.room.RemoveRoomsByIds; import ru.dragonestia.picker.api.repository.query.room.RemoveRoomsByIds;
import ru.dragonestia.picker.api.repository.type.RoomPath; import ru.dragonestia.picker.api.repository.type.RoomPath;
import java.util.List; import java.util.List;

2
client-api/src/main/java/ru/dragonestia/picker/api/repository/UserRepository.java
View File

@ -3,7 +3,7 @@ package ru.dragonestia.picker.api.repository;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import ru.dragonestia.picker.api.model.room.ShortResponseRoom; import ru.dragonestia.picker.api.model.room.ShortResponseRoom;
import ru.dragonestia.picker.api.model.user.ResponseUser; 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; import java.util.List;

2
client-api/src/main/java/ru/dragonestia/picker/api/repository/request/node/FindNodeById.java → client-api/src/main/java/ru/dragonestia/picker/api/repository/query/node/FindNodeById.java
View File

@ -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.Contract;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

2
client-api/src/main/java/ru/dragonestia/picker/api/repository/request/node/GetAllNodes.java → client-api/src/main/java/ru/dragonestia/picker/api/repository/query/node/GetAllNodes.java
View File

@ -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.Contract;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

2
client-api/src/main/java/ru/dragonestia/picker/api/repository/request/node/RemoveNodesByIds.java → client-api/src/main/java/ru/dragonestia/picker/api/repository/query/node/RemoveNodesByIds.java
View File

@ -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.Contract;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

2
client-api/src/main/java/ru/dragonestia/picker/api/repository/request/room/FindRoomById.java → client-api/src/main/java/ru/dragonestia/picker/api/repository/query/room/FindRoomById.java
View File

@ -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.Contract;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

2
client-api/src/main/java/ru/dragonestia/picker/api/repository/request/room/GetAllRooms.java → client-api/src/main/java/ru/dragonestia/picker/api/repository/query/room/GetAllRooms.java
View File

@ -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.Contract;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

4
client-api/src/main/java/ru/dragonestia/picker/api/repository/request/room/RemoveRoomsByIds.java → client-api/src/main/java/ru/dragonestia/picker/api/repository/query/room/RemoveRoomsByIds.java
View File

@ -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.Contract;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import ru.dragonestia.picker.api.repository.type.NodeIdentifier; import ru.dragonestia.picker.api.repository.type.NodeIdentifier;
import ru.dragonestia.picker.api.repository.type.RoomIdentifier; 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.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;

2
client-api/src/main/java/ru/dragonestia/picker/api/repository/request/user/FindRoomsLinkedWithUser.java → client-api/src/main/java/ru/dragonestia/picker/api/repository/query/user/FindRoomsLinkedWithUser.java
View File

@ -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.Contract;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

2
client-api/src/main/java/ru/dragonestia/picker/api/repository/request/user/FindUserById.java → client-api/src/main/java/ru/dragonestia/picker/api/repository/query/user/FindUserById.java
View File

@ -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.Contract;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

2
client-api/src/main/java/ru/dragonestia/picker/api/repository/request/user/GetAllUsersFromRoom.java → client-api/src/main/java/ru/dragonestia/picker/api/repository/query/user/GetAllUsersFromRoom.java
View File

@ -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.Contract;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

2
client-api/src/main/java/ru/dragonestia/picker/api/repository/request/user/LinkUsersWithRoom.java → client-api/src/main/java/ru/dragonestia/picker/api/repository/query/user/LinkUsersWithRoom.java
View File

@ -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.Contract;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

2
client-api/src/main/java/ru/dragonestia/picker/api/repository/request/user/SearchUsers.java → client-api/src/main/java/ru/dragonestia/picker/api/repository/query/user/SearchUsers.java
View File

@ -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.Contract;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

2
client-api/src/main/java/ru/dragonestia/picker/api/repository/request/user/UnlinkUsersFromRoom.java → client-api/src/main/java/ru/dragonestia/picker/api/repository/query/user/UnlinkUsersFromRoom.java
View File

@ -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.Contract;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

6
client-impl/src/main/java/ru/dragonestia/picker/api/impl/repository/NodeRepositoryImpl.java
View File

@ -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.INode;
import ru.dragonestia.picker.api.model.node.NodeDefinition; import ru.dragonestia.picker.api.model.node.NodeDefinition;
import ru.dragonestia.picker.api.repository.NodeRepository; import ru.dragonestia.picker.api.repository.NodeRepository;
import ru.dragonestia.picker.api.repository.request.node.FindNodeById; import ru.dragonestia.picker.api.repository.query.node.FindNodeById;
import ru.dragonestia.picker.api.repository.request.node.GetAllNodes; import ru.dragonestia.picker.api.repository.query.node.GetAllNodes;
import ru.dragonestia.picker.api.repository.request.node.RemoveNodesByIds; import ru.dragonestia.picker.api.repository.query.node.RemoveNodesByIds;
import ru.dragonestia.picker.api.repository.response.NodeDetailsResponse; import ru.dragonestia.picker.api.repository.response.NodeDetailsResponse;
import ru.dragonestia.picker.api.repository.response.NodeListResponse; import ru.dragonestia.picker.api.repository.response.NodeListResponse;
import ru.dragonestia.picker.api.repository.response.PickedRoomResponse; import ru.dragonestia.picker.api.repository.response.PickedRoomResponse;

6
client-impl/src/main/java/ru/dragonestia/picker/api/impl/repository/RoomRepositoryImpl.java
View File

@ -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.RoomDefinition;
import ru.dragonestia.picker.api.model.room.ShortResponseRoom; import ru.dragonestia.picker.api.model.room.ShortResponseRoom;
import ru.dragonestia.picker.api.repository.RoomRepository; import ru.dragonestia.picker.api.repository.RoomRepository;
import ru.dragonestia.picker.api.repository.request.room.FindRoomById; import ru.dragonestia.picker.api.repository.query.room.FindRoomById;
import ru.dragonestia.picker.api.repository.request.room.GetAllRooms; import ru.dragonestia.picker.api.repository.query.room.GetAllRooms;
import ru.dragonestia.picker.api.repository.request.room.RemoveRoomsByIds; import ru.dragonestia.picker.api.repository.query.room.RemoveRoomsByIds;
import ru.dragonestia.picker.api.repository.response.RoomInfoResponse; import ru.dragonestia.picker.api.repository.response.RoomInfoResponse;
import ru.dragonestia.picker.api.repository.response.RoomListResponse; import ru.dragonestia.picker.api.repository.response.RoomListResponse;
import ru.dragonestia.picker.api.repository.type.RoomPath; import ru.dragonestia.picker.api.repository.type.RoomPath;

2
client-impl/src/main/java/ru/dragonestia/picker/api/impl/repository/UserRepositoryImpl.java
View File

@ -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.room.ShortResponseRoom;
import ru.dragonestia.picker.api.model.user.ResponseUser; import ru.dragonestia.picker.api.model.user.ResponseUser;
import ru.dragonestia.picker.api.repository.UserRepository; 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.LinkedRoomsWithUserResponse;
import ru.dragonestia.picker.api.repository.response.RoomUserListResponse; import ru.dragonestia.picker.api.repository.response.RoomUserListResponse;
import ru.dragonestia.picker.api.repository.response.SearchUserResponse; import ru.dragonestia.picker.api.repository.response.SearchUserResponse;

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

@ -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.INode;
import ru.dragonestia.picker.api.model.node.NodeDetails; import ru.dragonestia.picker.api.model.node.NodeDetails;
import ru.dragonestia.picker.api.repository.NodeRepository; 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.Comparator;
import java.util.List; import java.util.List;

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

@ -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.RoomDetails;
import ru.dragonestia.picker.api.model.room.ShortResponseRoom; import ru.dragonestia.picker.api.model.room.ShortResponseRoom;
import ru.dragonestia.picker.api.repository.RoomRepository; 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; import java.util.List;

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

@ -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.IUser;
import ru.dragonestia.picker.api.model.user.UserDetails; import ru.dragonestia.picker.api.model.user.UserDetails;
import ru.dragonestia.picker.api.repository.UserRepository; import ru.dragonestia.picker.api.repository.UserRepository;
import ru.dragonestia.picker.api.repository.request.user.GetAllUsersFromRoom; import ru.dragonestia.picker.api.repository.query.user.GetAllUsersFromRoom;
import ru.dragonestia.picker.api.repository.request.user.UnlinkUsersFromRoom; import ru.dragonestia.picker.api.repository.query.user.UnlinkUsersFromRoom;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

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

@ -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.IRoom;
import ru.dragonestia.picker.api.model.room.ResponseRoom; import ru.dragonestia.picker.api.model.room.ResponseRoom;
import ru.dragonestia.picker.api.model.user.IUser; 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.AddUsers;
import ru.dragonestia.picker.cp.component.NavPath; import ru.dragonestia.picker.cp.component.NavPath;
import ru.dragonestia.picker.cp.component.Notifications; import ru.dragonestia.picker.cp.component.Notifications;

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

@ -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.RoomDetails;
import ru.dragonestia.picker.api.model.room.ShortResponseRoom; import ru.dragonestia.picker.api.model.room.ShortResponseRoom;
import ru.dragonestia.picker.api.model.user.IUser; 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.component.RefreshableTable;
import ru.dragonestia.picker.cp.util.RouteParamsExtractor; import ru.dragonestia.picker.cp.util.RouteParamsExtractor;

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

@ -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.IUser;
import ru.dragonestia.picker.api.model.user.UserDetails; import ru.dragonestia.picker.api.model.user.UserDetails;
import ru.dragonestia.picker.api.repository.UserRepository; 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.api.repository.type.UserIdentifier;
import ru.dragonestia.picker.cp.component.RefreshableTable; import ru.dragonestia.picker.cp.component.RefreshableTable;

6
control-panel/src/main/java/ru/dragonestia/picker/cp/util/RouteParamsExtractor.java
View File

@ -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.node.INode;
import ru.dragonestia.picker.api.model.room.IRoom; import ru.dragonestia.picker.api.model.room.IRoom;
import ru.dragonestia.picker.api.model.user.IUser; import ru.dragonestia.picker.api.model.user.IUser;
import ru.dragonestia.picker.api.repository.request.node.FindNodeById; import ru.dragonestia.picker.api.repository.query.node.FindNodeById;
import ru.dragonestia.picker.api.repository.request.room.FindRoomById; import ru.dragonestia.picker.api.repository.query.room.FindRoomById;
import ru.dragonestia.picker.api.repository.request.user.FindUserById; import ru.dragonestia.picker.api.repository.query.user.FindUserById;
import ru.dragonestia.picker.api.repository.type.NodeIdentifier; import ru.dragonestia.picker.api.repository.type.NodeIdentifier;
import ru.dragonestia.picker.api.repository.type.RoomIdentifier; import ru.dragonestia.picker.api.repository.type.RoomIdentifier;
import ru.dragonestia.picker.api.repository.type.UserIdentifier; import ru.dragonestia.picker.api.repository.type.UserIdentifier;