diff --git a/src/main/java/org/asamk/signal/json/JsonAdminDelete.java b/src/main/java/org/asamk/signal/json/JsonAdminDelete.java index f1165ca3..db7a9915 100644 --- a/src/main/java/org/asamk/signal/json/JsonAdminDelete.java +++ b/src/main/java/org/asamk/signal/json/JsonAdminDelete.java @@ -7,10 +7,7 @@ import java.util.UUID; @JsonSchema(title = "AdminDelete") public record JsonAdminDelete( - @Deprecated String targetAuthor, - String targetAuthorNumber, - String targetAuthorUuid, - long targetSentTimestamp + @Deprecated String targetAuthor, String targetAuthorNumber, String targetAuthorUuid, long targetSentTimestamp ) { static JsonAdminDelete from(MessageEnvelope.Data.AdminDelete adminDelete) { diff --git a/src/main/java/org/asamk/signal/json/JsonCallMessage.java b/src/main/java/org/asamk/signal/json/JsonCallMessage.java index 33f8c27d..6cd94a92 100644 --- a/src/main/java/org/asamk/signal/json/JsonCallMessage.java +++ b/src/main/java/org/asamk/signal/json/JsonCallMessage.java @@ -25,21 +25,14 @@ record JsonCallMessage( callMessage.iceUpdate().stream().map(IceUpdate::from).toList()); } - record Offer( - long id, - String type, - String opaque - ) { + record Offer(long id, String type, String opaque) { public static Offer from(final MessageEnvelope.Call.Offer offer) { return new Offer(offer.id(), offer.type().name(), Base64.getEncoder().encodeToString(offer.opaque())); } } - public record Answer( - long id, - String opaque - ) { + public record Answer(long id, String opaque) { public static Answer from(final MessageEnvelope.Call.Answer answer) { return new Answer(answer.id(), Base64.getEncoder().encodeToString(answer.opaque())); @@ -53,21 +46,14 @@ record JsonCallMessage( } } - public record Hangup( - long id, - String type, - int deviceId - ) { + public record Hangup(long id, String type, int deviceId) { public static Hangup from(final MessageEnvelope.Call.Hangup hangup) { return new Hangup(hangup.id(), hangup.type().name(), hangup.deviceId()); } } - public record IceUpdate( - long id, - String opaque - ) { + public record IceUpdate(long id, String opaque) { public static IceUpdate from(final MessageEnvelope.Call.IceUpdate iceUpdate) { return new IceUpdate(iceUpdate.id(), Base64.getEncoder().encodeToString(iceUpdate.opaque())); diff --git a/src/main/java/org/asamk/signal/json/JsonContactAvatar.java b/src/main/java/org/asamk/signal/json/JsonContactAvatar.java index dcd5d5ba..ff686f1a 100644 --- a/src/main/java/org/asamk/signal/json/JsonContactAvatar.java +++ b/src/main/java/org/asamk/signal/json/JsonContactAvatar.java @@ -5,10 +5,7 @@ import io.micronaut.jsonschema.JsonSchema; import org.asamk.signal.manager.api.MessageEnvelope; @JsonSchema(title = "ContactAvatar") -public record JsonContactAvatar( - JsonAttachment attachment, - boolean isProfile -) { +public record JsonContactAvatar(JsonAttachment attachment, boolean isProfile) { static JsonContactAvatar from(MessageEnvelope.Data.SharedContact.Avatar avatar) { return new JsonContactAvatar(JsonAttachment.from(avatar.attachment()), avatar.isProfile()); diff --git a/src/main/java/org/asamk/signal/json/JsonContactEmail.java b/src/main/java/org/asamk/signal/json/JsonContactEmail.java index 2cb9fa2d..4967f29f 100644 --- a/src/main/java/org/asamk/signal/json/JsonContactEmail.java +++ b/src/main/java/org/asamk/signal/json/JsonContactEmail.java @@ -6,11 +6,7 @@ import org.asamk.signal.manager.api.MessageEnvelope; import org.asamk.signal.util.Util; @JsonSchema(title = "ContactEmail") -public record JsonContactEmail( - String value, - String type, - String label -) { +public record JsonContactEmail(String value, String type, String label) { static JsonContactEmail from(MessageEnvelope.Data.SharedContact.Email email) { return new JsonContactEmail(email.value(), email.type().name(), Util.getStringIfNotBlank(email.label())); diff --git a/src/main/java/org/asamk/signal/json/JsonContactName.java b/src/main/java/org/asamk/signal/json/JsonContactName.java index d4d961fb..b9d85a99 100644 --- a/src/main/java/org/asamk/signal/json/JsonContactName.java +++ b/src/main/java/org/asamk/signal/json/JsonContactName.java @@ -7,12 +7,7 @@ import org.asamk.signal.util.Util; @JsonSchema(title = "ContactName") public record JsonContactName( - String nickname, - String given, - String family, - String prefix, - String suffix, - String middle + String nickname, String given, String family, String prefix, String suffix, String middle ) { static JsonContactName from(MessageEnvelope.Data.SharedContact.Name name) { diff --git a/src/main/java/org/asamk/signal/json/JsonContactPhone.java b/src/main/java/org/asamk/signal/json/JsonContactPhone.java index 2e306486..186e4e51 100644 --- a/src/main/java/org/asamk/signal/json/JsonContactPhone.java +++ b/src/main/java/org/asamk/signal/json/JsonContactPhone.java @@ -6,11 +6,7 @@ import org.asamk.signal.manager.api.MessageEnvelope; import org.asamk.signal.util.Util; @JsonSchema(title = "ContactPhone") -public record JsonContactPhone( - String value, - String type, - String label -) { +public record JsonContactPhone(String value, String type, String label) { static JsonContactPhone from(MessageEnvelope.Data.SharedContact.Phone phone) { return new JsonContactPhone(phone.value(), phone.type().name(), Util.getStringIfNotBlank(phone.label())); diff --git a/src/main/java/org/asamk/signal/json/JsonGroupInfo.java b/src/main/java/org/asamk/signal/json/JsonGroupInfo.java index 9dcb306b..69297d0c 100644 --- a/src/main/java/org/asamk/signal/json/JsonGroupInfo.java +++ b/src/main/java/org/asamk/signal/json/JsonGroupInfo.java @@ -6,12 +6,7 @@ import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.api.MessageEnvelope; @JsonSchema(title = "GroupInfo") -record JsonGroupInfo( - String groupId, - String groupName, - int revision, - String type -) { +record JsonGroupInfo(String groupId, String groupName, int revision, String type) { static JsonGroupInfo from(MessageEnvelope.Data.GroupContext groupContext, Manager m) { return new JsonGroupInfo(groupContext.groupId().toBase64(), diff --git a/src/main/java/org/asamk/signal/json/JsonMention.java b/src/main/java/org/asamk/signal/json/JsonMention.java index 2a3bb872..0d88e736 100644 --- a/src/main/java/org/asamk/signal/json/JsonMention.java +++ b/src/main/java/org/asamk/signal/json/JsonMention.java @@ -7,13 +7,7 @@ import org.asamk.signal.manager.api.MessageEnvelope; import java.util.UUID; @JsonSchema(title = "Mention") -public record JsonMention( - @Deprecated String name, - String number, - String uuid, - int start, - int length -) { +public record JsonMention(@Deprecated String name, String number, String uuid, int start, int length) { static JsonMention from(MessageEnvelope.Data.Mention mention) { final var address = mention.recipient(); diff --git a/src/main/java/org/asamk/signal/json/JsonPollCreate.java b/src/main/java/org/asamk/signal/json/JsonPollCreate.java index f388c27a..25b8d884 100644 --- a/src/main/java/org/asamk/signal/json/JsonPollCreate.java +++ b/src/main/java/org/asamk/signal/json/JsonPollCreate.java @@ -8,9 +8,7 @@ import java.util.List; @JsonSchema(title = "PollCreate") public record JsonPollCreate( - String question, - boolean allowMultiple, - List options + String question, boolean allowMultiple, List options ) { static JsonPollCreate from(MessageEnvelope.Data.PollCreate pollCreate) { diff --git a/src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java b/src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java index 7972d441..9d98bf86 100644 --- a/src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java +++ b/src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java @@ -7,9 +7,7 @@ import org.asamk.signal.manager.api.MessageEnvelope; @JsonSchema(title = "QuotedAttachment") public record JsonQuotedAttachment( - String contentType, - String filename, - @JsonInclude(JsonInclude.Include.NON_NULL) JsonAttachment thumbnail + String contentType, String filename, @JsonInclude(JsonInclude.Include.NON_NULL) JsonAttachment thumbnail ) { static JsonQuotedAttachment from(MessageEnvelope.Data.Attachment quotedAttachment) { diff --git a/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java b/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java index e8b29c02..26a4aca5 100644 --- a/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java +++ b/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java @@ -7,13 +7,7 @@ import org.asamk.signal.manager.api.MessageEnvelope; import java.util.List; @JsonSchema(title = "ReceiptMessage") -record JsonReceiptMessage( - long when, - boolean isDelivery, - boolean isRead, - boolean isViewed, - List timestamps -) { +record JsonReceiptMessage(long when, boolean isDelivery, boolean isRead, boolean isViewed, List timestamps) { static JsonReceiptMessage from(MessageEnvelope.Receipt receiptMessage) { final var when = receiptMessage.when(); diff --git a/src/main/java/org/asamk/signal/json/JsonRecipientAddress.java b/src/main/java/org/asamk/signal/json/JsonRecipientAddress.java index e8b11675..5236461f 100644 --- a/src/main/java/org/asamk/signal/json/JsonRecipientAddress.java +++ b/src/main/java/org/asamk/signal/json/JsonRecipientAddress.java @@ -7,11 +7,7 @@ import org.asamk.signal.manager.api.RecipientAddress; import java.util.UUID; @JsonSchema(title = "RecipientAddress") -public record JsonRecipientAddress( - String uuid, - String number, - String username -) { +public record JsonRecipientAddress(String uuid, String number, String username) { public static JsonRecipientAddress from(RecipientAddress address) { return new JsonRecipientAddress(address.uuid().map(UUID::toString).orElse(null), diff --git a/src/main/java/org/asamk/signal/json/JsonStoryMessage.java b/src/main/java/org/asamk/signal/json/JsonStoryMessage.java index 808d1f10..5b7495c3 100644 --- a/src/main/java/org/asamk/signal/json/JsonStoryMessage.java +++ b/src/main/java/org/asamk/signal/json/JsonStoryMessage.java @@ -45,11 +45,7 @@ record JsonStoryMessage( } public record Gradient( - String startColor, - String endColor, - List colors, - List positions, - Integer angle + String startColor, String endColor, List colors, List positions, Integer angle ) { static Gradient from(MessageEnvelope.Story.TextAttachment.Gradient gradient) { diff --git a/src/main/java/org/asamk/signal/json/JsonSyncReadMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncReadMessage.java index 76663964..e2c4a6e9 100644 --- a/src/main/java/org/asamk/signal/json/JsonSyncReadMessage.java +++ b/src/main/java/org/asamk/signal/json/JsonSyncReadMessage.java @@ -8,10 +8,7 @@ import java.util.UUID; @JsonSchema(title = "SyncReadMessage") record JsonSyncReadMessage( - @Deprecated String sender, - String senderNumber, - String senderUuid, - long timestamp + @Deprecated String sender, String senderNumber, String senderUuid, long timestamp ) { static JsonSyncReadMessage from(MessageEnvelope.Sync.Read readMessage) { diff --git a/src/main/java/org/asamk/signal/json/JsonSyncStoryMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncStoryMessage.java index 737b7870..b8254a8f 100644 --- a/src/main/java/org/asamk/signal/json/JsonSyncStoryMessage.java +++ b/src/main/java/org/asamk/signal/json/JsonSyncStoryMessage.java @@ -9,9 +9,7 @@ import java.util.UUID; @JsonSchema(title = "SyncStoryMessage") record JsonSyncStoryMessage( - String destinationNumber, - String destinationUuid, - @JsonUnwrapped JsonStoryMessage dataMessage + String destinationNumber, String destinationUuid, @JsonUnwrapped JsonStoryMessage dataMessage ) { static JsonSyncStoryMessage from(MessageEnvelope.Sync.Sent transcriptMessage) { diff --git a/src/main/java/org/asamk/signal/json/JsonTextStyle.java b/src/main/java/org/asamk/signal/json/JsonTextStyle.java index 05d1c33e..87591c2b 100644 --- a/src/main/java/org/asamk/signal/json/JsonTextStyle.java +++ b/src/main/java/org/asamk/signal/json/JsonTextStyle.java @@ -5,11 +5,7 @@ import io.micronaut.jsonschema.JsonSchema; import org.asamk.signal.manager.api.TextStyle; @JsonSchema(title = "TextStyle") -public record JsonTextStyle( - String style, - int start, - int length -) { +public record JsonTextStyle(String style, int start, int length) { static JsonTextStyle from(TextStyle textStyle) { return new JsonTextStyle(textStyle.style().name(), textStyle.start(), textStyle.length()); diff --git a/src/main/java/org/asamk/signal/json/JsonTypingMessage.java b/src/main/java/org/asamk/signal/json/JsonTypingMessage.java index f97abfbc..dae86d74 100644 --- a/src/main/java/org/asamk/signal/json/JsonTypingMessage.java +++ b/src/main/java/org/asamk/signal/json/JsonTypingMessage.java @@ -8,9 +8,7 @@ import org.asamk.signal.manager.api.MessageEnvelope; @JsonSchema(title = "TypingMessage") record JsonTypingMessage( - String action, - long timestamp, - @JsonInclude(JsonInclude.Include.NON_NULL) String groupId + String action, long timestamp, @JsonInclude(JsonInclude.Include.NON_NULL) String groupId ) { static JsonTypingMessage from(MessageEnvelope.Typing typingMessage) { diff --git a/src/main/java/org/asamk/signal/json/JsonUnpinMessage.java b/src/main/java/org/asamk/signal/json/JsonUnpinMessage.java index 5ea65aa4..6b5ffa5c 100644 --- a/src/main/java/org/asamk/signal/json/JsonUnpinMessage.java +++ b/src/main/java/org/asamk/signal/json/JsonUnpinMessage.java @@ -8,10 +8,7 @@ import java.util.UUID; @JsonSchema(title = "UnpinMessage") public record JsonUnpinMessage( - @Deprecated String targetAuthor, - String targetAuthorNumber, - String targetAuthorUuid, - long targetSentTimestamp + @Deprecated String targetAuthor, String targetAuthorNumber, String targetAuthorUuid, long targetSentTimestamp ) { static JsonUnpinMessage from(MessageEnvelope.Data.UnpinMessage unpinMessage) {