Skip to content

Commit 38cdd35

Browse files
committed
Add SharedUser type and add users field to UsersShared
1 parent c1f6a62 commit 38cdd35

File tree

2 files changed

+84
-5
lines changed

2 files changed

+84
-5
lines changed
Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.pengrad.telegrambot.model;
22

3+
import com.pengrad.telegrambot.model.shared.SharedUser;
4+
35
import java.io.Serializable;
46
import java.util.Arrays;
57
import java.util.Objects;
@@ -9,35 +11,48 @@ public class UsersShared implements Serializable {
911

1012
private Integer request_id;
1113
private Integer[] user_ids;
14+
private SharedUser[] users;
1215

1316
public Integer requestId() {
1417
return request_id;
1518
}
1619

20+
public SharedUser[] users() {
21+
return users;
22+
}
23+
24+
/**
25+
* @deprecated Use {@link UsersShared#users()} instead
26+
*/
27+
@Deprecated
1728
public Integer[] userIds() {
1829
return user_ids;
1930
}
2031

2132
@Override
2233
public boolean equals(Object o) {
2334
if (this == o) return true;
24-
if (o == null || getClass() != o.getClass()) return false;
35+
if (!(o instanceof UsersShared)) return false;
2536
UsersShared that = (UsersShared) o;
26-
return Objects.equals(request_id, that.request_id) && Arrays.equals(user_ids, that.user_ids);
37+
return Objects.equals(request_id, that.request_id)
38+
&& Arrays.equals(user_ids, that.user_ids)
39+
&& Arrays.equals(users, that.users);
2740
}
2841

2942
@Override
3043
public int hashCode() {
3144
int result = Objects.hash(request_id);
3245
result = 31 * result + Arrays.hashCode(user_ids);
46+
result = 31 * result + Arrays.hashCode(users);
3347
return result;
3448
}
3549

3650
@Override
3751
public String toString() {
3852
return "UsersShared{" +
39-
"request_id='" + request_id + '\'' +
40-
", user_ids='" + Arrays.toString(user_ids) + '\'' +
41-
'}';
53+
"request_id=" + request_id +
54+
", user_ids=" + Arrays.toString(user_ids) +
55+
", users=" + Arrays.toString(users) +
56+
'}';
4257
}
4358
}
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
package com.pengrad.telegrambot.model.shared;
2+
3+
import com.pengrad.telegrambot.model.PhotoSize;
4+
5+
import java.io.Serializable;
6+
import java.util.Arrays;
7+
import java.util.Objects;
8+
9+
public class SharedUser implements Serializable {
10+
11+
private final static long serialVersionUID = 0L;
12+
13+
private Integer user_id;
14+
private String first_name;
15+
private String last_name;
16+
private String username;
17+
private PhotoSize[] photo;
18+
19+
public Integer userId() {
20+
return user_id;
21+
}
22+
23+
public String firstName() {
24+
return first_name;
25+
}
26+
27+
public String lastName() {
28+
return last_name;
29+
}
30+
31+
public String username() {
32+
return username;
33+
}
34+
35+
public PhotoSize[] photo() {
36+
return photo;
37+
}
38+
39+
@Override
40+
public boolean equals(Object o) {
41+
if (this == o) return true;
42+
if (!(o instanceof SharedUser)) return false;
43+
SharedUser that = (SharedUser) o;
44+
return Objects.equals(user_id, that.user_id) && Objects.equals(first_name, that.first_name) && Objects.equals(last_name, that.last_name) && Objects.equals(username, that.username) && Arrays.equals(photo, that.photo);
45+
}
46+
47+
@Override
48+
public int hashCode() {
49+
int result = Objects.hash(user_id, first_name, last_name, username);
50+
result = 31 * result + Arrays.hashCode(photo);
51+
return result;
52+
}
53+
54+
@Override
55+
public String toString() {
56+
return "SharedUser{" +
57+
"user_id=" + user_id +
58+
", first_name='" + first_name + '\'' +
59+
", last_name='" + last_name + '\'' +
60+
", username='" + username + '\'' +
61+
", photo=" + Arrays.toString(photo) +
62+
'}';
63+
}
64+
}

0 commit comments

Comments
 (0)