From ed2f31f9f155d175ff0ce42a81d7c001ec073e0c Mon Sep 17 00:00:00 2001 From: Struchkov Mark Date: Wed, 26 Apr 2023 22:09:46 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=BE=D0=B3=D0=B8=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../godfather/telegram/domain/keyboard/InlineKeyBoard.java | 3 ++- .../godfather/telegram/domain/keyboard/MarkupKeyBoard.java | 3 ++- .../godfather/telegram/domain/keyboard/SimpleKeyBoardLine.java | 2 ++ .../telegram/domain/keyboard/button/ContactButton.java | 2 ++ .../telegram/domain/keyboard/button/SimpleButton.java | 2 ++ .../godfather/telegram/domain/keyboard/button/UrlButton.java | 2 ++ .../telegram/domain/keyboard/button/WebAppButton.java | 2 ++ 8 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 8c1edcd..1bc76d2 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ UTF-8 UTF-8 - 0.0.61 + 0.0.62-SNAPSHOT 6.5.0 diff --git a/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/keyboard/InlineKeyBoard.java b/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/keyboard/InlineKeyBoard.java index 342b953..b338214 100644 --- a/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/keyboard/InlineKeyBoard.java +++ b/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/keyboard/InlineKeyBoard.java @@ -10,15 +10,16 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import lombok.Singular; +import lombok.ToString; import java.util.List; import static dev.struchkov.godfather.telegram.domain.keyboard.SimpleKeyBoardLine.keyBoardLine; - @Getter @Setter @Builder +@ToString @NoArgsConstructor @AllArgsConstructor(access = AccessLevel.PRIVATE) public class InlineKeyBoard implements KeyBoard { diff --git a/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/keyboard/MarkupKeyBoard.java b/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/keyboard/MarkupKeyBoard.java index af2207c..8b965cc 100644 --- a/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/keyboard/MarkupKeyBoard.java +++ b/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/keyboard/MarkupKeyBoard.java @@ -3,7 +3,6 @@ package dev.struchkov.godfather.telegram.domain.keyboard; import dev.struchkov.godfather.main.domain.keyboard.KeyBoard; import dev.struchkov.godfather.main.domain.keyboard.KeyBoardButton; import dev.struchkov.godfather.main.domain.keyboard.KeyBoardLine; -import dev.struchkov.haiti.utils.Checker; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Builder; @@ -11,6 +10,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import lombok.Singular; +import lombok.ToString; import java.util.List; @@ -21,6 +21,7 @@ import static dev.struchkov.haiti.utils.Checker.checkNotEmpty; @Getter @Setter @Builder +@ToString @NoArgsConstructor @AllArgsConstructor(access = AccessLevel.PRIVATE) public class MarkupKeyBoard implements KeyBoard { diff --git a/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/keyboard/SimpleKeyBoardLine.java b/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/keyboard/SimpleKeyBoardLine.java index 24cce26..00f50c4 100644 --- a/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/keyboard/SimpleKeyBoardLine.java +++ b/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/keyboard/SimpleKeyBoardLine.java @@ -9,6 +9,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import lombok.Singular; +import lombok.ToString; import java.util.Arrays; import java.util.List; @@ -21,6 +22,7 @@ import java.util.List; @Getter @Setter @Builder +@ToString @NoArgsConstructor @AllArgsConstructor(access = AccessLevel.PRIVATE) public class SimpleKeyBoardLine implements KeyBoardLine { diff --git a/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/keyboard/button/ContactButton.java b/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/keyboard/button/ContactButton.java index 6f635af..afb68fa 100644 --- a/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/keyboard/button/ContactButton.java +++ b/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/keyboard/button/ContactButton.java @@ -7,6 +7,7 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import lombok.ToString; import static dev.struchkov.haiti.utils.Inspector.Utils.nullPointer; import static dev.struchkov.haiti.utils.Inspector.isNotNull; @@ -17,6 +18,7 @@ import static dev.struchkov.haiti.utils.Inspector.isNotNull; @Getter @Setter @Builder +@ToString @NoArgsConstructor @AllArgsConstructor(access = AccessLevel.PRIVATE) public class ContactButton implements KeyBoardButton { diff --git a/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/keyboard/button/SimpleButton.java b/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/keyboard/button/SimpleButton.java index b698a5d..e0221ce 100644 --- a/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/keyboard/button/SimpleButton.java +++ b/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/keyboard/button/SimpleButton.java @@ -6,6 +6,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import lombok.ToString; import java.util.Arrays; import java.util.stream.Collectors; @@ -20,6 +21,7 @@ import static dev.struchkov.haiti.utils.Inspector.isNotNull; */ @Getter @Setter +@ToString @NoArgsConstructor @EqualsAndHashCode public class SimpleButton implements KeyBoardButton { diff --git a/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/keyboard/button/UrlButton.java b/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/keyboard/button/UrlButton.java index 542cd0d..18824c7 100644 --- a/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/keyboard/button/UrlButton.java +++ b/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/keyboard/button/UrlButton.java @@ -7,12 +7,14 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import lombok.ToString; import static dev.struchkov.haiti.utils.Inspector.isNotNull; @Getter @Setter @Builder +@ToString @NoArgsConstructor @AllArgsConstructor(access = AccessLevel.PRIVATE) public class UrlButton implements KeyBoardButton { diff --git a/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/keyboard/button/WebAppButton.java b/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/keyboard/button/WebAppButton.java index e252884..8b8fcc4 100644 --- a/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/keyboard/button/WebAppButton.java +++ b/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/keyboard/button/WebAppButton.java @@ -7,12 +7,14 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import lombok.ToString; import static dev.struchkov.haiti.utils.Inspector.isNotNull; @Getter @Setter @Builder +@ToString @NoArgsConstructor @AllArgsConstructor(access = AccessLevel.PRIVATE) public class WebAppButton implements KeyBoardButton {