next-version

v.2.3.4
v.2.3.3
2023-01-23 14:42:45 +03:00 · 2022-12-17 18:42:03 +03:00 · 2022-12-17 18:39:28 +03:00 · 2022-12-17 16:32:57 +03:00 · 2022-12-17 16:31:20 +03:00 · 2022-12-17 16:30:05 +03:00
56 changed files with 483 additions and 1589 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -0,0 +1,103 @@
+---
+kind: pipeline
+type: docker
+name: snapshot-publish
+
+trigger:
+  branch:
+    - develop
+
+volumes:
+  - name: m2
+    host:
+      path: /drone/volume/m2
+
+steps:
+
+  - name: publish
+    image: maven:3.8.5-openjdk-17
+    privileged: true
+    volumes:
+      - name: m2
+        path: /root/.m2/repository
+    environment:
+      MAVEN_SETTINGS:
+        from_secret: MAVEN_SETTINGS
+    commands:
+      - echo "$MAVEN_SETTINGS" >> maven-settings.xml
+      - mvn --settings maven-settings.xml -U -P snapshot clean deploy
+
+---
+kind: pipeline
+type: docker
+name: release-maven-central
+
+trigger:
+  ref:
+    - refs/tags/v.*.*.*
+
+volumes:
+  - name: m2
+    host:
+      path: /drone/volume/m2
+
+steps:
+
+  - name: publish maven central
+    image: maven:3.8.5-openjdk-17
+    privileged: true
+    volumes:
+      - name: m2
+        path: /root/.m2/repository
+    environment:
+      GPG_PRIVATE_KEY:
+        from_secret: GPG_PRIVATE_KEY
+      MAVEN_SETTINGS:
+        from_secret: MAVEN_SETTINGS
+      GPG_PASSPHRASE:
+        from_secret: GPG_PASSPHRASE
+    commands:
+      - echo "$GPG_PRIVATE_KEY" >> gpg.key
+      - echo "$MAVEN_SETTINGS" >> maven-settings.xml
+      - gpg --pinentry-mode loopback --passphrase $GPG_PASSPHRASE --import gpg.key
+      - mvn --settings maven-settings.xml -U -P ossrh,release clean deploy
+
+---
+kind: pipeline
+type: docker
+name: release-struchkov-nexus
+
+trigger:
+  ref:
+    - refs/tags/v.*.*.*
+
+volumes:
+  - name: m2
+    host:
+      path: /drone/volume/m2
+
+steps:
+
+  - name: publish struchkov nexus
+    image: maven:3.8.5-openjdk-17
+    privileged: true
+    volumes:
+      - name: m2
+        path: /root/.m2/repository
+    environment:
+      GPG_PRIVATE_KEY:
+        from_secret: GPG_PRIVATE_KEY
+      MAVEN_SETTINGS:
+        from_secret: MAVEN_SETTINGS
+      GPG_PASSPHRASE:
+        from_secret: GPG_PASSPHRASE
+    commands:
+      - echo "$GPG_PRIVATE_KEY" >> gpg.key
+      - echo "$MAVEN_SETTINGS" >> maven-settings.xml
+      - gpg --pinentry-mode loopback --passphrase $GPG_PASSPHRASE --import gpg.key
+      - mvn --settings maven-settings.xml -U -P ossrh,release-struchkov-nexus clean deploy
+---
+kind: signature
+hmac: 43c584bfa9959fef91227a75238af6f91762f0e91472c8eaafaa8b1139c18b0e
+
+...
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,17 +0,0 @@
-image: maven:3.8.4-openjdk-11
-variables:
-  MAVEN_OPTS: "-Dmaven.repo.local=./.m2/repository"
-
-stages:
-  - deploy
-
-deploy:
-  stage: deploy
-  only:
-    - /^v.*$/
-  except:
-    - branches
-  before_script:
-    - gpg --pinentry-mode loopback --passphrase $GPG_PASSPHRASE --import $GPG_PRIVATE_KEY
-  script:
-    - 'mvn --settings $MAVEN_SETTINGS -U -P ossrh,release clean deploy'
--- a/haiti-bom/pom.xml
+++ b/haiti-bom/pom.xml
@ -1,275 +0,0 @@
-<?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"
-         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>
-
-    <groupId>dev.struchkov.haiti</groupId>
-    <artifactId>haiti-bom</artifactId>
-    <version>1.0.3</version>
-    <packaging>pom</packaging>
-
-    <name>Haiti BOM</name>
-    <description>Current versions of the framework dependencies</description>
-    <url>https://github.com/haiti-projects/haiti-framework</url>
-    <licenses>
-        <license>
-            <name>Apache License, Version 2.0</name>
-            <url>https://www.apache.org/licenses/LICENSE-2.0</url>
-        </license>
-    </licenses>
-    <issueManagement>
-        <system>GitHub</system>
-        <url>https://github.com/haiti-projects/haiti-framework/issues</url>
-    </issueManagement>
-
-    <properties>
-        <java.version>11</java.version>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
-        <haiti.ver>1.0.3</haiti.ver>
-
-        <haiti.exception.ver>${haiti.ver}</haiti.exception.ver>
-        <haiti.context.ver>${haiti.ver}</haiti.context.ver>
-        <haiti.core.ver>${haiti.ver}</haiti.core.ver>
-        <haiti.filter.api.ver>${haiti.ver}</haiti.filter.api.ver>
-        <haiti.utils.ver>${haiti.ver}</haiti.utils.ver>
-
-        <haiti.database.ver>0.0.4</haiti.database.ver>
-        <haiti.filter.criteria.ver>0.0.4</haiti.filter.criteria.ver>
-
-        <haiti.utils.network.ver>0.0.4</haiti.utils.network.ver>
-        <haiti.utils.field.constants>0.0.1</haiti.utils.field.constants>
-
-        <spring.data.elasticsearch.ver>4.3.1</spring.data.elasticsearch.ver>
-        <spring.data.jpa.ver>2.6.1</spring.data.jpa.ver>
-        <spring.data.commons.ver>2.6.1</spring.data.commons.ver>
-
-        <hibernate.core.ver>5.6.4.Final</hibernate.core.ver>
-        <javax.persisttence.api.ver>2.2</javax.persisttence.api.ver>
-        <elasticsearch.ver>7.16.3</elasticsearch.ver>
-        <slf4j.ver>1.7.33</slf4j.ver>
-        <google.auto.service.ver>1.0.1</google.auto.service.ver>
-        <jetbrains.annotations.ver>23.0.0</jetbrains.annotations.ver>
-
-        <plugin.maven.compiler.ver>3.10.1</plugin.maven.compiler.ver>
-        <plugin.nexus.staging.ver>1.6.13</plugin.nexus.staging.ver>
-        <plugin.maven.source.ver>3.2.1</plugin.maven.source.ver>
-        <plugin.maven.javadoc.ver>3.4.0</plugin.maven.javadoc.ver>
-        <plugin.maven.gpg.ver>3.0.1</plugin.maven.gpg.ver>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>dev.struchkov.haiti</groupId>
-                <artifactId>haiti-exception</artifactId>
-                <version>${haiti.exception.ver}</version>
-            </dependency>
-            <dependency>
-                <groupId>dev.struchkov.haiti</groupId>
-                <artifactId>haiti-context</artifactId>
-                <version>${haiti.context.ver}</version>
-            </dependency>
-            <dependency>
-                <groupId>dev.struchkov.haiti</groupId>
-                <artifactId>haiti-core</artifactId>
-                <version>${haiti.core.ver}</version>
-            </dependency>
-            <dependency>
-                <groupId>dev.struchkov.haiti</groupId>
-                <artifactId>haiti-filter</artifactId>
-                <version>${haiti.filter.api.ver}</version>
-            </dependency>
-            <dependency>
-                <groupId>dev.struchkov.haiti.filter</groupId>
-                <artifactId>haiti-filter-criteria</artifactId>
-                <version>${haiti.filter.criteria.ver}</version>
-            </dependency>
-            <dependency>
-                <groupId>dev.struchkov.haiti</groupId>
-                <artifactId>haiti-utils</artifactId>
-                <version>${haiti.utils.ver}</version>
-            </dependency>
-            <dependency>
-                <groupId>dev.struchkov.haiti.utils</groupId>
-                <artifactId>haiti-utils-network</artifactId>
-                <version>${haiti.utils.network.ver}</version>
-            </dependency>
-            <dependency>
-                <groupId>dev.struchkov.haiti.data</groupId>
-                <artifactId>haiti-database</artifactId>
-                <version>${haiti.database.ver}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.elasticsearch</groupId>
-                <artifactId>elasticsearch</artifactId>
-                <version>${elasticsearch.ver}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>javax.persistence</groupId>
-                <artifactId>javax.persistence-api</artifactId>
-                <version>${javax.persisttence.api.ver}</version>
-            </dependency>
-
-            <!-- spring -->
-            <dependency>
-                <groupId>org.springframework.data</groupId>
-                <artifactId>spring-data-elasticsearch</artifactId>
-                <version>${spring.data.elasticsearch.ver}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.springframework.data</groupId>
-                <artifactId>spring-data-commons</artifactId>
-                <version>${spring.data.commons.ver}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.springframework.data</groupId>
-                <artifactId>spring-data-jpa</artifactId>
-                <version>${spring.data.jpa.ver}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>${slf4j.ver}</version>
-            </dependency>
-
-            <!--database-->
-            <dependency>
-                <groupId>org.hibernate</groupId>
-                <artifactId>hibernate-core</artifactId>
-                <version>${hibernate.core.ver}</version>
-            </dependency>
-
-            <!--utils-->
-            <dependency>
-                <groupId>com.google.auto.service</groupId>
-                <artifactId>auto-service</artifactId>
-                <version>${google.auto.service.ver}</version>
-                <scope>provided</scope>
-                <optional>true</optional>
-            </dependency>
-
-            <dependency>
-                <groupId>org.jetbrains</groupId>
-                <artifactId>annotations</artifactId>
-                <version>${jetbrains.annotations.ver}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
-        </plugins>
-
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>${plugin.maven.compiler.ver}</version>
-                    <configuration>
-                        <source>11</source>
-                        <target>11</target>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.sonatype.plugins</groupId>
-                        <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>${plugin.nexus.staging.ver}</version>
-                        <extensions>true</extensions>
-                        <configuration>
-                            <serverId>ossrh</serverId>
-                            <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
-                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <version>${plugin.maven.source.ver}</version>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <goals>
-                                    <goal>jar-no-fork</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>${plugin.maven.javadoc.ver}</version>
-                        <executions>
-                            <execution>
-                                <id>attach-javadocs</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>${plugin.maven.gpg.ver}</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-    <scm>
-        <connection>scm:git:https://github.com/haiti-projects/haiti-framework.git</connection>
-        <url>https://github.com/haiti-projects/haiti-framework</url>
-        <developerConnection>scm:git:https://github.com/haiti-projects/haiti-framework.git</developerConnection>
-    </scm>
-
-    <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
-
-    <developers>
-        <developer>
-            <id>uPagge</id>
-            <name>Struchkov Mark</name>
-            <email>mark@struchkov.dev</email>
-            <url>https://mark.struchkov.dev</url>
-        </developer>
-    </developers>
-
-</project>
--- a/haiti-context/.gitignore
+++ b/haiti-context/.gitignore
@ -1,51 +0,0 @@
-# Created by .ignore support plugin (hsz.mobi)
-target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-release.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-.mvn/timing.properties
-.mvn/wrapper/maven-wrapper.jar
-*.class
-*.log
-*.ctxt
-.mtj.tmp/
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-hs_err_pid*
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
-.idea/**/contentModel.xml
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
-.idea/**/gradle.xml
-.idea/**/libraries
-cmake-build-*/
-.idea/**/mongoSettings.xml
-*.iws
-out/
-.idea_modules/
-atlassian-ide-plugin.xml
-.idea/replstate.xml
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
-.idea/httpRequests
-.idea/caches/build_file_checksums.ser
--- a/haiti-context/pom.xml
+++ b/haiti-context/pom.xml
@ -1,38 +0,0 @@
-<?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"
-         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>
-    <parent>
-        <groupId>dev.struchkov.haiti</groupId>
-        <artifactId>haiti</artifactId>
-        <version>1.0.3</version>
-    </parent>
-
-    <artifactId>haiti-context</artifactId>
-    <version>${haiti.context.ver}</version>
-
-    <name>Haiti Context</name>
-    <description>Basic framework general classes</description>
-    <url>https://github.com/haiti-projects/haiti-framework</url>
-
-    <properties>
-        <java.version>11</java.version>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>dev.struchkov.haiti</groupId>
-            <artifactId>haiti-exception</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>dev.struchkov.haiti</groupId>
-            <artifactId>haiti-utils</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>
--- a/haiti-context/src/main/java/dev/struchkov/haiti/context/anotation/Marker.java
+++ b/haiti-context/src/main/java/dev/struchkov/haiti/context/anotation/Marker.java
@ -1,18 +0,0 @@
-package dev.struchkov.haiti.context.anotation;
-
-/**
- * Маркер для разграничения политик валидации.
- *
- * @author upagge 26.05.20
- */
-public interface Marker {
-
-    interface Create {
-
-    }
-
-    interface Update {
-
-    }
-
-}
--- a/haiti-context/src/main/java/dev/struchkov/haiti/context/domain/BasicEntity.java
+++ b/haiti-context/src/main/java/dev/struchkov/haiti/context/domain/BasicEntity.java
@ -1,14 +0,0 @@
-package dev.struchkov.haiti.context.domain;
-
-/**
- * Базовая класс для сущностей.
- *
- * @author upagge 14.01.2021
- */
-public interface BasicEntity<Key> {
-
-    Key getId();
-
-    void setId(Key id);
-
-}
--- a/haiti-context/src/main/java/dev/struchkov/haiti/context/domain/ExistsContainer.java
+++ b/haiti-context/src/main/java/dev/struchkov/haiti/context/domain/ExistsContainer.java
@ -1,47 +0,0 @@
-package dev.struchkov.haiti.context.domain;
-
-import java.util.Collection;
-import java.util.Collections;
-
-import static dev.struchkov.haiti.utils.Inspector.isNotNull;
-
-/**
- * Контейнер для возврата результата сервисных методов exists.
- *
- * @author upagge 11.01.2021
- */
-public class ExistsContainer<Entity, Key> {
-
-    protected final Collection<Entity> container;
-    protected final boolean allFound;
-    protected final Collection<Key> idNoFound;
-
-    protected ExistsContainer(Collection<Entity> container, boolean allFound, Collection<Key> idNoFound) {
-        this.container = container;
-        this.allFound = allFound;
-        this.idNoFound = idNoFound;
-    }
-
-    public static <T, K> ExistsContainer<T, K> allFind(Collection<T> container) {
-        isNotNull(container);
-        return new ExistsContainer<>(container, true, Collections.emptyList());
-    }
-
-    public static <T, K> ExistsContainer<T, K> notAllFind(Collection<T> container, Collection<K> idNoFound) {
-        isNotNull(container, idNoFound);
-        return new ExistsContainer<>(container, false, idNoFound);
-    }
-
-    public Collection<Entity> getContainer() {
-        return container;
-    }
-
-    public boolean isAllFound() {
-        return allFound;
-    }
-
-    public Collection<Key> getIdNoFound() {
-        return idNoFound;
-    }
-
-}
--- a/haiti-context/src/main/java/dev/struchkov/haiti/context/enums/TypeSort.java
+++ b/haiti-context/src/main/java/dev/struchkov/haiti/context/enums/TypeSort.java
@ -1,12 +0,0 @@
-package dev.struchkov.haiti.context.enums;
-
-/**
- * Допустимые типы сортировки.
- *
- * @author upagge 28.01.2020
- */
-public enum TypeSort {
-
-    ASC, DESC
-
-}
--- a/haiti-context/src/main/java/dev/struchkov/haiti/context/page/Pagination.java
+++ b/haiti-context/src/main/java/dev/struchkov/haiti/context/page/Pagination.java
@ -1,13 +0,0 @@
-package dev.struchkov.haiti.context.page;
-
-import java.util.Set;
-
-public interface Pagination {
-
-    Integer getPage();
-
-    Integer getSize();
-
-    Set<? extends Sort> getSorts();
-
-}
--- a/haiti-context/src/main/java/dev/struchkov/haiti/context/page/Sheet.java
+++ b/haiti-context/src/main/java/dev/struchkov/haiti/context/page/Sheet.java
@ -1,22 +0,0 @@
-package dev.struchkov.haiti.context.page;
-
-import java.util.List;
-import java.util.function.Function;
-
-public interface Sheet<Entity> {
-
-    int getNumber();
-
-    int getSize();
-
-    long getTotalElement();
-
-    int getTotalPage();
-
-    List<Entity> getContent();
-
-    boolean hasContent();
-
-    <NewEntity> Sheet<NewEntity> map(Function<? super Entity, ? extends NewEntity> converter);
-
-}
--- a/haiti-context/src/main/java/dev/struchkov/haiti/context/page/Sort.java
+++ b/haiti-context/src/main/java/dev/struchkov/haiti/context/page/Sort.java
@ -1,11 +0,0 @@
-package dev.struchkov.haiti.context.page;
-
-import dev.struchkov.haiti.context.enums.TypeSort;
-
-public interface Sort {
-
-    TypeSort getType();
-
-    String getField();
-
-}
--- a/haiti-context/src/main/java/dev/struchkov/haiti/context/page/impl/PaginationImpl.java
+++ b/haiti-context/src/main/java/dev/struchkov/haiti/context/page/impl/PaginationImpl.java
@ -1,47 +0,0 @@
-package dev.struchkov.haiti.context.page.impl;
-
-import dev.struchkov.haiti.context.page.Pagination;
-import dev.struchkov.haiti.context.page.Sort;
-
-import java.util.Set;
-
-public class PaginationImpl implements Pagination {
-
-    private final Integer page;
-    private final Integer size;
-    private Set<? extends Sort> sorts;
-
-    private PaginationImpl(int page, int size) {
-        this.page = page;
-        this.size = size;
-    }
-
-    public PaginationImpl(int page, int size, Set<? extends Sort> sorts) {
-        this.page = page;
-        this.size = size;
-        this.sorts = sorts;
-    }
-
-    public static Pagination of(int page, int size) {
-        return new PaginationImpl(page, size);
-    }
-
-    public static Pagination of(int page, int size, Set<? extends Sort> sorts) {
-        return new PaginationImpl(page, size, sorts);
-    }
-
-    @Override
-    public Integer getPage() {
-        return page;
-    }
-
-    @Override
-    public Integer getSize() {
-        return size;
-    }
-
-    @Override
-    public Set<? extends Sort> getSorts() {
-        return sorts;
-    }
-}
--- a/haiti-context/src/main/java/dev/struchkov/haiti/context/page/impl/SheetImpl.java
+++ b/haiti-context/src/main/java/dev/struchkov/haiti/context/page/impl/SheetImpl.java
@ -1,88 +0,0 @@
-package dev.struchkov.haiti.context.page.impl;
-
-import dev.struchkov.haiti.context.page.Sheet;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-public class SheetImpl<Entity> implements Sheet<Entity> {
-
-    private final int number;
-    private final int size;
-    private final long totalElement;
-    private final int totalPage;
-    private final List<Entity> content;
-
-    public SheetImpl(int number, int size, long totalElement, int totalPage, List<Entity> content) {
-        this.number = number;
-        this.size = size;
-        this.totalElement = totalElement;
-        this.totalPage = totalPage;
-        this.content = content;
-    }
-
-    @Override
-    public <U> Sheet<U> map(Function<? super Entity, ? extends U> function) {
-        return new SheetImpl<>(
-                this.number,
-                this.size,
-                this.totalElement,
-                this.totalPage,
-                this.content.stream().map(function).collect(Collectors.toList())
-        );
-    }
-
-    public static <T> Sheet<T> empty() {
-        return new SheetImpl<>(
-                0,
-                0,
-                0L,
-                0,
-                Collections.emptyList()
-        );
-    }
-
-    public Sheet<Entity> filter(Predicate<? super Entity> predicate) {
-        final List<Entity> filterContent = content.stream().filter(predicate).collect(Collectors.toList());
-        return new SheetImpl<>(
-                this.number,
-                this.size,
-                this.totalElement,
-                this.totalPage,
-                filterContent
-        );
-    }
-
-    public boolean hasContent() {
-        return content != null && !content.isEmpty();
-    }
-
-    @Override
-    public int getNumber() {
-        return number;
-    }
-
-    @Override
-    public int getSize() {
-        return size;
-    }
-
-    @Override
-    public long getTotalElement() {
-        return totalElement;
-    }
-
-    @Override
-    public int getTotalPage() {
-        return totalPage;
-    }
-
-    @Override
-    public List<Entity> getContent() {
-        return content;
-    }
-
-}
--- a/haiti-context/src/main/java/dev/struchkov/haiti/context/page/impl/SortImpl.java
+++ b/haiti-context/src/main/java/dev/struchkov/haiti/context/page/impl/SortImpl.java
@ -1,33 +0,0 @@
-package dev.struchkov.haiti.context.page.impl;
-
-import dev.struchkov.haiti.context.enums.TypeSort;
-import dev.struchkov.haiti.context.page.Sort;
-
-import static dev.struchkov.haiti.utils.Inspector.isNotNull;
-
-public class SortImpl implements Sort {
-
-    private final TypeSort type;
-    private final String field;
-
-    private SortImpl(TypeSort type, String field) {
-        this.type = type;
-        this.field = field;
-    }
-
-    public static Sort of(TypeSort type, String field) {
-        isNotNull(type);
-        return new SortImpl(type, field);
-    }
-
-    @Override
-    public TypeSort getType() {
-        return type;
-    }
-
-    @Override
-    public String getField() {
-        return field;
-    }
-
-}
--- a/haiti-context/src/main/java/dev/struchkov/haiti/context/repository/SimpleManagerRepository.java
+++ b/haiti-context/src/main/java/dev/struchkov/haiti/context/repository/SimpleManagerRepository.java
@ -1,11 +0,0 @@
-package dev.struchkov.haiti.context.repository;
-
-import dev.struchkov.haiti.context.repository.simple.CrudOperation;
-import dev.struchkov.haiti.context.repository.simple.MultipleOperation;
-import dev.struchkov.haiti.context.repository.simple.PagingOperation;
-import dev.struchkov.haiti.context.domain.BasicEntity;
-
-public interface SimpleManagerRepository<T extends BasicEntity<K>, K>
-        extends CrudOperation<T, K>, MultipleOperation<T, K>, PagingOperation<T> {
-
-}
--- a/haiti-context/src/main/java/dev/struchkov/haiti/context/repository/simple/CrudOperation.java
+++ b/haiti-context/src/main/java/dev/struchkov/haiti/context/repository/simple/CrudOperation.java
@ -1,29 +0,0 @@
-package dev.struchkov.haiti.context.repository.simple;
-
-import java.util.Optional;
-
-/**
- * Контракт для реализации объекта, который будет взаимодействовать с хранилищем данных.
- *
- * @param <Entity> Класс сущности
- * @param <Key> Класс идентификатора
- * @author upagge
- */
-public interface CrudOperation<Entity, Key> {
-
-    /**
-     * Сохраняет сущность в базу данных. Не проверяет на наличие в хранилище.
-     * Если сущность с подобным идентификатором уже есть, то необходимо ее перезаписать.
-     *
-     * @param entity Сущность для сохранения
-     * @return Сохраненная сущность
-     */
-    Entity save(Entity entity);
-
-    Optional<Entity> findById(Key id);
-
-    boolean existsById(Key id);
-
-    void deleteById(Key id);
-
-}
--- a/haiti-context/src/main/java/dev/struchkov/haiti/context/repository/simple/MultipleOperation.java
+++ b/haiti-context/src/main/java/dev/struchkov/haiti/context/repository/simple/MultipleOperation.java
@ -1,16 +0,0 @@
-package dev.struchkov.haiti.context.repository.simple;
-
-import dev.struchkov.haiti.context.domain.BasicEntity;
-
-import java.util.Collection;
-import java.util.List;
-
-public interface MultipleOperation<T extends BasicEntity<K>, K> {
-
-    List<T> saveAll(Collection<T> entities);
-
-    void deleteAllById(Collection<K> primaryKeys);
-
-    List<T> findAllById(Collection<K> ids);
-
-}
--- a/haiti-context/src/main/java/dev/struchkov/haiti/context/repository/simple/PagingOperation.java
+++ b/haiti-context/src/main/java/dev/struchkov/haiti/context/repository/simple/PagingOperation.java
@ -1,10 +0,0 @@
-package dev.struchkov.haiti.context.repository.simple;
-
-import dev.struchkov.haiti.context.page.Pagination;
-import dev.struchkov.haiti.context.page.Sheet;
-
-public interface PagingOperation<T> {
-
-    Sheet<T> findAll(Pagination pagination);
-
-}
--- a/haiti-context/src/main/java/dev/struchkov/haiti/context/service/SimpleManagerService.java
+++ b/haiti-context/src/main/java/dev/struchkov/haiti/context/service/SimpleManagerService.java
@ -1,11 +0,0 @@
-package dev.struchkov.haiti.context.service;
-
-import dev.struchkov.haiti.context.domain.BasicEntity;
-import dev.struchkov.haiti.context.service.simple.MultipleService;
-import dev.struchkov.haiti.context.service.simple.PagingService;
-import dev.struchkov.haiti.context.service.simple.SimpleService;
-
-public interface SimpleManagerService<Entity extends BasicEntity<Key>, Key>
-        extends SimpleService<Entity, Key>, MultipleService<Entity, Key>, PagingService<Entity> {
-
-}
--- a/haiti-context/src/main/java/dev/struchkov/haiti/context/service/simple/FilterService.java
+++ b/haiti-context/src/main/java/dev/struchkov/haiti/context/service/simple/FilterService.java
@ -1,39 +0,0 @@
-package dev.struchkov.haiti.context.service.simple;
-
-import dev.struchkov.haiti.context.page.Pagination;
-import dev.struchkov.haiti.context.page.Sheet;
-
-import java.util.Optional;
-
-public interface FilterService<Entity, Filter> {
-
-    /**
-     * Получить все элементы по заданному фильтру.
-     *
-     * @param filter     Фильтр
-     * @param pagination Пагинация
-     */
-    Sheet<Entity> getAll(Filter filter, Pagination pagination);
-
-    /**
-     * Возвращает первый найденный объект по фильтру.
-     *
-     * @param filter Объект фильтра
-     */
-    Optional<Entity> getFirst(Filter filter);
-
-    /**
-     * Проверка на наличие хотя бы одной сущности, которая удовлетворяет определенному набору параметров.
-     *
-     * @param filter Набор параметров
-     */
-    boolean exists(Filter filter);
-
-    /**
-     * Получить количество сущностей, которые удовлетворяют определенному набору параметров.
-     *
-     * @param filter Набор параметров
-     */
-    long count(Filter filter);
-
-}
--- a/haiti-context/src/main/java/dev/struchkov/haiti/context/service/simple/MultipleService.java
+++ b/haiti-context/src/main/java/dev/struchkov/haiti/context/service/simple/MultipleService.java
@ -1,19 +0,0 @@
-package dev.struchkov.haiti.context.service.simple;
-
-import dev.struchkov.haiti.context.domain.BasicEntity;
-import dev.struchkov.haiti.context.domain.ExistsContainer;
-
-import java.util.Collection;
-import java.util.List;
-
-public interface MultipleService<Entity extends BasicEntity<Key>, Key> {
-
-    List<Entity> createAll(Collection<Entity> entities);
-
-    List<Entity> updateAll(Collection<Entity> entities);
-
-    void deleteAllById(Collection<Key> ids);
-
-    ExistsContainer<Entity, Key> existsById(Collection<Key> ids);
-
-}
--- a/haiti-context/src/main/java/dev/struchkov/haiti/context/service/simple/PagingService.java
+++ b/haiti-context/src/main/java/dev/struchkov/haiti/context/service/simple/PagingService.java
@ -1,16 +0,0 @@
-package dev.struchkov.haiti.context.service.simple;
-
-import dev.struchkov.haiti.context.page.Pagination;
-import dev.struchkov.haiti.context.page.Sheet;
-
-/**
- * Расширение базового контракта сервисов с добавлением пагинации.
- *
- * @param <Entity> Сущность сервиса.
- * @author upagge 26.05.20
- */
-public interface PagingService<Entity> {
-
-    Sheet<Entity> getAll(Pagination pagination);
-
-}
--- a/haiti-context/src/main/java/dev/struchkov/haiti/context/service/simple/SimpleService.java
+++ b/haiti-context/src/main/java/dev/struchkov/haiti/context/service/simple/SimpleService.java
@ -1,24 +0,0 @@
-package dev.struchkov.haiti.context.service.simple;
-
-import java.util.Optional;
-
-/**
- * Базовый контракт для сервисов.
- *
- * @param <Entity> Сущность сервиса.
- */
-public interface SimpleService<Entity, Key> {
-
-    Entity create(Entity entity);
-
-    Entity update(Entity entity);
-
-    Optional<Entity> getById(Key id);
-
-    Entity getByIdOrThrow(Key id);
-
-    boolean existsById(Key id);
-
-    void deleteById(Key id);
-
-}
--- a/haiti-context/src/main/java/module-info.java
+++ b/haiti-context/src/main/java/module-info.java
@ -1,12 +0,0 @@
-module haiti.context {
-    exports dev.struchkov.haiti.context.service.simple;
-    exports dev.struchkov.haiti.context.repository.simple;
-    exports dev.struchkov.haiti.context.page.impl;
-    exports dev.struchkov.haiti.context.repository;
-    exports dev.struchkov.haiti.context.domain;
-    exports dev.struchkov.haiti.context.service;
-    exports dev.struchkov.haiti.context.page;
-    exports dev.struchkov.haiti.context.enums;
-
-    requires transitive haiti.utils;
-}
--- a/haiti-core/.gitignore
+++ b/haiti-core/.gitignore
@ -1,51 +0,0 @@
-# Created by .ignore support plugin (hsz.mobi)
-target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-release.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-.mvn/timing.properties
-.mvn/wrapper/maven-wrapper.jar
-*.class
-*.log
-*.ctxt
-.mtj.tmp/
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-hs_err_pid*
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
-.idea/**/contentModel.xml
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
-.idea/**/gradle.xml
-.idea/**/libraries
-cmake-build-*/
-.idea/**/mongoSettings.xml
-*.iws
-out/
-.idea_modules/
-atlassian-ide-plugin.xml
-.idea/replstate.xml
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
-.idea/httpRequests
-.idea/caches/build_file_checksums.ser
--- a/haiti-core/pom.xml
+++ b/haiti-core/pom.xml
@ -1,39 +0,0 @@
-<?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"
-         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>
-    <parent>
-        <groupId>dev.struchkov.haiti</groupId>
-        <artifactId>haiti</artifactId>
-        <version>1.0.3</version>
-    </parent>
-
-    <artifactId>haiti-core</artifactId>
-    <version>${haiti.core.ver}</version>
-
-    <name>Haiti Core</name>
-    <description>Implementation of the main classes of the framework</description>
-    <url>https://github.com/haiti-projects/haiti-framework</url>
-
-    <properties>
-        <java.version>11</java.version>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>dev.struchkov.haiti</groupId>
-            <artifactId>haiti-context</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>dev.struchkov.haiti</groupId>
-            <artifactId>haiti-filter</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>
--- a/haiti-core/src/main/java/dev/struchkov/haiti/core/repository/SimpleManagerRepositoryMap.java
+++ b/haiti-core/src/main/java/dev/struchkov/haiti/core/repository/SimpleManagerRepositoryMap.java
@ -1,77 +0,0 @@
-package dev.struchkov.haiti.core.repository;
-
-import dev.struchkov.haiti.context.domain.BasicEntity;
-import dev.struchkov.haiti.context.page.Pagination;
-import dev.struchkov.haiti.context.page.Sheet;
-import dev.struchkov.haiti.context.repository.SimpleManagerRepository;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import static dev.struchkov.haiti.utils.Inspector.isNotNull;
-import static dev.struchkov.haiti.utils.Strings.ERR_OPERATION_NOT_SUPPORTED;
-
-public class SimpleManagerRepositoryMap<T extends BasicEntity<Long>> implements SimpleManagerRepository<T, Long> {
-
-    protected final Map<Long, T> map = new HashMap<>();
-    protected long key = 0;
-
-    @Override
-    public T save(T accessTarget) {
-        isNotNull(accessTarget);
-        accessTarget.setId(key);
-        map.put(key, accessTarget);
-        key++;
-        return accessTarget;
-    }
-
-    @Override
-    public Optional<T> findById(Long id) {
-        isNotNull(id);
-        return Optional.ofNullable(map.get(id));
-    }
-
-    @Override
-    public boolean existsById(Long id) {
-        isNotNull(id);
-        return map.containsKey(id);
-    }
-
-    @Override
-    public void deleteById(Long id) {
-        isNotNull(id);
-        map.remove(id);
-    }
-
-    @Override
-    public List<T> saveAll(Collection<T> accessTargets) {
-        isNotNull(accessTargets);
-        return accessTargets.stream()
-                .map(this::save)
-                .collect(Collectors.toList());
-    }
-
-    @Override
-    public void deleteAllById(Collection<Long> accessTargets) {
-        isNotNull(accessTargets);
-        accessTargets.forEach(map::remove);
-    }
-
-    @Override
-    public List<T> findAllById(Collection<Long> ids) {
-        isNotNull(ids);
-        return ids.stream()
-                .map(map::get)
-                .collect(Collectors.toList());
-    }
-
-    @Override
-    public Sheet<T> findAll(Pagination pagination) {
-        throw new IllegalStateException(ERR_OPERATION_NOT_SUPPORTED);
-    }
-
-}
--- a/haiti-core/src/main/java/dev/struchkov/haiti/core/service/AbstractFilterService.java
+++ b/haiti-core/src/main/java/dev/struchkov/haiti/core/service/AbstractFilterService.java
@ -1,46 +0,0 @@
-package dev.struchkov.haiti.core.service;
-
-import dev.struchkov.haiti.context.page.Pagination;
-import dev.struchkov.haiti.context.page.Sheet;
-import dev.struchkov.haiti.context.service.simple.FilterService;
-import dev.struchkov.haiti.filter.Filter;
-import dev.struchkov.haiti.filter.FilterOperation;
-import dev.struchkov.haiti.utils.Inspector;
-
-import java.util.Optional;
-
-public abstract class AbstractFilterService<Entity, F> implements FilterService<Entity, F> {
-
-    protected final FilterOperation<Entity> filterOperation;
-
-    protected AbstractFilterService(FilterOperation<Entity> filterOperation) {
-        this.filterOperation = filterOperation;
-    }
-
-    @Override
-    public Sheet<Entity> getAll(F filter, Pagination pagination) {
-        Inspector.isNotNull(filter);
-        return filterOperation.findAll(createFilter(filter), pagination);
-    }
-
-    @Override
-    public Optional<Entity> getFirst(F filter) {
-        Inspector.isNotNull(filter);
-        return filterOperation.findFirst(createFilter(filter));
-    }
-
-    @Override
-    public boolean exists(F filter) {
-        Inspector.isNotNull(filter);
-        return filterOperation.exists(createFilter(filter));
-    }
-
-    @Override
-    public long count(F filter) {
-        Inspector.isNotNull(filter);
-        return filterOperation.count(createFilter(filter));
-    }
-
-    protected abstract Filter createFilter(F filter);
-
-}
--- a/haiti-core/src/main/java/dev/struchkov/haiti/core/service/AbstractMultipleService.java
+++ b/haiti-core/src/main/java/dev/struchkov/haiti/core/service/AbstractMultipleService.java
@ -1,49 +0,0 @@
-package dev.struchkov.haiti.core.service;
-
-import dev.struchkov.haiti.context.domain.BasicEntity;
-import dev.struchkov.haiti.context.domain.ExistsContainer;
-import dev.struchkov.haiti.context.repository.simple.MultipleOperation;
-import dev.struchkov.haiti.context.service.simple.MultipleService;
-import dev.struchkov.haiti.context.service.simple.SimpleService;
-import dev.struchkov.haiti.core.util.ServiceOperation;
-import dev.struchkov.haiti.utils.Inspector;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public abstract class AbstractMultipleService<Entity extends BasicEntity<Key>, Key> implements MultipleService<Entity, Key> {
-
-    private final SimpleService<Entity, Key> simpleService;
-    private final MultipleOperation<Entity, Key> multipleOperation;
-
-    protected AbstractMultipleService(SimpleService<Entity, Key> simpleService, MultipleOperation<Entity, Key> multipleOperation) {
-        this.simpleService = simpleService;
-        this.multipleOperation = multipleOperation;
-    }
-
-    @Override
-    public void deleteAllById(Collection<Key> ids) {
-        Inspector.isNotNull(ids);
-        multipleOperation.deleteAllById(ids);
-    }
-
-    @Override
-    public List<Entity> createAll(Collection<Entity> entities) {
-        Inspector.isNotNull(entities);
-        return entities.stream().map(simpleService::create).collect(Collectors.toList());
-    }
-
-    @Override
-    public List<Entity> updateAll(Collection<Entity> entities) {
-        Inspector.isNotNull(entities);
-        return entities.stream().map(simpleService::update).collect(Collectors.toList());
-    }
-
-    @Override
-    public ExistsContainer<Entity, Key> existsById(Collection<Key> ids) {
-        Inspector.isNotNull(ids);
-        return ServiceOperation.existsContainerById(multipleOperation, ids);
-    }
-
-}
--- a/haiti-core/src/main/java/dev/struchkov/haiti/core/service/AbstractPagingService.java
+++ b/haiti-core/src/main/java/dev/struchkov/haiti/core/service/AbstractPagingService.java
@ -1,23 +0,0 @@
-package dev.struchkov.haiti.core.service;
-
-import dev.struchkov.haiti.context.page.Pagination;
-import dev.struchkov.haiti.context.page.Sheet;
-import dev.struchkov.haiti.context.repository.simple.PagingOperation;
-import dev.struchkov.haiti.context.service.simple.PagingService;
-import dev.struchkov.haiti.utils.Inspector;
-
-public abstract class AbstractPagingService<T> implements PagingService<T> {
-
-    private final PagingOperation<T> pagingOperation;
-
-    protected AbstractPagingService(PagingOperation<T> pagingOperation) {
-        this.pagingOperation = pagingOperation;
-    }
-
-    @Override
-    public Sheet<T> getAll(Pagination pagination) {
-        Inspector.isNotNull(pagination);
-        return pagingOperation.findAll(pagination);
-    }
-
-}
--- a/haiti-core/src/main/java/dev/struchkov/haiti/core/service/AbstractSimpleManagerService.java
+++ b/haiti-core/src/main/java/dev/struchkov/haiti/core/service/AbstractSimpleManagerService.java
@ -1,81 +0,0 @@
-package dev.struchkov.haiti.core.service;
-
-import dev.struchkov.haiti.context.domain.BasicEntity;
-import dev.struchkov.haiti.context.domain.ExistsContainer;
-import dev.struchkov.haiti.context.page.Pagination;
-import dev.struchkov.haiti.context.page.Sheet;
-import dev.struchkov.haiti.context.repository.SimpleManagerRepository;
-import dev.struchkov.haiti.context.service.SimpleManagerService;
-import dev.struchkov.haiti.core.util.ServiceOperation;
-import dev.struchkov.haiti.utils.Inspector;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import static dev.struchkov.haiti.context.exception.NotFoundException.notFoundException;
-
-public abstract class AbstractSimpleManagerService<Entity extends BasicEntity<Key>, Key> implements SimpleManagerService<Entity, Key> {
-
-    protected final SimpleManagerRepository<Entity, Key> repository;
-
-    protected AbstractSimpleManagerService(SimpleManagerRepository<Entity, Key> repository) {
-        this.repository = repository;
-    }
-
-    @Override
-    public void deleteAllById(Collection<Key> ids) {
-        Inspector.isNotNull(ids);
-        ServiceOperation.deleteAllById(repository, ids);
-    }
-
-    @Override
-    public Sheet<Entity> getAll(Pagination pagination) {
-        Inspector.isNotNull(pagination);
-        return ServiceOperation.getAll(repository, pagination);
-    }
-
-    @Override
-    public Optional<Entity> getById(Key id) {
-        Inspector.isNotNull(id);
-        return ServiceOperation.getById(repository, id);
-    }
-
-    @Override
-    public Entity getByIdOrThrow(Key id) {
-        Inspector.isNotNull(id);
-        return getById(id).orElseThrow(notFoundException("Объект не найден. Идентификатор: ", id));
-    }
-
-    @Override
-    public boolean existsById(Key id) {
-        Inspector.isNotNull(id);
-        return ServiceOperation.existsById(repository, id);
-    }
-
-    @Override
-    public void deleteById(Key id) {
-        Inspector.isNotNull(id);
-        ServiceOperation.deleteById(repository, id);
-    }
-
-    @Override
-    public List<Entity> createAll(Collection<Entity> entities) {
-        Inspector.isNotNull(entities);
-        return entities.stream().map(this::create).collect(Collectors.toList());
-    }
-
-    @Override
-    public List<Entity> updateAll(Collection<Entity> entities) {
-        Inspector.isNotNull(entities);
-        return entities.stream().map(this::update).collect(Collectors.toList());
-    }
-
-    @Override
-    public ExistsContainer<Entity, Key> existsById(Collection<Key> ids) {
-        Inspector.isNotNull(ids);
-        return ServiceOperation.existsContainerById(repository, ids);
-    }
-
-}
--- a/haiti-core/src/main/java/dev/struchkov/haiti/core/service/AbstractSimpleService.java
+++ b/haiti-core/src/main/java/dev/struchkov/haiti/core/service/AbstractSimpleService.java
@ -1,36 +0,0 @@
-package dev.struchkov.haiti.core.service;
-
-import dev.struchkov.haiti.context.repository.simple.CrudOperation;
-import dev.struchkov.haiti.context.service.simple.SimpleService;
-import dev.struchkov.haiti.core.util.ServiceOperation;
-import dev.struchkov.haiti.utils.Inspector;
-
-import java.util.Optional;
-
-public abstract class AbstractSimpleService<Entity, Key> implements SimpleService<Entity, Key> {
-
-    private final CrudOperation<Entity, Key> crudOperation;
-
-    protected AbstractSimpleService(CrudOperation<Entity, Key> crudOperation) {
-        this.crudOperation = crudOperation;
-    }
-
-    @Override
-    public Optional<Entity> getById(Key id) {
-        Inspector.isNotNull(id);
-        return ServiceOperation.getById(crudOperation, id);
-    }
-
-    @Override
-    public boolean existsById(Key id) {
-        Inspector.isNotNull(id);
-        return ServiceOperation.existsById(crudOperation, id);
-    }
-
-    @Override
-    public void deleteById(Key id) {
-        Inspector.isNotNull(id);
-        ServiceOperation.deleteById(crudOperation, id);
-    }
-
-}
--- a/haiti-core/src/main/java/dev/struchkov/haiti/core/util/ServiceOperation.java
+++ b/haiti-core/src/main/java/dev/struchkov/haiti/core/util/ServiceOperation.java
@ -1,60 +0,0 @@
-package dev.struchkov.haiti.core.util;
-
-import dev.struchkov.haiti.context.domain.BasicEntity;
-import dev.struchkov.haiti.context.domain.ExistsContainer;
-import dev.struchkov.haiti.context.page.Pagination;
-import dev.struchkov.haiti.context.page.Sheet;
-import dev.struchkov.haiti.context.repository.simple.CrudOperation;
-import dev.struchkov.haiti.context.repository.simple.MultipleOperation;
-import dev.struchkov.haiti.context.repository.simple.PagingOperation;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import static dev.struchkov.haiti.utils.Exceptions.utilityClass;
-
-public final class ServiceOperation {
-
-    private ServiceOperation() {
-        utilityClass();
-    }
-
-    public static <Entity extends BasicEntity<Key>, Key> void deleteAllById(MultipleOperation<Entity, Key> repository, Collection<Key> ids) {
-        repository.deleteAllById(ids);
-    }
-
-    public static <Entity> Sheet<Entity> getAll(PagingOperation<Entity> repository, Pagination pagination) {
-        return repository.findAll(pagination);
-    }
-
-    public static <Entity, Key> Optional<Entity> getById(CrudOperation<Entity, Key> repository, Key id) {
-        return repository.findById(id);
-    }
-
-    public static <Entity, Key> boolean existsById(CrudOperation<Entity, Key> repository, Key id) {
-        return repository.existsById(id);
-    }
-
-    public static <Entity, Key> void deleteById(CrudOperation<Entity, Key> repository, Key id) {
-        repository.deleteById(id);
-    }
-
-    public static <K, T extends BasicEntity<K>> ExistsContainer<T, K> existsContainerById(MultipleOperation<T, K> multipleOperation, Collection<K> ids) {
-        final List<T> existsEntity = multipleOperation.findAllById(ids);
-        final Set<K> existsIds = existsEntity.stream()
-                .map(BasicEntity::getId)
-                .collect(Collectors.toSet());
-        if (existsIds.containsAll(ids)) {
-            return ExistsContainer.allFind(existsEntity);
-        } else {
-            final Set<K> noExistsId = ids.stream()
-                    .filter(id -> !existsIds.contains(id))
-                    .collect(Collectors.toSet());
-            return ExistsContainer.notAllFind(existsEntity, noExistsId);
-        }
-    }
-
-}
--- a/haiti-core/src/main/java/module-info.java
+++ b/haiti-core/src/main/java/module-info.java
@ -1,5 +0,0 @@
-module haiti.core {
-    requires haiti.context;
-    requires haiti.exception;
-    requires haiti.filter;
-}
--- a/haiti-exception/pom.xml
+++ b/haiti-exception/pom.xml
@ -5,8 +5,8 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>dev.struchkov.haiti</groupId>
-        <artifactId>haiti</artifactId>
-        <version>1.0.3</version>
+        <artifactId>haiti-dependencies</artifactId>
+        <version>2.3.4</version>
    </parent>

    <artifactId>haiti-exception</artifactId>
