Configurable GetUpdates for SpringLongPollingBot

Author: afds

telegrambots-longpolling/src/main/java/org/telegram/telegrambots/longpolling/util/DefaultGetUpdatesGenerator.java

@@ -9,13 +9,17 @@
 @AllArgsConstructor
 public class DefaultGetUpdatesGenerator implements Function<Integer, GetUpdates> {
 
-    public static final DefaultGetUpdatesGenerator INSTANCE = new DefaultGetUpdatesGenerator(List.of());
+    public static final DefaultGetUpdatesGenerator INSTANCE = new DefaultGetUpdatesGenerator();
 
     private static final int GET_UPDATES_LIMIT = 100;
     private static final int GET_UPDATES_TIMEOUT = 50;
 
     private final List<String> allowedUpdates;
 
+    public DefaultGetUpdatesGenerator() {
+        this(List.of());
+    }
+
     @Override
     public GetUpdates apply(Integer lastReceivedUpdate) {
         return GetUpdates

telegrambots-springboot-longpolling-starter/src/test/java/org/telegram/telegrambots/longpolling/starter/TestTelegramBotStarterWithCustomUpdatesGenerator.java

@@ -1,6 +1,5 @@
 package org.telegram.telegrambots.longpolling.starter;
 
-import lombok.Getter;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
@@ -26,7 +25,6 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
 class TestTelegramBotStarterWithCustomUpdatesGenerator {
@@ -35,9 +33,9 @@ class TestTelegramBotStarterWithCustomUpdatesGenerator {
     private static final TelegramBotsLongPollingApplication mockApplication = mock(TelegramBotsLongPollingApplication.class);
 
     private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-			.withAllowBeanDefinitionOverriding(true)
+            .withAllowBeanDefinitionOverriding(true)
             .withConfiguration(AutoConfigurations.of(MockTelegramBotsApi.class,
-                                                     TelegramBotStarterConfiguration.class));
+                    TelegramBotStarterConfiguration.class));
 
     @Test
     void longPollingBotWithCustomUpdates() throws TelegramApiException {
@@ -46,16 +44,15 @@ void longPollingBotWithCustomUpdates() throws TelegramApiException {
 
         this.contextRunner.withUserConfiguration(CustomUpdatesLongPollingBotConfig.class)
                 .run((context) -> {
-                    assertThat(context).hasSingleBean(CustomUpdatesLongPollingBot.class);
+                    assertThat(context).hasSingleBean(CustomUpdatesLongPollingBotConfig.Bot.class);
 
                     final SpringLongPollingBot bot = context.getBean(SpringLongPollingBot.class);
                     final TelegramBotsLongPollingApplication telegramBotsApi = context.getBean(TelegramBotsLongPollingApplication.class);
 
-                    assertInstanceOf(CustomUpdatesLongPollingBot.class, bot);
+                    assertInstanceOf(CustomUpdatesLongPollingBotConfig.Bot.class, bot);
 
-                    final ArgumentCaptor<Function<Integer,GetUpdates>> getUpdatesGeneratorCaptor = ArgumentCaptor.captor();
+                    final ArgumentCaptor<Function<Integer, GetUpdates>> getUpdatesGeneratorCaptor = ArgumentCaptor.captor();
                     verify(telegramBotsApi, times(1)).registerBot(eq(bot.getBotToken()), any(), getUpdatesGeneratorCaptor.capture(), any(LongPollingUpdateConsumer.class));
-                    verifyNoMoreInteractions(telegramBotsApi);
 
                     final Function<Integer, GetUpdates> getUpdatesGenerator = getUpdatesGeneratorCaptor.getValue();
                     final GetUpdates getUpdates = getUpdatesGenerator.apply(123);
@@ -67,6 +64,32 @@ void longPollingBotWithCustomUpdates() throws TelegramApiException {
                 });
     }
 
+    @Test
+    void longPollingBotWithDefaultUpdates() throws TelegramApiException {
+
+        when(mockApplication.registerBot(anyString(), any(), any(), any(LongPollingUpdateConsumer.class))).thenReturn(someBotSession);
+
+        this.contextRunner.withUserConfiguration(DefaultUpdatesLongPollingBotConfig.class)
+                .run((context) -> {
+                    assertThat(context).hasSingleBean(DefaultUpdatesLongPollingBotConfig.Bot.class);
+
+                    final SpringLongPollingBot bot = context.getBean(SpringLongPollingBot.class);
+                    final TelegramBotsLongPollingApplication telegramBotsApi = context.getBean(TelegramBotsLongPollingApplication.class);
+
+                    assertInstanceOf(DefaultUpdatesLongPollingBotConfig.Bot.class, bot);
+
+                    final ArgumentCaptor<Function<Integer, GetUpdates>> getUpdatesGeneratorCaptor = ArgumentCaptor.captor();
+                    verify(telegramBotsApi, times(1)).registerBot(eq(bot.getBotToken()), any(), getUpdatesGeneratorCaptor.capture(), any(LongPollingUpdateConsumer.class));
+
+                    final Function<Integer, GetUpdates> getUpdatesGenerator = getUpdatesGeneratorCaptor.getValue();
+                    final GetUpdates getUpdates = getUpdatesGenerator.apply(123);
+                    assertNotNull(getUpdates);
+                    assertEquals(100, getUpdates.getLimit());
+                    assertEquals(124, getUpdates.getOffset());
+                    assertEquals(50, getUpdates.getTimeout());
+                    assertEquals(List.of(), getUpdates.getAllowedUpdates());
+                });
+    }
 
     @Configuration
     public static class MockTelegramBotsApi {
@@ -77,36 +100,56 @@ public TelegramBotsLongPollingApplication telegramBotsApplication() {
     }
 
     @Configuration
-    public static class CustomUpdatesLongPollingBotConfig {
+    static class CustomUpdatesLongPollingBotConfig {
         @Bean
         public SpringLongPollingBot longPollingBot() {
-            return new CustomUpdatesLongPollingBot();
+            return new Bot();
         }
-    }
 
-    @Getter
-    public static class CustomUpdatesLongPollingBot implements SpringLongPollingBot {
-        public CustomUpdatesLongPollingBot() {
+        static class Bot implements SpringLongPollingBot {
+
+            @Override
+            public String getBotToken() {
+                return "custom";
+            }
+
+            @Override
+            public LongPollingUpdateConsumer getUpdatesConsumer() {
+                return update -> {
+                };
+            }
+
+            @Override
+            public GetUpdates getUpdates(final int offset) {
+                return GetUpdates.builder()
+                        .limit(42)
+                        .timeout(555)
+                        .offset(offset + 1)
+                        .allowedUpdates(List.of("message", "callback_query", "message_reaction"))
+                        .build();
+            }
         }
+    }
 
-        @Override
-        public String getBotToken() {
-            return "token";
+    @Configuration
+    static class DefaultUpdatesLongPollingBotConfig {
+        @Bean
+        public SpringLongPollingBot longPollingBot() {
+            return new Bot();
         }
 
-        @Override
-        public LongPollingUpdateConsumer getUpdatesConsumer() {
-            return update -> { };
-        }
+        static class Bot implements SpringLongPollingBot {
+
+            @Override
+            public String getBotToken() {
+                return "default";
+            }
 
-        @Override
-        public GetUpdates getUpdates(final int offset) {
-            return GetUpdates.builder()
-                    .limit(42)
-                    .timeout(555)
-                    .offset(offset + 1)
-                    .allowedUpdates(List.of("message", "callback_query", "message_reaction"))
-                    .build();
+            @Override
+            public LongPollingUpdateConsumer getUpdatesConsumer() {
+                return update -> {
+                };
+            }
         }
     }
 }