Skip to content

Commit 2324a7f

Browse files
rubenlagusrubenlagus
committed
Undo custom annotation
1 parent ce38e20 commit 2324a7f

File tree

164 files changed

+722
-30
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+722
-30
lines changed

‎telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/annotations/BotApiJsonAnnotated.java

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/interfaces/BotApiObject.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.telegram.telegrambots.meta.api.interfaces;
22

3-
import org.telegram.telegrambots.meta.annotations.BotApiJsonAnnotated;
3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonInclude;
45

56
import java.io.Serializable;
67

@@ -9,6 +10,7 @@
910
* @version 1.0
1011
* An object from the Bots API received from Telegram Servers
1112
*/
12-
@BotApiJsonAnnotated
13+
@JsonIgnoreProperties(ignoreUnknown = true)
14+
@JsonInclude(JsonInclude.Include.NON_NULL)
1315
public interface BotApiObject extends Serializable {
1416
}

‎telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerCallbackQuery.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.telegram.telegrambots.meta.api.methods;
22

3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonInclude;
35
import com.fasterxml.jackson.annotation.JsonProperty;
46
import lombok.AllArgsConstructor;
57
import lombok.EqualsAndHashCode;
@@ -31,6 +33,8 @@
3133
@AllArgsConstructor
3234
@SuperBuilder
3335
@Jacksonized
36+
@JsonIgnoreProperties(ignoreUnknown = true)
37+
@JsonInclude(JsonInclude.Include.NON_NULL)
3438
public class AnswerCallbackQuery extends BotApiMethodBoolean {
3539
public static final String PATH = "answercallbackquery";
3640

‎telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerInlineQuery.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.telegram.telegrambots.meta.api.methods;
22

3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonInclude;
35
import com.fasterxml.jackson.annotation.JsonProperty;
46
import lombok.AllArgsConstructor;
57
import lombok.EqualsAndHashCode;
@@ -31,6 +33,8 @@
3133
@AllArgsConstructor
3234
@SuperBuilder
3335
@Jacksonized
36+
@JsonIgnoreProperties(ignoreUnknown = true)
37+
@JsonInclude(JsonInclude.Include.NON_NULL)
3438
public class AnswerInlineQuery extends BotApiMethodBoolean {
3539
public static final String PATH = "answerInlineQuery";
3640

‎telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerPreCheckoutQuery.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.telegram.telegrambots.meta.api.methods;
22

3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonInclude;
35
import com.fasterxml.jackson.annotation.JsonProperty;
46
import lombok.AllArgsConstructor;
57
import lombok.EqualsAndHashCode;
@@ -31,6 +33,8 @@
3133
@AllArgsConstructor
3234
@SuperBuilder
3335
@Jacksonized
36+
@JsonIgnoreProperties(ignoreUnknown = true)
37+
@JsonInclude(JsonInclude.Include.NON_NULL)
3438
public class AnswerPreCheckoutQuery extends BotApiMethodBoolean {
3539
public static final String PATH = "answerPreCheckoutQuery";
3640

‎telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/AnswerShippingQuery.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.telegram.telegrambots.meta.api.methods;
22

3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonInclude;
35
import com.fasterxml.jackson.annotation.JsonProperty;
46
import lombok.AllArgsConstructor;
57
import lombok.EqualsAndHashCode;
@@ -34,6 +36,8 @@
3436
@AllArgsConstructor
3537
@SuperBuilder
3638
@Jacksonized
39+
@JsonIgnoreProperties(ignoreUnknown = true)
40+
@JsonInclude(JsonInclude.Include.NON_NULL)
3741
public class AnswerShippingQuery extends BotApiMethodBoolean {
3842
public static final String PATH = "answerShippingQuery";
3943

‎telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/CopyMessage.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.telegram.telegrambots.meta.api.methods;
22

3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonInclude;
35
import com.fasterxml.jackson.annotation.JsonProperty;
46
import lombok.AllArgsConstructor;
57
import lombok.EqualsAndHashCode;
@@ -41,6 +43,8 @@
4143
@AllArgsConstructor
4244
@SuperBuilder
4345
@Jacksonized
46+
@JsonIgnoreProperties(ignoreUnknown = true)
47+
@JsonInclude(JsonInclude.Include.NON_NULL)
4448
public class CopyMessage extends BotApiMethod<MessageId> {
4549
public static final String PATH = "copyMessage";
4650

‎telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/CopyMessages.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.telegram.telegrambots.meta.api.methods;
22

3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonInclude;
35
import com.fasterxml.jackson.annotation.JsonProperty;
46
import lombok.AllArgsConstructor;
57
import lombok.EqualsAndHashCode;
@@ -43,6 +45,8 @@
4345
@AllArgsConstructor
4446
@SuperBuilder
4547
@Jacksonized
48+
@JsonIgnoreProperties(ignoreUnknown = true)
49+
@JsonInclude(JsonInclude.Include.NON_NULL)
4650
public class CopyMessages extends BotApiMethod<ArrayList<MessageId>> {
4751
public static final String PATH = "copyMessages";
4852

‎telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/ForwardMessage.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.telegram.telegrambots.meta.api.methods;
22

3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonInclude;
35
import com.fasterxml.jackson.annotation.JsonProperty;
46
import lombok.AllArgsConstructor;
57
import lombok.EqualsAndHashCode;
@@ -31,6 +33,8 @@
3133
@AllArgsConstructor
3234
@SuperBuilder
3335
@Jacksonized
36+
@JsonIgnoreProperties(ignoreUnknown = true)
37+
@JsonInclude(JsonInclude.Include.NON_NULL)
3438
public class ForwardMessage extends BotApiMethodMessage {
3539
public static final String PATH = "forwardmessage";
3640

‎telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/ForwardMessages.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.telegram.telegrambots.meta.api.methods;
22

3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonInclude;
35
import com.fasterxml.jackson.annotation.JsonProperty;
46
import lombok.AllArgsConstructor;
57
import lombok.EqualsAndHashCode;
@@ -39,6 +41,8 @@
3941
@AllArgsConstructor
4042
@SuperBuilder
4143
@Jacksonized
44+
@JsonIgnoreProperties(ignoreUnknown = true)
45+
@JsonInclude(JsonInclude.Include.NON_NULL)
4246
public class ForwardMessages extends BotApiMethod<ArrayList<MessageId>> {
4347
public static final String PATH = "forwardMessages";
4448

‎telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/GetFile.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.telegram.telegrambots.meta.api.methods;
22

3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonInclude;
35
import com.fasterxml.jackson.annotation.JsonProperty;
46
import lombok.EqualsAndHashCode;
57
import lombok.Getter;
@@ -31,6 +33,8 @@
3133
@RequiredArgsConstructor
3234
@SuperBuilder
3335
@Jacksonized
36+
@JsonIgnoreProperties(ignoreUnknown = true)
37+
@JsonInclude(JsonInclude.Include.NON_NULL)
3438
public class GetFile extends BotApiMethod<File> {
3539
public static final String PATH = "getFile";
3640

‎telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/GetUserProfilePhotos.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.telegram.telegrambots.meta.api.methods;
22

3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonInclude;
35
import com.fasterxml.jackson.annotation.JsonProperty;
46
import lombok.AllArgsConstructor;
57
import lombok.EqualsAndHashCode;
@@ -27,6 +29,8 @@
2729
@AllArgsConstructor
2830
@SuperBuilder
2931
@Jacksonized
32+
@JsonIgnoreProperties(ignoreUnknown = true)
33+
@JsonInclude(JsonInclude.Include.NON_NULL)
3034
public class GetUserProfilePhotos extends BotApiMethod<UserProfilePhotos> {
3135
public static final String PATH = "getuserprofilephotos";
3236

‎telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/SetPassportDataErrors.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.telegram.telegrambots.meta.api.methods;
22

3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonInclude;
35
import com.fasterxml.jackson.annotation.JsonProperty;
46
import lombok.EqualsAndHashCode;
57
import lombok.Getter;
@@ -30,6 +32,8 @@
3032
@RequiredArgsConstructor
3133
@SuperBuilder
3234
@Jacksonized
35+
@JsonIgnoreProperties(ignoreUnknown = true)
36+
@JsonInclude(JsonInclude.Include.NON_NULL)
3337
public class SetPassportDataErrors extends BotApiMethodBoolean {
3438
public static final String PATH = "setPassportDataErrors";
3539

‎telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/SetUserEmojiStatus.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.telegram.telegrambots.meta.api.methods;
22

3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonInclude;
35
import com.fasterxml.jackson.annotation.JsonProperty;
46
import lombok.AllArgsConstructor;
57
import lombok.EqualsAndHashCode;
@@ -31,6 +33,8 @@
3133
@AllArgsConstructor
3234
@SuperBuilder
3335
@Jacksonized
36+
@JsonIgnoreProperties(ignoreUnknown = true)
37+
@JsonInclude(JsonInclude.Include.NON_NULL)
3438
public class SetUserEmojiStatus extends BotApiMethodBoolean {
3539
public static final String PATH = "setUserEmojiStatus";
3640

‎telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/boosts/GetUserChatBoosts.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.telegram.telegrambots.meta.api.methods.boosts;
22

3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonInclude;
35
import com.fasterxml.jackson.annotation.JsonProperty;
46
import lombok.AllArgsConstructor;
57
import lombok.Builder;
@@ -29,6 +31,8 @@
2931
@NoArgsConstructor
3032
@AllArgsConstructor
3133
@Builder
34+
@JsonIgnoreProperties(ignoreUnknown = true)
35+
@JsonInclude(JsonInclude.Include.NON_NULL)
3236
public class GetUserChatBoosts extends BotApiMethod<UserChatBoosts> {
3337
public static final String PATH = "getUserChatBoosts";
3438

‎telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/botapimethods/BotApiMethodBoolean.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.telegram.telegrambots.meta.api.methods.botapimethods;
22

3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonInclude;
35
import lombok.AccessLevel;
46
import lombok.NoArgsConstructor;
57
import lombok.experimental.SuperBuilder;
@@ -13,6 +15,8 @@
1315
*/
1416
@NoArgsConstructor(access = AccessLevel.PROTECTED)
1517
@SuperBuilder
18+
@JsonIgnoreProperties(ignoreUnknown = true)
19+
@JsonInclude(JsonInclude.Include.NON_NULL)
1620
public abstract class BotApiMethodBoolean extends BotApiMethod<Boolean> {
1721
@Override
1822
public Boolean deserializeResponse(String answer) throws TelegramApiRequestException {

‎telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/botapimethods/BotApiMethodMessage.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.telegram.telegrambots.meta.api.methods.botapimethods;
22

3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonInclude;
35
import lombok.AccessLevel;
46
import lombok.NoArgsConstructor;
57
import lombok.experimental.SuperBuilder;
@@ -14,6 +16,8 @@
1416
*/
1517
@NoArgsConstructor(access = AccessLevel.PROTECTED)
1618
@SuperBuilder
19+
@JsonIgnoreProperties(ignoreUnknown = true)
20+
@JsonInclude(JsonInclude.Include.NON_NULL)
1721
public abstract class BotApiMethodMessage extends BotApiMethod<Message> {
1822
@Override
1923
public Message deserializeResponse(String answer) throws TelegramApiRequestException {

‎telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/botapimethods/BotApiMethodSerializable.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.telegram.telegrambots.meta.api.methods.botapimethods;
22

3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonInclude;
35
import lombok.AccessLevel;
46
import lombok.NoArgsConstructor;
57
import lombok.experimental.SuperBuilder;
@@ -19,6 +21,8 @@
1921
*/
2022
@NoArgsConstructor(access = AccessLevel.PROTECTED)
2123
@SuperBuilder
24+
@JsonIgnoreProperties(ignoreUnknown = true)
25+
@JsonInclude(JsonInclude.Include.NON_NULL)
2226
public abstract class BotApiMethodSerializable extends BotApiMethod<Serializable> {
2327
public Serializable deserializeResponseMessageOrBoolean(String answer) throws TelegramApiRequestException {
2428
return deserializeResponseFromPossibilities(answer, Arrays.asList(Message.class, Boolean.class));

‎telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/botapimethods/PartialBotApiMethod.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package org.telegram.telegrambots.meta.api.methods.botapimethods;
22

33
import com.fasterxml.jackson.annotation.JsonIgnore;
4+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
5+
import com.fasterxml.jackson.annotation.JsonInclude;
46
import com.fasterxml.jackson.annotation.JsonProperty;
57
import com.fasterxml.jackson.databind.JavaType;
68
import com.fasterxml.jackson.databind.ObjectMapper;
79
import com.fasterxml.jackson.databind.type.CollectionType;
810
import lombok.AccessLevel;
911
import lombok.NoArgsConstructor;
1012
import lombok.experimental.SuperBuilder;
11-
import org.telegram.telegrambots.meta.annotations.BotApiJsonAnnotated;
1213
import org.telegram.telegrambots.meta.api.interfaces.Validable;
1314
import org.telegram.telegrambots.meta.api.objects.ApiResponse;
1415
import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException;
@@ -24,7 +25,8 @@
2425
*/
2526
@NoArgsConstructor(access = AccessLevel.PROTECTED)
2627
@SuperBuilder
27-
@BotApiJsonAnnotated
28+
@JsonIgnoreProperties(ignoreUnknown = true)
29+
@JsonInclude(JsonInclude.Include.NON_NULL)
2830
public abstract class PartialBotApiMethod<T extends Serializable> implements Validable {
2931
@JsonIgnore
3032
protected static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
@@ -72,7 +74,8 @@ private T deserializeResponseInternal(String answer, JavaType type) throws Teleg
7274
@JsonProperty(BotApiMethod.METHOD_FIELD)
7375
public abstract String getMethod();
7476

75-
@BotApiJsonAnnotated
77+
@JsonIgnoreProperties(ignoreUnknown = true)
78+
@JsonInclude(JsonInclude.Include.NON_NULL)
7679
public static abstract class PartialBotApiMethodBuilder<T extends Serializable, C extends PartialBotApiMethod<T>, B extends PartialBotApiMethodBuilder<T, C, B>> {
7780

7881
}

‎telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/commands/SetMyCommands.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.telegram.telegrambots.meta.api.methods.commands;
22

3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonInclude;
35
import com.fasterxml.jackson.annotation.JsonProperty;
46
import lombok.AllArgsConstructor;
57
import lombok.EqualsAndHashCode;
@@ -33,6 +35,8 @@
3335
@AllArgsConstructor
3436
@SuperBuilder
3537
@Jacksonized
38+
@JsonIgnoreProperties(ignoreUnknown = true)
39+
@JsonInclude(JsonInclude.Include.NON_NULL)
3640
public class SetMyCommands extends BotApiMethodBoolean {
3741
public static final String PATH = "setMyCommands";
3842

‎telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/forum/CloseForumTopic.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.telegram.telegrambots.meta.api.methods.forum;
22

3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonInclude;
35
import com.fasterxml.jackson.annotation.JsonProperty;
46
import lombok.EqualsAndHashCode;
57
import lombok.Getter;
@@ -30,6 +32,8 @@
3032
@RequiredArgsConstructor
3133
@SuperBuilder
3234
@Jacksonized
35+
@JsonIgnoreProperties(ignoreUnknown = true)
36+
@JsonInclude(JsonInclude.Include.NON_NULL)
3337
public class CloseForumTopic extends BotApiMethodBoolean {
3438
public static final String PATH = "closeForumTopic";
3539

0 commit comments

Comments
 (0)