#3 change sessions impl

pom.xml

@@ -1,17 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <packaging>pom</packaging>
 
     <groupId>ru.penkrat.stbf</groupId>
     <artifactId>stbf-parent</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.0.2-SNAPSHOT</version>
     <name>stbf-parent</name>
 
     <description>Simple Telegram Bot Facade</description>
 
+    <scm>
+        <connection>scm:git:https://git.penkrat.ru/ruslan/stbf.git</connection>
+        <developerConnection>scm:git:https://git.penkrat.ru/ruslan/stbf.git</developerConnection>
+      <tag>HEAD</tag>
+  </scm>
+
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
@@ -60,6 +65,11 @@
                     <target>${java.version}</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <version>3.0.0-M4</version>
+            </plugin>
         </plugins>
     </build>
 

stbf-api/pom.xml

@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
 		<groupId>ru.penkrat.stbf</groupId>
 		<artifactId>stbf-parent</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>0.0.2-SNAPSHOT</version>
   	</parent>
 
 	<artifactId>stbf-api</artifactId>

stbf-api/src/main/java/ru/penkrat/stbf/api/BotRequest.java

@@ -14,4 +14,5 @@ public interface BotRequest {
 
 	Long getChatId();
 
+	BotSession getSession();
 }

stbf-api/src/main/java/ru/penkrat/stbf/api/BotSession.java

@@ -0,0 +1,9 @@
+package ru.penkrat.stbf.api;
+
+public interface BotSession {
+
+    Object getAttribute(String name);
+
+    void setAttribute(String name, Object value);
+
+}

stbf-api/src/main/java/ru/penkrat/stbf/api/SessionProvider.java

@@ -0,0 +1,8 @@
+package ru.penkrat.stbf.api;
+
+@FunctionalInterface
+public interface SessionProvider {
+
+    BotSession get(Long chatId);
+
+}

stbf-common/pom.xml

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>stbf-parent</artifactId>
 		<groupId>ru.penkrat.stbf</groupId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>0.0.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>stbf-common</artifactId>
@@ -16,7 +14,7 @@
 		<dependency>
 			<groupId>ru.penkrat.stbf</groupId>
 			<artifactId>stbf-api</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>0.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>

stbf-common/src/main/java/ru/penkrat/stbf/common/command/SessionAwareCommandChain.java

@@ -0,0 +1,20 @@
+package ru.penkrat.stbf.common.command;
+
+import lombok.RequiredArgsConstructor;
+import ru.penkrat.stbf.api.BotRequest;
+import ru.penkrat.stbf.api.BotResponse;
+import ru.penkrat.stbf.api.CommandChain;
+import ru.penkrat.stbf.api.SessionProvider;
+import ru.penkrat.stbf.common.session.SessionAwareBotRequest;
+
+@RequiredArgsConstructor
+public class SessionAwareCommandChain implements CommandChain {
+
+	private final CommandChain delegate;
+	private final SessionProvider sessionProvider;
+
+	@Override
+	public void processCommand(BotRequest botRequest, BotResponse botResponse) {
+		delegate.processCommand(new SessionAwareBotRequest(botRequest, sessionProvider), botResponse);
+	}
+}

stbf-common/src/main/java/ru/penkrat/stbf/common/command/ThreadPolledCommandChain.java

@@ -0,0 +1,31 @@
+package ru.penkrat.stbf.common.command;
+
+import ru.penkrat.stbf.api.BotRequest;
+import ru.penkrat.stbf.api.BotResponse;
+import ru.penkrat.stbf.api.CommandChain;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+public class ThreadPolledCommandChain implements CommandChain {
+
+	private final CommandChain delegate;
+	private final ExecutorService executor;
+
+	public ThreadPolledCommandChain(CommandChain delegate) {
+		this(delegate, 4);
+	}
+
+	public ThreadPolledCommandChain(CommandChain delegate, int nThreads) {
+		this.delegate = delegate;
+		this.executor = Executors.newFixedThreadPool(nThreads);
+	}
+
+	@Override
+	public void processCommand(BotRequest botRequest, BotResponse botResponse) {
+		executor.execute(() -> {
+			delegate.processCommand(botRequest, botResponse);
+		});
+	}
+
+}

stbf-common/src/main/java/ru/penkrat/stbf/common/session/InMemBotSessionProvider.java

