From a38b7edbdfce3a8bf52cc14f7c37066f37a7baac Mon Sep 17 00:00:00 2001 From: Era Dorta Date: Mon, 2 Mar 2026 02:04:24 +0100 Subject: [PATCH] Add missing required = true schemas --- .../asamk/signal/json/JsonAttachmentData.java | 2 +- .../org/asamk/signal/json/JsonContact.java | 56 +++++++++---------- .../java/org/asamk/signal/json/JsonError.java | 2 +- .../signal/json/JsonMessageEnvelope.java | 16 +++--- .../signal/json/JsonSyncReadMessage.java | 5 +- .../asamk/signal/json/JsonTypingMessage.java | 4 +- 6 files changed, 45 insertions(+), 40 deletions(-) diff --git a/src/main/java/org/asamk/signal/json/JsonAttachmentData.java b/src/main/java/org/asamk/signal/json/JsonAttachmentData.java index ba76dec7..1315353a 100644 --- a/src/main/java/org/asamk/signal/json/JsonAttachmentData.java +++ b/src/main/java/org/asamk/signal/json/JsonAttachmentData.java @@ -4,5 +4,5 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(name = "AttachmentData") public record JsonAttachmentData( - String data + @Schema(required = true) String data ) {} diff --git a/src/main/java/org/asamk/signal/json/JsonContact.java b/src/main/java/org/asamk/signal/json/JsonContact.java index e302eaaf..4c0c2106 100644 --- a/src/main/java/org/asamk/signal/json/JsonContact.java +++ b/src/main/java/org/asamk/signal/json/JsonContact.java @@ -7,42 +7,42 @@ import java.util.List; @Schema(name = "Contact") public record JsonContact( - String number, - String uuid, - String username, - String name, - String givenName, - String familyName, - String nickName, - String nickGivenName, - String nickFamilyName, - String note, - String color, - boolean isBlocked, - boolean isHidden, - int messageExpirationTime, - boolean profileSharing, - boolean unregistered, - JsonProfile profile, + @Schema(required = true) String number, + @Schema(required = true) String uuid, + @Schema(required = true) String username, + @Schema(required = true) String name, + @Schema(required = true) String givenName, + @Schema(required = true) String familyName, + @Schema(required = true) String nickName, + @Schema(required = true) String nickGivenName, + @Schema(required = true) String nickFamilyName, + @Schema(required = true) String note, + @Schema(required = true) String color, + @Schema(required = true) boolean isBlocked, + @Schema(required = true) boolean isHidden, + @Schema(required = true) int messageExpirationTime, + @Schema(required = true) boolean profileSharing, + @Schema(required = true) boolean unregistered, + @Schema(required = true) JsonProfile profile, @JsonInclude(JsonInclude.Include.NON_NULL) JsonInternal internal ) { @Schema(name = "Profile") public record JsonProfile( - long lastUpdateTimestamp, - String givenName, - String familyName, - String about, - String aboutEmoji, - boolean hasAvatar, - String mobileCoinAddress + @Schema(required = true) long lastUpdateTimestamp, + @Schema(required = true) String givenName, + @Schema(required = true) String familyName, + @Schema(required = true) String about, + @Schema(required = true) String aboutEmoji, + @Schema(required = true) boolean hasAvatar, + @Schema(required = true) String mobileCoinAddress ) {} @Schema(name = "Internal") public record JsonInternal( - List capabilities, - String unidentifiedAccessMode, - Boolean sharesPhoneNumber, - Boolean discoverableByPhonenumber + @Schema(required = true) List capabilities, + @Schema(required = true) String unidentifiedAccessMode, + @Schema(required = true) Boolean sharesPhoneNumber, + @Schema(required = true) Boolean discoverableByPhonenumber ) {} } diff --git a/src/main/java/org/asamk/signal/json/JsonError.java b/src/main/java/org/asamk/signal/json/JsonError.java index d6ab7b2d..f404d1af 100644 --- a/src/main/java/org/asamk/signal/json/JsonError.java +++ b/src/main/java/org/asamk/signal/json/JsonError.java @@ -3,7 +3,7 @@ package org.asamk.signal.json; import io.swagger.v3.oas.annotations.media.Schema; @Schema(name = "Error") -public record JsonError(String message, String type) { +public record JsonError(@Schema(required = true) String message, @Schema(required = true) String type) { public static JsonError from(Throwable exception) { return new JsonError(exception.getMessage(), exception.getClass().getSimpleName()); diff --git a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java index 857c7fad..b39c0c71 100644 --- a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java +++ b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java @@ -13,14 +13,14 @@ import java.util.UUID; @Schema(name = "MessageEnvelope") public record JsonMessageEnvelope( - @Deprecated String source, - String sourceNumber, - String sourceUuid, - String sourceName, - Integer sourceDevice, - long timestamp, - long serverReceivedTimestamp, - long serverDeliveredTimestamp, + @Schema(required = true) @Deprecated String source, + @Schema(required = true) String sourceNumber, + @Schema(required = true) String sourceUuid, + @Schema(required = true) String sourceName, + @Schema(required = true) Integer sourceDevice, + @Schema(required = true) long timestamp, + @Schema(required = true) long serverReceivedTimestamp, + @Schema(required = true) long serverDeliveredTimestamp, @JsonInclude(JsonInclude.Include.NON_NULL) JsonDataMessage dataMessage, @JsonInclude(JsonInclude.Include.NON_NULL) JsonEditMessage editMessage, @JsonInclude(JsonInclude.Include.NON_NULL) JsonStoryMessage storyMessage, diff --git a/src/main/java/org/asamk/signal/json/JsonSyncReadMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncReadMessage.java index a7bc41e3..187c9ed6 100644 --- a/src/main/java/org/asamk/signal/json/JsonSyncReadMessage.java +++ b/src/main/java/org/asamk/signal/json/JsonSyncReadMessage.java @@ -7,7 +7,10 @@ import java.util.UUID; @Schema(name = "SyncReadMessage") record JsonSyncReadMessage( - @Deprecated String sender, String senderNumber, String senderUuid, long timestamp + @Schema(required = true) @Deprecated String sender, + @Schema(required = true) String senderNumber, + @Schema(required = true) String senderUuid, + @Schema(required = true) long timestamp ) { static JsonSyncReadMessage from(MessageEnvelope.Sync.Read readMessage) { diff --git a/src/main/java/org/asamk/signal/json/JsonTypingMessage.java b/src/main/java/org/asamk/signal/json/JsonTypingMessage.java index 4680ae70..a4a9346f 100644 --- a/src/main/java/org/asamk/signal/json/JsonTypingMessage.java +++ b/src/main/java/org/asamk/signal/json/JsonTypingMessage.java @@ -8,7 +8,9 @@ import org.asamk.signal.manager.api.MessageEnvelope; @Schema(name = "TypingMessage") record JsonTypingMessage( - String action, long timestamp, @JsonInclude(JsonInclude.Include.NON_NULL) String groupId + @Schema(required = true) String action, + @Schema(required = true) long timestamp, + @JsonInclude(JsonInclude.Include.NON_NULL) String groupId ) { static JsonTypingMessage from(MessageEnvelope.Typing typingMessage) {