Skip to content

Commit e967c00

Browse files
ScarletRedManScarletRedMan
committed
Renamed package 'request' -> 'query'
1 parent 86044b0 commit e967c00

25 files changed

+36
-38
lines changed

‎client-api/src/main/java/ru/dragonestia/picker/api/repository/NodeRepository.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import org.jetbrains.annotations.NotNull;
44
import ru.dragonestia.picker.api.model.node.INode;
55
import ru.dragonestia.picker.api.model.node.NodeDefinition;
6-
import ru.dragonestia.picker.api.repository.request.node.FindNodeById;
7-
import ru.dragonestia.picker.api.repository.request.node.GetAllNodes;
8-
import ru.dragonestia.picker.api.repository.request.node.RemoveNodesByIds;
6+
import ru.dragonestia.picker.api.repository.query.node.FindNodeById;
7+
import ru.dragonestia.picker.api.repository.query.node.GetAllNodes;
8+
import ru.dragonestia.picker.api.repository.query.node.RemoveNodesByIds;
99
import ru.dragonestia.picker.api.repository.response.PickedRoomResponse;
1010
import ru.dragonestia.picker.api.repository.type.NodeIdentifier;
1111
import ru.dragonestia.picker.api.repository.type.UserIdentifier;

‎client-api/src/main/java/ru/dragonestia/picker/api/repository/RoomRepository.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import ru.dragonestia.picker.api.model.room.ResponseRoom;
66
import ru.dragonestia.picker.api.model.room.RoomDefinition;
77
import ru.dragonestia.picker.api.model.room.ShortResponseRoom;
8-
import ru.dragonestia.picker.api.repository.request.room.FindRoomById;
9-
import ru.dragonestia.picker.api.repository.request.room.GetAllRooms;
10-
import ru.dragonestia.picker.api.repository.request.room.RemoveRoomsByIds;
8+
import ru.dragonestia.picker.api.repository.query.room.FindRoomById;
9+
import ru.dragonestia.picker.api.repository.query.room.GetAllRooms;
10+
import ru.dragonestia.picker.api.repository.query.room.RemoveRoomsByIds;
1111
import ru.dragonestia.picker.api.repository.type.RoomPath;
1212

1313
import java.util.List;

‎client-api/src/main/java/ru/dragonestia/picker/api/repository/UserRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import org.jetbrains.annotations.NotNull;
44
import ru.dragonestia.picker.api.model.room.ShortResponseRoom;
55
import ru.dragonestia.picker.api.model.user.ResponseUser;
6-
import ru.dragonestia.picker.api.repository.request.user.*;
6+
import ru.dragonestia.picker.api.repository.query.user.*;
77

88
import java.util.List;
99

‎client-api/src/main/java/ru/dragonestia/picker/api/repository/request/node/FindNodeById.java renamed to ‎client-api/src/main/java/ru/dragonestia/picker/api/repository/query/node/FindNodeById.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ru.dragonestia.picker.api.repository.request.node;
1+
package ru.dragonestia.picker.api.repository.query.node;
22

33
import org.jetbrains.annotations.Contract;
44
import org.jetbrains.annotations.NotNull;

‎client-api/src/main/java/ru/dragonestia/picker/api/repository/request/node/GetAllNodes.java renamed to ‎client-api/src/main/java/ru/dragonestia/picker/api/repository/query/node/GetAllNodes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ru.dragonestia.picker.api.repository.request.node;
1+
package ru.dragonestia.picker.api.repository.query.node;
22

33
import org.jetbrains.annotations.Contract;
44
import org.jetbrains.annotations.NotNull;

‎client-api/src/main/java/ru/dragonestia/picker/api/repository/request/node/RemoveNodesByIds.java renamed to ‎client-api/src/main/java/ru/dragonestia/picker/api/repository/query/node/RemoveNodesByIds.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ru.dragonestia.picker.api.repository.request.node;
1+
package ru.dragonestia.picker.api.repository.query.node;
22

33
import org.jetbrains.annotations.Contract;
44
import org.jetbrains.annotations.NotNull;