@@ -0,0 +1,18 @@
+package ru.penkrat.stbf.common.session;
+
+import ru.penkrat.stbf.api.BotSession;
+import ru.penkrat.stbf.api.SessionProvider;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class InMemBotSessionProvider implements SessionProvider {
+
+    private static final Map<Long, BotSession> MAP = new ConcurrentHashMap<>();
+
+    @Override
+    public BotSession get(Long chatId) {
+        return MAP.computeIfAbsent(chatId, k -> new MapBackedBotSession(new ConcurrentHashMap<>()));
+    }
+
+}

stbf-common/src/main/java/ru/penkrat/stbf/common/session/MapBackedBotSession.java

@@ -0,0 +1,22 @@
+package ru.penkrat.stbf.common.session;
+
+import lombok.RequiredArgsConstructor;
+import ru.penkrat.stbf.api.BotSession;
+
+import java.util.Map;
+
+@RequiredArgsConstructor
+class MapBackedBotSession implements BotSession {
+
+    private final Map<String, Object> map;
+
+    @Override
+    public Object getAttribute(String name) {
+        return map.get(name);
+    }
+
+    @Override
+    public void setAttribute(String name, Object value) {
+        map.put(name, value);
+    }
+}

stbf-common/src/main/java/ru/penkrat/stbf/common/session/SessionAwareBotRequest.java

@@ -0,0 +1,49 @@
+package ru.penkrat.stbf.common.session;
+
+import lombok.RequiredArgsConstructor;
+import ru.penkrat.stbf.api.BotRequest;
+import ru.penkrat.stbf.api.BotSession;
+import ru.penkrat.stbf.api.SessionProvider;
+
+import java.util.Objects;
+import java.util.Optional;
+
+@RequiredArgsConstructor
+public class SessionAwareBotRequest implements BotRequest {
+
+	private final BotRequest delegate;
+
+	private final SessionProvider sessionProvider;
+
+	private BotSession botSession;
+
+	@Override
+	public BotSession getSession() {
+		if (botSession == null) {
+			botSession = sessionProvider.get(getChatId());
+			Objects.requireNonNull(botSession, "Session can not be null");
+		}
+		return botSession;
+	}
+
+	public Optional<String> getMessageText() {
+		return this.delegate.getMessageText();
+	}
+
+	public Optional<String> getPhoneNumber() {
+		return this.delegate.getPhoneNumber();
+	}
+
+	public Optional<String> getCallbackData() {
+		return this.delegate.getCallbackData();
+	}
+
+	public Optional<String> getCallbackMessageText() {
+		return this.delegate.getCallbackMessageText();
+	}
+
+	public Long getChatId() {
+		return this.delegate.getChatId();
+	}
+
+}

stbf-demo/pom.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>stbf-parent</artifactId>
         <groupId>ru.penkrat.stbf</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>0.0.2-SNAPSHOT</version>
     </parent>
 
     <groupId>ru.penkrat.stbf</groupId>
@@ -35,6 +34,11 @@
             <groupId>ru.penkrat.stbf</groupId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <artifactId>stbf-common</artifactId>
+            <groupId>ru.penkrat.stbf</groupId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>info.picocli</groupId>
             <artifactId>picocli</artifactId>
@@ -108,8 +112,7 @@
                         </goals>
                         <configuration>
                             <transformers>
-                                <transformer
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <mainClass>ru.penkrat.stbf.demo.App</mainClass>
                                 </transformer>
                             </transformers>

stbf-demo/src/main/java/ru/penkrat/stbf/demo/App.java

@@ -5,13 +5,16 @@ import org.slf4j.LoggerFactory;
 import picocli.CommandLine;
 import ru.penkrat.stbf.api.BotCommandChain;
 import ru.penkrat.stbf.api.CommandChain;