@ -16,12 +16,4 @@
    <description>General exceptions for the haiti project</description>
    <url>https://github.com/haiti-projects/haiti-framework</url>

-    <properties>
-        <java.version>11</java.version>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
-
 </project>
--- a/haiti-exception/src/main/java/dev/struchkov/haiti/context/exception/AccessException.java
+++ b/haiti-exception/src/main/java/dev/struchkov/haiti/context/exception/AccessException.java
@ -12,7 +12,7 @@ public class AccessException extends BasicException {
        super(message);
    }

-    public static Supplier<AccessException> supplier(String message, Object... objects) {
+    public static Supplier<AccessException> accessException(String message, Object... objects) {
        return () -> new AccessException(MessageFormat.format(message, objects));
    }

--- a/haiti-exception/src/main/java/dev/struchkov/haiti/context/exception/ConvertException.java
+++ b/haiti-exception/src/main/java/dev/struchkov/haiti/context/exception/ConvertException.java
@ -16,7 +16,7 @@ public class ConvertException extends BasicException {
        super(message, cause);
    }

-    public static Supplier<ConvertException> supplier(String message, Object... objects) {
+    public static Supplier<ConvertException> convertException(String message, Object... objects) {
        return () -> new ConvertException(MessageFormat.format(message, objects));
    }

--- a/haiti-exception/src/main/java/dev/struchkov/haiti/context/exception/CreateException.java
+++ b/haiti-exception/src/main/java/dev/struchkov/haiti/context/exception/CreateException.java
@ -12,7 +12,7 @@ public class CreateException extends BasicException {
        super(message);
    }

-    public static Supplier<CreateException> supplier(String message, Object... objects) {
+    public static Supplier<CreateException> createException(String message, Object... objects) {
        return () -> new CreateException(MessageFormat.format(message, objects));
    }

--- a/haiti-filter/pom.xml
+++ b/haiti-filter/pom.xml
@ -1,34 +0,0 @@
-<?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"
-         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>
-    <parent>
-        <groupId>dev.struchkov.haiti</groupId>
-        <artifactId>haiti</artifactId>
-        <version>1.0.3</version>
-    </parent>
-
-    <artifactId>haiti-filter</artifactId>
-    <version>${haiti.filter.api.ver}</version>
-
-    <name>Haiti Filter</name>
-    <description>Fast and convenient filtering requests to data warehouses.</description>
-    <url>https://github.com/haiti-projects/haiti-framework</url>
-
-    <properties>
-        <java.version>11</java.version>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>dev.struchkov.haiti</groupId>
-            <artifactId>haiti-context</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>
--- a/haiti-filter/src/main/java/dev/struchkov/haiti/filter/Filter.java
+++ b/haiti-filter/src/main/java/dev/struchkov/haiti/filter/Filter.java
@ -1,21 +0,0 @@
-package dev.struchkov.haiti.filter;
-
-import java.util.function.Consumer;
-
-public interface Filter {
-
-    Filter and(FilterQuery filterQuery);
-
-    Filter and(Consumer<FilterQuery> query);
-
-    Filter or(FilterQuery filterQuery);
-
-    Filter or(Consumer<FilterQuery> query);
-
-    Filter not(FilterQuery filterQuery);
-
-    Filter not(Consumer<FilterQuery> query);
-
-    <Q> Q build();
-
-}
--- a/haiti-filter/src/main/java/dev/struchkov/haiti/filter/FilterOperation.java
+++ b/haiti-filter/src/main/java/dev/struchkov/haiti/filter/FilterOperation.java
@ -1,18 +0,0 @@
-package dev.struchkov.haiti.filter;
-
-import dev.struchkov.haiti.context.page.Pagination;
-import dev.struchkov.haiti.context.page.Sheet;
-
-import java.util.Optional;
-
-public interface FilterOperation<T> {
-
-    Sheet<T> findAll(Filter filter, Pagination pagination);
-
-    Optional<T> findFirst(Filter filter);
-
-    boolean exists(Filter filter);
-
-    long count(Filter filter);
-
-}
--- a/haiti-filter/src/main/java/dev/struchkov/haiti/filter/FilterQuery.java
+++ b/haiti-filter/src/main/java/dev/struchkov/haiti/filter/FilterQuery.java
@ -1,61 +0,0 @@
-package dev.struchkov.haiti.filter;
-
-import java.util.Set;
-
-public interface FilterQuery {
-
-    /**
-     * Добавляет в запрос поиск по диапазону.
-     *
-     * @param field Название поля в elasticsearch
-     * @param from  Начало интервала
-     * @param to    Конец интервала
-     */
-    <Y extends Comparable<? super Y>> FilterQuery between(String field, Y from, Y to);
-
-    <Y extends Comparable<? super Y>> FilterQuery greaterThan(String field, Y value);
-
-    <Y extends Comparable<? super Y>> FilterQuery lessThan(String field, Y value);
-
-    /**
-     * Добавляет в запрос проверку по значению поля
-     *
-     * @param field Название поля
-     * @param value Значение поля для проверки
-     */
-    FilterQuery matchPhrase(String field, Object value);
-
-    /**
-     * Добавляет в запрос проверку по нескольким значениям одного поля
-     *
-     * @param field Название поля
-     * @param value Значения поля
-     */
-    <U> FilterQuery matchPhrase(String field, Set<U> value);
-
-    /**
-     * Добавляет в запрос проверку на NULL значение поля
-     *
-     * @param field Наименование поля
-     */
-    FilterQuery exists(String field);
-
-    /**
-     * Поиск подстрок
-     *
-     * @param field Названия поля
-     * @param value Часть искомого значения
-     */
-    FilterQuery like(String field, String value, boolean ignoreCase);
-
-    /**
-     * Добавляет в запрос поиск по флагу, который конвертируется в диапазон
-     *
-     * @param flag  Значение флага
-     * @param field Поле для проверки
-     */
-    FilterQuery checkBoolInt(String field, Boolean flag);
-
-    <Q> Q build();
-
-}
--- a/haiti-filter/src/main/java/dev/struchkov/haiti/filter/exception/BadFilterConstructorException.java
+++ b/haiti-filter/src/main/java/dev/struchkov/haiti/filter/exception/BadFilterConstructorException.java
@ -1,9 +0,0 @@
-package dev.struchkov.haiti.filter.exception;
-
-public class BadFilterConstructorException extends FilterException {
-
-    public BadFilterConstructorException(String s) {
-        super(s);
-    }
-
-}
--- a/haiti-filter/src/main/java/dev/struchkov/haiti/filter/exception/FilterException.java
+++ b/haiti-filter/src/main/java/dev/struchkov/haiti/filter/exception/FilterException.java
@ -1,20 +0,0 @@
-package dev.struchkov.haiti.filter.exception;
-
-import dev.struchkov.haiti.context.exception.BasicException;
-
-/**
- * Исключения связанные с работой фильтров.
- *
- * @author upagge 09.11.2020
- */
-public class FilterException extends BasicException {
-
-    protected FilterException(String message) {
-        super(message);
-    }
-
-    protected FilterException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-}
--- a/haiti-filter/src/main/java/module-info.java
+++ b/haiti-filter/src/main/java/module-info.java
@ -1,6 +0,0 @@
-module haiti.filter {
-    exports dev.struchkov.haiti.filter;
-
-    requires haiti.exception;
-    requires haiti.context;
-}
--- a/haiti-utils/pom.xml
+++ b/haiti-utils/pom.xml
@ -5,8 +5,8 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>dev.struchkov.haiti</groupId>
-        <artifactId>haiti</artifactId>
-        <version>1.0.3</version>
+        <artifactId>haiti-dependencies</artifactId>
+        <version>2.3.4</version>
    </parent>

    <name>Haiti Utils</name>
@ -16,19 +16,15 @@
    <artifactId>haiti-utils</artifactId>
    <version>${haiti.utils.ver}</version>

-    <properties>
-        <java.version>11</java.version>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
-
    <dependencies>
        <dependency>
            <groupId>dev.struchkov.haiti</groupId>
            <artifactId>haiti-exception</artifactId>
        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
    </dependencies>

 </project>
--- a/haiti-utils/src/main/java/dev/struchkov/haiti/utils/Checker.java
+++ b/haiti-utils/src/main/java/dev/struchkov/haiti/utils/Checker.java
@ -1,8 +1,10 @@
 package dev.struchkov.haiti.utils;

 import java.util.Collection;
+import java.util.Map;

 import static dev.struchkov.haiti.utils.Exceptions.utilityClass;
+import static dev.struchkov.haiti.utils.Strings.EMPTY;

 public final class Checker {

@ -14,10 +16,30 @@ public final class Checker {
        return o == null;
    }

+    public static boolean checkAllNull(Object... objects) {
+        if (objects.length == 0) return false;
+
+        for (Object object : objects)
+            if (checkNotNull(object))
+                return false;
+
+        return true;
+    }
+
    public static boolean checkNotNull(Object o) {
        return o != null;
    }

+    public static boolean checkAllNotNull(Object... objects) {
+        if (objects.length == 0) return false;
+
+        for (Object object : objects)
+            if (checkNull(object))
+                return false;
+
+        return true;
+    }
+
    /**
     * Проверка коллекции на пустоту.
     *
@ -27,6 +49,10 @@ public final class Checker {
        return collection != null && !collection.isEmpty();
    }

+    public static boolean checkNotEmpty(Map<?, ?> map) {
+        return map != null && !map.isEmpty();
+    }
+
    /**
     * Проверка массива на пустоту
     *
@ -40,6 +66,10 @@ public final class Checker {
        }
    }

+    public static boolean checkNotEmpty(String s) {
+        return !EMPTY.equals(s);
+    }
+
    /**
     * Проверка коллекции на пустоту.
     *
@ -58,6 +88,18 @@ public final class Checker {
        return args == null || args.length == 0;
    }

+    public static boolean checkEmpty(String s) {
+        return EMPTY.equals(s);
+    }
+
+    public static boolean checkFalse(Boolean b) {
+        return b != null && !b;
+    }
+
+    public static boolean checkTrue(Boolean b) {
+        return b != null && b;
+    }
+
    public static boolean checkLong(String s) {
        try {
            Long.parseLong(s);
--- a/haiti-utils/src/main/java/dev/struchkov/haiti/utils/CollectionUtils.java
+++ b/haiti-utils/src/main/java/dev/struchkov/haiti/utils/CollectionUtils.java
@ -0,0 +1,37 @@
+package dev.struchkov.haiti.utils;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static dev.struchkov.haiti.utils.Exceptions.utilityClass;
+
+public final class CollectionUtils {
+
+    private CollectionUtils() {
+        utilityClass();
+    }
+
+    public static <T> List<T> toList(T... t) {
+        return Arrays.stream(t).collect(Collectors.toList());
+    }
+
+    public static <T> Collection<T> toCollection(T... t) {
+        return Arrays.stream(t).collect(Collectors.toList());
+    }
+
+    public static <T> Collection<T> toCollection(Collection<T> collection, T... t) {
+        return Stream.concat(
+                collection.stream(), Arrays.stream(t)
+        ).collect(Collectors.toList());
+    }
+
+    public static <T> Collection<T> toCollection(Collection<T> collectionOne, Collection<T> collectionTwo) {
+        return Stream.concat(
+                collectionOne.stream(), collectionTwo.stream()
+        ).collect(Collectors.toList());
+    }
+
+}
--- a/haiti-utils/src/main/java/dev/struchkov/haiti/utils/Inspector.java
+++ b/haiti-utils/src/main/java/dev/struchkov/haiti/utils/Inspector.java
@ -32,7 +32,7 @@ public final class Inspector {
    }

    /**
-     * Проверяет множество объектов на null. Если хотябы один объект null, то будет выброшено исключение
+     * Проверяет множество объектов на null. Если хотя бы один объект не null, то будет выброшено исключение
     *
     * @param e       исключение, которое необходимо выбросить
     * @param objects проверяемое множество объектов
@ -43,6 +43,14 @@ public final class Inspector {
            if (checkNull(o)) throw e.get();
    }

+    /**
+     * Проверяет множество объектов на null. Если хотя бы один объект null, то будет выброшено исключение
+     */
+    public static void isAnyNull(Supplier<? extends RuntimeException> e, Object... objects) {
+        for (Object o : objects)
+            if (checkNotNull(o)) throw e.get();
+    }
+
    /**
     * Проверка на null значение с возвращением исключения, если объект null.
     *
@ -54,6 +62,11 @@ public final class Inspector {
            if (checkNull(o)) throw new NullPointerException("Object cannot be null");
    }

+    public static void isNotNull(Supplier<? extends RuntimeException> e, Object... objects) {
+        for (Object o : objects)
+            if (checkNull(o)) throw e.get();
+    }
+
    /**
     * Проверка на true значение с возвращением исключения, если flag не true.
     *
--- a/haiti-utils/src/main/java/dev/struchkov/haiti/utils/ObjectUtils.java
+++ b/haiti-utils/src/main/java/dev/struchkov/haiti/utils/ObjectUtils.java
@ -7,10 +7,6 @@ import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;

 import static dev.struchkov.haiti.utils.Exceptions.utilityClass;
 import static dev.struchkov.haiti.utils.Inspector.isNotNull;
@ -145,24 +141,4 @@ public class ObjectUtils {
                && method.getName().toLowerCase().endsWith(fieldName.toLowerCase());
    }

-    public static <T> List<T> toList(T... t) {
-        return Arrays.stream(t).collect(Collectors.toList());
-    }
-
-    public static <T> Collection<T> toCollect(T... t) {
-        return Arrays.stream(t).collect(Collectors.toList());
-    }
-
-    public static <T> Collection<T> toCollect(Collection<T> collection, T... t) {
-        return Stream.concat(
-                collection.stream(), Arrays.stream(t)
-        ).collect(Collectors.toList());
-    }
-
-    public static <T> Collection<T> toCollect(Collection<T> collectionOne, Collection<T> collectionTwo) {
-        return Stream.concat(
-                collectionOne.stream(), collectionTwo.stream()
-        ).collect(Collectors.toList());
-    }
-
 }
--- a/haiti-utils/src/main/java/dev/struchkov/haiti/utils/Parser.java
+++ b/haiti-utils/src/main/java/dev/struchkov/haiti/utils/Parser.java
@ -0,0 +1,38 @@
+package dev.struchkov.haiti.utils;
+
+import dev.struchkov.haiti.utils.domain.CompositeUrl;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static dev.struchkov.haiti.utils.Checker.checkNull;
+import static dev.struchkov.haiti.utils.Exceptions.utilityClass;
+
+public final class Parser {
+
+    private static Pattern urlParse;
+
+    private Parser() {
+        utilityClass();
+    }
+
+    public static CompositeUrl url(String url) {
+        final Matcher matcher = getUrlParse().matcher(url);
+
+        matcher.find();
+
+        final String protocol = matcher.group(1);
+        final String domain = matcher.group(2);
+        final String port = matcher.group(3);
+        final String path = matcher.group(4);
+        return CompositeUrl.of(protocol, domain, port, path);
+    }
+
+    private static Pattern getUrlParse() {
+        if (checkNull(urlParse)) {
+            urlParse = Pattern.compile("(https?://)([^:^/]*)(:\\d*)?(.*)?");
+        }
+        return urlParse;
+    }
+
+}
--- a/haiti-utils/src/main/java/dev/struchkov/haiti/utils/concurrent/ForkJoinUtils.java
+++ b/haiti-utils/src/main/java/dev/struchkov/haiti/utils/concurrent/ForkJoinUtils.java
@ -0,0 +1,63 @@
+package dev.struchkov.haiti.utils.concurrent;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ForkJoinTask;
+
+import static dev.struchkov.haiti.utils.Exceptions.utilityClass;
+
+public class ForkJoinUtils {
+
+    private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(ForkJoinUtils.class);
+
+    private ForkJoinUtils() {
+        utilityClass();
+    }
+
+    public static <T> List<T> pullTaskResults(List<ForkJoinTask<List<T>>> tasks) {
+        final List<T> results = new ArrayList<>();
+        Iterator<ForkJoinTask<List<T>>> iterator = tasks.iterator();
+        while (!tasks.isEmpty()) {
+            while (iterator.hasNext()) {
+                final ForkJoinTask<List<T>> task = iterator.next();
+                if (task.isDone()) {
+                    final List<T> jsons;
+                    try {
+                        jsons = task.get();
+                        results.addAll(jsons);
+                    } catch (InterruptedException | ExecutionException e) {
+                        log.error(e.getMessage(), e);
+                        Thread.currentThread().interrupt();
+                    }
+                    iterator.remove();
+                }
+            }
+            iterator = tasks.iterator();
+        }
+        return results;
+    }
+
+    public static <T> List<T> pullTaskResult(List<ForkJoinTask<T>> tasks) {
+        final List<T> results = new ArrayList<>();
+        Iterator<ForkJoinTask<T>> iterator = tasks.iterator();
+        while (!tasks.isEmpty()) {
+            while (iterator.hasNext()) {
+                final ForkJoinTask<T> task = iterator.next();
+                if (task.isDone()) {
+                    try {
+                        results.add(task.get());
+                    } catch (InterruptedException | ExecutionException e) {
+                        log.error(e.getMessage(), e);
+                        Thread.currentThread().interrupt();
+                    }
+                    iterator.remove();
+                }
+            }
+            iterator = tasks.iterator();
+        }
+        return results;
+    }
+
+}
--- a/haiti-utils/src/main/java/dev/struchkov/haiti/utils/domain/CompositeUrl.java
+++ b/haiti-utils/src/main/java/dev/struchkov/haiti/utils/domain/CompositeUrl.java
@ -0,0 +1,39 @@
+package dev.struchkov.haiti.utils.domain;
+
+import java.util.Optional;
+
+public class CompositeUrl {
+
+    private final String protocol;
+    private final String domain;
+    private final String port;
+    private final String path;
+
+    private CompositeUrl(String protocol, String domain, String port, String path) {
+        this.protocol = protocol;
+        this.domain = domain;
+        this.port = port;
+        this.path = path;
+    }
+
+    public static CompositeUrl of(String protocol, String domain, String port, String path) {
+        return new CompositeUrl(protocol, domain, port, path);
+    }
+
+    public Optional<String> getProtocol() {
+        return Optional.ofNullable(protocol);
+    }
+
+    public Optional<String> getDomain() {
+        return Optional.ofNullable(domain);
+    }
+
+    public Optional<String> getPort() {
+        return Optional.ofNullable(port);
+    }
+
+    public Optional<String> getPath() {
+        return Optional.ofNullable(path);
+    }
+
+}
--- a/haiti-utils/src/main/java/module-info.java
+++ b/haiti-utils/src/main/java/module-info.java
@ -1,5 +1,9 @@
 module haiti.utils {
    exports dev.struchkov.haiti.utils;
+    exports dev.struchkov.haiti.utils.concurrent;
+    exports dev.struchkov.haiti.utils.domain;

    requires haiti.exception;
+
+    requires org.slf4j;
 }
--- a/pom.xml
+++ b/pom.xml
@ -5,8 +5,8 @@
    <modelVersion>4.0.0</modelVersion>

    <groupId>dev.struchkov.haiti</groupId>
-    <artifactId>haiti</artifactId>
-    <version>1.0.3</version>
+    <artifactId>haiti-dependencies</artifactId>
+    <version>2.4.0-SNAPSHOT</version>
    <packaging>pom</packaging>

    <name>Haiti Framework</name>
@ -24,12 +24,8 @@
    </issueManagement>

    <modules>
-        <module>haiti-bom</module>
        <module>haiti-exception</module>
        <module>haiti-utils</module>
-        <module>haiti-context</module>
-        <module>haiti-core</module>
-        <module>haiti-filter</module>
    </modules>

    <properties>
@ -39,16 +35,13 @@
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

-        <haiti.ver>1.0.3</haiti.ver>
-
-        <haiti.bom.ver>${haiti.ver}</haiti.bom.ver>
+        <haiti.ver>${project.version}</haiti.ver>
        <haiti.exception.ver>${haiti.ver}</haiti.exception.ver>
        <haiti.context.ver>${haiti.ver}</haiti.context.ver>
-        <haiti.core.ver>${haiti.ver}</haiti.core.ver>
-        <haiti.filter.api.ver>${haiti.ver}</haiti.filter.api.ver>
-        <haiti.filter.criteria.ver>${haiti.ver}</haiti.filter.criteria.ver>
-        <haiti.database.ver>${haiti.ver}</haiti.database.ver>
-        <haiti.utils.ver>${haiti.ver}</haiti.utils.ver>
+
+        <javax.persistence.api.version>2.2</javax.persistence.api.version>
+        <google.auto.service.version>1.0.1</google.auto.service.version>
+        <slf4j.api.version>2.0.6</slf4j.api.version>

        <plugin.maven.compiler.ver>3.10.1</plugin.maven.compiler.ver>
        <plugin.nexus.staging.ver>1.6.13</plugin.nexus.staging.ver>
@ -61,10 +54,29 @@
        <dependencies>
            <dependency>
                <groupId>dev.struchkov.haiti</groupId>
-                <artifactId>haiti-bom</artifactId>
-                <version>${haiti.bom.ver}</version>
-                <type>pom</type>
-                <scope>import</scope>
+                <artifactId>haiti-exception</artifactId>
+                <version>${haiti.exception.ver}</version>
+            </dependency>
+            <dependency>
+                <groupId>dev.struchkov.haiti</groupId>
+                <artifactId>haiti-utils</artifactId>
+                <version>${haiti.utils.ver}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>javax.persistence</groupId>
+                <artifactId>javax.persistence-api</artifactId>
+                <version>${javax.persistence.api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.auto.service</groupId>
+                <artifactId>auto-service</artifactId>
+                <version>${google.auto.service.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>${slf4j.api.version}</version>
            </dependency>
        </dependencies>
    </dependencyManagement>
@ -77,11 +89,6 @@
                    <artifactId>nexus-staging-maven-plugin</artifactId>
                    <version>${plugin.nexus.staging.ver}</version>
                    <extensions>true</extensions>
-                    <configuration>
-                        <serverId>ossrh</serverId>
-                        <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
-                        <autoReleaseAfterClose>true</autoReleaseAfterClose>
-                    </configuration>
                </plugin>
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
@ -136,6 +143,10 @@
        </pluginManagement>

        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
@ -159,6 +170,11 @@
                    <plugin>
                        <groupId>org.sonatype.plugins</groupId>
                        <artifactId>nexus-staging-maven-plugin</artifactId>
+                        <configuration>
+                            <serverId>ossrh</serverId>
+                            <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                        </configuration>
                    </plugin>
                    <plugin>
                        <groupId>org.apache.maven.plugins</groupId>
@ -175,21 +191,105 @@
                </plugins>
            </build>
        </profile>
+        <profile>
+            <id>release-struchkov-nexus</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.sonatype.plugins</groupId>
+                        <artifactId>nexus-staging-maven-plugin</artifactId>
+                        <configuration>
+                            <serverId>struchkov-nexus</serverId>
+                            <nexusUrl>https://nexus.struchkov.dev/nexus/</nexusUrl>
+                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                            <skipStaging>true</skipStaging>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>snapshot</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.sonatype.plugins</groupId>
+                        <artifactId>nexus-staging-maven-plugin</artifactId>
+                        <configuration>
+                            <serverId>struchkov-nexus</serverId>
+                            <nexusUrl>https://nexus.struchkov.dev/nexus/</nexusUrl>
+                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
    </profiles>

-    <scm>
-        <connection>scm:git:https://github.com/haiti-projects/haiti-framework.git</connection>
-        <url>https://github.com/haiti-projects/haiti-framework</url>
-        <developerConnection>scm:git:https://github.com/haiti-projects/haiti-framework.git</developerConnection>
-    </scm>
+    <repositories>
+        <repository>
+            <id>struchkov-nexus-release</id>
+            <url>https://nexus.struchkov.dev/repository/maven-releases/</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>fail</checksumPolicy>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>struchkov-nexus-snapshot</id>
+            <url>https://nexus.struchkov.dev/repository/maven-snapshots/</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>warn</checksumPolicy>
+            </snapshots>
+        </repository>
+    </repositories>

    <distributionManagement>
+        <repository>
+            <id>struchkov-nexus-release</id>
+            <url>https://nexus.struchkov.dev/repository/maven-releases/</url>
+        </repository>
        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+            <id>struchkov-nexus-snapshot</id>
+            <url>https://nexus.struchkov.dev/repository/maven-snapshots/</url>
        </snapshotRepository>
    </distributionManagement>

+    <scm>
+        <connection>scm:git:https://git.struchkov.dev/Haiti/haiti-framework.git</connection>
+        <url>https://git.struchkov.dev/Haiti/haiti-framework</url>
+        <developerConnection>scm:git:https://git.struchkov.dev/Haiti/haiti-framework.git</developerConnection>
+    </scm>
+
    <developers>
        <developer>
            <id>uPagge</id>
Author	SHA1	Message	Date
Struchkov Mark	78eb00fdf0	next-version Some checks failed continuous-integration/drone/push Build is failing Details continuous-integration/drone Build is failing Details	2023-01-23 14:42:45 +03:00
Struchkov Mark	3d4ddb0b41	v.2.3.4 All checks were successful continuous-integration/drone/tag Build is passing Details	2022-12-17 18:42:03 +03:00
Struchkov Mark	fe43edb943	v.2.3.3 Some checks failed continuous-integration/drone/tag Build is failing Details	2022-12-17 18:39:28 +03:00
Struchkov Mark	2a6e735fb3	v.2.3.2 All checks were successful continuous-integration/drone/tag Build is passing Details	2022-12-17 16:32:57 +03:00
Struchkov Mark	0a175d9c0b	Убрал .gitlab-ci.yml	2022-12-17 16:31:20 +03:00
Struchkov Mark	020f108f07	Рефакторинг модулей Some checks failed continuous-integration/drone/tag Build is failing Details	2022-12-17 16:30:05 +03:00
Struchkov Mark	87fe31027c	Добавил утилиты для работы с ForkJoinPool Some checks failed continuous-integration/drone/tag Build is failing Details	2022-12-17 16:12:35 +03:00
Struchkov Mark	bd235b6b25	Настройка сборки drone	2022-12-17 16:03:00 +03:00
Struchkov Mark	e5d7ff57c4	Настройка сборки drone	2022-12-17 16:02:48 +03:00
Struchkov Mark	25f3592c49	Настройка сборки drone Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2022-12-17 16:01:41 +03:00
Struchkov Mark	9ab66ec979	Настройка сборки drone Some checks reported errors continuous-integration/drone/push Build was killed Details	2022-12-17 15:58:11 +03:00
Struchkov Mark	4f26e9f71d	Настройка сборки drone Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2022-12-17 15:57:44 +03:00
Struchkov Mark	78d449f7ea	Настройка сборки drone Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2022-12-17 15:55:26 +03:00
Struchkov Mark	ef58b57e88	Настройка сборки drone Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2022-12-17 15:55:08 +03:00
Struchkov Mark	b5fa479f47	Настройка сборки drone Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2022-12-17 15:54:41 +03:00
Struchkov Mark	c15337d5e4	Настройка сборки drone Some checks failed continuous-integration/drone/push Build is failing Details	2022-12-17 15:53:12 +03:00
Struchkov Mark	a61d9910c7	Настройка сборки drone Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2022-12-17 15:51:30 +03:00
Struchkov Mark	9e6f09de2c	Настройка сборки drone Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2022-12-17 13:59:07 +03:00
Struchkov Mark	40e31d292f	Настройка сборки drone Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2022-12-17 13:58:03 +03:00
Struchkov Mark	67cdc0555b	Настройка сборки drone Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2022-12-17 13:56:15 +03:00
Struchkov Mark	476d5fcf10	Настройка сборки drone Some checks failed continuous-integration/drone/push Build is failing Details	2022-12-17 13:54:35 +03:00
Struchkov Mark	4ed0315854	Настройка сборки drone Some checks reported errors continuous-integration/drone/push Build was killed Details	2022-12-17 13:54:02 +03:00
Struchkov Mark	7a11e8b8af	Настройка сборки drone Some checks failed continuous-integration/drone/push Build is failing Details	2022-12-17 13:53:21 +03:00
Struchkov Mark	8818cb3fc3	Настройка сборки drone Some checks failed continuous-integration/drone/push Build is failing Details	2022-12-17 13:52:26 +03:00
Struchkov Mark	fed80e2a82	Настройка сборки drone Some checks failed continuous-integration/drone/push Build is failing Details	2022-12-17 13:51:33 +03:00
Struchkov Mark	4df1745677	Настройка сборки drone Some checks failed continuous-integration/drone/push Build is failing Details	2022-12-17 13:51:02 +03:00
Struchkov Mark	f60be70c52	Настройка сборки drone Some checks failed continuous-integration/drone/push Build is failing Details	2022-12-17 13:48:10 +03:00
Struchkov Mark	aa48033cfe	Настройка сборки drone Some checks failed continuous-integration/drone/push Build is failing Details	2022-12-17 13:47:42 +03:00
Struchkov Mark	8b7375a1d3	Настройка сборки drone Some checks failed continuous-integration/drone/push Build is failing Details	2022-12-17 13:46:47 +03:00
Struchkov Mark	33782192a5	Настройка сборки drone Some checks failed continuous-integration/drone/push Build is failing Details	2022-12-17 13:46:14 +03:00
Struchkov Mark	b9d6c9f2af	Настройка сборки drone Some checks failed continuous-integration/drone/push Build is failing Details	2022-12-17 13:44:06 +03:00
Struchkov Mark	bf28bb6ecb	Настройка сборки drone Some checks failed continuous-integration/drone/push Build is failing Details	2022-12-17 13:43:36 +03:00
Struchkov Mark	b6b78e21fb	Настройка сборки drone Some checks failed continuous-integration/drone/push Build is failing Details	2022-12-17 13:43:17 +03:00
Struchkov Mark	d7f28a6056	Настройка сборки drone Some checks failed continuous-integration/drone/push Build is failing Details	2022-12-17 13:42:46 +03:00
Struchkov Mark	44d4398ae4	Настройка сборки drone Some checks failed continuous-integration/drone/push Build is failing Details	2022-12-17 13:32:13 +03:00
Struchkov Mark	bd8db135bf	Настройка сборки drone Some checks failed continuous-integration/drone/push Build is failing Details	2022-12-17 13:29:42 +03:00
Struchkov Mark	1f5c315cb9	Настройка сборки drone Some checks failed continuous-integration/drone/push Build is failing Details	2022-12-17 12:55:54 +03:00
Struchkov Mark	c19d42770a	Настройка сборки drone Some checks failed continuous-integration/drone/push Build is failing Details	2022-12-17 12:55:32 +03:00
Struchkov Mark	a28d6bcd1f	Настройка сборки drone Some checks failed continuous-integration/drone/push Build is failing Details	2022-12-17 12:54:55 +03:00
Struchkov Mark	8fa55d0ea1	Настройка сборки drone Some checks failed continuous-integration/drone/push Build is failing Details	2022-12-17 12:54:02 +03:00
Struchkov Mark	9d24e3daad	Настройка сборки drone Some checks failed continuous-integration/drone/push Build is failing Details	2022-12-17 12:52:09 +03:00
Struchkov Mark	082c18eecb	Настройка сборки drone Some checks failed continuous-integration/drone/push Build is failing Details	2022-12-17 12:51:47 +03:00
Struchkov Mark	9015bb6f65	Настройка сборки drone Some checks failed continuous-integration/drone/push Build is failing Details	2022-12-17 12:50:45 +03:00
Struchkov Mark	af2700ab39	Настройка сборки drone Some checks failed continuous-integration/drone/push Build is failing Details	2022-12-17 12:49:20 +03:00
Struchkov Mark	98e0825c69	Настройка сборки drone Some checks failed continuous-integration/drone/push Build is failing Details	2022-12-17 12:48:39 +03:00
Struchkov Mark	82b8d74e33	Настройка сборки drone Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2022-12-17 12:43:12 +03:00
Struchkov Mark	2e0da4f29f	Настройка сборки drone Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2022-12-17 12:42:32 +03:00
Struchkov Mark	08625f4912	Настройка сборки drone Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2022-12-17 12:24:51 +03:00
Struchkov Mark	0c598456fd	Настройка сборки drone All checks were successful continuous-integration/drone/push Build is passing Details	2022-12-17 12:24:12 +03:00
Struchkov Mark	23349231e9	Настройка сборки drone Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2022-12-17 12:22:46 +03:00
Struchkov Mark	995f028b2b	Настройка сборки drone Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2022-12-17 12:20:07 +03:00
Struchkov Mark	81ee713dec	Настройка сборки drone Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2022-12-17 12:15:42 +03:00
Struchkov Mark	4bd7fe2ddf	Настройка сборки drone Some checks reported errors continuous-integration/drone/push Build encountered an error Details continuous-integration/drone Build encountered an error Details	2022-12-17 12:13:13 +03:00
Struchkov Mark	05b5cab9d3	Настройка сборки drone	2022-12-17 12:11:39 +03:00
Struchkov Mark	63bc66810c	Добавил новые проверки в Checker	2022-12-09 21:08:54 +03:00
Struchkov Mark	7907a80f77	рефакторинг	2022-12-09 21:03:41 +03:00
Struchkov Mark	6b8c430dbb	release-1.5.0	2022-08-02 21:53:48 +03:00
Struchkov Mark	fb9d8a0f6e	Небольшой рефакторинг	2022-07-30 10:32:11 +03:00
Struchkov Mark	e8867426ad	Навел порядок в утилитарном модуле	2022-07-26 08:44:28 +03:00
Struchkov Mark	ae8391ccb8	Добавил Parser	2022-07-23 10:40:47 +03:00