‎client-api/src/main/java/ru/dragonestia/picker/api/repository/request/room/FindRoomById.java renamed to ‎client-api/src/main/java/ru/dragonestia/picker/api/repository/query/room/FindRoomById.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ru.dragonestia.picker.api.repository.request.room;
1+
package ru.dragonestia.picker.api.repository.query.room;
22

33
import org.jetbrains.annotations.Contract;
44
import org.jetbrains.annotations.NotNull;

‎client-api/src/main/java/ru/dragonestia/picker/api/repository/request/room/GetAllRooms.java renamed to ‎client-api/src/main/java/ru/dragonestia/picker/api/repository/query/room/GetAllRooms.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ru.dragonestia.picker.api.repository.request.room;
1+
package ru.dragonestia.picker.api.repository.query.room;
22

33
import org.jetbrains.annotations.Contract;
44
import org.jetbrains.annotations.NotNull;

‎client-api/src/main/java/ru/dragonestia/picker/api/repository/request/room/RemoveRoomsByIds.java renamed to ‎client-api/src/main/java/ru/dragonestia/picker/api/repository/query/room/RemoveRoomsByIds.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
package ru.dragonestia.picker.api.repository.request.room;
1+
package ru.dragonestia.picker.api.repository.query.room;
22

33
import org.jetbrains.annotations.Contract;
44
import org.jetbrains.annotations.NotNull;
55
import ru.dragonestia.picker.api.repository.type.NodeIdentifier;
66
import ru.dragonestia.picker.api.repository.type.RoomIdentifier;
7-
import ru.dragonestia.picker.api.repository.type.RoomPath;
87

9-
import java.util.Collections;
108
import java.util.Set;
119
import java.util.stream.Collectors;
1210

‎client-api/src/main/java/ru/dragonestia/picker/api/repository/request/user/FindRoomsLinkedWithUser.java renamed to ‎client-api/src/main/java/ru/dragonestia/picker/api/repository/query/user/FindRoomsLinkedWithUser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ru.dragonestia.picker.api.repository.request.user;
1+
package ru.dragonestia.picker.api.repository.query.user;
22

33
import org.jetbrains.annotations.Contract;
44
import org.jetbrains.annotations.NotNull;

‎client-api/src/main/java/ru/dragonestia/picker/api/repository/request/user/FindUserById.java renamed to ‎client-api/src/main/java/ru/dragonestia/picker/api/repository/query/user/FindUserById.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ru.dragonestia.picker.api.repository.request.user;
1+
package ru.dragonestia.picker.api.repository.query.user;
22

33
import org.jetbrains.annotations.Contract;
44
import org.jetbrains.annotations.NotNull;

‎client-api/src/main/java/ru/dragonestia/picker/api/repository/request/user/GetAllUsersFromRoom.java renamed to ‎client-api/src/main/java/ru/dragonestia/picker/api/repository/query/user/GetAllUsersFromRoom.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ru.dragonestia.picker.api.repository.request.user;
1+
package ru.dragonestia.picker.api.repository.query.user;
22

33
import org.jetbrains.annotations.Contract;
44
import org.jetbrains.annotations.NotNull;

‎client-api/src/main/java/ru/dragonestia/picker/api/repository/request/user/LinkUsersWithRoom.java renamed to ‎client-api/src/main/java/ru/dragonestia/picker/api/repository/query/user/LinkUsersWithRoom.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ru.dragonestia.picker.api.repository.request.user;
1+
package ru.dragonestia.picker.api.repository.query.user;
22

33
import org.jetbrains.annotations.Contract;
44
import org.jetbrains.annotations.NotNull;

‎client-api/src/main/java/ru/dragonestia/picker/api/repository/request/user/SearchUsers.java renamed to ‎client-api/src/main/java/ru/dragonestia/picker/api/repository/query/user/SearchUsers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ru.dragonestia.picker.api.repository.request.user;
1+
package ru.dragonestia.picker.api.repository.query.user;
22

33
import org.jetbrains.annotations.Contract;
44
import org.jetbrains.annotations.NotNull;

