Compare commits

..

4 Commits

Author SHA1 Message Date
d13c4a051f
[maven-release-plugin] prepare for next development iteration
All checks were successful
continuous-integration/drone/push Build is passing
2023-02-18 11:28:53 +03:00
db8f447eb4
[maven-release-plugin] prepare release v.0.0.49 2023-02-18 11:28:53 +03:00
9b041eb42d
Небольшой рефаакторинг 2023-02-18 11:26:15 +03:00
66ce848308
Обновил зависимости 2023-02-18 11:23:59 +03:00
28 changed files with 58 additions and 53 deletions

19
pom.xml
View File

@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?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> <modelVersion>4.0.0</modelVersion>
<groupId>dev.struchkov.godfather.telegram</groupId> <groupId>dev.struchkov.godfather.telegram</groupId>
<artifactId>telegram-bot</artifactId> <artifactId>telegram-bot</artifactId>
<version>0.0.49-SNAPSHOT</version> <version>0.0.50-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>
@ -38,16 +37,24 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<godfather.core.ver>0.0.51-SNAPSHOT</godfather.core.ver> <godfather.core.ver>0.0.51</godfather.core.ver>
<!-- https://mvnrepository.com/artifact/org.telegram/telegrambots -->
<telegrambots.ver>6.3.0</telegrambots.ver> <telegrambots.ver>6.3.0</telegrambots.ver>
<haiti.version>2.0.0</haiti.version> <haiti.version>2.6.0</haiti.version>
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-compiler-plugin -->
<plugin.maven.compiler.ver>3.10.1</plugin.maven.compiler.ver> <plugin.maven.compiler.ver>3.10.1</plugin.maven.compiler.ver>
<!-- https://mvnrepository.com/artifact/org.sonatype.plugins/nexus-staging-maven-plugin -->
<plugin.nexus.staging.ver>1.6.13</plugin.nexus.staging.ver> <plugin.nexus.staging.ver>1.6.13</plugin.nexus.staging.ver>
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-source-plugin -->
<plugin.maven.source.ver>3.2.1</plugin.maven.source.ver> <plugin.maven.source.ver>3.2.1</plugin.maven.source.ver>
<plugin.maven.javadoc.ver>3.4.0</plugin.maven.javadoc.ver> <!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-javadoc-plugin -->
<plugin.maven.javadoc.ver>3.5.0</plugin.maven.javadoc.ver>
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-gpg-plugin -->
<plugin.maven.gpg.ver>3.0.1</plugin.maven.gpg.ver> <plugin.maven.gpg.ver>3.0.1</plugin.maven.gpg.ver>
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-release-plugin -->
<plugin.maven.release.ver>3.0.0-M7</plugin.maven.release.ver> <plugin.maven.release.ver>3.0.0-M7</plugin.maven.release.ver>
</properties> </properties>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>telegram-bot</artifactId> <artifactId>telegram-bot</artifactId>
<groupId>dev.struchkov.godfather.telegram</groupId> <groupId>dev.struchkov.godfather.telegram</groupId>
<version>0.0.49-SNAPSHOT</version> <version>0.0.50-SNAPSHOT</version>
</parent> </parent>
<artifactId>telegram-consumer</artifactId> <artifactId>telegram-consumer</artifactId>

View File

