Skip to content

Commit 920f176

Browse files
authored
Merge pull request #375 from RomanPrudkogliad/master
fix int in shared_users json serialization
2 parents 4b8396d + 90590ca commit 920f176

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

library/src/main/java/com/pengrad/telegrambot/model/UsersShared.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class UsersShared implements Serializable {
1010
private final static long serialVersionUID = 0L;
1111

1212
private Integer request_id;
13-
private Integer[] user_ids;
13+
private Long[] user_ids;
1414
private SharedUser[] users;
1515

1616
public Integer requestId() {
@@ -25,7 +25,7 @@ public SharedUser[] users() {
2525
* @deprecated Use {@link UsersShared#users()} instead
2626
*/
2727
@Deprecated
28-
public Integer[] userIds() {
28+
public Long[] userIds() {
2929
return user_ids;
3030
}
3131

library/src/main/java/com/pengrad/telegrambot/model/shared/SharedUser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ public class SharedUser implements Serializable {
1010

1111
private final static long serialVersionUID = 0L;
1212

13-
private Integer user_id;
13+
private Long user_id;
1414
private String first_name;
1515
private String last_name;
1616
private String username;
1717
private PhotoSize[] photo;
1818

19-
public Integer userId() {
19+
public Long userId() {
2020
return user_id;
2121
}
2222

library/src/test/java/com/pengrad/telegrambot/BotUtilsTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@
2020
public class BotUtilsTest {
2121

2222
final String updateStr = "{\"update_id\":874199391,\n" +
23-
"\"message\":{\"message_id\":33111,\"from\":{\"id\":1231231231,\"is_bot\":false,\"first_name\":\"RRRR\",\"username\":\"RRRR54321\"},\"chat\":{\"id\":-23123123123123,\"title\":\"hhh iiiiii ccccc\",\"type\":\"supergroup\"},\"date\":1579958705,\"text\":\"block the news\"}}";
23+
"\"message\":{\"message_id\":33111,\"from\":{\"id\":1231231231,\"is_bot\":false,\"first_name\":\"RRRR\",\"username\":\"RRRR54321\"},\"chat\":{\"id\":-23123123123123,\"title\":\"hhh iiiiii ccccc\",\"type\":\"supergroup\"},\"user_shared\":{\"user_id\":6111111111,\"request_id\":1},\"users_shared\":{\"user_ids\":[6111111111],\"users\":[{\"user_id\":6111111111,\"first_name\":\"FirstNameTest\",\"last_name\":\"LastNameTest\"}],\"request_id\":1},\"date\":1579958705,\"text\":\"block the news\"}}";
2424

2525
private void check(Update update) {
2626
assertEquals(update.updateId(), Integer.valueOf(874199391));
2727
assertEquals(update.message().messageId(), Integer.valueOf(33111));
28+
assertEquals(update.message().usersShared().users()[0].userId(), Long.valueOf(6111111111L));
2829
}
2930

3031
@Test
@@ -51,5 +52,4 @@ public void parseNull() {
5152
assertNull(BotUtils.fromJson(null, SendResponse.class));
5253
assertNull(BotUtils.fromJson("",SendResponse.class));
5354
}
54-
5555
}

0 commit comments

Comments
 (0)