From ae2e298df4a7fd0b970f599f1560c6bcd8d2a8b7 Mon Sep 17 00:00:00 2001 From: alterdekim Date: Mon, 8 Jul 2024 22:34:20 +0300 Subject: [PATCH] objectmapper patch --- .../alterdekim/game/component/game/ActionDialogBody.java | 6 +++++- .../game/component/game/DialogButtonsList.java | 9 ++++++++- .../com/alterdekim/game/component/game/GameRoom.java | 1 - 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/alterdekim/game/component/game/ActionDialogBody.java b/src/main/java/com/alterdekim/game/component/game/ActionDialogBody.java index 7e4f47d..2e1f8b0 100644 --- a/src/main/java/com/alterdekim/game/component/game/ActionDialogBody.java +++ b/src/main/java/com/alterdekim/game/component/game/ActionDialogBody.java @@ -1,4 +1,8 @@ package com.alterdekim.game.component.game; -public interface ActionDialogBody { +import com.fasterxml.jackson.annotation.JsonProperty; + +public abstract class ActionDialogBody { + @JsonProperty("value") + public abstract Object getVal(); } diff --git a/src/main/java/com/alterdekim/game/component/game/DialogButtonsList.java b/src/main/java/com/alterdekim/game/component/game/DialogButtonsList.java index 94e3a67..4d1cd4b 100644 --- a/src/main/java/com/alterdekim/game/component/game/DialogButtonsList.java +++ b/src/main/java/com/alterdekim/game/component/game/DialogButtonsList.java @@ -1,5 +1,6 @@ package com.alterdekim.game.component.game; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.RequiredArgsConstructor; @@ -8,6 +9,12 @@ import java.util.List; @Getter @RequiredArgsConstructor -public class DialogButtonsList implements ActionDialogBody { +public class DialogButtonsList extends ActionDialogBody { + @JsonIgnore private final List buttons; + + @Override + public Object getVal() { + return this.buttons; + } } diff --git a/src/main/java/com/alterdekim/game/component/game/GameRoom.java b/src/main/java/com/alterdekim/game/component/game/GameRoom.java index 3e27e2f..5be4a96 100644 --- a/src/main/java/com/alterdekim/game/component/game/GameRoom.java +++ b/src/main/java/com/alterdekim/game/component/game/GameRoom.java @@ -125,7 +125,6 @@ public class GameRoom { buttons.add(new DialogButton("Button1", DialogButtonColor.GREEN, Collections.singletonList(WebSocketMessageType.HideDialog))); DialogButtonsList b = new DialogButtonsList(buttons); sendMessage(message.getUid(), WebSocketMessageType.ShowDialog, new ActionDialog("Title!", "Description!", ActionDialogType.Buttons, b)); - log.info("FUUUUUUUUUUUUUUUUUUCK"); } private void sendMessage(Long userId, WebSocketMessageType type, Object o) {