Undo custom annotation

rubenlagus · Dec 2, 2024 · 2324a7f · 2324a7f
1 parent ce38e20
commit 2324a7f
Show file tree

Hide file tree

Showing 164 changed files with 722 additions and 30 deletions.
diff --git a/...ts-meta/src/main/java/org/telegram/telegrambots/meta/annotations/BotApiJsonAnnotated.java b/...ts-meta/src/main/java/org/telegram/telegrambots/meta/annotations/BotApiJsonAnnotated.java
diff --git a/...ambots-meta/src/main/java/org/telegram/telegrambots/meta/api/interfaces/BotApiObject.java b/...ambots-meta/src/main/java/org/telegram/telegrambots/meta/api/interfaces/BotApiObject.java
@@ -1,6 +1,7 @@
 package org.telegram.telegrambots.meta.api.interfaces;
 
-import org.telegram.telegrambots.meta.annotations.BotApiJsonAnnotated;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 
 import java.io.Serializable;
 
@@ -9,6 +10,7 @@
  * @version 1.0
  * An object from the Bots API received from Telegram Servers
  */
-@BotApiJsonAnnotated
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public interface BotApiObject extends Serializable {
 }
diff --git a/...ts-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerCallbackQuery.java b/...ts-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerCallbackQuery.java
@@ -1,5 +1,7 @@
 package org.telegram.telegrambots.meta.api.methods;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