‎client-api/src/main/java/ru/dragonestia/picker/api/repository/request/user/UnlinkUsersFromRoom.java renamed to ‎client-api/src/main/java/ru/dragonestia/picker/api/repository/query/user/UnlinkUsersFromRoom.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ru.dragonestia.picker.api.repository.request.user;
1+
package ru.dragonestia.picker.api.repository.query.user;
22

33
import org.jetbrains.annotations.Contract;
44
import org.jetbrains.annotations.NotNull;

‎client-impl/src/main/java/ru/dragonestia/picker/api/impl/repository/NodeRepositoryImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
import ru.dragonestia.picker.api.model.node.INode;
1111
import ru.dragonestia.picker.api.model.node.NodeDefinition;
1212
import ru.dragonestia.picker.api.repository.NodeRepository;
13-
import ru.dragonestia.picker.api.repository.request.node.FindNodeById;
14-
import ru.dragonestia.picker.api.repository.request.node.GetAllNodes;
15-
import ru.dragonestia.picker.api.repository.request.node.RemoveNodesByIds;
13+
import ru.dragonestia.picker.api.repository.query.node.FindNodeById;
14+
import ru.dragonestia.picker.api.repository.query.node.GetAllNodes;
15+
import ru.dragonestia.picker.api.repository.query.node.RemoveNodesByIds;
1616
import ru.dragonestia.picker.api.repository.response.NodeDetailsResponse;
1717
import ru.dragonestia.picker.api.repository.response.NodeListResponse;
1818
import ru.dragonestia.picker.api.repository.response.PickedRoomResponse;

‎client-impl/src/main/java/ru/dragonestia/picker/api/impl/repository/RoomRepositoryImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
import ru.dragonestia.picker.api.model.room.RoomDefinition;
1313
import ru.dragonestia.picker.api.model.room.ShortResponseRoom;
1414
import ru.dragonestia.picker.api.repository.RoomRepository;
15-
import ru.dragonestia.picker.api.repository.request.room.FindRoomById;
16-
import ru.dragonestia.picker.api.repository.request.room.GetAllRooms;
17-
import ru.dragonestia.picker.api.repository.request.room.RemoveRoomsByIds;
15+
import ru.dragonestia.picker.api.repository.query.room.FindRoomById;
16+
import ru.dragonestia.picker.api.repository.query.room.GetAllRooms;
17+
import ru.dragonestia.picker.api.repository.query.room.RemoveRoomsByIds;
1818
import ru.dragonestia.picker.api.repository.response.RoomInfoResponse;
1919
import ru.dragonestia.picker.api.repository.response.RoomListResponse;
2020
import ru.dragonestia.picker.api.repository.type.RoomPath;

‎client-impl/src/main/java/ru/dragonestia/picker/api/impl/repository/UserRepositoryImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import ru.dragonestia.picker.api.model.room.ShortResponseRoom;
1010
import ru.dragonestia.picker.api.model.user.ResponseUser;
1111
import ru.dragonestia.picker.api.repository.UserRepository;
12-
import ru.dragonestia.picker.api.repository.request.user.*;
12+
import ru.dragonestia.picker.api.repository.query.user.*;
1313
import ru.dragonestia.picker.api.repository.response.LinkedRoomsWithUserResponse;
1414
import ru.dragonestia.picker.api.repository.response.RoomUserListResponse;
1515
import ru.dragonestia.picker.api.repository.response.SearchUserResponse;

‎control-panel/src/main/java/ru/dragonestia/picker/cp/component/NodeList.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import ru.dragonestia.picker.api.model.node.INode;
1818
import ru.dragonestia.picker.api.model.node.NodeDetails;
1919
import ru.dragonestia.picker.api.repository.NodeRepository;
20-
import ru.dragonestia.picker.api.repository.request.node.GetAllNodes;
20+
import ru.dragonestia.picker.api.repository.query.node.GetAllNodes;
2121

2222
import java.util.Comparator;
2323
import java.util.List;

‎control-panel/src/main/java/ru/dragonestia/picker/cp/component/RoomList.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import ru.dragonestia.picker.api.model.room.RoomDetails;
2020
import ru.dragonestia.picker.api.model.room.ShortResponseRoom;
2121
import ru.dragonestia.picker.api.repository.RoomRepository;
22-
import ru.dragonestia.picker.api.repository.request.room.GetAllRooms;
22+
import ru.dragonestia.picker.api.repository.query.room.GetAllRooms;
2323

