Skip to content

Commit cbd252f

Browse files
authored
Add missing optional arguments (#819)
1 parent 05ba174 commit cbd252f

24 files changed

+137
-2
lines changed

slack-api-client/src/main/java/com/slack/api/methods/RequestFormBuilder.java

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ public static FormBody.Builder toForm(AdminAppsApproveRequest req) {
190190
FormBody.Builder form = new FormBody.Builder();
191191
setIfNotNull("app_id", req.getAppId(), form);
192192
setIfNotNull("request_id", req.getRequestId(), form);
193+
setIfNotNull("enterprise_id", req.getEnterpriseId(), form);
193194
setIfNotNull("team_id", req.getTeamId(), form);
194195
return form;
195196
}
@@ -207,6 +208,7 @@ public static FormBody.Builder toForm(AdminAppsRestrictRequest req) {
207208
FormBody.Builder form = new FormBody.Builder();
208209
setIfNotNull("app_id", req.getAppId(), form);
209210
setIfNotNull("request_id", req.getRequestId(), form);
211+
setIfNotNull("enterprise_id", req.getEnterpriseId(), form);
210212
setIfNotNull("team_id", req.getTeamId(), form);
211213
return form;
212214
}
@@ -663,6 +665,11 @@ public static FormBody.Builder toForm(AdminUsersAssignRequest req) {
663665
FormBody.Builder form = new FormBody.Builder();
664666
setIfNotNull("team_id", req.getTeamId(), form);
665667
setIfNotNull("user_id", req.getUserId(), form);
668+
if (req.getChannelIds() != null && req.getChannelIds().size() > 0) {
669+
setIfNotNull("channel_ids", req.getChannelIds().stream().collect(joining(",")), form);
670+
}
671+
setIfNotNull("is_restricted", req.isRestricted(), form);
672+
setIfNotNull("is_ultra_restricted", req.isUltraRestricted(), form);
666673
return form;
667674
}
668675

@@ -1419,6 +1426,7 @@ public static FormBody.Builder toForm(DndEndSnoozeRequest req) {
14191426
public static FormBody.Builder toForm(DndInfoRequest req) {
14201427
FormBody.Builder form = new FormBody.Builder();
14211428
setIfNotNull("user", req.getUser(), form);
1429+
setIfNotNull("team_id", req.getTeamId(), form);
14221430
return form;
14231431
}
14241432

@@ -1433,6 +1441,7 @@ public static FormBody.Builder toForm(DndTeamInfoRequest req) {
14331441
if (req.getUsers() != null) {
14341442
setIfNotNull("users", req.getUsers().stream().collect(joining(",")), form);
14351443
}
1444+
setIfNotNull("team_id", req.getTeamId(), form);
14361445
return form;
14371446
}
14381447

@@ -1917,6 +1926,7 @@ public static FormBody.Builder toForm(ReactionsListRequest req) {
19171926
setIfNotNull("full", req.isFull(), form);
19181927
setIfNotNull("count", req.getCount(), form);
19191928
setIfNotNull("page", req.getPage(), form);
1929+
setIfNotNull("limit", req.getLimit(), form);
19201930
setIfNotNull("team_id", req.getTeamId(), form);
19211931
return form;
19221932
}
@@ -1936,29 +1946,34 @@ public static FormBody.Builder toForm(RemindersAddRequest req) {
19361946
setIfNotNull("text", req.getText(), form);
19371947
setIfNotNull("time", req.getTime(), form);
19381948
setIfNotNull("user", req.getUser(), form);
1949+
setIfNotNull("team_id", req.getTeamId(), form);
19391950
return form;
19401951
}
19411952

19421953
public static FormBody.Builder toForm(RemindersCompleteRequest req) {
19431954
FormBody.Builder form = new FormBody.Builder();
19441955
setIfNotNull("reminder", req.getReminder(), form);
1956+
setIfNotNull("team_id", req.getTeamId(), form);
19451957
return form;
19461958
}
19471959

19481960
public static FormBody.Builder toForm(RemindersDeleteRequest req) {
19491961
FormBody.Builder form = new FormBody.Builder();
19501962
setIfNotNull("reminder", req.getReminder(), form);
1963+
setIfNotNull("team_id", req.getTeamId(), form);
19511964
return form;
19521965
}
19531966

19541967
public static FormBody.Builder toForm(RemindersInfoRequest req) {
19551968
FormBody.Builder form = new FormBody.Builder();
19561969
setIfNotNull("reminder", req.getReminder(), form);
1970+
setIfNotNull("team_id", req.getTeamId(), form);
19571971
return form;
19581972
}
19591973

19601974
public static FormBody.Builder toForm(RemindersListRequest req) {
19611975
FormBody.Builder form = new FormBody.Builder();
1976+
setIfNotNull("team_id", req.getTeamId(), form);
19621977
return form;
19631978
}
19641979

@@ -1996,6 +2011,7 @@ public static FormBody.Builder toForm(SearchAllRequest req) {
19962011
public static FormBody.Builder toForm(SearchMessagesRequest req) {
19972012
FormBody.Builder form = new FormBody.Builder();
19982013
setIfNotNull("query", req.getQuery(), form);
2014+
setIfNotNull("cursor", req.getCursor(), form);
19992015
setIfNotNull("sort", req.getSort(), form);
20002016
setIfNotNull("sort_dir", req.getSortDir(), form);
20012017
setIfNotNull("highlight", req.isHighlight(), form);
@@ -2029,7 +2045,10 @@ public static FormBody.Builder toForm(StarsAddRequest req) {
20292045
public static FormBody.Builder toForm(StarsListRequest req) {
20302046
FormBody.Builder form = new FormBody.Builder();
20312047
setIfNotNull("count", req.getCount(), form);
2048+
setIfNotNull("cursor", req.getCursor(), form);
2049+
setIfNotNull("limit", req.getLimit(), form);
20322050
setIfNotNull("page", req.getPage(), form);
2051+
setIfNotNull("team_id", req.getTeamId(), form);
20332052
return form;
20342053
}
20352054

@@ -2091,20 +2110,23 @@ public static FormBody.Builder toForm(UsergroupsCreateRequest req) {
20912110
setIfNotNull("channels", req.getChannels().stream().collect(joining(",")), form);
20922111
}
20932112
setIfNotNull("include_count", req.isIncludeCount(), form);
2113+
setIfNotNull("team_id", req.getTeamId(), form);
20942114
return form;
20952115
}
20962116

20972117
public static FormBody.Builder toForm(UsergroupsDisableRequest req) {
20982118
FormBody.Builder form = new FormBody.Builder();
20992119
setIfNotNull("usergroup", req.getUsergroup(), form);
21002120
setIfNotNull("include_count", req.isIncludeCount(), form);
2121+
setIfNotNull("team_id", req.getTeamId(), form);
21012122
return form;
21022123
}
21032124

21042125
public static FormBody.Builder toForm(UsergroupsEnableRequest req) {
21052126
FormBody.Builder form = new FormBody.Builder();
21062127
setIfNotNull("usergroup", req.getUsergroup(), form);
21072128
setIfNotNull("include_count", req.isIncludeCount(), form);
2129+
setIfNotNull("team_id", req.getTeamId(), form);
21082130
return form;
21092131
}
21102132

@@ -2113,6 +2135,7 @@ public static FormBody.Builder toForm(UsergroupsListRequest req) {
21132135
setIfNotNull("include_disabled", req.isIncludeDisabled(), form);
21142136
setIfNotNull("include_count", req.isIncludeCount(), form);
21152137
setIfNotNull("include_users", req.isIncludeUsers(), form);
2138+
setIfNotNull("team_id", req.getTeamId(), form);
21162139
return form;
21172140
}
21182141

@@ -2126,13 +2149,15 @@ public static FormBody.Builder toForm(UsergroupsUpdateRequest req) {
21262149
setIfNotNull("channels", req.getChannels().stream().collect(joining(",")), form);
21272150
}
21282151
setIfNotNull("include_count", req.isIncludeCount(), form);
2152+
setIfNotNull("team_id", req.getTeamId(), form);
21292153
return form;
21302154
}
21312155

21322156
public static FormBody.Builder toForm(UsergroupsUsersListRequest req) {
21332157
FormBody.Builder form = new FormBody.Builder();
21342158
setIfNotNull("usergroup", req.getUsergroup(), form);
21352159
setIfNotNull("include_disabled", req.isIncludeDisabled(), form);
2160+
setIfNotNull("team_id", req.getTeamId(), form);
21362161
return form;
21372162
}
21382163

@@ -2143,6 +2168,7 @@ public static FormBody.Builder toForm(UsergroupsUsersUpdateRequest req) {
21432168
setIfNotNull("users", req.getUsers().stream().collect(joining(",")), form);
21442169
}
21452170
setIfNotNull("include_count", req.isIncludeCount(), form);
2171+
setIfNotNull("team_id", req.getTeamId(), form);
21462172
return form;
21472173
}
21482174

slack-api-client/src/main/java/com/slack/api/methods/request/admin/apps/AdminAppsApproveRequest.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,12 @@ public class AdminAppsApproveRequest implements SlackApiRequest {
2727
private String requestId;
2828

2929
/**
30-
* Workspace Id
30+
* The ID of the enterprise to approve the app on
31+
*/
32+
private String enterpriseId;
33+
34+
/**
35+
* The ID of the workspace to approve the app on
3136
*/
3237
private String teamId;
3338

slack-api-client/src/main/java/com/slack/api/methods/request/admin/apps/AdminAppsRestrictRequest.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,12 @@ public class AdminAppsRestrictRequest implements SlackApiRequest {
2727
private String requestId;
2828

2929
/**
30-
* Workspace Id
30+
* The ID of the enterprise to approve the app on
31+
*/
32+
private String enterpriseId;
33+
34+
/**
35+
* The ID of the workspace to approve the app on
3136
*/
3237
private String teamId;
3338

slack-api-client/src/main/java/com/slack/api/methods/request/admin/users/AdminUsersAssignRequest.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import lombok.Builder;
55
import lombok.Data;
66

7+
import java.util.List;
8+
79
/**
810
* https://api.slack.com/methods/admin.users.assign
911
*/
@@ -26,6 +28,11 @@ public class AdminUsersAssignRequest implements SlackApiRequest {
2628
*/
2729
private String userId;
2830

31+
/**
32+
* Comma separated values of channel IDs to add user in the new workspace.
33+
*/
34+
private List<String> channelIds;
35+
2936
/**
3037
* True if user should be added to the workspace as a guest.
3138
*/

slack-api-client/src/main/java/com/slack/api/methods/request/dnd/DndInfoRequest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,6 @@ public class DndInfoRequest implements SlackApiRequest {
1818
*/
1919
private String user;
2020

21+
private String teamId;
22+
2123
}

slack-api-client/src/main/java/com/slack/api/methods/request/dnd/DndTeamInfoRequest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,6 @@ public class DndTeamInfoRequest implements SlackApiRequest {
2020
*/
2121
private List<String> users;
2222

23+
private String teamId;
24+
2325
}

slack-api-client/src/main/java/com/slack/api/methods/request/pins/PinsAddRequest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@ public class PinsAddRequest implements SlackApiRequest {
2121
/**
2222
* File to pin.
2323
*/
24+
@Deprecated
2425
private String file;
2526

2627
/**
2728
* File comment to pin.
2829
*/
30+
@Deprecated
2931
private String fileComment;
3032

3133
/**

slack-api-client/src/main/java/com/slack/api/methods/request/pins/PinsRemoveRequest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@ public class PinsRemoveRequest implements SlackApiRequest {
2121
/**
2222
* File to un-pin.
2323
*/
24+
@Deprecated
2425
private String file;
2526

2627
/**
2728
* File comment to un-pin.
2829
*/
30+
@Deprecated
2931
private String fileComment;
3032

3133
/**

slack-api-client/src/main/java/com/slack/api/methods/request/reactions/ReactionsAddRequest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@ public class ReactionsAddRequest implements SlackApiRequest {
2121
/**
2222
* File to add reaction to.
2323
*/
24+
@Deprecated
2425
private String file;
2526

2627
/**
2728
* File comment to add reaction to.
2829
*/
30+
@Deprecated
2931
private String fileComment;
3032

3133
/**

slack-api-client/src/main/java/com/slack/api/methods/request/reactions/ReactionsListRequest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ public class ReactionsListRequest implements SlackApiRequest {
2727

2828
private Integer page;
2929

30+
private Integer limit;
31+
3032
/**
3133
* Required for org-wide apps.
3234
*/

0 commit comments

Comments
 (0)