Удалил лишние зависимости, обновил оставшиеся

This commit is contained in:
Struchkov Mark 2023-02-18 11:18:40 +03:00
parent e5994c8052
commit 5cfa516454
Signed by: upagge
GPG Key ID: D3018BE7BA428CA6
13 changed files with 38 additions and 82 deletions

View File

@ -16,6 +16,11 @@
</properties>
<dependencies>
<dependency>
<groupId>dev.struchkov.godfather</groupId>
<artifactId>bot-context-main</artifactId>
</dependency>
<dependency>
<groupId>dev.struchkov.godfather</groupId>
<artifactId>bot-domain-simple</artifactId>

View File

@ -28,24 +28,6 @@
<groupId>dev.struchkov.haiti</groupId>
<artifactId>haiti-utils</artifactId>
</dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>javax.persistence-api</artifactId>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -1,7 +1,7 @@
package dev.struchkov.godfather.quarkus.core.service;
import dev.struchkov.godfather.main.domain.ContextKey;
import dev.struchkov.godfather.quarkus.data.StorylineContext;
import dev.struchkov.haiti.utils.container.ContextKey;
import io.smallrye.mutiny.Uni;
import org.jetbrains.annotations.NotNull;

View File

@ -1,7 +1,7 @@
package dev.struchkov.godfather.simple.core.service;
import dev.struchkov.godfather.main.domain.ContextKey;
import dev.struchkov.godfather.simple.data.StorylineContext;
import dev.struchkov.haiti.utils.container.ContextKey;
import org.jetbrains.annotations.NotNull;
import java.util.HashMap;

View File

@ -1,7 +1,7 @@
package dev.struchkov.godfather.simple.core.unit.func;
import dev.struchkov.godfather.main.domain.content.Message;
import dev.struchkov.haiti.utils.Pair;
import dev.struchkov.haiti.utils.container.Pair;
/**
* TODO: Добавить описание класса.

View File

@ -1,6 +1,6 @@
package dev.struchkov.godfather.quarkus.data;
import dev.struchkov.godfather.main.domain.ContextKey;
import dev.struchkov.haiti.utils.container.ContextKey;
import io.smallrye.mutiny.Uni;
import org.jetbrains.annotations.NotNull;

View File

@ -1,6 +1,6 @@
package dev.struchkov.godfather.simple.data;
import dev.struchkov.godfather.main.domain.ContextKey;
import dev.struchkov.haiti.utils.container.ContextKey;
import org.jetbrains.annotations.NotNull;
import java.util.Map;

View File

@ -1,23 +0,0 @@
package dev.struchkov.godfather.main.domain;
public interface ContextKey<T> {
String getValue();
Class<T> getType();
static <T> ContextKey<T> of(String value, Class<T> type) {
return new ContextKey<>() {
@Override
public String getValue() {
return value;
}
@Override
public Class<T> getType() {
return type;
}
};
}
}

View File

@ -1,7 +1,7 @@
package dev.struchkov.godfather.main.domain.content;
import dev.struchkov.autoresponder.entity.DeliverableText;
import dev.struchkov.godfather.main.domain.ContextKey;
import dev.struchkov.haiti.utils.container.ContextKey;
import java.time.LocalDateTime;
import java.util.HashMap;

View File

@ -1,10 +1,12 @@
package dev.struchkov.godfather.main.domain.keyboard.button;
import dev.struchkov.godfather.main.domain.keyboard.KeyBoardButton;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
import static dev.struchkov.haiti.utils.Inspector.Utils.nullPointer;
import static dev.struchkov.haiti.utils.Inspector.isNotNull;
/**
* Абстрактная сущность кнопки для клавиатуры.
*
@ -28,11 +30,13 @@ public class SimpleButton implements KeyBoardButton {
this.callbackData = callbackData;
}
public static SimpleButton simpleButton(@NotNull String label, String callbackData) {
public static SimpleButton simpleButton(String label, String callbackData) {
isNotNull(label, nullPointer("label"));
return new SimpleButton(label, callbackData);
}
public static SimpleButton simpleButton(@NotNull String label) {
public static SimpleButton simpleButton(String label) {
isNotNull(label, nullPointer("label"));
return new SimpleButton(label, null);
}

View File

@ -1,8 +1,8 @@
package dev.struchkov.godfather.quarkus.domain;
import dev.struchkov.godfather.main.domain.ContextKey;
import dev.struchkov.godfather.main.domain.keyboard.KeyBoard;
import dev.struchkov.haiti.utils.container.ContextKey;
import java.util.HashMap;
import java.util.Map;

View File

@ -1,7 +1,7 @@
package dev.struchkov.godfather.simple.domain;
import dev.struchkov.godfather.main.domain.ContextKey;
import dev.struchkov.godfather.main.domain.keyboard.KeyBoard;
import dev.struchkov.haiti.utils.container.ContextKey;
import java.util.HashMap;
import java.util.Map;

48
pom.xml
View File

@ -34,22 +34,26 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<godfather.context.ver>${project.version}</godfather.context.ver>
<godfather.core.ver>${project.version}</godfather.core.ver>
<autoresponder.ver>3.6.1</autoresponder.ver>
<haiti.utils>2.6.0</haiti.utils>
<autoresponder.ver>3.5.0</autoresponder.ver>
<haiti.utils>2.2.0</haiti.utils>
<!-- https://mvnrepository.com/artifact/io.smallrye.reactive/smallrye-mutiny-vertx-core -->
<smallrye.mutiny.vertx.core.version>2.30.1</smallrye.mutiny.vertx.core.version>
<javax.persistence.api.ver>2.2</javax.persistence.api.ver>
<validation.api.ver>2.0.1.Final</validation.api.ver>
<slf4j.api.ver>1.7.36</slf4j.api.ver>
<jetbrains.annotations.ver>23.0.0</jetbrains.annotations.ver>
<!-- https://mvnrepository.com/artifact/org.jetbrains/annotations -->
<jetbrains.annotations.version>24.0.0</jetbrains.annotations.version>
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-compiler-plugin -->
<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>
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-source-plugin -->
<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>
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-release-plugin -->
<plugin.maven.release.ver>3.0.0-M7</plugin.maven.release.ver>
</properties>
@ -137,31 +141,15 @@
</dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>javax.persistence-api</artifactId>
<version>${javax.persistence.api.ver}</version>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>${validation.api.ver}</version>
<groupId>io.smallrye.reactive</groupId>
<artifactId>smallrye-mutiny-vertx-core</artifactId>
<version>${smallrye.mutiny.vertx.core.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>${jetbrains.annotations.ver}</version>
</dependency>
<dependency>
<groupId>io.smallrye.reactive</groupId>
<artifactId>smallrye-mutiny-vertx-core</artifactId>
<version>2.24.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.api.ver}</version>
<version>${jetbrains.annotations.version}</version>
</dependency>
</dependencies>
</dependencyManagement>