From b92cf9426deb9eefb97b7986a7dc54f849e9aa90 Mon Sep 17 00:00:00 2001 From: bitwheeze Date: Sun, 14 Apr 2024 18:22:11 +0200 Subject: [PATCH] fix extensions make it as array, add Builder and AllArgsConstructor --- .../bitwheeze/golos/goloslib/model/op/CommentOptions.java | 3 +-- .../model/op/DelegateVestingSharesWithInterest.java | 3 +-- .../java/bitwheeze/golos/goloslib/model/op/Donate.java | 2 ++ .../java/bitwheeze/golos/goloslib/model/op/Invite.java | 3 +-- .../golos/goloslib/model/op/LimitOrderCreate.java | 4 ++++ .../bitwheeze/golos/goloslib/model/op/TransferFromTip.java | 7 +++++-- .../bitwheeze/golos/goloslib/model/op/WithdrawVesting.java | 6 ++---- 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/main/java/bitwheeze/golos/goloslib/model/op/CommentOptions.java b/src/main/java/bitwheeze/golos/goloslib/model/op/CommentOptions.java index c9a60bb..4baab76 100644 --- a/src/main/java/bitwheeze/golos/goloslib/model/op/CommentOptions.java +++ b/src/main/java/bitwheeze/golos/goloslib/model/op/CommentOptions.java @@ -19,6 +19,5 @@ public class CommentOptions extends Operation { private short percentSteemDollars; private boolean allowVotes; private boolean allowCurationRewards; - @JsonDeserialize(using = ToStringDeserializer.class) - private String extensions; + private String[] extensions; } diff --git a/src/main/java/bitwheeze/golos/goloslib/model/op/DelegateVestingSharesWithInterest.java b/src/main/java/bitwheeze/golos/goloslib/model/op/DelegateVestingSharesWithInterest.java index 13e6b98..a61e543 100644 --- a/src/main/java/bitwheeze/golos/goloslib/model/op/DelegateVestingSharesWithInterest.java +++ b/src/main/java/bitwheeze/golos/goloslib/model/op/DelegateVestingSharesWithInterest.java @@ -18,6 +18,5 @@ public class DelegateVestingSharesWithInterest extends Operation { String delegatee; Asset vestingShares; int interestRate; - @JsonDeserialize(using = ToStringDeserializer.class) - private String extensions; + private String[] extensions; } diff --git a/src/main/java/bitwheeze/golos/goloslib/model/op/Donate.java b/src/main/java/bitwheeze/golos/goloslib/model/op/Donate.java index 04a2625..1e1f565 100644 --- a/src/main/java/bitwheeze/golos/goloslib/model/op/Donate.java +++ b/src/main/java/bitwheeze/golos/goloslib/model/op/Donate.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; import lombok.ToString; @@ -12,6 +13,7 @@ @JsonDeserialize(using = JsonDeserializer.None.class) @OpName("donate") @AllArgsConstructor +@Builder public class Donate extends Operation { private String from; private String to; diff --git a/src/main/java/bitwheeze/golos/goloslib/model/op/Invite.java b/src/main/java/bitwheeze/golos/goloslib/model/op/Invite.java index 04646f1..357ea22 100644 --- a/src/main/java/bitwheeze/golos/goloslib/model/op/Invite.java +++ b/src/main/java/bitwheeze/golos/goloslib/model/op/Invite.java @@ -17,6 +17,5 @@ public class Invite extends Operation { String creator; Asset balance; String inviteKey; - @JsonDeserialize(using = ToStringDeserializer.class) - private String extensions; + private String[] extensions; } diff --git a/src/main/java/bitwheeze/golos/goloslib/model/op/LimitOrderCreate.java b/src/main/java/bitwheeze/golos/goloslib/model/op/LimitOrderCreate.java index a782272..4a6e3d5 100644 --- a/src/main/java/bitwheeze/golos/goloslib/model/op/LimitOrderCreate.java +++ b/src/main/java/bitwheeze/golos/goloslib/model/op/LimitOrderCreate.java @@ -6,6 +6,8 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import bitwheeze.golos.goloslib.model.Asset; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; import lombok.ToString; @@ -13,6 +15,8 @@ @ToString @JsonDeserialize(using = JsonDeserializer.None.class) @OpName("limit_order_create") +@AllArgsConstructor +@Builder public class LimitOrderCreate extends Operation { private String owner; private long orderid; diff --git a/src/main/java/bitwheeze/golos/goloslib/model/op/TransferFromTip.java b/src/main/java/bitwheeze/golos/goloslib/model/op/TransferFromTip.java index 71b723e..f60af95 100644 --- a/src/main/java/bitwheeze/golos/goloslib/model/op/TransferFromTip.java +++ b/src/main/java/bitwheeze/golos/goloslib/model/op/TransferFromTip.java @@ -4,17 +4,20 @@ import bitwheeze.golos.goloslib.model.Asset; import bitwheeze.golos.goloslib.model.ToStringDeserializer; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; import lombok.ToString; @Data @ToString @OpName("transfer_from_tip") +@AllArgsConstructor +@Builder public class TransferFromTip extends Operation { private String from; private String to; private Asset amount; private String memo; - @JsonDeserialize(using = ToStringDeserializer.class) - private String extensions; + private String[] extensions; } diff --git a/src/main/java/bitwheeze/golos/goloslib/model/op/WithdrawVesting.java b/src/main/java/bitwheeze/golos/goloslib/model/op/WithdrawVesting.java index 0a75c67..4cecea2 100644 --- a/src/main/java/bitwheeze/golos/goloslib/model/op/WithdrawVesting.java +++ b/src/main/java/bitwheeze/golos/goloslib/model/op/WithdrawVesting.java @@ -1,16 +1,14 @@ package bitwheeze.golos.goloslib.model.op; import bitwheeze.golos.goloslib.model.Asset; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.ToString; +import lombok.*; @Data @ToString @OpName("withdraw_vesting") @AllArgsConstructor @NoArgsConstructor +@Builder public class WithdrawVesting extends Operation { String account; Asset vestingShares;