From a65c228c9b66b54093b5f7dd9f3b43ca18cad4ba Mon Sep 17 00:00:00 2001
From: Era Dorta <era.dorta@proton.me>
Date: Mon, 2 Mar 2026 00:30:12 +0100
Subject: [PATCH] Remove the json prefix from the names

---
 src/main/java/org/asamk/signal/json/JsonAdminDelete.java      | 2 ++
 src/main/java/org/asamk/signal/json/JsonAttachment.java       | 2 ++
 src/main/java/org/asamk/signal/json/JsonAttachmentData.java   | 3 +++
 src/main/java/org/asamk/signal/json/JsonCallMessage.java      | 2 ++
 src/main/java/org/asamk/signal/json/JsonContact.java          | 4 ++++
 src/main/java/org/asamk/signal/json/JsonContactAddress.java   | 2 ++
 src/main/java/org/asamk/signal/json/JsonContactAvatar.java    | 2 ++
 src/main/java/org/asamk/signal/json/JsonContactEmail.java     | 2 ++
 src/main/java/org/asamk/signal/json/JsonContactName.java      | 2 ++
 src/main/java/org/asamk/signal/json/JsonContactPhone.java     | 2 ++
 src/main/java/org/asamk/signal/json/JsonDataMessage.java      | 2 ++
 src/main/java/org/asamk/signal/json/JsonEditMessage.java      | 2 ++
 src/main/java/org/asamk/signal/json/JsonError.java            | 3 +++
 src/main/java/org/asamk/signal/json/JsonGroupInfo.java        | 2 ++
 src/main/java/org/asamk/signal/json/JsonMention.java          | 2 ++
 src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java  | 2 ++
 src/main/java/org/asamk/signal/json/JsonPayment.java          | 2 ++
 src/main/java/org/asamk/signal/json/JsonPinMessage.java       | 2 ++
 src/main/java/org/asamk/signal/json/JsonPollCreate.java       | 2 ++
 src/main/java/org/asamk/signal/json/JsonPollTerminate.java    | 2 ++
 src/main/java/org/asamk/signal/json/JsonPollVote.java         | 2 ++
 src/main/java/org/asamk/signal/json/JsonPreview.java          | 2 ++
 src/main/java/org/asamk/signal/json/JsonQuote.java            | 2 ++
 src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java | 2 ++
 src/main/java/org/asamk/signal/json/JsonReaction.java         | 2 ++
 src/main/java/org/asamk/signal/json/JsonReceiptMessage.java   | 2 ++
 src/main/java/org/asamk/signal/json/JsonRecipientAddress.java | 2 ++
 src/main/java/org/asamk/signal/json/JsonRemoteDelete.java     | 3 +++
 src/main/java/org/asamk/signal/json/JsonSchemaCatalog.java    | 2 ++
 .../java/org/asamk/signal/json/JsonSendMessageResult.java     | 2 ++
 src/main/java/org/asamk/signal/json/JsonSharedContact.java    | 2 ++
 src/main/java/org/asamk/signal/json/JsonSticker.java          | 2 ++
 src/main/java/org/asamk/signal/json/JsonStoryContext.java     | 2 ++
 src/main/java/org/asamk/signal/json/JsonStoryMessage.java     | 2 ++
 src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java  | 2 ++
 src/main/java/org/asamk/signal/json/JsonSyncMessage.java      | 3 +++
 src/main/java/org/asamk/signal/json/JsonSyncReadMessage.java  | 2 ++
 src/main/java/org/asamk/signal/json/JsonSyncStoryMessage.java | 2 ++
 src/main/java/org/asamk/signal/json/JsonTextStyle.java        | 2 ++
 src/main/java/org/asamk/signal/json/JsonTypingMessage.java    | 2 ++
 src/main/java/org/asamk/signal/json/JsonUnpinMessage.java     | 2 ++
 41 files changed, 88 insertions(+)