@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>dev.struchkov.godfather.telegram</groupId> <groupId>dev.struchkov.godfather.telegram</groupId>
<artifactId>telegram-consumer</artifactId> <artifactId>telegram-consumer</artifactId>
<version>0.0.49-SNAPSHOT</version> <version>0.0.50-SNAPSHOT</version>
</parent> </parent>
<artifactId>telegram-consumer-main</artifactId> <artifactId>telegram-consumer-main</artifactId>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>dev.struchkov.godfather.telegram</groupId> <groupId>dev.struchkov.godfather.telegram</groupId>
<artifactId>telegram-consumer</artifactId> <artifactId>telegram-consumer</artifactId>
<version>0.0.49-SNAPSHOT</version> <version>0.0.50-SNAPSHOT</version>
</parent> </parent>
<artifactId>telegram-consumer-quarkus</artifactId> <artifactId>telegram-consumer-quarkus</artifactId>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>dev.struchkov.godfather.telegram</groupId> <groupId>dev.struchkov.godfather.telegram</groupId>
<artifactId>telegram-consumer</artifactId> <artifactId>telegram-consumer</artifactId>
<version>0.0.49-SNAPSHOT</version> <version>0.0.50-SNAPSHOT</version>
</parent> </parent>
<artifactId>telegram-consumer-simple</artifactId> <artifactId>telegram-consumer-simple</artifactId>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>telegram-bot</artifactId> <artifactId>telegram-bot</artifactId>
<groupId>dev.struchkov.godfather.telegram</groupId> <groupId>dev.struchkov.godfather.telegram</groupId>
<version>0.0.49-SNAPSHOT</version> <version>0.0.50-SNAPSHOT</version>
</parent> </parent>
<artifactId>telegram-context</artifactId> <artifactId>telegram-context</artifactId>

View File

@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>dev.struchkov.godfather.telegram</groupId> <groupId>dev.struchkov.godfather.telegram</groupId>
<artifactId>telegram-context</artifactId> <artifactId>telegram-context</artifactId>
<version>0.0.49-SNAPSHOT</version> <version>0.0.50-SNAPSHOT</version>
</parent> </parent>
<artifactId>telegram-context-main</artifactId> <artifactId>telegram-context-main</artifactId>

View File