+import ru.penkrat.stbf.common.command.SessionAwareCommandChain;
+import ru.penkrat.stbf.common.command.ThreadPolledCommandChain;
+import ru.penkrat.stbf.common.session.InMemBotSessionProvider;
 import ru.penkrat.stbf.impl.pengrad.PengradTelegramBot;
 import ru.penkrat.stbf.templates.xml.XmlFlowResolver;
 
 import java.util.concurrent.atomic.AtomicReference;
 
 @CommandLine.Command(name = "java -jar stbf-demo.jar", mixinStandardHelpOptions = true, description = "Run bot",
-        version = "Simple Telegram bot framework Demo app v. 0.0.1")
+		version = "Simple Telegram bot framework Demo app v. 0.0.2")
 public class App implements Runnable {
 
 	private static final Logger log = LoggerFactory.getLogger(App.class);
@@ -28,13 +31,13 @@ public class App implements Runnable {
 		new CommandLine(new App()).execute(args);
 	}
 
-    private BotCommandChain getCommandChain(String filename) {
+	private CommandChain getCommandChain(String filename) {
 		XmlFlowResolver flow = new XmlFlowResolver(filename);
 
 		BotCommandChain chain = new BotCommandChain();
 		flow.getCommands().forEach(chain::add);
 
-        return chain;
+		return new ThreadPolledCommandChain(new SessionAwareCommandChain(chain, new InMemBotSessionProvider()));
 	}
 
 	private Runnable start(String token, CommandChain chain) {

stbf-pengrad/pom.xml

@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
 		<groupId>ru.penkrat.stbf</groupId>
 		<artifactId>stbf-parent</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>0.0.2-SNAPSHOT</version>
   	</parent>
 
 	<artifactId>stbf-pengrad</artifactId>
@@ -18,12 +16,12 @@
 		<dependency>
 			<groupId>ru.penkrat.stbf</groupId>
 			<artifactId>stbf-api</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>0.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.pengrad</groupId>
 			<artifactId>java-telegram-bot-api</artifactId>
-			<version>[4.9.0,5.2.0]</version>
+			<version>6.2.0</version>
 		</dependency>
 	</dependencies>
 

stbf-pengrad/src/main/java/ru/penkrat/stbf/impl/pengrad/BotRequestImpl.java

@@ -1,17 +1,17 @@
 package ru.penkrat.stbf.impl.pengrad;
 
-import static lombok.AccessLevel.PROTECTED;
-
-import java.util.Optional;
-
 import com.pengrad.telegrambot.model.CallbackQuery;
 import com.pengrad.telegrambot.model.Contact;
 import com.pengrad.telegrambot.model.Message;
 import com.pengrad.telegrambot.model.Update;
-
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import ru.penkrat.stbf.api.BotRequest;
+import ru.penkrat.stbf.api.BotSession;
+
+import java.util.Optional;
+
+import static lombok.AccessLevel.PROTECTED;
 
 @RequiredArgsConstructor
 public class BotRequestImpl implements BotRequest {
@@ -58,4 +58,9 @@ public class BotRequestImpl implements BotRequest {
 				.orElseGet(() -> update.message()).chat().id();
 	}
 
+	@Override
+	public BotSession getSession() {
+		throw new UnsupportedOperationException("Session is not supported");
+	}
+
 }

stbf-pengrad/src/main/java/ru/penkrat/stbf/impl/pengrad/BotResponseImpl.java

@@ -11,6 +11,7 @@ import com.pengrad.telegrambot.request.AbstractSendRequest;
 import com.pengrad.telegrambot.request.DeleteMessage;
 import com.pengrad.telegrambot.request.EditMessageText;
 import com.pengrad.telegrambot.request.SendDocument;
+import com.pengrad.telegrambot.response.BaseResponse;
 import com.pengrad.telegrambot.response.SendResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -27,7 +28,7 @@ public class BotResponseImpl implements BotResponse {
 
     @Override
     public void send(Screen screen) {
-        log.debug("Send message: \n============\n{}\n============", screen.getText().trim());
+        log.trace("Send trace: \n============\n{}\n============", screen.getText().trim());
 
         AbstractSendRequest<? extends AbstractSendRequest> sendMessage = SendMethodUtils.createFromScreen(chatId(), screen);
 
@@ -36,8 +37,8 @@ public class BotResponseImpl implements BotResponse {
             KeyboardButton[][] keyboard = kk.getKeyboard();
             InlineKeyboardButton[][] inlineKeyboard = kk.getInlineKeyboard();
 
-            if (log.isDebugEnabled()) {
+            if (log.isTraceEnabled()) {
-                log.debug("{}", kk.toFriendlyString());
+                log.trace("{}", kk.toFriendlyString());
             }
 
             if (inlineKeyboard != null && inlineKeyboard.length > 0) {
@@ -45,12 +46,14 @@ public class BotResponseImpl implements BotResponse {
             } else if (keyboard != null && keyboard.length > 0) {
                 sendMessage = sendMessage.replyMarkup(new ReplyKeyboardMarkup(keyboard));
             } else {
-                log.debug("No keyboard");
+                log.trace("No keyboard");
             }
         }
 
         final SendResponse sendResponse = telegramBot.execute(sendMessage);
         SendMethodUtils.processResponse(screen, sendResponse);
+
+        log.debug("Response message = {}", sendResponse.message().messageId());
     }
 
     @Override
@@ -76,18 +79,23 @@ public class BotResponseImpl implements BotResponse {
             KeyboardImpl kk = (KeyboardImpl) screen.getKeyboard();
             InlineKeyboardButton[][] inlineKeyboard = kk.getInlineKeyboard();
 
-            if (log.isDebugEnabled()) {
+            if (log.isTraceEnabled()) {
-                log.debug("{}", kk.toFriendlyString());
+                log.trace("{}", kk.toFriendlyString());
             }
 
             if (inlineKeyboard != null && inlineKeyboard.length > 0) {
                 editMessage = editMessage.replyMarkup(new InlineKeyboardMarkup(inlineKeyboard));
             } else {
-                log.debug("No keyboard");
+                log.trace("No keyboard");
             }
         }
 
-        telegramBot.execute(editMessage);
+        final BaseResponse response = telegramBot.execute(editMessage);
+        if (response.isOk()) {
+            log.debug("Response ok, edit message = {}", messageId());
+        } else {
+            log.debug("Response error code {}", response.errorCode());
+        }
     }
 
     @Override

stbf-pengrad/src/main/java/ru/penkrat/stbf/impl/pengrad/KeyboardImpl.java

@@ -1,6 +1,6 @@
 package ru.penkrat.stbf.impl.pengrad;
 
-import com.google.gson.internal.reflect.ReflectionAccessor;
+import com.google.gson.internal.reflect.ReflectionHelper;
 import com.pengrad.telegrambot.model.request.InlineKeyboardButton;
 import com.pengrad.telegrambot.model.request.KeyboardButton;
 import lombok.Value;
@@ -58,7 +58,7 @@ class KeyboardImpl implements Keyboard {
         return text.computeIfAbsent(btn, o -> {
             try {
                 Field text = btn.getClass().getDeclaredField("text");
-                ReflectionAccessor.getInstance().makeAccessible(text);
+                ReflectionHelper.makeAccessible(text);
                 return String.valueOf(text.get(btn));
             } catch (NoSuchFieldException | IllegalAccessException e) {
                 return "*error*";

stbf-pengrad/src/main/java/ru/penkrat/stbf/impl/pengrad/PengradTelegramBot.java

@@ -2,11 +2,13 @@ package ru.penkrat.stbf.impl.pengrad;
 
 import com.pengrad.telegrambot.TelegramBot;
 import com.pengrad.telegrambot.UpdatesListener;
+import com.pengrad.telegrambot.model.CallbackQuery;
 import com.pengrad.telegrambot.model.Update;
-
 import lombok.extern.slf4j.Slf4j;
 import ru.penkrat.stbf.api.CommandChain;
 
+import java.util.Optional;
+
 @Slf4j
 public class PengradTelegramBot extends TelegramBot implements AutoCloseable {
 
@@ -15,6 +17,13 @@ public class PengradTelegramBot extends TelegramBot implements AutoCloseable {
 		this.setUpdatesListener(updates -> {
 			for (Update update : updates) {
 				try {
+					final Long chatId = Optional.of(update)
+							.map(Update::callbackQuery)
+							.map(CallbackQuery::message)
+							.orElseGet(() -> update.message()).chat().id();
+
+					log.debug("New message in chat {}", chatId);
+
 					commandChain.processCommand(
 							new BotRequestImpl(update),
 							new BotResponseImpl(update, this));

stbf-rubenlagus/pom.xml

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>stbf-parent</artifactId>
 		<groupId>ru.penkrat.stbf</groupId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>0.0.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>stbf-rubenlagus</artifactId>
@@ -17,7 +15,7 @@
 		<dependency>
 			<groupId>ru.penkrat.stbf</groupId>
 			<artifactId>stbf-api</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>0.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.telegram</groupId>

stbf-rubenlagus/src/main/java/ru/penkrat/stbf/impl/rubenlagus/BotRequestImpl.java

@@ -1,17 +1,17 @@
 package ru.penkrat.stbf.impl.rubenlagus;
 
-import static lombok.AccessLevel.PROTECTED;
+import lombok.Getter;
-
+import lombok.RequiredArgsConstructor;
-import java.util.Optional;
-
 import org.telegram.telegrambots.meta.api.objects.CallbackQuery;
 import org.telegram.telegrambots.meta.api.objects.Contact;
 import org.telegram.telegrambots.meta.api.objects.Message;
 import org.telegram.telegrambots.meta.api.objects.Update;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 import ru.penkrat.stbf.api.BotRequest;
+import ru.penkrat.stbf.api.BotSession;
+
+import java.util.Optional;
+
+import static lombok.AccessLevel.PROTECTED;
 
 @RequiredArgsConstructor
 class BotRequestImpl implements BotRequest {
@@ -52,7 +52,12 @@ class BotRequestImpl implements BotRequest {
 
 	@Override
 	public Long getChatId() {
-		return update.getMessage().getChatId();
+		return Utils.getChatId(update);
+	}
+
+	@Override
+	public BotSession getSession() {
+		throw new UnsupportedOperationException("Session is not supported");
 	}
 
 }

stbf-rubenlagus/src/main/java/ru/penkrat/stbf/impl/rubenlagus/RubenlagusTelegramBot.java

@@ -1,12 +1,11 @@
 package ru.penkrat.stbf.impl.rubenlagus;
 
+import lombok.extern.slf4j.Slf4j;
 import org.telegram.telegrambots.bots.TelegramLongPollingBot;
 import org.telegram.telegrambots.meta.TelegramBotsApi;
 import org.telegram.telegrambots.meta.api.objects.Update;
 import org.telegram.telegrambots.meta.exceptions.TelegramApiException;
 import org.telegram.telegrambots.updatesreceivers.DefaultBotSession;
-
-import lombok.extern.slf4j.Slf4j;
 import ru.penkrat.stbf.api.BotCommandChain;
 
 @Slf4j

stbf-rubenlagus/src/main/java/ru/penkrat/stbf/impl/rubenlagus/Utils.java

@@ -0,0 +1,21 @@
+package ru.penkrat.stbf.impl.rubenlagus;
+
+import lombok.experimental.UtilityClass;
+import org.telegram.telegrambots.meta.api.objects.Update;
+
+@UtilityClass
+class Utils {
+
+    Long getChatId(Update update) {
+        if (update.getMessage() != null) {
+            return update.getMessage().getChatId();
+        }
+
+        if (update.getCallbackQuery() != null) {
+            update.getCallbackQuery().getMessage().getChatId();
+        }
+
+        throw new IllegalStateException("Can't extract chatId from 'Update'");
+    }
+
+}

stbf-templates/pom.xml

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>stbf-parent</artifactId>
 		<groupId>ru.penkrat.stbf</groupId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>0.0.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>stbf-templates</artifactId>
 	<properties>

stbf-test/pom.xml

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>stbf-parent</artifactId>
 		<groupId>ru.penkrat.stbf</groupId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>0.0.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>stbf-test</artifactId>
@@ -16,12 +14,12 @@
 		<dependency>
 			<groupId>ru.penkrat.stbf</groupId>
 			<artifactId>stbf-api</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>0.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>ru.penkrat.stbf</groupId>
 			<artifactId>stbf-common</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>0.0.2-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

stbf-test/src/main/java/ru/penkrat/stbf/test/BotRequestImpl.java

@@ -6,6 +6,7 @@ import java.util.Random;
 import lombok.Builder;
 import lombok.Getter;
 import ru.penkrat.stbf.api.BotRequest;
+import ru.penkrat.stbf.api.BotSession;
 
 @Builder
 class BotRequestImpl implements BotRequest {
@@ -14,6 +15,7 @@ class BotRequestImpl implements BotRequest {
 	private String phoneNumber;
 	private String callbackData;
 	private String callbackMessageText;
+	private BotSession session;
 
 	@Getter
 	@Builder.Default
@@ -39,4 +41,9 @@ class BotRequestImpl implements BotRequest {
 		return Optional.ofNullable(callbackMessageText);
 	}
 
+	@Override
+	public BotSession getSession() {
+		return session;
+	}
+
 }