Remove the json prefix from the names

This commit is contained in:
Era Dorta 2026-03-02 00:30:12 +01:00
parent d271a2db3d
commit a65c228c9b
41 changed files with 88 additions and 0 deletions

View File

@ -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
) {

View File

@ -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,

View File

@ -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
) {}

View File

@ -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,

View File

@ -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,

View File

@ -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,

View File

@ -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) {

View File

@ -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) {

View File

@ -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
) {

View File

@ -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) {

View File

@ -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,

View File

@ -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) {

View File

@ -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) {

View File

@ -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) {

View File

@ -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) {

View File

@ -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,

View File

@ -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) {

View File

@ -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,

View File

@ -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
) {

View File

@ -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) {

View File

@ -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,

View File

@ -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) {

View File

@ -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,

View File

@ -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
) {

View File

@ -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,

View File

@ -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) {

View File

@ -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) {

View File

@ -1,3 +1,6 @@
package org.asamk.signal.json;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(name = "RemoteDelete")
record JsonRemoteDelete(long timestamp) {}

View File

@ -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;

View File

@ -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,

View File

@ -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,

View File

@ -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) {

View File

@ -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
) {

View File

@ -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,

View File

@ -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,

View File

@ -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,

View File

@ -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
) {

View File

@ -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
) {

View File

@ -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) {

View File

@ -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
) {

View File

@ -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
) {