Skip to content

Commit 742a401

Browse files
committed
Fix TransactionPartnerUser.hashCode(), ReactionTypeAdapter
1 parent 0d9fd3d commit 742a401

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

library/src/main/java/com/pengrad/telegrambot/model/stars/partner/TransactionPartnerUser.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,14 @@ public PaidMedia[] paidMedia() {
3535
public boolean equals(Object o) {
3636
if (this == o) return true;
3737
if (o == null || getClass() != o.getClass()) return false;
38+
if (!super.equals(o)) return false;
3839
TransactionPartnerUser that = (TransactionPartnerUser) o;
39-
return Objects.equals(type(), that.type()) &&
40-
Objects.equals(user, that.user) &&
41-
Objects.equals(invoice_payload, that.invoice_payload) &&
42-
Objects.equals(paid_media, that.paid_media);
40+
return Objects.equals(user, that.user) && Objects.equals(invoice_payload, that.invoice_payload) && Objects.deepEquals(paid_media, that.paid_media);
4341
}
4442

4543
@Override
4644
public int hashCode() {
47-
return Objects.hash(type(), user, invoice_payload);
45+
return Objects.hash(super.hashCode(), user, invoice_payload, Arrays.hashCode(paid_media));
4846
}
4947

5048
@Override

library/src/main/java/com/pengrad/telegrambot/utility/gson/ReactionTypeAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public ReactionType deserialize(JsonElement element, Type type, JsonDeserializat
2121
} else if (ReactionTypeCustomEmoji.CUSTOM_EMOJI_TYPE.equals(discriminator)) {
2222
return context.deserialize(object, ReactionTypeCustomEmoji.class);
2323
} else if (ReactionTypePaid.PAID_TYPE.equals(discriminator)) {
24-
return context.deserialize(object, ReactionTypeCustomEmoji.class);
24+
return context.deserialize(object, ReactionTypePaid.class);
2525
}
2626

2727
return new ReactionType(discriminator);

0 commit comments

Comments
 (0)