Skip to content

Commit 0f760e3

Browse files
committed
Add null checks to Boolean getters
1 parent 7dbd47a commit 0f760e3

File tree

6 files changed

+90
-75
lines changed

6 files changed

+90
-75
lines changed

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,63 +28,63 @@ public class ChatAdministratorRights implements Serializable {
2828
private Boolean can_manage_topics;
2929

3030
public Boolean isAnonymous() {
31-
return is_anonymous;
31+
return is_anonymous != null && is_anonymous;
3232
}
3333

3434
public Boolean canManageChat() {
35-
return can_manage_chat;
35+
return can_manage_chat != null && can_manage_chat;
3636
}
3737

3838
public Boolean canDeleteMessages() {
39-
return can_delete_messages;
39+
return can_delete_messages != null && can_delete_messages;
4040
}
4141

4242
public Boolean canManageVideoChats() {
43-
return can_manage_video_chats;
43+
return can_manage_video_chats != null && can_manage_video_chats;
4444
}
4545

4646
public Boolean canRestrictMembers() {
47-
return can_restrict_members;
47+
return can_restrict_members != null && can_restrict_members;
4848
}
4949

5050
public Boolean canPromoteMembers() {
51-
return can_promote_members;
51+
return can_promote_members != null && can_promote_members;
5252
}
5353

5454
public Boolean canChangeInfo() {
55-
return can_change_info;
55+
return can_change_info != null && can_change_info;
5656
}
5757

5858
public Boolean canInviteUsers() {
59-
return can_invite_users;
59+
return can_invite_users != null && can_invite_users;
6060
}
6161

6262
public Boolean canPostMessages() {
63-
return can_post_messages;
63+
return can_post_messages != null && can_post_messages;
6464
}
6565

6666
public Boolean canEditMessages() {
67-
return can_edit_messages;
67+
return can_edit_messages != null && can_edit_messages;
6868
}
6969

7070
public Boolean canPinMessages() {
71-
return can_pin_messages;
71+
return can_pin_messages != null && can_pin_messages;
7272
}
7373

7474
public Boolean canPostStories() {
75-
return can_post_stories;
75+
return can_post_stories != null && can_post_stories;
7676
}
7777

7878
public Boolean canEditStories() {
79-
return can_edit_stories;
79+
return can_edit_stories != null && can_edit_stories;
8080
}
8181

8282
public Boolean canDeleteStories() {
83-
return can_delete_stories;
83+
return can_delete_stories != null && can_delete_stories;
8484
}
8585

8686
public Boolean canManageTopics() {
87-
return can_manage_topics;
87+
return can_manage_topics != null && can_manage_topics;
8888
}
8989

9090
public ChatAdministratorRights canManageChat(boolean canManageChat) {

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

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public enum Status {
2424
private Boolean can_manage_chat;
2525
private Boolean can_post_messages;
2626
private Boolean can_edit_messages;
27-
private Boolean can_delete_messages;
27+
private Boolean can_delete_messages;
2828
private Boolean can_manage_video_chats;
2929
private Boolean can_restrict_members;
3030
private Boolean can_promote_members;
@@ -62,122 +62,122 @@ public String customTitle() {
6262
}
6363

6464
public Boolean isAnonymous() {
65-
return is_anonymous;
65+
return is_anonymous != null && is_anonymous;
6666
}
6767

6868
public Integer untilDate() {
6969
return until_date;
7070
}
7171

7272
public Boolean canBeEdited() {
73-
return can_be_edited;
73+
return can_be_edited != null && can_be_edited;
7474
}
7575

7676
public Boolean canManageChat() {
77-
return can_manage_chat;
77+
return can_manage_chat != null && can_manage_chat;
7878
}
7979

8080
public Boolean canPostMessages() {
81-
return can_post_messages;
81+
return can_post_messages != null && can_post_messages;
8282
}
8383

8484
public Boolean canEditMessages() {
85-
return can_edit_messages;
85+
return can_edit_messages != null && can_edit_messages;
8686
}
8787

8888
public Boolean canDeleteMessages() {
89-
return can_delete_messages;
89+
return can_delete_messages != null && can_delete_messages;
9090
}
9191

9292
/**
93-
* @deprecated Use canManageVideoChats() instead
94-
*/
93+
* @deprecated Use canManageVideoChats() instead
94+
*/
9595
public Boolean canManageVoiceChats() {
96-
return can_manage_video_chats;
96+
return canManageVideoChats();
9797
}
9898

9999
public Boolean canManageVideoChats() {
100-
return can_manage_video_chats;
100+
return can_manage_video_chats != null && can_manage_video_chats;
101101
}
102102

103103
public Boolean canRestrictMembers() {
104-
return can_restrict_members;
104+
return can_restrict_members != null && can_restrict_members;
105105
}
106106

107107
public Boolean canPromoteMembers() {
108-
return can_promote_members;
108+
return can_promote_members != null && can_promote_members;
109109
}
110110

111111
public Boolean canChangeInfo() {
112-
return can_change_info;
112+
return can_change_info != null && can_change_info;
113113
}
114114

115115
public Boolean canInviteUsers() {
116-
return can_invite_users;
116+
return can_invite_users != null && can_invite_users;
117117
}
118118

119119
public Boolean canPinMessages() {
120-
return can_pin_messages;
120+
return can_pin_messages != null && can_pin_messages;
121121
}
122122

123123
public Boolean canPostStories() {
124-
return can_post_stories;
124+
return can_post_stories != null && can_post_stories;
125125
}
126126

127127
public Boolean canEditStories() {
128-
return can_edit_stories;
128+
return can_edit_stories != null && can_edit_stories;
129129
}
130130

131131
public Boolean canDeleteStories() {
132-
return can_delete_stories;
132+
return can_delete_stories != null && can_delete_stories;
133133
}
134134

135135
public Boolean canManageTopics() {
136-
return can_manage_topics;
136+
return can_manage_topics != null && can_manage_topics;
137137
}
138138

139139
public Boolean isMember() {
140-
return is_member;
140+
return is_member != null && is_member;
141141
}
142142

143143
public Boolean canSendMessages() {
144-
return can_send_messages;
144+
return can_send_messages != null && can_send_messages;
145145
}
146146

147147
public Boolean canSendAudios() {
148-
return can_send_audios;
148+
return can_send_audios != null && can_send_audios;
149149
}
150150

151151
public Boolean canSendDocuments() {
152-
return can_send_documents;
152+
return can_send_documents != null && can_send_documents;
153153
}
154154

155155
public Boolean canSendPhotos() {
156-
return can_send_photos;
156+
return can_send_photos != null && can_send_photos;
157157
}
158158

159159
public Boolean canSendVideos() {
160-
return can_send_videos;
160+
return can_send_videos != null && can_send_videos;
161161
}
162162

163163
public Boolean canSendVideoNotes() {
164-
return can_send_video_notes;
164+
return can_send_video_notes != null && can_send_video_notes;
165165
}
166166

167167
public Boolean canSendVoiceNotes() {
168-
return can_send_voice_notes;
168+
return can_send_voice_notes != null && can_send_voice_notes;
169169
}
170170

171171
public Boolean canSendPolls() {
172-
return can_send_polls;
172+
return can_send_polls != null && can_send_polls;
173173
}
174174

175175
public Boolean canSendOtherMessages() {
176-
return can_send_other_messages;
176+
return can_send_other_messages != null && can_send_other_messages;
177177
}
178178

179179
public Boolean canAddWebPagePreviews() {
180-
return can_add_web_page_previews;
180+
return can_add_web_page_previews != null && can_add_web_page_previews;
181181
}
182182

183183
@Override

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,59 +28,59 @@ public class ChatPermissions implements Serializable {
2828
private Boolean can_manage_topics;
2929

3030
public Boolean canSendMessages() {
31-
return can_send_messages;
31+
return can_send_messages != null && can_send_messages;
3232
}
3333

3434
public Boolean canSendAudios() {
35-
return can_send_audios;
35+
return can_send_audios != null && can_send_audios;
3636
}
3737

3838
public Boolean canSendDocuments() {
39-
return can_send_documents;
39+
return can_send_documents != null && can_send_documents;
4040
}
4141

4242
public Boolean canSendPhotos() {
43-
return can_send_photos;
43+
return can_send_photos != null && can_send_photos;
4444
}
4545

4646
public Boolean canSendVideos() {
47-
return can_send_videos;
47+
return can_send_videos != null && can_send_videos;
4848
}
4949

5050
public Boolean canSendVideoNotes() {
51-
return can_send_video_notes;
51+
return can_send_video_notes != null && can_send_video_notes;
5252
}
5353

5454
public Boolean canSendVoiceNotes() {
55-
return can_send_voice_notes;
55+
return can_send_voice_notes != null && can_send_voice_notes;
5656
}
5757

5858
public Boolean canSendPolls() {
59-
return can_send_polls;
59+
return can_send_polls != null && can_send_polls;
6060
}
6161

6262
public Boolean canSendOtherMessages() {
63-
return can_send_other_messages;
63+
return can_send_other_messages != null && can_send_other_messages;
6464
}
6565

6666
public Boolean canAddWebPagePreviews() {
67-
return can_add_web_page_previews;
67+
return can_add_web_page_previews != null && can_add_web_page_previews;
6868
}
6969

7070
public Boolean canChangeInfo() {
71-
return can_change_info;
71+
return can_change_info != null && can_change_info;
7272
}
7373

7474
public Boolean canInviteUsers() {
75-
return can_invite_users;
75+
return can_invite_users != null && can_invite_users;
7676
}
7777

7878
public Boolean canPinMessages() {
79-
return can_pin_messages;
79+
return can_pin_messages != null && can_pin_messages;
8080
}
8181

8282
public Boolean canManageTopics() {
83-
return can_manage_topics;
83+
return can_manage_topics != null && can_manage_topics;
8484
}
8585

8686
public ChatPermissions canSendMessages(boolean canSendMessages) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@ public Boolean addedToAttachmentMenu() {
6262
}
6363

6464
public Boolean canJoinGroups() {
65-
return can_join_groups;
65+
return can_join_groups != null && can_join_groups;
6666
}
6767

6868
public Boolean canReadAllGroupMessages() {
69-
return can_read_all_group_messages;
69+
return can_read_all_group_messages != null && can_read_all_group_messages;
7070
}
7171

7272
public Boolean supportsInlineQueries() {
73-
return supports_inline_queries;
73+
return supports_inline_queries != null && supports_inline_queries;
7474
}
7575

7676
@Override

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ public class WriteAccessAllowed implements Serializable {
1111
private Boolean from_attachment_menu;
1212

1313
public Boolean fromRequest() {
14-
return from_request;
14+
return from_request != null && from_request;
1515
}
1616

1717
public String webAppName() {
1818
return web_app_name;
1919
}
2020

2121
public Boolean fromAttachmentMenu() {
22-
return from_attachment_menu;
22+
return from_attachment_menu != null && from_attachment_menu;
2323
}
2424

2525
@Override
@@ -35,16 +35,16 @@ public boolean equals(Object o) {
3535
@Override
3636
public int hashCode() {
3737
return Objects.hash(from_request,
38-
web_app_name,
39-
from_attachment_menu);
38+
web_app_name,
39+
from_attachment_menu);
4040
}
4141

4242
@Override
4343
public String toString() {
44-
return "WriteAccessAllowed{" +
45-
"from_request=" + from_request +
46-
", web_app_name='" + web_app_name + '\'' +
47-
", from_attachment_menu=" + from_attachment_menu +
44+
return "WriteAccessAllowed{" +
45+
"from_request=" + from_request +
46+
", web_app_name='" + web_app_name + '\'' +
47+
", from_attachment_menu=" + from_attachment_menu +
4848
'}';
4949
}
5050
}

0 commit comments

Comments
 (0)