fix and up version

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>ru.penkrat.stbf</groupId>
     <artifactId>stbf-parent</artifactId>
-    <version>0.0.2-SNAPSHOT</version>
+    <version>0.0.1.1</version>
     <name>stbf-parent</name>
 
     <description>Simple Telegram Bot Facade</description>
@@ -14,7 +14,7 @@
     <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>
+      <tag>stbf-parent-0.0.1</tag>
   </scm>
 
     <licenses>

stbf-api/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ru.penkrat.stbf</groupId>
 		<artifactId>stbf-parent</artifactId>
-		<version>0.0.2-SNAPSHOT</version>
+		<version>0.0.1</version>
   	</parent>
 
 	<artifactId>stbf-api</artifactId>

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

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

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

@@ -1,9 +0,0 @@
-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

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

stbf-common/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>stbf-parent</artifactId>
 		<groupId>ru.penkrat.stbf</groupId>
-		<version>0.0.2-SNAPSHOT</version>
+		<version>0.0.1</version>
 	</parent>
 
 	<artifactId>stbf-common</artifactId>
@@ -14,7 +14,7 @@
 		<dependency>
 			<groupId>ru.penkrat.stbf</groupId>
 			<artifactId>stbf-api</artifactId>
-			<version>0.0.2-SNAPSHOT</version>
+			<version>0.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>

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

@@ -1,18 +0,0 @@
-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

@@ -1,22 +0,0 @@
-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-demo/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>stbf-parent</artifactId>
         <groupId>ru.penkrat.stbf</groupId>
-        <version>0.0.2-SNAPSHOT</version>
+        <version>0.0.1</version>
     </parent>
 
     <groupId>ru.penkrat.stbf</groupId>
@@ -34,11 +34,6 @@
             <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>

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

@@ -5,7 +5,6 @@ import org.slf4j.LoggerFactory;
 import picocli.CommandLine;
 import ru.penkrat.stbf.api.BotCommandChain;
 import ru.penkrat.stbf.api.CommandChain;
-import ru.penkrat.stbf.common.session.InMemBotSessionProvider;
 import ru.penkrat.stbf.impl.pengrad.PengradTelegramBot;
 import ru.penkrat.stbf.templates.xml.XmlFlowResolver;
 