@@ -31,6 +33,8 @@
 @AllArgsConstructor
 @SuperBuilder
 @Jacksonized
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class AnswerCallbackQuery extends BotApiMethodBoolean {
     public static final String PATH = "answercallbackquery";
 

diff --git a/...bots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerInlineQuery.java b/...bots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerInlineQuery.java
@@ -1,5 +1,7 @@
 package org.telegram.telegrambots.meta.api.methods;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
@@ -31,6 +33,8 @@
 @AllArgsConstructor
 @SuperBuilder
 @Jacksonized
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class AnswerInlineQuery extends BotApiMethodBoolean {
     public static final String PATH = "answerInlineQuery";
 

diff --git a/...meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerPreCheckoutQuery.java b/...meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerPreCheckoutQuery.java
@@ -1,5 +1,7 @@
 package org.telegram.telegrambots.meta.api.methods;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
@@ -31,6 +33,8 @@
 @AllArgsConstructor
 @SuperBuilder
 @Jacksonized
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class AnswerPreCheckoutQuery extends BotApiMethodBoolean {
     public static final String PATH = "answerPreCheckoutQuery";
 

diff --git a/...ts-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerShippingQuery.java b/...ts-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerShippingQuery.java
@@ -1,5 +1,7 @@
 package org.telegram.telegrambots.meta.api.methods;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
@@ -34,6 +36,8 @@
 @AllArgsConstructor
 @SuperBuilder
 @Jacksonized
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class AnswerShippingQuery extends BotApiMethodBoolean {
     public static final String PATH = "answerShippingQuery";
 

diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/CopyMessage.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/CopyMessage.java
@@ -1,5 +1,7 @@
 package org.telegram.telegrambots.meta.api.methods;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
@@ -41,6 +43,8 @@
 @AllArgsConstructor
 @SuperBuilder
 @Jacksonized
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class CopyMessage extends BotApiMethod<MessageId> {
     public static final String PATH = "copyMessage";
 

diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/CopyMessages.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/CopyMessages.java
@@ -1,5 +1,7 @@
 package org.telegram.telegrambots.meta.api.methods;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
@@ -43,6 +45,8 @@
 @AllArgsConstructor
 @SuperBuilder
 @Jacksonized
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class CopyMessages extends BotApiMethod<ArrayList<MessageId>> {
     public static final String PATH = "copyMessages";
 

diff --git a/...rambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/ForwardMessage.java b/...rambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/ForwardMessage.java
@@ -1,5 +1,7 @@
 package org.telegram.telegrambots.meta.api.methods;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
@@ -31,6 +33,8 @@
 @AllArgsConstructor
 @SuperBuilder
 @Jacksonized
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class ForwardMessage extends BotApiMethodMessage {
     public static final String PATH = "forwardmessage";
 

diff --git a/...ambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/ForwardMessages.java b/...ambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/ForwardMessages.java
@@ -1,5 +1,7 @@
 package org.telegram.telegrambots.meta.api.methods;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
@@ -39,6 +41,8 @@
 @AllArgsConstructor
 @SuperBuilder
 @Jacksonized
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class ForwardMessages extends BotApiMethod<ArrayList<MessageId>> {
     public static final String PATH = "forwardMessages";
 

diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/GetFile.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/GetFile.java
@@ -1,5 +1,7 @@
 package org.telegram.telegrambots.meta.api.methods;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -31,6 +33,8 @@
 @RequiredArgsConstructor
 @SuperBuilder
 @Jacksonized
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class GetFile extends BotApiMethod<File> {
     public static final String PATH = "getFile";
 

diff --git a/...s-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/GetUserProfilePhotos.java b/...s-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/GetUserProfilePhotos.java
@@ -1,5 +1,7 @@
 package org.telegram.telegrambots.meta.api.methods;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
@@ -27,6 +29,8 @@
 @AllArgsConstructor
 @SuperBuilder
 @Jacksonized
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class GetUserProfilePhotos extends BotApiMethod<UserProfilePhotos> {
     public static final String PATH = "getuserprofilephotos";
 

diff --git a/...-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/SetPassportDataErrors.java b/...-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/SetPassportDataErrors.java
@@ -1,5 +1,7 @@
 package org.telegram.telegrambots.meta.api.methods;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -30,6 +32,8 @@
 @RequiredArgsConstructor
 @SuperBuilder
 @Jacksonized
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class SetPassportDataErrors extends BotApiMethodBoolean {
     public static final String PATH = "setPassportDataErrors";
 

diff --git a/...ots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/SetUserEmojiStatus.java b/...ots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/SetUserEmojiStatus.java
@@ -1,5 +1,7 @@
 package org.telegram.telegrambots.meta.api.methods;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
@@ -31,6 +33,8 @@
 @AllArgsConstructor
 @SuperBuilder
 @Jacksonized
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class SetUserEmojiStatus extends BotApiMethodBoolean {
     public static final String PATH = "setUserEmojiStatus";
 

diff --git a/...ta/src/main/java/org/telegram/telegrambots/meta/api/methods/boosts/GetUserChatBoosts.java b/...ta/src/main/java/org/telegram/telegrambots/meta/api/methods/boosts/GetUserChatBoosts.java
@@ -1,5 +1,7 @@
 package org.telegram.telegrambots.meta.api.methods.boosts;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -29,6 +31,8 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class GetUserChatBoosts extends BotApiMethod<UserChatBoosts> {
     public static final String PATH = "getUserChatBoosts";
 

diff --git a/...in/java/org/telegram/telegrambots/meta/api/methods/botapimethods/BotApiMethodBoolean.java b/...in/java/org/telegram/telegrambots/meta/api/methods/botapimethods/BotApiMethodBoolean.java
@@ -1,5 +1,7 @@
 package org.telegram.telegrambots.meta.api.methods.botapimethods;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
@@ -13,6 +15,8 @@
  */
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @SuperBuilder
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public abstract class BotApiMethodBoolean extends BotApiMethod<Boolean> {
     @Override
     public Boolean deserializeResponse(String answer) throws TelegramApiRequestException {

diff --git a/...in/java/org/telegram/telegrambots/meta/api/methods/botapimethods/BotApiMethodMessage.java b/...in/java/org/telegram/telegrambots/meta/api/methods/botapimethods/BotApiMethodMessage.java
@@ -1,5 +1,7 @@
 package org.telegram.telegrambots.meta.api.methods.botapimethods;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
@@ -14,6 +16,8 @@
  */
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @SuperBuilder
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public abstract class BotApiMethodMessage extends BotApiMethod<Message> {
     @Override
     public Message deserializeResponse(String answer) throws TelegramApiRequestException {

diff --git a/...va/org/telegram/telegrambots/meta/api/methods/botapimethods/BotApiMethodSerializable.java b/...va/org/telegram/telegrambots/meta/api/methods/botapimethods/BotApiMethodSerializable.java
@@ -1,5 +1,7 @@
 package org.telegram.telegrambots.meta.api.methods.botapimethods;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
@@ -19,6 +21,8 @@
  */
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @SuperBuilder
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public abstract class BotApiMethodSerializable extends BotApiMethod<Serializable> {
     public Serializable deserializeResponseMessageOrBoolean(String answer) throws TelegramApiRequestException {
         return deserializeResponseFromPossibilities(answer, Arrays.asList(Message.class, Boolean.class));

diff --git a/...in/java/org/telegram/telegrambots/meta/api/methods/botapimethods/PartialBotApiMethod.java b/...in/java/org/telegram/telegrambots/meta/api/methods/botapimethods/PartialBotApiMethod.java
@@ -1,14 +1,15 @@
 package org.telegram.telegrambots.meta.api.methods.botapimethods;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.type.CollectionType;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
-import org.telegram.telegrambots.meta.annotations.BotApiJsonAnnotated;
 import org.telegram.telegrambots.meta.api.interfaces.Validable;
 import org.telegram.telegrambots.meta.api.objects.ApiResponse;
 import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException;
@@ -24,7 +25,8 @@
  */
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @SuperBuilder
-@BotApiJsonAnnotated
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public abstract class PartialBotApiMethod<T extends Serializable> implements Validable {
     @JsonIgnore
     protected static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
@@ -72,7 +74,8 @@ private T deserializeResponseInternal(String answer, JavaType type) throws Teleg
     @JsonProperty(BotApiMethod.METHOD_FIELD)
     public abstract String getMethod();
 
-    @BotApiJsonAnnotated
+    @JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
     public static abstract class PartialBotApiMethodBuilder<T extends Serializable, C extends PartialBotApiMethod<T>, B extends PartialBotApiMethodBuilder<T, C, B>> {
 
     }

diff --git a/...meta/src/main/java/org/telegram/telegrambots/meta/api/methods/commands/SetMyCommands.java b/...meta/src/main/java/org/telegram/telegrambots/meta/api/methods/commands/SetMyCommands.java
@@ -1,5 +1,7 @@
 package org.telegram.telegrambots.meta.api.methods.commands;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
@@ -33,6 +35,8 @@
 @AllArgsConstructor
 @SuperBuilder
 @Jacksonized
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class SetMyCommands extends BotApiMethodBoolean {
     public static final String PATH = "setMyCommands";
 

diff --git a/...-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/CloseForumTopic.java b/...-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/CloseForumTopic.java
@@ -1,5 +1,7 @@
 package org.telegram.telegrambots.meta.api.methods.forum;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -30,6 +32,8 @@
 @RequiredArgsConstructor
 @SuperBuilder
 @Jacksonized
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class CloseForumTopic extends BotApiMethodBoolean {
     public static final String PATH = "closeForumTopic";