From 2009ef411dfbc9891ddbe2483e8f5b5e49e2ef3a Mon Sep 17 00:00:00 2001 From: Chase22 Date: Mon, 21 Sep 2020 19:31:50 +0200 Subject: [PATCH] Add timeout and update limit for long-polling updates to DefaultBotOptions Just a little commit to make the long-polling timeout and long-polling limit configurable via the BotOptions. Mainly for Testing --- .../telegrambots/bots/DefaultBotOptions.java | 20 +++++++++++++++++++ .../updatesreceivers/DefaultBotSession.java | 4 ++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/telegrambots/src/main/java/org/telegram/telegrambots/bots/DefaultBotOptions.java b/telegrambots/src/main/java/org/telegram/telegrambots/bots/DefaultBotOptions.java index 7e2e59af..2f59d7d2 100644 --- a/telegrambots/src/main/java/org/telegram/telegrambots/bots/DefaultBotOptions.java +++ b/telegrambots/src/main/java/org/telegram/telegrambots/bots/DefaultBotOptions.java @@ -26,6 +26,8 @@ public class DefaultBotOptions implements BotOptions { private ProxyType proxyType; private String proxyHost; private int proxyPort; + private int getUpdatesTimeout; + private int getUpdatesLimit; public enum ProxyType { NO_PROXY, @@ -39,6 +41,8 @@ public class DefaultBotOptions implements BotOptions { baseUrl = ApiConstants.BASE_URL; httpContext = HttpClientContext.create(); proxyType = ProxyType.NO_PROXY; + getUpdatesLimit = ApiConstants.GETUPDATES_TIMEOUT; + getUpdatesLimit = 100; } @Override @@ -129,4 +133,20 @@ public class DefaultBotOptions implements BotOptions { public void setProxyPort(int proxyPort) { this.proxyPort = proxyPort; } + + public int getGetUpdatesTimeout() { + return getUpdatesTimeout; + } + + public void setGetUpdatesTimeout(int getUpdatesTimeout) { + this.getUpdatesTimeout = getUpdatesTimeout; + } + + public int getGetUpdatesLimit() { + return getUpdatesLimit; + } + + public void setGetUpdatesLimit(int getUpdatesLimit) { + this.getUpdatesLimit = getUpdatesLimit; + } } diff --git a/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/DefaultBotSession.java b/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/DefaultBotSession.java index da98f1b8..804181c0 100644 --- a/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/DefaultBotSession.java +++ b/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/DefaultBotSession.java @@ -236,8 +236,8 @@ public class DefaultBotSession implements BotSession { private List getUpdatesFromServer() throws IOException { GetUpdates request = new GetUpdates() - .setLimit(100) - .setTimeout(ApiConstants.GETUPDATES_TIMEOUT) + .setLimit(options.getGetUpdatesLimit()) + .setTimeout(options.getGetUpdatesTimeout()) .setOffset(lastReceivedUpdate + 1); if (options.getAllowedUpdates() != null) {