@ -1,7 +1,7 @@
package dev.struchkov.godfather.telegram.main.context; package dev.struchkov.godfather.telegram.main.context;
import dev.struchkov.godfather.main.domain.ContextKey;
import dev.struchkov.haiti.utils.Exceptions; import dev.struchkov.haiti.utils.Exceptions;
import dev.struchkov.haiti.utils.container.ContextKey;
public final class BoxAnswerPayload { public final class BoxAnswerPayload {

View File

@ -1,7 +1,7 @@
package dev.struchkov.godfather.telegram.main.context; package dev.struchkov.godfather.telegram.main.context;
import dev.struchkov.godfather.main.domain.ContextKey;
import dev.struchkov.haiti.utils.Exceptions; import dev.struchkov.haiti.utils.Exceptions;
import dev.struchkov.haiti.utils.container.ContextKey;
public final class MailPayload { public final class MailPayload {

View File

@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>dev.struchkov.godfather.telegram</groupId> <groupId>dev.struchkov.godfather.telegram</groupId>
<artifactId>telegram-context</artifactId> <artifactId>telegram-context</artifactId>
<version>0.0.49-SNAPSHOT</version> <version>0.0.50-SNAPSHOT</version>
</parent> </parent>
<artifactId>telegram-context-quarkus</artifactId> <artifactId>telegram-context-quarkus</artifactId>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>telegram-context</artifactId> <artifactId>telegram-context</artifactId>
<groupId>dev.struchkov.godfather.telegram</groupId> <groupId>dev.struchkov.godfather.telegram</groupId>
<version>0.0.49-SNAPSHOT</version> <version>0.0.50-SNAPSHOT</version>
</parent> </parent>
<artifactId>telegram-context-simple</artifactId> <artifactId>telegram-context-simple</artifactId>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>dev.struchkov.godfather.telegram</groupId> <groupId>dev.struchkov.godfather.telegram</groupId>
<artifactId>telegram-bot</artifactId> <artifactId>telegram-bot</artifactId>
<version>0.0.49-SNAPSHOT</version> <version>0.0.50-SNAPSHOT</version>
</parent> </parent>
<modules> <modules>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>dev.struchkov.godfather.telegram</groupId> <groupId>dev.struchkov.godfather.telegram</groupId>
<artifactId>telegram-core</artifactId> <artifactId>telegram-core</artifactId>
<version>0.0.49-SNAPSHOT</version> <version>0.0.50-SNAPSHOT</version>
</parent> </parent>
<artifactId>telegram-core-main</artifactId> <artifactId>telegram-core-main</artifactId>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>telegram-core</artifactId> <artifactId>telegram-core</artifactId>
<groupId>dev.struchkov.godfather.telegram</groupId> <groupId>dev.struchkov.godfather.telegram</groupId>
<version>0.0.49-SNAPSHOT</version> <version>0.0.50-SNAPSHOT</version>
</parent> </parent>
<artifactId>telegram-core-quarkus</artifactId> <artifactId>telegram-core-quarkus</artifactId>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>dev.struchkov.godfather.telegram</groupId> <groupId>dev.struchkov.godfather.telegram</groupId>
<artifactId>telegram-core</artifactId> <artifactId>telegram-core</artifactId>
<version>0.0.49-SNAPSHOT</version> <version>0.0.50-SNAPSHOT</version>
</parent> </parent>
<artifactId>telegram-core-simple</artifactId> <artifactId>telegram-core-simple</artifactId>

View File

@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>dev.struchkov.godfather.telegram</groupId> <groupId>dev.struchkov.godfather.telegram</groupId>
<artifactId>telegram-bot</artifactId> <artifactId>telegram-bot</artifactId>
<version>0.0.49-SNAPSHOT</version> <version>0.0.50-SNAPSHOT</version>
</parent> </parent>
<artifactId>telegram-domain</artifactId> <artifactId>telegram-domain</artifactId>

View File

@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>dev.struchkov.godfather.telegram</groupId> <groupId>dev.struchkov.godfather.telegram</groupId>
<artifactId>telegram-domain</artifactId> <artifactId>telegram-domain</artifactId>
<version>0.0.49-SNAPSHOT</version> <version>0.0.50-SNAPSHOT</version>
</parent> </parent>
<artifactId>telegram-domain-main</artifactId> <artifactId>telegram-domain-main</artifactId>

View File

@ -2,7 +2,7 @@ package dev.struchkov.godfather.telegram.domain.attachment;
import dev.struchkov.godfather.main.domain.content.Attachment; import dev.struchkov.godfather.main.domain.content.Attachment;
import dev.struchkov.haiti.utils.Parser; import dev.struchkov.haiti.utils.Parser;
import dev.struchkov.haiti.utils.domain.CompositeUrl; import dev.struchkov.haiti.utils.container.CompositeUrl;
public class LinkAttachment extends Attachment { public class LinkAttachment extends Attachment {

View File

@ -1,7 +1,9 @@
package dev.struchkov.godfather.telegram.domain.keyboard.button; package dev.struchkov.godfather.telegram.domain.keyboard.button;
import dev.struchkov.godfather.main.domain.keyboard.KeyBoardButton; import dev.struchkov.godfather.main.domain.keyboard.KeyBoardButton;
import org.jetbrains.annotations.NotNull;
import static dev.struchkov.haiti.utils.Inspector.Utils.nullPointer;
import static dev.struchkov.haiti.utils.Inspector.isNotNull;
/** /**
* Запрашивает у пользователя его контактный номер. * Запрашивает у пользователя его контактный номер.
@ -16,7 +18,8 @@ public class ContactButton implements KeyBoardButton {
this.label = label; this.label = label;
} }
public static ContactButton contactButton(@NotNull String label) { public static ContactButton contactButton(String label) {
isNotNull(label, nullPointer("label"));
return new ContactButton(label); return new ContactButton(label);
} }

View File

@ -1,7 +1,8 @@
package dev.struchkov.godfather.telegram.domain.keyboard.button; package dev.struchkov.godfather.telegram.domain.keyboard.button;
import dev.struchkov.godfather.main.domain.keyboard.KeyBoardButton; import dev.struchkov.godfather.main.domain.keyboard.KeyBoardButton;
import org.jetbrains.annotations.NotNull;
import static dev.struchkov.haiti.utils.Inspector.isNotNull;
public class UrlButton implements KeyBoardButton { public class UrlButton implements KeyBoardButton {
@ -15,7 +16,8 @@ public class UrlButton implements KeyBoardButton {
this.url = url; this.url = url;
} }
public static UrlButton urlButton(@NotNull String label, @NotNull String url) { public static UrlButton urlButton(String label, String url) {
isNotNull(label, url);
return new UrlButton(label, url); return new UrlButton(label, url);
} }
@ -31,4 +33,5 @@ public class UrlButton implements KeyBoardButton {
public String getUrl() { public String getUrl() {
return url; return url;
} }
} }

View File

@ -1,7 +1,8 @@
package dev.struchkov.godfather.telegram.domain.keyboard.button; package dev.struchkov.godfather.telegram.domain.keyboard.button;
import dev.struchkov.godfather.main.domain.keyboard.KeyBoardButton; import dev.struchkov.godfather.main.domain.keyboard.KeyBoardButton;
import org.jetbrains.annotations.NotNull;
import static dev.struchkov.haiti.utils.Inspector.isNotNull;
public class WebAppButton implements KeyBoardButton { public class WebAppButton implements KeyBoardButton {
@ -15,7 +16,8 @@ public class WebAppButton implements KeyBoardButton {
this.url = url; this.url = url;
} }
public static WebAppButton webAppButton(@NotNull String label, @NotNull String url) { public static WebAppButton webAppButton(String label, String url) {
isNotNull(label, url);
return new WebAppButton(label, url); return new WebAppButton(label, url);
} }

View File

@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>dev.struchkov.godfather.telegram</groupId> <groupId>dev.struchkov.godfather.telegram</groupId>
<artifactId>telegram-domain</artifactId> <artifactId>telegram-domain</artifactId>
<version>0.0.49-SNAPSHOT</version> <version>0.0.50-SNAPSHOT</version>
</parent> </parent>
<artifactId>telegram-domain-quarkus</artifactId> <artifactId>telegram-domain-quarkus</artifactId>

View File

@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>dev.struchkov.godfather.telegram</groupId> <groupId>dev.struchkov.godfather.telegram</groupId>
<artifactId>telegram-domain</artifactId> <artifactId>telegram-domain</artifactId>
<version>0.0.49-SNAPSHOT</version> <version>0.0.50-SNAPSHOT</version>
</parent> </parent>
<artifactId>telegram-domain-simple</artifactId> <artifactId>telegram-domain-simple</artifactId>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>dev.struchkov.godfather.telegram</groupId> <groupId>dev.struchkov.godfather.telegram</groupId>
<artifactId>telegram-bot</artifactId> <artifactId>telegram-bot</artifactId>
<version>0.0.49-SNAPSHOT</version> <version>0.0.50-SNAPSHOT</version>
</parent> </parent>
<artifactId>telegram-sender</artifactId> <artifactId>telegram-sender</artifactId>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>dev.struchkov.godfather.telegram</groupId> <groupId>dev.struchkov.godfather.telegram</groupId>
<artifactId>telegram-sender</artifactId> <artifactId>telegram-sender</artifactId>
<version>0.0.49-SNAPSHOT</version> <version>0.0.50-SNAPSHOT</version>
</parent> </parent>
<artifactId>telegram-sender-main</artifactId> <artifactId>telegram-sender-main</artifactId>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>dev.struchkov.godfather.telegram</groupId> <groupId>dev.struchkov.godfather.telegram</groupId>
<artifactId>telegram-sender</artifactId> <artifactId>telegram-sender</artifactId>
<version>0.0.49-SNAPSHOT</version> <version>0.0.50-SNAPSHOT</version>
</parent> </parent>
<artifactId>telegram-sender-quarkus</artifactId> <artifactId>telegram-sender-quarkus</artifactId>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>dev.struchkov.godfather.telegram</groupId> <groupId>dev.struchkov.godfather.telegram</groupId>
<artifactId>telegram-sender</artifactId> <artifactId>telegram-sender</artifactId>
<version>0.0.49-SNAPSHOT</version> <version>0.0.50-SNAPSHOT</version>
</parent> </parent>
<artifactId>telegram-sender-simple</artifactId> <artifactId>telegram-sender-simple</artifactId>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>dev.struchkov.godfather.telegram</groupId> <groupId>dev.struchkov.godfather.telegram</groupId>
<artifactId>telegram-bot</artifactId> <artifactId>telegram-bot</artifactId>
<version>0.0.49-SNAPSHOT</version> <version>0.0.50-SNAPSHOT</version>
</parent> </parent>
<artifactId>telegram-simple</artifactId> <artifactId>telegram-simple</artifactId>