From 3f86cb91519d1be5f6ec2ebb6ae99b1c2e244733 Mon Sep 17 00:00:00 2001 From: ScarletRedMan Date: Mon, 11 Mar 2024 21:20:45 +0700 Subject: [PATCH] Moved details to new package --- .../java/ru/dragonestia/picker/service/NodeService.java | 2 +- .../java/ru/dragonestia/picker/service/RoomService.java | 2 +- .../java/ru/dragonestia/picker/service/UserService.java | 4 ++-- .../ru/dragonestia/picker/service/impl/NodeServiceImpl.java | 2 +- .../ru/dragonestia/picker/service/impl/RoomServiceImpl.java | 2 +- .../ru/dragonestia/picker/service/impl/UserServiceImpl.java | 4 ++-- .../java/ru/dragonestia/picker/util/DetailsExtractor.java | 6 +++--- .../main/java/ru/dragonestia/picker/util/DetailsParser.java | 6 +++--- .../ru/dragonestia/picker/api/model/node/NodeDetails.java | 5 +++++ .../api/{repository/details => model/room}/RoomDetails.java | 2 +- .../ru/dragonestia/picker/api/model/user/UserDetails.java | 5 +++++ .../java/ru/dragonestia/picker/cp/component/NodeList.java | 2 +- .../java/ru/dragonestia/picker/cp/component/RoomList.java | 2 +- .../java/ru/dragonestia/picker/cp/component/UserList.java | 2 +- .../java/ru/dragonestia/picker/cp/page/UserDetailsPage.java | 2 +- .../java/ru/dragonestia/picker/cp/page/UserSearchPage.java | 2 +- .../picker/cp/repository/impl/NodeRepositoryImpl.java | 2 +- .../picker/cp/repository/impl/RoomRepositoryImpl.java | 2 +- .../picker/cp/repository/impl/UserRepositoryImpl.java | 4 ++-- 19 files changed, 34 insertions(+), 24 deletions(-) create mode 100644 client-api/src/main/java/ru/dragonestia/picker/api/model/node/NodeDetails.java rename client-api/src/main/java/ru/dragonestia/picker/api/{repository/details => model/room}/RoomDetails.java (51%) create mode 100644 client-api/src/main/java/ru/dragonestia/picker/api/model/user/UserDetails.java diff --git a/app/src/main/java/ru/dragonestia/picker/service/NodeService.java b/app/src/main/java/ru/dragonestia/picker/service/NodeService.java index 66bcca3..a0d9203 100644 --- a/app/src/main/java/ru/dragonestia/picker/service/NodeService.java +++ b/app/src/main/java/ru/dragonestia/picker/service/NodeService.java @@ -2,7 +2,7 @@ package ru.dragonestia.picker.service; import ru.dragonestia.picker.api.exception.InvalidNodeIdentifierException; import ru.dragonestia.picker.api.exception.NodeAlreadyExistException; -import ru.dragonestia.picker.api.repository.details.NodeDetails; +import ru.dragonestia.picker.api.model.node.NodeDetails; import ru.dragonestia.picker.api.repository.response.type.RNode; import ru.dragonestia.picker.model.Node; diff --git a/app/src/main/java/ru/dragonestia/picker/service/RoomService.java b/app/src/main/java/ru/dragonestia/picker/service/RoomService.java index 848d357..d8a1be8 100644 --- a/app/src/main/java/ru/dragonestia/picker/service/RoomService.java +++ b/app/src/main/java/ru/dragonestia/picker/service/RoomService.java @@ -2,7 +2,7 @@ package ru.dragonestia.picker.service; import ru.dragonestia.picker.api.exception.InvalidRoomIdentifierException; import ru.dragonestia.picker.api.exception.RoomAlreadyExistException; -import ru.dragonestia.picker.api.repository.details.RoomDetails; +import ru.dragonestia.picker.api.model.room.RoomDetails; import ru.dragonestia.picker.api.repository.response.type.RRoom; import ru.dragonestia.picker.model.Room; import ru.dragonestia.picker.model.Node; diff --git a/app/src/main/java/ru/dragonestia/picker/service/UserService.java b/app/src/main/java/ru/dragonestia/picker/service/UserService.java index a9a65e3..952c09c 100644 --- a/app/src/main/java/ru/dragonestia/picker/service/UserService.java +++ b/app/src/main/java/ru/dragonestia/picker/service/UserService.java @@ -1,10 +1,10 @@ package ru.dragonestia.picker.service; import ru.dragonestia.picker.api.exception.RoomAreFullException; -import ru.dragonestia.picker.api.repository.details.RoomDetails; +import ru.dragonestia.picker.api.model.room.RoomDetails; +import ru.dragonestia.picker.api.model.user.UserDetails; import ru.dragonestia.picker.api.repository.response.type.RRoom; import ru.dragonestia.picker.api.repository.response.type.RUser; -import ru.dragonestia.picker.api.repository.details.UserDetails; import ru.dragonestia.picker.model.Room; import ru.dragonestia.picker.model.User; diff --git a/app/src/main/java/ru/dragonestia/picker/service/impl/NodeServiceImpl.java b/app/src/main/java/ru/dragonestia/picker/service/impl/NodeServiceImpl.java index c37b81c..3fb8b10 100644 --- a/app/src/main/java/ru/dragonestia/picker/service/impl/NodeServiceImpl.java +++ b/app/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.api.repository.details.NodeDetails; +import ru.dragonestia.picker.api.model.node.NodeDetails; import ru.dragonestia.picker.api.repository.response.type.RNode; import ru.dragonestia.picker.model.Node; import ru.dragonestia.picker.repository.NodeRepository; diff --git a/app/src/main/java/ru/dragonestia/picker/service/impl/RoomServiceImpl.java b/app/src/main/java/ru/dragonestia/picker/service/impl/RoomServiceImpl.java index 4a4e159..44568c8 100644 --- a/app/src/main/java/ru/dragonestia/picker/service/impl/RoomServiceImpl.java +++ b/app/src/main/java/ru/dragonestia/picker/service/impl/RoomServiceImpl.java @@ -7,7 +7,7 @@ import ru.dragonestia.picker.api.exception.InvalidRoomIdentifierException; 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.details.RoomDetails; +import ru.dragonestia.picker.api.model.room.RoomDetails; import ru.dragonestia.picker.api.repository.response.type.RRoom; import ru.dragonestia.picker.model.Room; import ru.dragonestia.picker.model.Node; diff --git a/app/src/main/java/ru/dragonestia/picker/service/impl/UserServiceImpl.java b/app/src/main/java/ru/dragonestia/picker/service/impl/UserServiceImpl.java index e102463..362fd8d 100644 --- a/app/src/main/java/ru/dragonestia/picker/service/impl/UserServiceImpl.java +++ b/app/src/main/java/ru/dragonestia/picker/service/impl/UserServiceImpl.java @@ -2,10 +2,10 @@ package ru.dragonestia.picker.service.impl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import ru.dragonestia.picker.api.repository.details.RoomDetails; +import ru.dragonestia.picker.api.model.room.RoomDetails; +import ru.dragonestia.picker.api.model.user.UserDetails; import ru.dragonestia.picker.api.repository.response.type.RRoom; import ru.dragonestia.picker.api.repository.response.type.RUser; -import ru.dragonestia.picker.api.repository.details.UserDetails; import ru.dragonestia.picker.model.Room; import ru.dragonestia.picker.model.User; import ru.dragonestia.picker.repository.UserRepository; diff --git a/app/src/main/java/ru/dragonestia/picker/util/DetailsExtractor.java b/app/src/main/java/ru/dragonestia/picker/util/DetailsExtractor.java index 44a4161..3fad006 100644 --- a/app/src/main/java/ru/dragonestia/picker/util/DetailsExtractor.java +++ b/app/src/main/java/ru/dragonestia/picker/util/DetailsExtractor.java @@ -2,9 +2,9 @@ package ru.dragonestia.picker.util; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; -import ru.dragonestia.picker.api.repository.details.NodeDetails; -import ru.dragonestia.picker.api.repository.details.RoomDetails; -import ru.dragonestia.picker.api.repository.details.UserDetails; +import ru.dragonestia.picker.api.model.node.NodeDetails; +import ru.dragonestia.picker.api.model.room.RoomDetails; +import ru.dragonestia.picker.api.model.user.UserDetails; import ru.dragonestia.picker.api.repository.response.type.RNode; import ru.dragonestia.picker.api.repository.response.type.RRoom; import ru.dragonestia.picker.api.repository.response.type.RUser; diff --git a/app/src/main/java/ru/dragonestia/picker/util/DetailsParser.java b/app/src/main/java/ru/dragonestia/picker/util/DetailsParser.java index f6ea12b..cfaccb0 100644 --- a/app/src/main/java/ru/dragonestia/picker/util/DetailsParser.java +++ b/app/src/main/java/ru/dragonestia/picker/util/DetailsParser.java @@ -1,9 +1,9 @@ package ru.dragonestia.picker.util; import org.springframework.stereotype.Component; -import ru.dragonestia.picker.api.repository.details.NodeDetails; -import ru.dragonestia.picker.api.repository.details.RoomDetails; -import ru.dragonestia.picker.api.repository.details.UserDetails; +import ru.dragonestia.picker.api.model.node.NodeDetails; +import ru.dragonestia.picker.api.model.room.RoomDetails; +import ru.dragonestia.picker.api.model.user.UserDetails; import java.util.HashSet; import java.util.Set; diff --git a/client-api/src/main/java/ru/dragonestia/picker/api/model/node/NodeDetails.java b/client-api/src/main/java/ru/dragonestia/picker/api/model/node/NodeDetails.java new file mode 100644 index 0000000..f2319ec --- /dev/null +++ b/client-api/src/main/java/ru/dragonestia/picker/api/model/node/NodeDetails.java @@ -0,0 +1,5 @@ +package ru.dragonestia.picker.api.model.node; + +public enum NodeDetails { + PERSIST +} diff --git a/client-api/src/main/java/ru/dragonestia/picker/api/repository/details/RoomDetails.java b/client-api/src/main/java/ru/dragonestia/picker/api/model/room/RoomDetails.java similarity index 51% rename from client-api/src/main/java/ru/dragonestia/picker/api/repository/details/RoomDetails.java rename to client-api/src/main/java/ru/dragonestia/picker/api/model/room/RoomDetails.java index 29e9ee1..3036bdd 100644 --- a/client-api/src/main/java/ru/dragonestia/picker/api/repository/details/RoomDetails.java +++ b/client-api/src/main/java/ru/dragonestia/picker/api/model/room/RoomDetails.java @@ -1,4 +1,4 @@ -package ru.dragonestia.picker.api.repository.details; +package ru.dragonestia.picker.api.model.room; public enum RoomDetails { COUNT_USERS, diff --git a/client-api/src/main/java/ru/dragonestia/picker/api/model/user/UserDetails.java b/client-api/src/main/java/ru/dragonestia/picker/api/model/user/UserDetails.java new file mode 100644 index 0000000..8c846c6 --- /dev/null +++ b/client-api/src/main/java/ru/dragonestia/picker/api/model/user/UserDetails.java @@ -0,0 +1,5 @@ +package ru.dragonestia.picker.api.model.user; + +public enum UserDetails { + COUNT_ROOMS +} 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 1354ba3..d3ee7db 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 @@ -15,8 +15,8 @@ import com.vaadin.flow.component.orderedlayout.VerticalLayout; import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.data.value.ValueChangeMode; import lombok.Setter; +import ru.dragonestia.picker.api.model.node.NodeDetails; import ru.dragonestia.picker.api.repository.NodeRepository; -import ru.dragonestia.picker.api.repository.details.NodeDetails; import ru.dragonestia.picker.api.repository.response.type.RNode; import java.util.Comparator; 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 ec485f2..2e6d07f 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 @@ -16,8 +16,8 @@ import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.data.value.ValueChangeMode; import lombok.Setter; import lombok.extern.log4j.Log4j2; +import ru.dragonestia.picker.api.model.room.RoomDetails; import ru.dragonestia.picker.api.repository.RoomRepository; -import ru.dragonestia.picker.api.repository.details.RoomDetails; import ru.dragonestia.picker.api.repository.response.type.RNode; import ru.dragonestia.picker.api.repository.response.type.RRoom; 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 982041b..3239072 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 @@ -9,10 +9,10 @@ import com.vaadin.flow.component.icon.Icon; import com.vaadin.flow.component.icon.VaadinIcon; import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.component.orderedlayout.VerticalLayout; +import ru.dragonestia.picker.api.model.user.UserDetails; import ru.dragonestia.picker.api.repository.UserRepository; import ru.dragonestia.picker.api.repository.response.type.RRoom; import ru.dragonestia.picker.api.repository.response.type.RUser; -import ru.dragonestia.picker.api.repository.details.UserDetails; import java.util.ArrayList; import java.util.List; 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 bab6fa8..7471c56 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 @@ -13,9 +13,9 @@ import com.vaadin.flow.router.BeforeEnterObserver; import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import lombok.RequiredArgsConstructor; +import ru.dragonestia.picker.api.model.room.RoomDetails; import ru.dragonestia.picker.api.repository.RoomRepository; import ru.dragonestia.picker.api.repository.UserRepository; -import ru.dragonestia.picker.api.repository.details.RoomDetails; import ru.dragonestia.picker.api.repository.response.type.RRoom; import ru.dragonestia.picker.api.repository.response.type.RUser; import ru.dragonestia.picker.cp.component.RefreshableTable; 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 fc633d8..7742052 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 @@ -14,8 +14,8 @@ import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import org.springframework.beans.factory.annotation.Autowired; +import ru.dragonestia.picker.api.model.user.UserDetails; import ru.dragonestia.picker.api.repository.UserRepository; -import ru.dragonestia.picker.api.repository.details.UserDetails; import ru.dragonestia.picker.api.repository.response.type.RUser; import ru.dragonestia.picker.cp.component.RefreshableTable; diff --git a/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/NodeRepositoryImpl.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/NodeRepositoryImpl.java index dab1594..1ce37c0 100644 --- a/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/NodeRepositoryImpl.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/NodeRepositoryImpl.java @@ -7,7 +7,7 @@ import org.springframework.http.HttpMethod; import ru.dragonestia.picker.api.exception.InvalidNodeIdentifierException; import ru.dragonestia.picker.api.exception.NodeAlreadyExistException; import ru.dragonestia.picker.api.exception.NodeNotFoundException; -import ru.dragonestia.picker.api.repository.details.NodeDetails; +import ru.dragonestia.picker.api.model.node.NodeDetails; import ru.dragonestia.picker.api.repository.response.NodeDetailsResponse; import ru.dragonestia.picker.api.repository.response.NodeListResponse; import ru.dragonestia.picker.api.repository.response.type.RNode; diff --git a/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/RoomRepositoryImpl.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/RoomRepositoryImpl.java index 21a823a..00385d5 100644 --- a/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/RoomRepositoryImpl.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/RoomRepositoryImpl.java @@ -8,7 +8,7 @@ import ru.dragonestia.picker.api.exception.InvalidRoomIdentifierException; import ru.dragonestia.picker.api.exception.NodeNotFoundException; import ru.dragonestia.picker.api.exception.RoomAlreadyExistException; import ru.dragonestia.picker.api.exception.RoomNotFoundException; -import ru.dragonestia.picker.api.repository.details.RoomDetails; +import ru.dragonestia.picker.api.model.room.RoomDetails; import ru.dragonestia.picker.api.repository.response.type.RNode; import ru.dragonestia.picker.api.repository.response.type.RRoom; import ru.dragonestia.picker.api.repository.RoomRepository; diff --git a/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/UserRepositoryImpl.java b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/UserRepositoryImpl.java index 425d8a2..fcc8715 100644 --- a/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/UserRepositoryImpl.java +++ b/control-panel/src/main/java/ru/dragonestia/picker/cp/repository/impl/UserRepositoryImpl.java @@ -7,14 +7,14 @@ import org.springframework.http.HttpMethod; 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.api.repository.details.RoomDetails; +import ru.dragonestia.picker.api.model.room.RoomDetails; +import ru.dragonestia.picker.api.model.user.UserDetails; import ru.dragonestia.picker.api.repository.response.LinkedRoomsWithUserResponse; import ru.dragonestia.picker.api.repository.response.SearchUserResponse; import ru.dragonestia.picker.api.repository.response.UserDetailsResponse; import ru.dragonestia.picker.api.repository.response.type.RRoom; import ru.dragonestia.picker.api.repository.response.type.RUser; import ru.dragonestia.picker.api.repository.UserRepository; -import ru.dragonestia.picker.api.repository.details.UserDetails; import ru.dragonestia.picker.api.repository.response.RoomUserListResponse; import java.util.*;