2424
import java.util.List;
2525

‎control-panel/src/main/java/ru/dragonestia/picker/cp/component/UserList.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
import ru.dragonestia.picker.api.model.user.IUser;
1414
import ru.dragonestia.picker.api.model.user.UserDetails;
1515
import ru.dragonestia.picker.api.repository.UserRepository;
16-
import ru.dragonestia.picker.api.repository.request.user.GetAllUsersFromRoom;
17-
import ru.dragonestia.picker.api.repository.request.user.UnlinkUsersFromRoom;
16+
import ru.dragonestia.picker.api.repository.query.user.GetAllUsersFromRoom;
17+
import ru.dragonestia.picker.api.repository.query.user.UnlinkUsersFromRoom;
1818

1919
import java.util.ArrayList;
2020
import java.util.List;

‎control-panel/src/main/java/ru/dragonestia/picker/cp/page/RoomDetailsPage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import ru.dragonestia.picker.api.model.room.IRoom;
2020
import ru.dragonestia.picker.api.model.room.ResponseRoom;
2121
import ru.dragonestia.picker.api.model.user.IUser;
22-
import ru.dragonestia.picker.api.repository.request.user.LinkUsersWithRoom;
22+
import ru.dragonestia.picker.api.repository.query.user.LinkUsersWithRoom;
2323
import ru.dragonestia.picker.cp.component.AddUsers;
2424
import ru.dragonestia.picker.cp.component.NavPath;
2525
import ru.dragonestia.picker.cp.component.Notifications;

‎control-panel/src/main/java/ru/dragonestia/picker/cp/page/UserDetailsPage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import ru.dragonestia.picker.api.model.room.RoomDetails;
1818
import ru.dragonestia.picker.api.model.room.ShortResponseRoom;
1919
import ru.dragonestia.picker.api.model.user.IUser;
20-
import ru.dragonestia.picker.api.repository.request.user.FindRoomsLinkedWithUser;
20+
import ru.dragonestia.picker.api.repository.query.user.FindRoomsLinkedWithUser;
2121
import ru.dragonestia.picker.cp.component.RefreshableTable;
2222
import ru.dragonestia.picker.cp.util.RouteParamsExtractor;
2323

‎control-panel/src/main/java/ru/dragonestia/picker/cp/page/UserSearchPage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import ru.dragonestia.picker.api.model.user.IUser;
1919
import ru.dragonestia.picker.api.model.user.UserDetails;
2020
import ru.dragonestia.picker.api.repository.UserRepository;
21-
import ru.dragonestia.picker.api.repository.request.user.SearchUsers;
21+
import ru.dragonestia.picker.api.repository.query.user.SearchUsers;
2222
import ru.dragonestia.picker.api.repository.type.UserIdentifier;
2323
import ru.dragonestia.picker.cp.component.RefreshableTable;
2424

‎control-panel/src/main/java/ru/dragonestia/picker/cp/util/RouteParamsExtractor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
import ru.dragonestia.picker.api.model.node.INode;
1010
import ru.dragonestia.picker.api.model.room.IRoom;
1111
import ru.dragonestia.picker.api.model.user.IUser;
12-
import ru.dragonestia.picker.api.repository.request.node.FindNodeById;
13-
import ru.dragonestia.picker.api.repository.request.room.FindRoomById;
14-
import ru.dragonestia.picker.api.repository.request.user.FindUserById;
12+
import ru.dragonestia.picker.api.repository.query.node.FindNodeById;
13+
import ru.dragonestia.picker.api.repository.query.room.FindRoomById;
14+
import ru.dragonestia.picker.api.repository.query.user.FindUserById;
1515
import ru.dragonestia.picker.api.repository.type.NodeIdentifier;
1616
import ru.dragonestia.picker.api.repository.type.RoomIdentifier;
1717
import ru.dragonestia.picker.api.repository.type.UserIdentifier;

0 commit comments

Comments
 (0)