From 9f2aeaa06eac409246242132d729ee2d22a315fc Mon Sep 17 00:00:00 2001 From: ScarletRedMan Date: Wed, 13 Mar 2024 13:36:57 +0700 Subject: [PATCH] Fixed Jackson configuration --- .../main/java/ru/dragonestia/picker/api/model/node/INode.java | 3 +++ .../main/java/ru/dragonestia/picker/api/model/room/IRoom.java | 4 ++++ .../main/java/ru/dragonestia/picker/api/model/user/IUser.java | 3 +++ .../ru/dragonestia/picker/api/impl/util/RestTemplate.java | 3 +-- .../main/java/ru/dragonestia/picker/config/JacksonConfig.java | 3 +-- 5 files changed, 12 insertions(+), 4 deletions(-) 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 55e91be..7078d36 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 @@ -4,10 +4,13 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import ru.dragonestia.picker.api.repository.type.NodeIdentifier; +import java.beans.Transient; + public interface INode { @NotNull String getIdentifier(); + @Transient default @NotNull NodeIdentifier getIdentifierObject() { return NodeIdentifier.of(getIdentifier()); } 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 be5c196..25459e3 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 @@ -6,18 +6,22 @@ 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.beans.Transient; + public interface IRoom { int UNLIMITED_SLOTS = -1; @NotNull String getIdentifier(); + @Transient default @NotNull RoomIdentifier getIdentifierObject() { return RoomIdentifier.of(getIdentifier()); } @NotNull String getNodeIdentifier(); + @Transient default @NotNull NodeIdentifier getNodeIdentifierObject() { return NodeIdentifier.of(getNodeIdentifier()); } 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 5d0a45f..65f8f97 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 @@ -4,10 +4,13 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import ru.dragonestia.picker.api.repository.type.UserIdentifier; +import java.beans.Transient; + public interface IUser { @NotNull String getIdentifier(); + @Transient default @NotNull UserIdentifier getIdentifierObject() { return UserIdentifier.of(getIdentifier()); } diff --git a/client-impl/src/main/java/ru/dragonestia/picker/api/impl/util/RestTemplate.java b/client-impl/src/main/java/ru/dragonestia/picker/api/impl/util/RestTemplate.java index 1847dcb..75185da 100644 --- a/client-impl/src/main/java/ru/dragonestia/picker/api/impl/util/RestTemplate.java +++ b/client-impl/src/main/java/ru/dragonestia/picker/api/impl/util/RestTemplate.java @@ -36,8 +36,7 @@ public class RestTemplate { mapper.setVisibility(mapper.getSerializationConfig().getDefaultVisibilityChecker() .withFieldVisibility(JsonAutoDetect.Visibility.ANY) .withGetterVisibility(JsonAutoDetect.Visibility.NONE) - .withSetterVisibility(JsonAutoDetect.Visibility.NONE) - .withCreatorVisibility(JsonAutoDetect.Visibility.NONE)); + .withSetterVisibility(JsonAutoDetect.Visibility.NONE)); return mapper; } diff --git a/server/src/main/java/ru/dragonestia/picker/config/JacksonConfig.java b/server/src/main/java/ru/dragonestia/picker/config/JacksonConfig.java index 66445c4..a698df8 100644 --- a/server/src/main/java/ru/dragonestia/picker/config/JacksonConfig.java +++ b/server/src/main/java/ru/dragonestia/picker/config/JacksonConfig.java @@ -14,8 +14,7 @@ public class JacksonConfig { mapper.setVisibility(mapper.getSerializationConfig().getDefaultVisibilityChecker() .withFieldVisibility(JsonAutoDetect.Visibility.ANY) .withGetterVisibility(JsonAutoDetect.Visibility.NONE) - .withSetterVisibility(JsonAutoDetect.Visibility.NONE) - .withCreatorVisibility(JsonAutoDetect.Visibility.NONE)); + .withSetterVisibility(JsonAutoDetect.Visibility.NONE)); return mapper; }