From aa32c3b715126b38a6f17e1503ea5bbfa21225ab Mon Sep 17 00:00:00 2001 From: Struchkov Mark Date: Thu, 6 Apr 2023 20:22:15 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B8=D0=BB=20=D1=80?= =?UTF-8?q?=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BA?= =?UTF-8?q?=D0=BB=D0=B0=D0=B2=D0=B8=D0=B0=D1=82=D1=83=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/keyboard/button/SimpleButton.java | 67 ------------------- .../keyboard/simple/SimpleKeyBoardLine.java | 38 ----------- 2 files changed, 105 deletions(-) delete mode 100644 bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/keyboard/button/SimpleButton.java delete mode 100644 bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/keyboard/simple/SimpleKeyBoardLine.java diff --git a/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/keyboard/button/SimpleButton.java b/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/keyboard/button/SimpleButton.java deleted file mode 100644 index 2c25d16..0000000 --- a/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/keyboard/button/SimpleButton.java +++ /dev/null @@ -1,67 +0,0 @@ -package dev.struchkov.godfather.main.domain.keyboard.button; - -import dev.struchkov.godfather.main.domain.keyboard.KeyBoardButton; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.util.Objects; - -import static dev.struchkov.haiti.utils.Inspector.Utils.nullPointer; -import static dev.struchkov.haiti.utils.Inspector.isNotNull; - -/** - * Абстрактная сущность кнопки для клавиатуры. - * - * @author upagge [08/07/2019] - */ -@Getter -@Setter -@NoArgsConstructor -public class SimpleButton implements KeyBoardButton { - - public static final String TYPE = "SIMPLE"; - - /** - * Надпись на кнопке. - */ - protected String label; - /** - * Данные, которые возвращаются при нажатии. - */ - protected String callbackData; - - protected SimpleButton(String label, String callbackData) { - this.label = label; - this.callbackData = callbackData; - } - - public static SimpleButton simpleButton(String label, String callbackData) { - isNotNull(label, nullPointer("label")); - return new SimpleButton(label, callbackData); - } - - public static SimpleButton simpleButton(String label) { - isNotNull(label, nullPointer("label")); - return new SimpleButton(label, null); - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - SimpleButton that = (SimpleButton) o; - return Objects.equals(label, that.label) && Objects.equals(callbackData, that.callbackData); - } - - @Override - public int hashCode() { - return Objects.hash(label, callbackData); - } - - @Override - public String getType() { - return TYPE; - } - -} diff --git a/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/keyboard/simple/SimpleKeyBoardLine.java b/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/keyboard/simple/SimpleKeyBoardLine.java deleted file mode 100644 index b7eeedd..0000000 --- a/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/keyboard/simple/SimpleKeyBoardLine.java +++ /dev/null @@ -1,38 +0,0 @@ -package dev.struchkov.godfather.main.domain.keyboard.simple; - -import dev.struchkov.godfather.main.domain.keyboard.KeyBoardButton; -import dev.struchkov.godfather.main.domain.keyboard.KeyBoardLine; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.Singular; - -import java.util.Arrays; -import java.util.List; - -/** - * Строка в меню клавиатуры {@link dev.struchkov.godfather.main.domain.keyboard.KeyBoard}. - * - * @author upagge [08/07/2019] - */ -@Getter -@Setter -@Builder -@NoArgsConstructor -@AllArgsConstructor(access = AccessLevel.PRIVATE) -public class SimpleKeyBoardLine implements KeyBoardLine { - - /** - * Кнопки в строке. - */ - @Singular - protected List buttons; - - public static SimpleKeyBoardLine simpleLine(KeyBoardButton... keyBoardButton) { - return new SimpleKeyBoardLine(Arrays.stream(keyBoardButton).toList()); - } - -}