Merge pull request #217 from vskurikhin/216-separate-to-lib-daybook

Fix #216 separate to lib-daybook

api-gateway/build.gradle

@@ -11,6 +11,9 @@ repositories {
 }
 
 dependencies {
+
+    implementation project(':lib-daybook')
+
     implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     implementation enforcedPlatform("${quarkusPlatformGroupId}:quarkus-camel-bom:${quarkusPlatformVersion}")
 
@@ -42,6 +45,7 @@ dependencies {
     annotationProcessor "org.projectlombok:lombok-mapstruct-binding:0.2.0"
     annotationProcessor "org.projectlombok:lombok:$libVers.lombok"
     annotationProcessor project(":spi-mapstruct")
+    annotationProcessor project(":lib-daybook")
 
     liquibaseRuntime 'info.picocli:picocli:4.6.3'
     liquibaseRuntime group: 'org.slf4j', name: 'slf4j-api', version: libVers.slf4j

api-gateway/settings.gradle

@@ -0,0 +1,2 @@
+include 'lib-daybook'
+project(':lib-daybook').projectDir = new File('../lib-daybook')

api-gateway/src/main/java/su/svn/daybook3/api/gateway/annotations/ExceptionBadRequestAnswer.java

@@ -1,5 +1,5 @@
 /*
- * This file was last modified at 2024-05-14 23:32 by Victor N. Skurikhin.
+ * This file was last modified at 2024-10-30 09:18 by Victor N. Skurikhin.
  * This is free and unencumbered software released into the public domain.
  * For more information, please refer to <http://unlicense.org>
  * ExceptionBadRequestAnswer.java

api-gateway/src/main/java/su/svn/daybook3/api/gateway/annotations/ExceptionDuplicateAnswer.java

@@ -1,5 +1,5 @@
 /*
- * This file was last modified at 2024-05-14 23:32 by Victor N. Skurikhin.
+ * This file was last modified at 2024-10-30 09:18 by Victor N. Skurikhin.
  * This is free and unencumbered software released into the public domain.
  * For more information, please refer to <http://unlicense.org>
  * ExceptionDuplicateAnswer.java

api-gateway/src/main/java/su/svn/daybook3/api/gateway/annotations/ExceptionNoSuchElementAnswer.java

@@ -1,5 +1,5 @@
 /*
- * This file was last modified at 2024-05-14 23:32 by Victor N. Skurikhin.
+ * This file was last modified at 2024-10-30 09:18 by Victor N. Skurikhin.
  * This is free and unencumbered software released into the public domain.
  * For more information, please refer to <http://unlicense.org>
  * ExceptionNoSuchElementAnswer.java

api-gateway/src/main/java/su/svn/daybook3/api/gateway/annotations/PrincipalLogging.java

@@ -1,5 +1,5 @@
 /*
- * This file was last modified at 2024-05-14 23:32 by Victor N. Skurikhin.
+ * This file was last modified at 2024-10-30 09:19 by Victor N. Skurikhin.
  * This is free and unencumbered software released into the public domain.
  * For more information, please refer to <http://unlicense.org>
  * PrincipalLogging.java

api-gateway/src/main/java/su/svn/daybook3/api/gateway/domain/dao/AbstractDao.java

@@ -1,5 +1,5 @@
 /*
- * This file was last modified at 2024-05-14 21:36 by Victor N. Skurikhin.
+ * This file was last modified at 2024-10-30 00:04 by Victor N. Skurikhin.
  * This is free and unencumbered software released into the public domain.
  * For more information, please refer to <http://unlicense.org>
  * AbstractDao.java
@@ -10,7 +10,7 @@
 
 import io.smallrye.mutiny.Uni;
 import io.vertx.mutiny.sqlclient.Row;
-import su.svn.daybook3.api.gateway.domain.model.CasesOfId;
+import su.svn.daybook3.domain.model.CasesOfId;
 
 import jakarta.annotation.Nonnull;
 

api-gateway/src/main/java/su/svn/daybook3/api/gateway/domain/dao/AbstractViewDao.java

@@ -1,5 +1,5 @@
 /*
- * This file was last modified at 2024-05-14 21:36 by Victor N. Skurikhin.
+ * This file was last modified at 2024-10-30 09:48 by Victor N. Skurikhin.
  * This is free and unencumbered software released into the public domain.
  * For more information, please refer to <http://unlicense.org>
  * AbstractViewDao.java
@@ -14,11 +14,10 @@
 import io.vertx.mutiny.sqlclient.RowSet;
 import io.vertx.mutiny.sqlclient.SqlConnection;
 import io.vertx.mutiny.sqlclient.Tuple;
-import su.svn.daybook3.api.gateway.annotations.SQL;
-import su.svn.daybook3.api.gateway.models.Identification;
-
 import jakarta.annotation.Nonnull;
 import jakarta.inject.Inject;
+import su.svn.daybook3.annotations.SQL;
+import su.svn.daybook3.models.Identification;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;

api-gateway/src/main/java/su/svn/daybook3/api/gateway/domain/dao/CodifierDao.java

@@ -1,5 +1,5 @@
 /*
- * This file was last modified at 2024-05-14 21:36 by Victor N. Skurikhin.
+ * This file was last modified at 2024-10-30 09:48 by Victor N. Skurikhin.
  * This is free and unencumbered software released into the public domain.
  * For more information, please refer to <http://unlicense.org>
  * CodifierDao.java
@@ -10,12 +10,11 @@
 
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
+import jakarta.enterprise.context.ApplicationScoped;
+import su.svn.daybook3.annotations.SQL;
 import su.svn.daybook3.api.gateway.annotations.PrincipalLogging;
-import su.svn.daybook3.api.gateway.annotations.SQL;
 import su.svn.daybook3.api.gateway.domain.model.CodifierTable;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 import java.util.Optional;
 
 @ApplicationScoped

api-gateway/src/main/java/su/svn/daybook3/api/gateway/domain/dao/DaoIface.java

@@ -1,5 +1,5 @@
 /*
- * This file was last modified at 2024-05-14 21:36 by Victor N. Skurikhin.
+ * This file was last modified at 2024-10-30 00:11 by Victor N. Skurikhin.
  * This is free and unencumbered software released into the public domain.
  * For more information, please refer to <http://unlicense.org>
  * DaoIface.java
@@ -9,7 +9,7 @@
 package su.svn.daybook3.api.gateway.domain.dao;
 
 import io.smallrye.mutiny.Uni;
-import su.svn.daybook3.api.gateway.domain.model.CasesOfId;
+import su.svn.daybook3.domain.model.CasesOfId;
 
 import java.io.Serializable;
 import java.util.Optional;

api-gateway/src/main/java/su/svn/daybook3/api/gateway/domain/dao/DaoViewIface.java

@@ -1,5 +1,5 @@
 /*
- * This file was last modified at 2024-05-14 21:36 by Victor N. Skurikhin.
+ * This file was last modified at 2024-10-30 00:11 by Victor N. Skurikhin.
  * This is free and unencumbered software released into the public domain.
  * For more information, please refer to <http://unlicense.org>
  * DaoViewIface.java
@@ -10,7 +10,7 @@
 
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
-import su.svn.daybook3.api.gateway.models.Identification;
+import su.svn.daybook3.models.Identification;
 
 import java.io.Serializable;
 import java.util.Optional;

api-gateway/src/main/java/su/svn/daybook3/api/gateway/domain/dao/I18nDao.java

@@ -1,5 +1,5 @@
 /*
- * This file was last modified at 2024-05-14 21:36 by Victor N. Skurikhin.
+ * This file was last modified at 2024-10-30 09:48 by Victor N. Skurikhin.
  * This is free and unencumbered software released into the public domain.
  * For more information, please refer to <http://unlicense.org>
  * I18nDao.java
@@ -10,12 +10,11 @@
 
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
+import jakarta.enterprise.context.ApplicationScoped;
+import su.svn.daybook3.annotations.SQL;
 import su.svn.daybook3.api.gateway.annotations.PrincipalLogging;
-import su.svn.daybook3.api.gateway.annotations.SQL;
 import su.svn.daybook3.api.gateway.domain.model.I18nTable;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 import java.util.List;
 import java.util.Optional;
 

api-gateway/src/main/java/su/svn/daybook3/api/gateway/domain/dao/I18nViewDao.java

@@ -1,5 +1,5 @@
 /*
- * This file was last modified at 2024-05-14 21:36 by Victor N. Skurikhin.
+ * This file was last modified at 2024-10-30 09:48 by Victor N. Skurikhin.
  * This is free and unencumbered software released into the public domain.
  * For more information, please refer to <http://unlicense.org>
  * I18nViewDao.java
@@ -10,12 +10,11 @@
 
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
+import jakarta.enterprise.context.ApplicationScoped;
+import su.svn.daybook3.annotations.SQL;
 import su.svn.daybook3.api.gateway.annotations.PrincipalLogging;
-import su.svn.daybook3.api.gateway.annotations.SQL;
 import su.svn.daybook3.api.gateway.domain.model.I18nView;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 import java.util.List;
 import java.util.Optional;
 

api-gateway/src/main/java/su/svn/daybook3/api/gateway/domain/dao/KeyValueDao.java

@@ -1,5 +1,5 @@
 /*
- * This file was last modified at 2024-05-14 21:36 by Victor N. Skurikhin.
+ * This file was last modified at 2024-10-30 09:48 by Victor N. Skurikhin.
  * This is free and unencumbered software released into the public domain.
  * For more information, please refer to <http://unlicense.org>
  * KeyValueDao.java
@@ -11,12 +11,11 @@
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
 import io.vertx.core.json.JsonObject;
+import jakarta.enterprise.context.ApplicationScoped;
+import su.svn.daybook3.annotations.SQL;
 import su.svn.daybook3.api.gateway.annotations.PrincipalLogging;
-import su.svn.daybook3.api.gateway.annotations.SQL;
 import su.svn.daybook3.api.gateway.domain.model.KeyValueTable;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 import java.math.BigInteger;
 import java.util.Optional;
 import java.util.UUID;

api-gateway/src/main/java/su/svn/daybook3/api/gateway/domain/dao/LanguageDao.java

@@ -1,5 +1,5 @@
 /*
- * This file was last modified at 2024-05-14 21:36 by Victor N. Skurikhin.
+ * This file was last modified at 2024-10-30 09:48 by Victor N. Skurikhin.
  * This is free and unencumbered software released into the public domain.
  * For more information, please refer to <http://unlicense.org>
  * LanguageDao.java
@@ -10,12 +10,11 @@
 
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
+import jakarta.enterprise.context.ApplicationScoped;
+import su.svn.daybook3.annotations.SQL;
 import su.svn.daybook3.api.gateway.annotations.PrincipalLogging;
-import su.svn.daybook3.api.gateway.annotations.SQL;
 import su.svn.daybook3.api.gateway.domain.model.LanguageTable;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 import java.util.Optional;
 
 @ApplicationScoped

api-gateway/src/main/java/su/svn/daybook3/api/gateway/domain/dao/RoleDao.java

@@ -1,5 +1,5 @@
 /*
- * This file was last modified at 2024-05-14 21:36 by Victor N. Skurikhin.
+ * This file was last modified at 2024-10-30 09:48 by Victor N. Skurikhin.
  * This is free and unencumbered software released into the public domain.
  * For more information, please refer to <http://unlicense.org>
  * RoleDao.java
@@ -10,12 +10,11 @@
 
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
-import su.svn.daybook3.api.gateway.annotations.PrincipalLogging;
-import su.svn.daybook3.api.gateway.annotations.SQL;
-import su.svn.daybook3.api.gateway.domain.model.RoleTable;
-
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
+import su.svn.daybook3.annotations.SQL;
+import su.svn.daybook3.api.gateway.annotations.PrincipalLogging;
+import su.svn.daybook3.api.gateway.domain.model.RoleTable;
 
 import java.util.Optional;
 import java.util.UUID;

api-gateway/src/main/java/su/svn/daybook3/api/gateway/domain/dao/SessionDao.java

@@ -1,5 +1,5 @@
 /*
- * This file was last modified at 2024-05-14 21:36 by Victor N. Skurikhin.
+ * This file was last modified at 2024-10-30 09:48 by Victor N. Skurikhin.
  * This is free and unencumbered software released into the public domain.
  * For more information, please refer to <http://unlicense.org>
  * SessionDao.java
@@ -10,12 +10,11 @@
 
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
+import jakarta.enterprise.context.ApplicationScoped;
+import su.svn.daybook3.annotations.SQL;
 import su.svn.daybook3.api.gateway.annotations.PrincipalLogging;
-import su.svn.daybook3.api.gateway.annotations.SQL;
 import su.svn.daybook3.api.gateway.domain.model.SessionTable;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 import java.util.Optional;
 import java.util.UUID;
 

api-gateway/src/main/java/su/svn/daybook3/api/gateway/domain/dao/SettingDao.java

@@ -1,5 +1,5 @@
 /*
- * This file was last modified at 2024-05-14 21:36 by Victor N. Skurikhin.
+ * This file was last modified at 2024-10-30 09:54 by Victor N. Skurikhin.
  * This is free and unencumbered software released into the public domain.
  * For more information, please refer to <http://unlicense.org>
  * SettingDao.java
@@ -10,12 +10,11 @@
 
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
+import jakarta.enterprise.context.ApplicationScoped;
+import su.svn.daybook3.annotations.SQL;
 import su.svn.daybook3.api.gateway.annotations.PrincipalLogging;
-import su.svn.daybook3.api.gateway.annotations.SQL;
 import su.svn.daybook3.api.gateway.domain.model.SettingTable;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 import java.util.Optional;
 
 @ApplicationScoped

api-gateway/src/main/java/su/svn/daybook3/api/gateway/domain/dao/SettingViewDao.java

@@ -1,5 +1,5 @@
 /*
- * This file was last modified at 2024-05-14 21:36 by Victor N. Skurikhin.
+ * This file was last modified at 2024-10-30 09:54 by Victor N. Skurikhin.
  * This is free and unencumbered software released into the public domain.
  * For more information, please refer to <http://unlicense.org>
  * SettingViewDao.java
@@ -11,8 +11,8 @@
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
 import jakarta.enterprise.context.ApplicationScoped;
+import su.svn.daybook3.annotations.SQL;
 import su.svn.daybook3.api.gateway.annotations.PrincipalLogging;
-import su.svn.daybook3.api.gateway.annotations.SQL;
 import su.svn.daybook3.api.gateway.domain.model.SettingView;
 
 import java.util.Collections;