From 6bf38542487b0ec8bb2dead79494b4c986938402 Mon Sep 17 00:00:00 2001 From: Dmitry Kazinets Date: Fri, 28 Feb 2025 15:22:54 +0300 Subject: [PATCH 1/3] Added AcceptFreeTextRequestItem & AcceptRequestItem NON_EMPTY --- .../AcceptFreeTextRequestItem.java | 22 +++++++++++++++++++ .../incomingRequests/AcceptRequestItem.java | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 src/main/java/eu/enmeshed/requests/incomingRequests/AcceptFreeTextRequestItem.java diff --git a/src/main/java/eu/enmeshed/requests/incomingRequests/AcceptFreeTextRequestItem.java b/src/main/java/eu/enmeshed/requests/incomingRequests/AcceptFreeTextRequestItem.java new file mode 100644 index 0000000..c19bdce --- /dev/null +++ b/src/main/java/eu/enmeshed/requests/incomingRequests/AcceptFreeTextRequestItem.java @@ -0,0 +1,22 @@ +package eu.enmeshed.requests.incomingRequests; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@JsonInclude(JsonInclude.Include.NON_EMPTY) +@AllArgsConstructor +@NoArgsConstructor +@Getter +@Setter +@Builder +public final class AcceptFreeTextRequestItem extends DecideRequestItemDerivation { + @JsonProperty("accept") + private final boolean accept = true; + private String freeText; +} diff --git a/src/main/java/eu/enmeshed/requests/incomingRequests/AcceptRequestItem.java b/src/main/java/eu/enmeshed/requests/incomingRequests/AcceptRequestItem.java index 444b725..96f718c 100644 --- a/src/main/java/eu/enmeshed/requests/incomingRequests/AcceptRequestItem.java +++ b/src/main/java/eu/enmeshed/requests/incomingRequests/AcceptRequestItem.java @@ -1,5 +1,6 @@ package eu.enmeshed.requests.incomingRequests; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Map; import lombok.AllArgsConstructor; @@ -8,6 +9,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; +@JsonInclude(JsonInclude.Include.NON_EMPTY) @AllArgsConstructor @NoArgsConstructor @Getter From cec7053401ca3bdac31490a6a759e463dbb4c729 Mon Sep 17 00:00:00 2001 From: Dmitry Kazinets Date: Fri, 28 Feb 2025 15:35:27 +0300 Subject: [PATCH 2/3] Added permits for DecideRequestItemDerivation --- .../requests/incomingRequests/DecideRequestItemDerivation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/eu/enmeshed/requests/incomingRequests/DecideRequestItemDerivation.java b/src/main/java/eu/enmeshed/requests/incomingRequests/DecideRequestItemDerivation.java index 53c73d4..e739d2c 100644 --- a/src/main/java/eu/enmeshed/requests/incomingRequests/DecideRequestItemDerivation.java +++ b/src/main/java/eu/enmeshed/requests/incomingRequests/DecideRequestItemDerivation.java @@ -4,7 +4,7 @@ import lombok.Getter; @Getter -public sealed class DecideRequestItemDerivation extends DecideRequestItem permits RejectRequestItem, AcceptRequestItem { +public sealed class DecideRequestItemDerivation extends DecideRequestItem permits RejectRequestItem, AcceptRequestItem, AcceptFreeTextRequestItem { @JsonProperty("accept") private boolean accept; From 3b8db7a21ea82787d41174c862b173a8454ef428 Mon Sep 17 00:00:00 2001 From: Dmitry Kazinets Date: Fri, 28 Feb 2025 15:56:12 +0300 Subject: [PATCH 3/3] Removed NON_EMPTY --- .../enmeshed/requests/incomingRequests/AcceptRequestItem.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/eu/enmeshed/requests/incomingRequests/AcceptRequestItem.java b/src/main/java/eu/enmeshed/requests/incomingRequests/AcceptRequestItem.java index 96f718c..444b725 100644 --- a/src/main/java/eu/enmeshed/requests/incomingRequests/AcceptRequestItem.java +++ b/src/main/java/eu/enmeshed/requests/incomingRequests/AcceptRequestItem.java @@ -1,6 +1,5 @@ package eu.enmeshed.requests.incomingRequests; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Map; import lombok.AllArgsConstructor; @@ -9,7 +8,6 @@ import lombok.NoArgsConstructor; import lombok.Setter; -@JsonInclude(JsonInclude.Include.NON_EMPTY) @AllArgsConstructor @NoArgsConstructor @Getter