diff --git a/src/main/java/org/asamk/signal/json/JsonAdminDelete.java b/src/main/java/org/asamk/signal/json/JsonAdminDelete.java
index 60ab45bd..af95b231 100644
--- a/src/main/java/org/asamk/signal/json/JsonAdminDelete.java
+++ b/src/main/java/org/asamk/signal/json/JsonAdminDelete.java
@@ -1,9 +1,11 @@
 package org.asamk.signal.json;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.UUID;
 
+@Schema(name = "AdminDelete")
 public record JsonAdminDelete(
         @Deprecated String targetAuthor, String targetAuthorNumber, String targetAuthorUuid, long targetSentTimestamp
 ) {
diff --git a/src/main/java/org/asamk/signal/json/JsonAttachment.java b/src/main/java/org/asamk/signal/json/JsonAttachment.java
index c75b3987..8ff72712 100644
--- a/src/main/java/org/asamk/signal/json/JsonAttachment.java
+++ b/src/main/java/org/asamk/signal/json/JsonAttachment.java
@@ -1,7 +1,9 @@
 package org.asamk.signal.json;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
+@Schema(name = "Attachment")
 record JsonAttachment(
         String contentType,
         String filename,
diff --git a/src/main/java/org/asamk/signal/json/JsonAttachmentData.java b/src/main/java/org/asamk/signal/json/JsonAttachmentData.java
index 05a90c21..ba76dec7 100644
--- a/src/main/java/org/asamk/signal/json/JsonAttachmentData.java
+++ b/src/main/java/org/asamk/signal/json/JsonAttachmentData.java
@@ -1,5 +1,8 @@
 package org.asamk.signal.json;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(name = "AttachmentData")
 public record JsonAttachmentData(
         String data
 ) {}
diff --git a/src/main/java/org/asamk/signal/json/JsonCallMessage.java b/src/main/java/org/asamk/signal/json/JsonCallMessage.java
index 1b1bc2ba..bf11917c 100644
--- a/src/main/java/org/asamk/signal/json/JsonCallMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonCallMessage.java
@@ -1,12 +1,14 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.Base64;
 import java.util.List;
 
+@Schema(name = "CallMessage")
 record JsonCallMessage(
         @JsonInclude(JsonInclude.Include.NON_NULL) Offer offerMessage,
         @JsonInclude(JsonInclude.Include.NON_NULL) Answer answerMessage,
diff --git a/src/main/java/org/asamk/signal/json/JsonContact.java b/src/main/java/org/asamk/signal/json/JsonContact.java
index 71f05c8d..e302eaaf 100644
--- a/src/main/java/org/asamk/signal/json/JsonContact.java
+++ b/src/main/java/org/asamk/signal/json/JsonContact.java
@@ -1,9 +1,11 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 import java.util.List;
 
+@Schema(name = "Contact")
 public record JsonContact(
         String number,
         String uuid,
@@ -25,6 +27,7 @@ public record JsonContact(
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonInternal internal
 ) {
 
+    @Schema(name = "Profile")
     public record JsonProfile(
             long lastUpdateTimestamp,
             String givenName,
@@ -35,6 +38,7 @@ public record JsonContact(
             String mobileCoinAddress
     ) {}
 
+    @Schema(name = "Internal")
     public record JsonInternal(
             List<String> capabilities,
             String unidentifiedAccessMode,
diff --git a/src/main/java/org/asamk/signal/json/JsonContactAddress.java b/src/main/java/org/asamk/signal/json/JsonContactAddress.java
index 7184f532..7f9c8587 100644
--- a/src/main/java/org/asamk/signal/json/JsonContactAddress.java
+++ b/src/main/java/org/asamk/signal/json/JsonContactAddress.java
@@ -1,8 +1,10 @@
 package org.asamk.signal.json;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.util.Util;
 
+@Schema(name = "ContactAddress")
 public record JsonContactAddress(
         String type,
         String label,
diff --git a/src/main/java/org/asamk/signal/json/JsonContactAvatar.java b/src/main/java/org/asamk/signal/json/JsonContactAvatar.java
index 56b1a4e3..c4a28721 100644
--- a/src/main/java/org/asamk/signal/json/JsonContactAvatar.java
+++ b/src/main/java/org/asamk/signal/json/JsonContactAvatar.java
@@ -1,7 +1,9 @@
 package org.asamk.signal.json;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
+@Schema(name = "ContactAvatar")
 public record JsonContactAvatar(JsonAttachment attachment, boolean isProfile) {
 
     static JsonContactAvatar from(MessageEnvelope.Data.SharedContact.Avatar avatar) {
diff --git a/src/main/java/org/asamk/signal/json/JsonContactEmail.java b/src/main/java/org/asamk/signal/json/JsonContactEmail.java
index 7db600db..58be643f 100644
--- a/src/main/java/org/asamk/signal/json/JsonContactEmail.java
+++ b/src/main/java/org/asamk/signal/json/JsonContactEmail.java
@@ -1,8 +1,10 @@
 package org.asamk.signal.json;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.util.Util;
 
+@Schema(name = "ContactEmail")
 public record JsonContactEmail(String value, String type, String label) {
 
     static JsonContactEmail from(MessageEnvelope.Data.SharedContact.Email email) {
diff --git a/src/main/java/org/asamk/signal/json/JsonContactName.java b/src/main/java/org/asamk/signal/json/JsonContactName.java
index 4d8c2327..71aa0a73 100644
--- a/src/main/java/org/asamk/signal/json/JsonContactName.java
+++ b/src/main/java/org/asamk/signal/json/JsonContactName.java
@@ -1,8 +1,10 @@
 package org.asamk.signal.json;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.util.Util;
 
+@Schema(name = "ContactName")
 public record JsonContactName(
         String nickname, String given, String family, String prefix, String suffix, String middle
 ) {
diff --git a/src/main/java/org/asamk/signal/json/JsonContactPhone.java b/src/main/java/org/asamk/signal/json/JsonContactPhone.java
index 5da482ff..ad726bcd 100644
--- a/src/main/java/org/asamk/signal/json/JsonContactPhone.java
+++ b/src/main/java/org/asamk/signal/json/JsonContactPhone.java
@@ -1,8 +1,10 @@
 package org.asamk.signal.json;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.util.Util;
 
+@Schema(name = "ContactPhone")
 public record JsonContactPhone(String value, String type, String label) {
 
     static JsonContactPhone from(MessageEnvelope.Data.SharedContact.Phone phone) {
diff --git a/src/main/java/org/asamk/signal/json/JsonDataMessage.java b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
index 44f7f936..ec8265cb 100644
--- a/src/main/java/org/asamk/signal/json/JsonDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
@@ -1,12 +1,14 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.List;
 
+@Schema(name = "DataMessage")
 record JsonDataMessage(
         long timestamp,
         String message,
diff --git a/src/main/java/org/asamk/signal/json/JsonEditMessage.java b/src/main/java/org/asamk/signal/json/JsonEditMessage.java
index ef61e343..fb31d4ba 100644
--- a/src/main/java/org/asamk/signal/json/JsonEditMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonEditMessage.java
@@ -1,8 +1,10 @@
 package org.asamk.signal.json;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
+@Schema(name = "EditMessage")
 record JsonEditMessage(long targetSentTimestamp, JsonDataMessage dataMessage) {
 
     static JsonEditMessage from(MessageEnvelope.Edit editMessage, Manager m) {
diff --git a/src/main/java/org/asamk/signal/json/JsonError.java b/src/main/java/org/asamk/signal/json/JsonError.java
index 07f8a431..d6ab7b2d 100644
--- a/src/main/java/org/asamk/signal/json/JsonError.java
+++ b/src/main/java/org/asamk/signal/json/JsonError.java
@@ -1,5 +1,8 @@
 package org.asamk.signal.json;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(name = "Error")
 public record JsonError(String message, String type) {
 
     public static JsonError from(Throwable exception) {
diff --git a/src/main/java/org/asamk/signal/json/JsonGroupInfo.java b/src/main/java/org/asamk/signal/json/JsonGroupInfo.java
index c370d1e2..0296f274 100644
--- a/src/main/java/org/asamk/signal/json/JsonGroupInfo.java
+++ b/src/main/java/org/asamk/signal/json/JsonGroupInfo.java
@@ -1,8 +1,10 @@
 package org.asamk.signal.json;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
+@Schema(name = "GroupInfo")
 record JsonGroupInfo(String groupId, String groupName, int revision, String type) {
 
     static JsonGroupInfo from(MessageEnvelope.Data.GroupContext groupContext, Manager m) {
diff --git a/src/main/java/org/asamk/signal/json/JsonMention.java b/src/main/java/org/asamk/signal/json/JsonMention.java
index c4c962a0..70728523 100644
--- a/src/main/java/org/asamk/signal/json/JsonMention.java
+++ b/src/main/java/org/asamk/signal/json/JsonMention.java
@@ -1,9 +1,11 @@
 package org.asamk.signal.json;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.UUID;
 
+@Schema(name = "Mention")
 public record JsonMention(@Deprecated String name, String number, String uuid, int start, int length) {
 
     static JsonMention from(MessageEnvelope.Data.Mention mention) {
diff --git a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
index 8ab8ea83..857c7fad 100644
--- a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
+++ b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
@@ -1,6 +1,7 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.MessageEnvelope;
@@ -10,6 +11,7 @@ import org.asamk.signal.manager.api.UntrustedIdentityException;
 
 import java.util.UUID;
 
+@Schema(name = "MessageEnvelope")
 public record JsonMessageEnvelope(
         @Deprecated String source,
         String sourceNumber,
diff --git a/src/main/java/org/asamk/signal/json/JsonPayment.java b/src/main/java/org/asamk/signal/json/JsonPayment.java
index d3e5c483..957df083 100644
--- a/src/main/java/org/asamk/signal/json/JsonPayment.java
+++ b/src/main/java/org/asamk/signal/json/JsonPayment.java
@@ -1,7 +1,9 @@
 package org.asamk.signal.json;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
+@Schema(name = "Payment")
 public record JsonPayment(String note, byte[] receipt) {
 
     static JsonPayment from(MessageEnvelope.Data.Payment payment) {
diff --git a/src/main/java/org/asamk/signal/json/JsonPinMessage.java b/src/main/java/org/asamk/signal/json/JsonPinMessage.java
index 137805af..419b4fda 100644
--- a/src/main/java/org/asamk/signal/json/JsonPinMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonPinMessage.java
@@ -1,9 +1,11 @@
 package org.asamk.signal.json;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.UUID;
 
+@Schema(name = "PinMessage")
 public record JsonPinMessage(
         @Deprecated String targetAuthor,
         String targetAuthorNumber,
diff --git a/src/main/java/org/asamk/signal/json/JsonPollCreate.java b/src/main/java/org/asamk/signal/json/JsonPollCreate.java
index 2c36c4ca..335a8d17 100644
--- a/src/main/java/org/asamk/signal/json/JsonPollCreate.java
+++ b/src/main/java/org/asamk/signal/json/JsonPollCreate.java
@@ -1,9 +1,11 @@
 package org.asamk.signal.json;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.List;
 
+@Schema(name = "PollCreate")
 public record JsonPollCreate(
         String question, boolean allowMultiple, List<String> options
 ) {
diff --git a/src/main/java/org/asamk/signal/json/JsonPollTerminate.java b/src/main/java/org/asamk/signal/json/JsonPollTerminate.java
index 0642559f..eb3483ee 100644
--- a/src/main/java/org/asamk/signal/json/JsonPollTerminate.java
+++ b/src/main/java/org/asamk/signal/json/JsonPollTerminate.java
@@ -1,7 +1,9 @@
 package org.asamk.signal.json;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
+@Schema(name = "PollTerminate")
 public record JsonPollTerminate(long targetSentTimestamp) {
 
     static JsonPollTerminate from(MessageEnvelope.Data.PollTerminate pollTerminate) {
diff --git a/src/main/java/org/asamk/signal/json/JsonPollVote.java b/src/main/java/org/asamk/signal/json/JsonPollVote.java
index 520a838e..aab9e47c 100644
--- a/src/main/java/org/asamk/signal/json/JsonPollVote.java
+++ b/src/main/java/org/asamk/signal/json/JsonPollVote.java
@@ -1,10 +1,12 @@
 package org.asamk.signal.json;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.List;
 import java.util.UUID;
 
+@Schema(name = "PollVote")
 public record JsonPollVote(
         @Deprecated String author,
         String authorNumber,
diff --git a/src/main/java/org/asamk/signal/json/JsonPreview.java b/src/main/java/org/asamk/signal/json/JsonPreview.java
index c5e0d49e..03467b20 100644
--- a/src/main/java/org/asamk/signal/json/JsonPreview.java
+++ b/src/main/java/org/asamk/signal/json/JsonPreview.java
@@ -1,7 +1,9 @@
 package org.asamk.signal.json;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
+@Schema(name = "Preview")
 public record JsonPreview(String url, String title, String description, JsonAttachment image) {
 
     static JsonPreview from(MessageEnvelope.Data.Preview preview) {
diff --git a/src/main/java/org/asamk/signal/json/JsonQuote.java b/src/main/java/org/asamk/signal/json/JsonQuote.java
index 514f3db9..5e62de6f 100644
--- a/src/main/java/org/asamk/signal/json/JsonQuote.java
+++ b/src/main/java/org/asamk/signal/json/JsonQuote.java
@@ -1,12 +1,14 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.List;
 import java.util.UUID;
 
+@Schema(name = "Quote")
 public record JsonQuote(
         long id,
         @Deprecated String author,
diff --git a/src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java b/src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java
index e5022798..29373e19 100644
--- a/src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java
+++ b/src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java
@@ -1,9 +1,11 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 import org.asamk.signal.manager.api.MessageEnvelope;
 
+@Schema(name = "QuotedAttachment")
 public record JsonQuotedAttachment(
         String contentType, String filename, @JsonInclude(JsonInclude.Include.NON_NULL) JsonAttachment thumbnail
 ) {
diff --git a/src/main/java/org/asamk/signal/json/JsonReaction.java b/src/main/java/org/asamk/signal/json/JsonReaction.java
index 71da4df5..2c5ea996 100644
--- a/src/main/java/org/asamk/signal/json/JsonReaction.java
+++ b/src/main/java/org/asamk/signal/json/JsonReaction.java
@@ -1,9 +1,11 @@
 package org.asamk.signal.json;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.UUID;
 
+@Schema(name = "Reaction")
 public record JsonReaction(
         String emoji,
         @Deprecated String targetAuthor,
diff --git a/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java b/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java
index ec61b2f1..30c05ad3 100644
--- a/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java
@@ -1,9 +1,11 @@
 package org.asamk.signal.json;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.List;
 
+@Schema(name = "ReceiptMessage")
 record JsonReceiptMessage(long when, boolean isDelivery, boolean isRead, boolean isViewed, List<Long> timestamps) {
 
     static JsonReceiptMessage from(MessageEnvelope.Receipt receiptMessage) {
diff --git a/src/main/java/org/asamk/signal/json/JsonRecipientAddress.java b/src/main/java/org/asamk/signal/json/JsonRecipientAddress.java
index 0d9fc8cd..5533a767 100644
--- a/src/main/java/org/asamk/signal/json/JsonRecipientAddress.java
+++ b/src/main/java/org/asamk/signal/json/JsonRecipientAddress.java
@@ -1,9 +1,11 @@
 package org.asamk.signal.json;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.asamk.signal.manager.api.RecipientAddress;
 
 import java.util.UUID;
 
+@Schema(name = "RecipientAddress")
 public record JsonRecipientAddress(String uuid, String number, String username) {
 
     public static JsonRecipientAddress from(RecipientAddress address) {
diff --git a/src/main/java/org/asamk/signal/json/JsonRemoteDelete.java b/src/main/java/org/asamk/signal/json/JsonRemoteDelete.java
index 5a5727e5..270d8354 100644
--- a/src/main/java/org/asamk/signal/json/JsonRemoteDelete.java
+++ b/src/main/java/org/asamk/signal/json/JsonRemoteDelete.java
@@ -1,3 +1,6 @@
 package org.asamk.signal.json;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(name = "RemoteDelete")
 record JsonRemoteDelete(long timestamp) {}
diff --git a/src/main/java/org/asamk/signal/json/JsonSchemaCatalog.java b/src/main/java/org/asamk/signal/json/JsonSchemaCatalog.java
index 1ff4d141..a2ecace5 100644
--- a/src/main/java/org/asamk/signal/json/JsonSchemaCatalog.java
+++ b/src/main/java/org/asamk/signal/json/JsonSchemaCatalog.java
@@ -1,7 +1,9 @@
 package org.asamk.signal.json;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 
+@Schema(name = "SchemaCatalog")
 public class JsonSchemaCatalog {
 
     public JsonAdminDelete adminDelete;
diff --git a/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java b/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java
index f9ca8f86..e1c4e1d5 100644
--- a/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java
+++ b/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java
@@ -1,10 +1,12 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.SendMessageResult;
 
+@Schema(name = "SendMessageResult")
 public record JsonSendMessageResult(
         JsonRecipientAddress recipientAddress,
         @JsonInclude(JsonInclude.Include.NON_NULL) String groupId,
diff --git a/src/main/java/org/asamk/signal/json/JsonSharedContact.java b/src/main/java/org/asamk/signal/json/JsonSharedContact.java
index d898c63f..c58e2b93 100644
--- a/src/main/java/org/asamk/signal/json/JsonSharedContact.java
+++ b/src/main/java/org/asamk/signal/json/JsonSharedContact.java
@@ -1,11 +1,13 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.List;
 
+@Schema(name = "SharedContact")
 public record JsonSharedContact(
         JsonContactName name,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonContactAvatar avatar,
diff --git a/src/main/java/org/asamk/signal/json/JsonSticker.java b/src/main/java/org/asamk/signal/json/JsonSticker.java
index 720130ef..889855ac 100644
--- a/src/main/java/org/asamk/signal/json/JsonSticker.java
+++ b/src/main/java/org/asamk/signal/json/JsonSticker.java
@@ -1,8 +1,10 @@
 package org.asamk.signal.json;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.util.Hex;
 
+@Schema(name = "Sticker")
 public record JsonSticker(String packId, int stickerId) {
 
     static JsonSticker from(MessageEnvelope.Data.Sticker sticker) {
diff --git a/src/main/java/org/asamk/signal/json/JsonStoryContext.java b/src/main/java/org/asamk/signal/json/JsonStoryContext.java
index e2cc0c55..f5798093 100644
--- a/src/main/java/org/asamk/signal/json/JsonStoryContext.java
+++ b/src/main/java/org/asamk/signal/json/JsonStoryContext.java
@@ -1,9 +1,11 @@
 package org.asamk.signal.json;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.UUID;
 
+@Schema(name = "StoryContext")
 record JsonStoryContext(
         String authorNumber, String authorUuid, long sentTimestamp
 ) {
diff --git a/src/main/java/org/asamk/signal/json/JsonStoryMessage.java b/src/main/java/org/asamk/signal/json/JsonStoryMessage.java
index c1ca6144..90e3e485 100644
--- a/src/main/java/org/asamk/signal/json/JsonStoryMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonStoryMessage.java
@@ -1,6 +1,7 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 import org.asamk.signal.manager.api.Color;
 import org.asamk.signal.manager.api.GroupId;
@@ -8,6 +9,7 @@ import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.List;
 
+@Schema(name = "StoryMessage")
 record JsonStoryMessage(
         boolean allowsReplies,
         @JsonInclude(JsonInclude.Include.NON_NULL) String groupId,
diff --git a/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
index 4c2cd6ab..fd1a105d 100644
--- a/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
@@ -2,6 +2,7 @@ package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.MessageEnvelope;
@@ -9,6 +10,7 @@ import org.asamk.signal.manager.api.RecipientAddress;
 
 import java.util.UUID;
 
+@Schema(name = "SyncDataMessage")
 record JsonSyncDataMessage(
         @Deprecated String destination,
         String destinationNumber,
diff --git a/src/main/java/org/asamk/signal/json/JsonSyncMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
index 072b2e3b..3447a526 100644
--- a/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
@@ -9,12 +9,15 @@ import org.asamk.signal.manager.api.RecipientAddress;
 
 import java.util.List;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 enum JsonSyncMessageType {
     CONTACTS_SYNC,
     GROUPS_SYNC,
     REQUEST_SYNC
 }
 
+@Schema(name = "SyncMessage")
 record JsonSyncMessage(
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonSyncDataMessage sentMessage,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonSyncStoryMessage sentStoryMessage,
diff --git a/src/main/java/org/asamk/signal/json/JsonSyncReadMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncReadMessage.java
index 50c6ecee..a7bc41e3 100644
--- a/src/main/java/org/asamk/signal/json/JsonSyncReadMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncReadMessage.java
@@ -1,9 +1,11 @@
 package org.asamk.signal.json;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.UUID;
 
+@Schema(name = "SyncReadMessage")
 record JsonSyncReadMessage(
         @Deprecated String sender, String senderNumber, String senderUuid, long timestamp
 ) {
diff --git a/src/main/java/org/asamk/signal/json/JsonSyncStoryMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncStoryMessage.java
index 6b435223..4438c803 100644
--- a/src/main/java/org/asamk/signal/json/JsonSyncStoryMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncStoryMessage.java
@@ -1,11 +1,13 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.UUID;
 
+@Schema(name = "SyncStoryMessage")
 record JsonSyncStoryMessage(
         String destinationNumber, String destinationUuid, @JsonUnwrapped JsonStoryMessage dataMessage
 ) {
diff --git a/src/main/java/org/asamk/signal/json/JsonTextStyle.java b/src/main/java/org/asamk/signal/json/JsonTextStyle.java
index 898e7db6..becd1b3c 100644
--- a/src/main/java/org/asamk/signal/json/JsonTextStyle.java
+++ b/src/main/java/org/asamk/signal/json/JsonTextStyle.java
@@ -1,7 +1,9 @@
 package org.asamk.signal.json;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.asamk.signal.manager.api.TextStyle;
 
+@Schema(name = "TextStyle")
 public record JsonTextStyle(String style, int start, int length) {
 
     static JsonTextStyle from(TextStyle textStyle) {
diff --git a/src/main/java/org/asamk/signal/json/JsonTypingMessage.java b/src/main/java/org/asamk/signal/json/JsonTypingMessage.java
index 79a66d34..4680ae70 100644
--- a/src/main/java/org/asamk/signal/json/JsonTypingMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonTypingMessage.java
@@ -1,10 +1,12 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
+@Schema(name = "TypingMessage")
 record JsonTypingMessage(
         String action, long timestamp, @JsonInclude(JsonInclude.Include.NON_NULL) String groupId
 ) {
diff --git a/src/main/java/org/asamk/signal/json/JsonUnpinMessage.java b/src/main/java/org/asamk/signal/json/JsonUnpinMessage.java
index dad137c5..09936752 100644
--- a/src/main/java/org/asamk/signal/json/JsonUnpinMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonUnpinMessage.java
@@ -1,9 +1,11 @@
 package org.asamk.signal.json;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.UUID;
 
+@Schema(name = "UnpinMessage")
 public record JsonUnpinMessage(
         @Deprecated String targetAuthor, String targetAuthorNumber, String targetAuthorUuid, long targetSentTimestamp
 ) {