From f7d99aea42c7cf4981b574c8fa619aa72bacb94b Mon Sep 17 00:00:00 2001
From: Pavel Vetokhin <pavetok@users.noreply.github.com>
Date: Sun, 17 Mar 2024 11:28:54 +0300
Subject: [PATCH] Setup gear logging (#412)

---
 README.adoc                                   |  1 +
 app/pom.xml                                   | 14 +++----
 .../src/it/resources/logback-test.xml         | 11 ------
 .../bezmen/core/SepulkaServiceImpl.java       |  2 +-
 .../src/it/resources/logback-test.xml         | 11 ------
 .../bezmen/core/SepulkaServiceImpl.kt         |  2 +-
 .../src/it/resources/logback-test.xml         | 11 ------
 lib/pom.xml                                   |  9 ++++-
 lib/storage/src/it/resources/logback-test.xml | 11 ------
 .../src/test/resources/logback-test.xml       | 11 ------
 pom.xml                                       |  8 +++-
 test/e2e/src/test/resources/logback-test.xml  | 11 ------
 test/pom.xml                                  |  7 ----
 tool/pom.xml                                  | 37 +++----------------
 tool/testing/pom.xml                          | 19 +++++++++-
 tool/testing/src/main/resources/log4j2.xml    | 17 +++++++++
 tool/testing/src/main/resources/logback.xml   | 13 +++++++
 17 files changed, 78 insertions(+), 117 deletions(-)
 delete mode 100644 app/sepuling-java/src/it/resources/logback-test.xml
 delete mode 100644 app/sepuling-kotlin/src/it/resources/logback-test.xml
 delete mode 100644 lib/messaging/src/it/resources/logback-test.xml
 delete mode 100644 lib/storage/src/it/resources/logback-test.xml
 delete mode 100644 lib/storage/src/test/resources/logback-test.xml
 delete mode 100644 test/e2e/src/test/resources/logback-test.xml
 create mode 100644 tool/testing/src/main/resources/log4j2.xml
 create mode 100644 tool/testing/src/main/resources/logback.xml

diff --git a/README.adoc b/README.adoc
index cff11ed5..77368e57 100644
--- a/README.adoc
+++ b/README.adoc
@@ -8,6 +8,7 @@
 . Адаптируем имена (find & replace)
 .. Имя проекта (в шаблоне bezmen)
 .. Имя приложения (в шаблоне sepuling)
+.. Имя базы данных (в шаблоне enteropia)
 .. Имя схемы данных (в шаблоне sepulkarium)
 . Настраиваем синхронизацию
 .. Создаем Github App на уровне репозитория или организации
diff --git a/app/pom.xml b/app/pom.xml
index 4bd6d59d..08ae9c5c 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -66,7 +66,7 @@
           <artifactId>maven-dependency-plugin</artifactId>
           <executions>
             <execution>
-              <id>deps-jars</id>
+              <id>copy-deps</id>
               <phase>pre-integration-test</phase>
               <goals>
                 <goal>copy-dependencies</goal>
@@ -74,11 +74,11 @@
               <configuration>
                 <includeScope>runtime</includeScope>
                 <excludeGroupIds>${project.groupId}</excludeGroupIds>
-                <outputDirectory>${project.build.directory}/image-context/lib</outputDirectory>
+                <outputDirectory>${project.build.directory}/image/lib</outputDirectory>
               </configuration>
             </execution>
             <execution>
-              <id>libs-jars</id>
+              <id>copy-libs</id>
               <phase>pre-integration-test</phase>
               <goals>
                 <goal>copy-dependencies</goal>
@@ -86,11 +86,11 @@
               <configuration>
                 <includeScope>runtime</includeScope>
                 <includeGroupIds>${project.groupId}</includeGroupIds>
-                <outputDirectory>${project.build.directory}/image-context/bin</outputDirectory>
+                <outputDirectory>${project.build.directory}/image/bin</outputDirectory>
               </configuration>
             </execution>
             <execution>
-              <id>app-jar</id>
+              <id>copy-app</id>
               <phase>pre-integration-test</phase>
               <goals>
                 <goal>copy</goal>
@@ -101,7 +101,7 @@
                     <groupId>${project.groupId}</groupId>
                     <artifactId>${project.artifactId}</artifactId>
                     <version>${project.version}</version>
-                    <outputDirectory>${project.build.directory}/image-context/bin</outputDirectory>
+                    <outputDirectory>${project.build.directory}/image/bin</outputDirectory>
                   </artifactItem>
                 </artifactItems>
               </configuration>
@@ -124,7 +124,7 @@
             <executable>docker</executable>
             <arguments>
               <argument>build</argument>
-              <argument>${project.build.directory}/image-context</argument>
+              <argument>${project.build.directory}/image</argument>
               <argument>--file</argument>
               <argument>${project.basedir}/Dockerfile</argument>
               <argument>--tag</argument>
diff --git a/app/sepuling-java/src/it/resources/logback-test.xml b/app/sepuling-java/src/it/resources/logback-test.xml
deleted file mode 100644
index 885aa3cb..00000000
--- a/app/sepuling-java/src/it/resources/logback-test.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<configuration>
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="ERROR">
-    <appender-ref ref="STDOUT" />
-  </root>
-</configuration>
diff --git a/app/sepuling-java/src/main/java/smecalculus/bezmen/core/SepulkaServiceImpl.java b/app/sepuling-java/src/main/java/smecalculus/bezmen/core/SepulkaServiceImpl.java
index 33ad4de4..78f01e7c 100644
--- a/app/sepuling-java/src/main/java/smecalculus/bezmen/core/SepulkaServiceImpl.java
+++ b/app/sepuling-java/src/main/java/smecalculus/bezmen/core/SepulkaServiceImpl.java
@@ -41,6 +41,6 @@ public RegistrationResponse register(RegistrationRequest request) {
     public ViewingResponse view(SepulkaMessageDm.ViewingRequest request) {
         LOG.debug("Handling sepulka viewing request: {}", request);
         var state = dao.getBy(request.internalId());
-        return state.map(factory::newMessage).orElseThrow(RuntimeException::new);
+        return state.map(factory::newMessage).orElseThrow(() -> new RuntimeException("NotFoundException"));
     }
 }
diff --git a/app/sepuling-kotlin/src/it/resources/logback-test.xml b/app/sepuling-kotlin/src/it/resources/logback-test.xml
deleted file mode 100644
index 885aa3cb..00000000
--- a/app/sepuling-kotlin/src/it/resources/logback-test.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<configuration>
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="ERROR">
-    <appender-ref ref="STDOUT" />
-  </root>
-</configuration>
diff --git a/app/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/core/SepulkaServiceImpl.kt b/app/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/core/SepulkaServiceImpl.kt
index 31c1a9bd..7e8b3ff2 100644
--- a/app/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/core/SepulkaServiceImpl.kt
+++ b/app/sepuling-kotlin/src/main/kotlin/smecalculus/bezmen/core/SepulkaServiceImpl.kt
@@ -27,6 +27,6 @@ class SepulkaServiceImpl(
 
     override fun view(request: ViewingRequest): ViewingResponse {
         val state = dao.getBy(request.internalId)
-        return state?.let { factory.newMessage(it) } ?: throw RuntimeException()
+        return state?.let { factory.newMessage(it) } ?: throw RuntimeException("NotFoundException")
     }
 }
diff --git a/lib/messaging/src/it/resources/logback-test.xml b/lib/messaging/src/it/resources/logback-test.xml
deleted file mode 100644
index 885aa3cb..00000000
--- a/lib/messaging/src/it/resources/logback-test.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<configuration>
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="ERROR">
-    <appender-ref ref="STDOUT" />
-  </root>
-</configuration>
diff --git a/lib/pom.xml b/lib/pom.xml
index 02cca27a..a9462bfd 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -96,8 +96,10 @@
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
+        <artifactId>slf4j-bom</artifactId>
         <version>2.0.12</version>
+        <scope>import</scope>
+        <type>pom</type>
       </dependency>
       <dependency>
         <groupId>ch.qos.logback</groupId>
@@ -195,6 +197,11 @@
         <artifactId>h2</artifactId>
         <version>2.2.224</version>
       </dependency>
+      <dependency>
+        <groupId>net.bytebuddy</groupId>
+        <artifactId>byte-buddy</artifactId>
+        <version>1.14.12</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
diff --git a/lib/storage/src/it/resources/logback-test.xml b/lib/storage/src/it/resources/logback-test.xml
deleted file mode 100644
index 885aa3cb..00000000
--- a/lib/storage/src/it/resources/logback-test.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<configuration>
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="ERROR">
-    <appender-ref ref="STDOUT" />
-  </root>
-</configuration>
diff --git a/lib/storage/src/test/resources/logback-test.xml b/lib/storage/src/test/resources/logback-test.xml
deleted file mode 100644
index 885aa3cb..00000000
--- a/lib/storage/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<configuration>
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="ERROR">
-    <appender-ref ref="STDOUT" />
-  </root>
-</configuration>
diff --git a/pom.xml b/pom.xml
index d57c5bf8..39d62d7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -275,6 +275,9 @@
                 junit.jupiter.execution.parallel.config.fixed.parallelism=2
               </configurationParameters>
             </properties>
+            <systemPropertyVariables>
+              <java.util.logging.manager>org.apache.logging.log4j.jul.LogManager</java.util.logging.manager>
+            </systemPropertyVariables>
           </configuration>
         </plugin>
         <plugin>
@@ -302,6 +305,9 @@
                 junit.jupiter.execution.parallel.enabled=false
               </configurationParameters>
             </properties>
+            <systemPropertyVariables>
+              <java.util.logging.manager>org.apache.logging.log4j.jul.LogManager</java.util.logging.manager>
+            </systemPropertyVariables>
           </configuration>
           <executions>
             <execution>
@@ -367,7 +373,7 @@
           <artifactId>maven-deploy-plugin</artifactId>
           <version>3.1.1</version>
           <configuration>
-            <skip>true</skip>
+            <skip>true</skip>  <!-- enable explicitly in public modules -->
           </configuration>
         </plugin>
       </plugins>
diff --git a/test/e2e/src/test/resources/logback-test.xml b/test/e2e/src/test/resources/logback-test.xml
deleted file mode 100644
index 885aa3cb..00000000
--- a/test/e2e/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<configuration>
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="ERROR">
-    <appender-ref ref="STDOUT" />
-  </root>
-</configuration>
diff --git a/test/pom.xml b/test/pom.xml
index 7733a945..f8b86a49 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -27,13 +27,6 @@
 
   <dependencyManagement>
     <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>lib</artifactId>
-        <version>${revision}</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>tool</artifactId>
diff --git a/tool/pom.xml b/tool/pom.xml
index a8d28c63..1ff7a14e 100644
--- a/tool/pom.xml
+++ b/tool/pom.xml
@@ -29,13 +29,10 @@
     <dependencies>
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>abstraction-client</artifactId>
+        <artifactId>lib</artifactId>
         <version>${revision}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.projectlombok</groupId>
-        <artifactId>lombok</artifactId>
-        <version>${lombok.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
       </dependency>
       <dependency>
         <groupId>com.github.docker-java</groupId>
@@ -71,19 +68,9 @@
         <type>pom</type>
       </dependency>
       <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>2.0.12</version>
-      </dependency>
-      <dependency>
-        <groupId>ch.qos.logback</groupId>
-        <artifactId>logback-classic</artifactId>
-        <version>1.5.3</version>
-      </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson</groupId>
-        <artifactId>jackson-bom</artifactId>
-        <version>2.17.0</version>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-bom</artifactId>
+        <version>2.23.1</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -92,23 +79,11 @@
         <artifactId>jakarta.servlet-api</artifactId>
         <version>6.0.0</version>
       </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-framework-bom</artifactId>
-        <version>6.1.5</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
       <dependency>
         <groupId>org.awaitility</groupId>
         <artifactId>awaitility</artifactId>
         <version>4.2.1</version>
       </dependency>
-      <dependency>
-        <groupId>net.bytebuddy</groupId>
-        <artifactId>byte-buddy</artifactId>
-        <version>1.14.12</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
diff --git a/tool/testing/pom.xml b/tool/testing/pom.xml
index 6f4abde7..2ebd5702 100644
--- a/tool/testing/pom.xml
+++ b/tool/testing/pom.xml
@@ -48,8 +48,23 @@
     </dependency>
 
     <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-api</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-slf4j2-impl</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-jul</artifactId>
       <scope>runtime</scope>
     </dependency>
 
diff --git a/tool/testing/src/main/resources/log4j2.xml b/tool/testing/src/main/resources/log4j2.xml
new file mode 100644
index 00000000..3570db2e
--- /dev/null
+++ b/tool/testing/src/main/resources/log4j2.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Gear stack logging -->
+<Configuration status="WARN">
+  <Appenders>
+    <Console name="CONSOLE" target="SYSTEM_OUT">
+      <PatternLayout pattern="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1.} - %msg%n"/>
+    </Console>
+  </Appenders>
+  <Loggers>
+    <Logger name="smecalculus.bezmen" level="error"/>
+    <Logger name="org.junit.jupiter.api" level="debug"/>
+    <Logger name="com.github.dockerjava" level="info"/>
+    <Root level="error">
+      <AppenderRef ref="CONSOLE"/>
+    </Root>
+  </Loggers>
+</Configuration>
diff --git a/tool/testing/src/main/resources/logback.xml b/tool/testing/src/main/resources/logback.xml
new file mode 100644
index 00000000..aec6a480
--- /dev/null
+++ b/tool/testing/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- Product stack logging -->
+<configuration>
+  <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1} - %msg%n</pattern>
+    </encoder>
+  </appender>
+  <logger name="smecalculus.bezmen" level="error"/>
+  <root level="error">
+    <appender-ref ref="CONSOLE"/>
+  </root>
+</configuration>