@@ -39,7 +38,7 @@ public class App implements Runnable {
     }
 
     private Runnable start(String token, CommandChain chain) {
-        return () -> botAtomicReference.set(new PengradTelegramBot(token, chain, new InMemBotSessionProvider()));
+        return () -> botAtomicReference.set(new PengradTelegramBot(token, chain));
     }
 
     private void onShutdown() {

stbf-pengrad/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ru.penkrat.stbf</groupId>
 		<artifactId>stbf-parent</artifactId>
-		<version>0.0.2-SNAPSHOT</version>
+		<version>0.0.1.1</version>
   	</parent>
 
 	<artifactId>stbf-pengrad</artifactId>
@@ -16,12 +16,12 @@
 		<dependency>
 			<groupId>ru.penkrat.stbf</groupId>
 			<artifactId>stbf-api</artifactId>
-			<version>0.0.2-SNAPSHOT</version>
+			<version>0.0.1</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,13 +1,13 @@
 package ru.penkrat.stbf.impl.pengrad;
 
 import com.pengrad.telegrambot.model.CallbackQuery;
+import com.pengrad.telegrambot.model.Chat;
 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;
 
@@ -19,9 +19,6 @@ public class BotRequestImpl implements BotRequest {
 	@Getter(PROTECTED)
 	private final Update update;
 
-    @Getter
-    private final BotSession session;
-
 	@Override
 	public Optional<String> getMessageText() {
 		if (update.message() != null) {
@@ -55,10 +52,25 @@ public class BotRequestImpl implements BotRequest {
 
 	@Override
 	public Long getChatId() {
-        return Optional.of(update)
+		return Optional.ofNullable(getMessage())
-                .map(Update::callbackQuery)
+				.map(Message::chat)
-                .map(CallbackQuery::message)
+				.map(Chat::id)
-                .orElseGet(() -> update.message()).chat().id();
+				.orElse(null);
+	}
+
+	private Message getMessage() {
+		if (update != null) {
+			if (update.callbackQuery() != null) {
+				return update.callbackQuery().message();
+			}
+			if (update.message() != null) {
+				return update.message();
+			}
+			if (update.editedMessage() != null) {
+				return update.editedMessage();
+			}
+		}
+		return null;
 	}
 
 }

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

@@ -11,7 +11,6 @@ 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;
@@ -28,7 +27,7 @@ public class BotResponseImpl implements BotResponse {
 
     @Override
     public void send(Screen screen) {
-        log.trace("Send trace: \n============\n{}\n============", screen.getText().trim());
+        log.debug("Send message: \n============\n{}\n============", screen.getText().trim());
 
         AbstractSendRequest<? extends AbstractSendRequest> sendMessage = SendMethodUtils.createFromScreen(chatId(), screen);
 
@@ -37,8 +36,8 @@ public class BotResponseImpl implements BotResponse {
             KeyboardButton[][] keyboard = kk.getKeyboard();
             InlineKeyboardButton[][] inlineKeyboard = kk.getInlineKeyboard();
 
-            if (log.isTraceEnabled()) {
+            if (log.isDebugEnabled()) {
-                log.trace("{}", kk.toFriendlyString());
+                log.debug("{}", kk.toFriendlyString());
             }
 
             if (inlineKeyboard != null && inlineKeyboard.length > 0) {
@@ -46,14 +45,12 @@ public class BotResponseImpl implements BotResponse {
             } else if (keyboard != null && keyboard.length > 0) {
                 sendMessage = sendMessage.replyMarkup(new ReplyKeyboardMarkup(keyboard));
             } else {
-                log.trace("No keyboard");
+                log.debug("No keyboard");
             }
         }
 
         final SendResponse sendResponse = telegramBot.execute(sendMessage);
         SendMethodUtils.processResponse(screen, sendResponse);
-
-        log.debug("Response message = {}", sendResponse.message().messageId());
     }
 
     @Override
@@ -79,23 +76,18 @@ public class BotResponseImpl implements BotResponse {
             KeyboardImpl kk = (KeyboardImpl) screen.getKeyboard();
             InlineKeyboardButton[][] inlineKeyboard = kk.getInlineKeyboard();
 
-            if (log.isTraceEnabled()) {
+            if (log.isDebugEnabled()) {
-                log.trace("{}", kk.toFriendlyString());
+                log.debug("{}", kk.toFriendlyString());
             }
 
             if (inlineKeyboard != null && inlineKeyboard.length > 0) {
                 editMessage = editMessage.replyMarkup(new InlineKeyboardMarkup(inlineKeyboard));
             } else {
-                log.trace("No keyboard");
+                log.debug("No keyboard");
             }
         }
 
-        final BaseResponse response = telegramBot.execute(editMessage);
+        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/PengradTelegramBot.java

@@ -2,37 +2,21 @@ 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 ru.penkrat.stbf.api.SessionProvider;
-
-import java.util.Optional;
 
 @Slf4j
 public class PengradTelegramBot extends TelegramBot implements AutoCloseable {
 
 	public PengradTelegramBot(String botToken, CommandChain commandChain) {
-        this(botToken, commandChain, (id) -> {
-            throw new IllegalArgumentException("'SessionProvider' is not defined");
-        });
-    }
-
-    public PengradTelegramBot(String botToken, CommandChain commandChain, SessionProvider sessionProvider) {
 		super(botToken);
 		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, sessionProvider.get(chatId)),
+							new BotRequestImpl(update),
 							new BotResponseImpl(update, this));
 				} catch (Exception e) {
 					log.error("Bot Error:", e);

stbf-rubenlagus/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>stbf-parent</artifactId>
 		<groupId>ru.penkrat.stbf</groupId>
-		<version>0.0.2-SNAPSHOT</version>
+		<version>0.0.1</version>
 	</parent>
 
 	<artifactId>stbf-rubenlagus</artifactId>
@@ -15,7 +15,7 @@
 		<dependency>
 			<groupId>ru.penkrat.stbf</groupId>
 			<artifactId>stbf-api</artifactId>
-			<version>0.0.2-SNAPSHOT</version>
+			<version>0.0.1</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 lombok.Getter;
+import static lombok.AccessLevel.PROTECTED;
-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 {
@@ -19,9 +19,6 @@ class BotRequestImpl implements BotRequest {
 	@Getter(PROTECTED)
 	private final Update update;
 
-    @Getter
-    private final BotSession session;
-
 	@Override
 	public Optional<String> getMessageText() {
 		if (update.hasMessage()) {
@@ -55,7 +52,7 @@ class BotRequestImpl implements BotRequest {
 
 	@Override
 	public Long getChatId() {
-        return Utils.getChatId(update);
+		return update.getMessage().getChatId();
 	}
 
 }

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

@@ -1,13 +1,13 @@
 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;
-import ru.penkrat.stbf.api.SessionProvider;
 
 @Slf4j
 public class RubenlagusTelegramBot extends TelegramLongPollingBot {
@@ -15,19 +15,11 @@ public class RubenlagusTelegramBot extends TelegramLongPollingBot {
 	private final String botUsername;
 	private final String botToken;
 	private final BotCommandChain commandChain;
-    private final SessionProvider sessionProvider;
 
 	public RubenlagusTelegramBot(String botUsername, String botToken, BotCommandChain botCommandChain) {
-        this(botUsername, botToken, botCommandChain, (id) -> {
-            throw new IllegalArgumentException("'SessionProvider' is not defined");
-        });
-    }
-
-    public RubenlagusTelegramBot(String botUsername, String botToken, BotCommandChain botCommandChain, SessionProvider sessionProvider) {
 		this.botUsername = botUsername;
 		this.botToken = botToken;
 		this.commandChain = botCommandChain;
-        this.sessionProvider = sessionProvider;
 
 		TelegramBotsApi telegramBotsApi;
 		try {
@@ -42,7 +34,7 @@ public class RubenlagusTelegramBot extends TelegramLongPollingBot {
 	public void onUpdateReceived(Update update) {
 		try {
 			commandChain.processCommand(
-                    new BotRequestImpl(update, sessionProvider.get(Utils.getChatId(update))),
+					new BotRequestImpl(update),
 					new BotResponseImpl(update, this));
 		} catch (Exception e) {
 			log.error("Bot Error:", e);

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

@@ -1,21 +0,0 @@
-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

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>stbf-parent</artifactId>
 		<groupId>ru.penkrat.stbf</groupId>
-		<version>0.0.2-SNAPSHOT</version>
+		<version>0.0.1</version>
 	</parent>
 	<artifactId>stbf-templates</artifactId>
 	<properties>

stbf-test/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>stbf-parent</artifactId>
 		<groupId>ru.penkrat.stbf</groupId>
-		<version>0.0.2-SNAPSHOT</version>
+		<version>0.0.1</version>
 	</parent>
 
 	<artifactId>stbf-test</artifactId>
@@ -14,12 +14,12 @@
 		<dependency>
 			<groupId>ru.penkrat.stbf</groupId>
 			<artifactId>stbf-api</artifactId>
-			<version>0.0.2-SNAPSHOT</version>
+			<version>0.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>ru.penkrat.stbf</groupId>
 			<artifactId>stbf-common</artifactId>
-			<version>0.0.2-SNAPSHOT</version>
+			<version>0.0.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

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

@@ -6,7 +6,6 @@ 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 {
@@ -15,7 +14,6 @@ class BotRequestImpl implements BotRequest {
 	private String phoneNumber;
 	private String callbackData;
 	private String callbackMessageText;
-	private BotSession session;
 
 	@Getter
 	@Builder.Default
@@ -41,9 +39,4 @@ class BotRequestImpl implements BotRequest {
 		return Optional.ofNullable(callbackMessageText);
 	}
 
-	@Override
-	public BotSession getSession() {
-		return session;
-	}
-
 }