diff --git a/client-api/src/main/java/ru/dragonestia/picker/api/model/node/INode.java b/client-api/src/main/java/ru/dragonestia/picker/api/model/node/INode.java index d5d6c6a..55e91be 100644 --- a/client-api/src/main/java/ru/dragonestia/picker/api/model/node/INode.java +++ b/client-api/src/main/java/ru/dragonestia/picker/api/model/node/INode.java @@ -2,11 +2,16 @@ package ru.dragonestia.picker.api.model.node; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import ru.dragonestia.picker.api.repository.type.NodeIdentifier; public interface INode { @NotNull String getIdentifier(); + default @NotNull NodeIdentifier getIdentifierObject() { + return NodeIdentifier.of(getIdentifier()); + } + @NotNull PickingMethod getPickingMethod(); @Nullable Boolean isPersist(); diff --git a/client-api/src/main/java/ru/dragonestia/picker/api/model/room/IRoom.java b/client-api/src/main/java/ru/dragonestia/picker/api/model/room/IRoom.java index 3502dc8..be5c196 100644 --- a/client-api/src/main/java/ru/dragonestia/picker/api/model/room/IRoom.java +++ b/client-api/src/main/java/ru/dragonestia/picker/api/model/room/IRoom.java @@ -12,8 +12,16 @@ public interface IRoom { @NotNull String getIdentifier(); + default @NotNull RoomIdentifier getIdentifierObject() { + return RoomIdentifier.of(getIdentifier()); + } + @NotNull String getNodeIdentifier(); + default @NotNull NodeIdentifier getNodeIdentifierObject() { + return NodeIdentifier.of(getNodeIdentifier()); + } + default @NotNull RoomPath getPath() { return new RoomPath(NodeIdentifier.of(getNodeIdentifier()), RoomIdentifier.of(getIdentifier())); } diff --git a/client-api/src/main/java/ru/dragonestia/picker/api/model/user/IUser.java b/client-api/src/main/java/ru/dragonestia/picker/api/model/user/IUser.java index 89ff2c5..5d0a45f 100644 --- a/client-api/src/main/java/ru/dragonestia/picker/api/model/user/IUser.java +++ b/client-api/src/main/java/ru/dragonestia/picker/api/model/user/IUser.java @@ -2,10 +2,15 @@ package ru.dragonestia.picker.api.model.user; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import ru.dragonestia.picker.api.repository.type.UserIdentifier; public interface IUser { @NotNull String getIdentifier(); + default @NotNull UserIdentifier getIdentifierObject() { + return UserIdentifier.of(getIdentifier()); + } + @Nullable String getDetail(@NotNull UserDetails detail); }