Skip to content

Commit abc8bd6

Browse files
Align int / long types with Zulip database schema
Fixes #400
1 parent 7482816 commit abc8bd6

33 files changed

Lines changed: 60 additions & 60 deletions

src/main/java/com/github/jamesnetherton/zulip/client/api/channel/ChannelFolder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class ChannelFolder {
2626
private int order;
2727

2828
@JsonProperty
29-
private int id;
29+
private long id;
3030

3131
@JsonProperty("is_archived")
3232
private boolean archived;
@@ -55,7 +55,7 @@ public int getOrder() {
5555
return order;
5656
}
5757

58-
public int getId() {
58+
public long getId() {
5959
return id;
6060
}
6161

src/main/java/com/github/jamesnetherton/zulip/client/api/channel/request/CreateChannelFolderApiRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*
1414
* @see <a href="https://zulip.com/api/create-channel-folder">https://zulip.com/api/create-channel-folder</a>
1515
*/
16-
public class CreateChannelFolderApiRequest extends ZulipApiRequest implements ExecutableApiRequest<Integer> {
16+
public class CreateChannelFolderApiRequest extends ZulipApiRequest implements ExecutableApiRequest<Long> {
1717
public static final String NAME = "name";
1818
public static final String DESCRIPTION = "description";
1919

@@ -48,7 +48,7 @@ public CreateChannelFolderApiRequest withDescription(String description) {
4848
* @throws ZulipClientException if the request was not successful
4949
*/
5050
@Override
51-
public Integer execute() throws ZulipClientException {
51+
public Long execute() throws ZulipClientException {
5252
return client().post(CREATE_CHANNEL_FOLDERS, getParams(), CreateChannelFolderApiResponse.class).getChannelFolderId();
5353
}
5454
}

src/main/java/com/github/jamesnetherton/zulip/client/api/channel/request/ReorderChannelFoldersApiRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class ReorderChannelFoldersApiRequest extends ZulipApiRequest implements
2222
* @param client The Zulip HTTP client
2323
* @param channelFolderIdOrder The order of the channel folder ids
2424
*/
25-
public ReorderChannelFoldersApiRequest(ZulipHttpClient client, Integer... channelFolderIdOrder) {
25+
public ReorderChannelFoldersApiRequest(ZulipHttpClient client, Long... channelFolderIdOrder) {
2626
super(client);
2727
putParamAsJsonString(ORDER, channelFolderIdOrder);
2828
}

src/main/java/com/github/jamesnetherton/zulip/client/api/channel/request/UpdateChannelFolderApiRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ public class UpdateChannelFolderApiRequest extends ZulipApiRequest implements Vo
1818
public static final String DESCRIPTION = "description";
1919
public static final String IS_ARCHIVED = "is_archived";
2020

21-
private final int channelFolderId;
21+
private final long channelFolderId;
2222

2323
/**
2424
* Constructs a {@link UpdateChannelFolderApiRequest}.
2525
*
2626
* @param client The Zulip HTTP client
2727
* @param channelFolderId The id of the channel folder to update
2828
*/
29-
public UpdateChannelFolderApiRequest(ZulipHttpClient client, int channelFolderId) {
29+
public UpdateChannelFolderApiRequest(ZulipHttpClient client, long channelFolderId) {
3030
super(client);
3131
this.channelFolderId = channelFolderId;
3232
}

src/main/java/com/github/jamesnetherton/zulip/client/api/channel/response/CreateChannelFolderApiResponse.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
*/
1111
public class CreateChannelFolderApiResponse extends ZulipApiResponse {
1212
@JsonProperty
13-
private int channelFolderId;
13+
private long channelFolderId;
1414

15-
public int getChannelFolderId() {
15+
public long getChannelFolderId() {
1616
return channelFolderId;
1717
}
1818
}

src/main/java/com/github/jamesnetherton/zulip/client/api/message/DetachedUpload.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
public final class DetachedUpload {
99
@JsonProperty
10-
private int id;
10+
private long id;
1111
@JsonProperty
1212
private String name;
1313
@JsonProperty
@@ -19,7 +19,7 @@ public final class DetachedUpload {
1919
@JsonProperty
2020
private List<DetachedUploadMessage> messages = new ArrayList<>();
2121

22-
public int getId() {
22+
public long getId() {
2323
return id;
2424
}
2525

src/main/java/com/github/jamesnetherton/zulip/client/api/message/MessageFlagsUpdateResult.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public int getUpdatedCount() {
3838
return delegate.getUpdatedCount();
3939
}
4040

41-
public List<Integer> getIgnoredBecauseNotSubscribedChannels() {
41+
public List<Long> getIgnoredBecauseNotSubscribedChannels() {
4242
return delegate.getIgnoredBecauseNotSubscribedChannels();
4343
}
4444
}

src/main/java/com/github/jamesnetherton/zulip/client/api/message/MessageReminder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class MessageReminder {
1616
private boolean failed;
1717

1818
@JsonProperty
19-
private int reminderId;
19+
private long reminderId;
2020

2121
@JsonProperty
2222
private int reminderTargetMessageId;
@@ -41,7 +41,7 @@ public boolean isFailed() {
4141
return failed;
4242
}
4343

44-
public int getReminderId() {
44+
public long getReminderId() {
4545
return reminderId;
4646
}
4747

src/main/java/com/github/jamesnetherton/zulip/client/api/message/MessageService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public DeleteMessageApiRequest deleteMessage(long messageId) {
109109
* @param messageReminderId The id of the message reminder to delete
110110
* @return The {@link DeleteMessageReminderApiRequest} builder object
111111
*/
112-
public DeleteMessageReminderApiRequest deleteMessageReminder(int messageReminderId) {
112+
public DeleteMessageReminderApiRequest deleteMessageReminder(long messageReminderId) {
113113
return new DeleteMessageReminderApiRequest(this.client, messageReminderId);
114114
}
115115

src/main/java/com/github/jamesnetherton/zulip/client/api/message/request/CreateMessageReminderApiRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
* @see <a href="https://zulip.com/api/create-message-reminder">https://zulip.com/api/create-message-reminder</a>
1616
*/
17-
public class CreateMessageReminderApiRequest extends ZulipApiRequest implements ExecutableApiRequest<Integer> {
17+
public class CreateMessageReminderApiRequest extends ZulipApiRequest implements ExecutableApiRequest<Long> {
1818
public static final String MESSAGE_ID = "message_id";
1919
public static final String NOTE = "note";
2020
public static final String SCHEDULED_DELIVERY_TIMESTAMP = "scheduled_delivery_timestamp";
@@ -53,7 +53,7 @@ public CreateMessageReminderApiRequest withNote(String note) {
5353
* @throws ZulipClientException if the request was not successful
5454
*/
5555
@Override
56-
public Integer execute() throws ZulipClientException {
56+
public Long execute() throws ZulipClientException {
5757
return client().post(MESSAGE_REMINDER_API_PATH, getParams(), CreateMessageReminderApiResponse.class).getReminderId();
5858
}
5959
}

0 commit comments

Comments
 (0)