update application.yml logic

.idea/workspace.xml

@@ -6,8 +6,8 @@
   <component name="ChangeListManager">
     <list default="true" id="137ea174-7fc0-49e0-a3b0-3deac854d820" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/conf/ptis/utic-ptis-server.yml" beforeDir="false" afterPath="$PROJECT_DIR$/conf/ptis/utic-ptis-server.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/utic-ptis-server/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/utic-ptis-server/src/main/resources/application.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/utic-ptis-server/src/main/java/com/utic/center/utic/ptis/server/health/SystemHealthService.java" beforeDir="false" afterPath="$PROJECT_DIR$/utic-ptis-server/src/main/java/com/utic/center/utic/ptis/server/health/SystemHealthService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/utic-stat-server/src/main/java/com/utic/center/utic/stat/server/health/SystemHealthService.java" beforeDir="false" afterPath="$PROJECT_DIR$/utic-stat-server/src/main/java/com/utic/center/utic/stat/server/health/SystemHealthService.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -77,60 +77,6 @@
                 <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
                 <item name="utic-center" type="f1a62948:ProjectNode" />
               </path>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="utic-center" type="f1a62948:ProjectNode" />
-                <item name="utic-ptis-server" type="2d1252cf:ModuleNode" />
-              </path>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="utic-center" type="f1a62948:ProjectNode" />
-                <item name="utic-ptis-server" type="2d1252cf:ModuleNode" />
-                <item name="Tasks" type="e4a08cd1:TasksNode" />
-              </path>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="utic-center" type="f1a62948:ProjectNode" />
-                <item name="utic-ptis-server" type="2d1252cf:ModuleNode" />
-                <item name="Tasks" type="e4a08cd1:TasksNode" />
-                <item name="build" type="c8890929:TasksNode$1" />
-              </path>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="utic-center" type="f1a62948:ProjectNode" />
-                <item name="utic-stat-server" type="2d1252cf:ModuleNode" />
-              </path>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="utic-center" type="f1a62948:ProjectNode" />
-                <item name="utic-stat-server" type="2d1252cf:ModuleNode" />
-                <item name="Tasks" type="e4a08cd1:TasksNode" />
-              </path>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="utic-center" type="f1a62948:ProjectNode" />
-                <item name="utic-stat-server" type="2d1252cf:ModuleNode" />
-                <item name="Tasks" type="e4a08cd1:TasksNode" />
-                <item name="build" type="c8890929:TasksNode$1" />
-              </path>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="utic-center" type="f1a62948:ProjectNode" />
-                <item name="utic-traf-server" type="2d1252cf:ModuleNode" />
-              </path>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="utic-center" type="f1a62948:ProjectNode" />
-                <item name="utic-traf-server" type="2d1252cf:ModuleNode" />
-                <item name="Tasks" type="e4a08cd1:TasksNode" />
-              </path>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="utic-center" type="f1a62948:ProjectNode" />
-                <item name="utic-traf-server" type="2d1252cf:ModuleNode" />
-                <item name="Tasks" type="e4a08cd1:TasksNode" />
-                <item name="build" type="c8890929:TasksNode$1" />
-              </path>
             </expand>
             <select />
           </tree_state>
@@ -339,7 +285,7 @@
       </map>
     </option>
   </component>
-  <component name="RunManager" selected="Spring Boot.UticStatServerApplication">
+  <component name="RunManager" selected="Gradle.utic-center:utic-stat-server [bootJar]">
     <configuration name="utic-center:utic-center-common [build]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
       <ExternalSystemSettings>
         <option name="executionName" />
@@ -414,7 +360,7 @@
         <option name="executionName" />
         <option name="externalProjectPath" value="$PROJECT_DIR$/utic-traf-server" />
         <option name="externalSystemIdString" value="GRADLE" />
-        <option name="scriptParameters" />
+        <option name="scriptParameters" value="" />
         <option name="taskDescriptions">
           <list />
         </option>
@@ -501,10 +447,10 @@
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Gradle.utic-center:utic-traf-server [clean]" />
-        <item itemvalue="Gradle.utic-center:utic-traf-server [bootJar]" />
         <item itemvalue="Gradle.utic-center:utic-stat-server [bootJar]" />
         <item itemvalue="Gradle.utic-center:utic-ptis-server [bootJar]" />
+        <item itemvalue="Gradle.utic-center:utic-traf-server [bootJar]" />
+        <item itemvalue="Gradle.utic-center:utic-traf-server [clean]" />
         <item itemvalue="Gradle.utic-center:utic-center-common [build]" />
       </list>
     </recent_temporary>
@@ -698,7 +644,10 @@
       <workItem from="1761537277586" duration="7213000" />
       <workItem from="1761870097642" duration="13060000" />
       <workItem from="1762488156041" duration="55000" />
-      <workItem from="1762839134015" duration="27000" />
+      <workItem from="1762839134015" duration="120000" />
+      <workItem from="1762916213038" duration="1753000" />
+      <workItem from="1763101664772" duration="2670000" />
+      <workItem from="1763338075361" duration="17435000" />
     </task>
     <servers />
   </component>

utic-ptis-server/src/main/java/com/utic/center/utic/ptis/server/health/SystemHealthService.java

@@ -10,6 +10,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import javax.sql.DataSource;
 import java.lang.management.ManagementFactory;
 import java.lang.management.ThreadInfo;
 import java.lang.management.ThreadMXBean;
@@ -24,7 +25,7 @@ import java.util.Map;
 public class SystemHealthService {
 
     private final ApplicationConfig config;
-    private final HikariDataSource dataSource;
+    private final DataSource dataSource;
     private final Map<Thread.State, Integer> stateCountMap = new EnumMap<>(Thread.State.class);
     private final SystemHealth systemHealth = new SystemHealth();
     private final DecimalFormat df = new DecimalFormat("#.##");
@@ -73,7 +74,9 @@ public class SystemHealthService {
     }
 
     private void logSessionStatus() {
-        HikariPoolMXBean poolStats = this.dataSource.getHikariPoolMXBean();
+        HikariDataSource hikariDataSource = (HikariDataSource) this.dataSource;
+        HikariPoolMXBean poolStats = hikariDataSource.getHikariPoolMXBean();
+//        HikariPoolMXBean poolStats = this.dataSource.getHikariPoolMXBean();
         int totalConnections = poolStats.getTotalConnections();
         int activeConnections = poolStats.getActiveConnections();
         int idleConnections = poolStats.getIdleConnections();

utic-ptis-server/src/main/resources/application.yml

@@ -1,11 +1,11 @@
 spring:
+  application:
+    name: utic-ptis-server
   profiles:
     active: prod
   config:
     import:
       - optional:file:${user.dir}/conf/utic-ptis-server.yml
-  application:
-    name: utic-ptis-server
   main:
     #    web-application-type: none
     log-startup-info: true
@@ -69,6 +69,8 @@ spring:
   config:
     activate:
       on-profile: dev
+    import:
+      - optional:file:${user.dir}/conf/utic-ptis-server-dev.yml
   datasource:
     hikari:
       driver-class-name: oracle.jdbc.OracleDriver
@@ -83,6 +85,8 @@ spring:
   config:
     activate:
       on-profile: prod
+    import:
+      - optional:file:${user.dir}/conf/utic-ptis-server-prod.yml
   datasource:
     hikari:
       driver-class-name: oracle.jdbc.OracleDriver

utic-stat-server/src/main/java/com/utic/center/utic/stat/server/health/SystemHealthService.java

@@ -1,5 +1,6 @@
 package com.utic.center.utic.stat.server.health;
 
+import com.utic.center.common.utils.SystemHealth;
 import com.utic.center.utic.stat.server.config.ApplicationConfig;
 import com.utic.center.utic.stat.server.repository.ApplicationRepository;
 import com.zaxxer.hikari.HikariDataSource;
@@ -9,6 +10,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import javax.sql.DataSource;
 import java.lang.management.ManagementFactory;
 import java.lang.management.ThreadInfo;
 import java.lang.management.ThreadMXBean;
@@ -23,9 +25,9 @@ import java.util.Map;
 public class SystemHealthService {
 
     private final ApplicationConfig config;
-    private final HikariDataSource dataSource;
+    private final DataSource dataSource;
     private final Map<Thread.State, Integer> stateCountMap = new EnumMap<>(Thread.State.class);
-    private final com.utic.center.common.utils.SystemHealth systemHealth = new com.utic.center.common.utils.SystemHealth();
+    private final SystemHealth systemHealth = new SystemHealth();
     private final DecimalFormat df = new DecimalFormat("#.##");
 
     public boolean checkSystemHealth() {
@@ -72,7 +74,8 @@ public class SystemHealthService {
     }
 
     private void logSessionStatus() {
-        HikariPoolMXBean poolStats = this.dataSource.getHikariPoolMXBean();
+        HikariDataSource hikariDataSource = (HikariDataSource) this.dataSource;
+        HikariPoolMXBean poolStats = hikariDataSource.getHikariPoolMXBean();
         int totalConnections = poolStats.getTotalConnections();
         int activeConnections = poolStats.getActiveConnections();
         int idleConnections = poolStats.getIdleConnections();

utic-stat-server/src/main/resources/application.yml

@@ -1,11 +1,11 @@
 spring:
+  application:
+    name: utic-stat-server
   profiles:
     active: prod
   config:
-      import:
-        - optional:file:${user.dir}/conf/utic-stat-server.yml
-  application:
-    name: utic-stat-server
+    import:
+      - optional:file:${user.dir}/conf/utic-stat-server.yml
   main:
 #    web-application-type: none
     log-startup-info: true
@@ -72,6 +72,8 @@ spring:
   config:
     activate:
       on-profile: dev
+    import:
+      - optional:file:${user.dir}/conf/utic-stat-server-dev.yml
   datasource:
     hikari:
       driver-class-name: oracle.jdbc.OracleDriver
@@ -86,6 +88,8 @@ spring:
   config:
     activate:
       on-profile: prod
+    import:
+      - optional:file:${user.dir}/conf/utic-stat-server-prod.yml
   datasource:
     hikari:
       driver-class-name: oracle.jdbc.OracleDriver

utic-traf-server/src/main/resources/application.yml

@@ -1,11 +1,11 @@
 spring:
+  application:
+    name: utic-traf-server
   profiles:
     active: prod
   config:
-      import:
-        - optional:file:${user.dir}/conf/utic-traf-server.yml
-  application:
-    name: utic-traf-server
+    import:
+      - optional:file:${user.dir}/conf/utic-traf-server.yml
   main:
 #    web-application-type: none
     log-startup-info: true
@@ -95,6 +95,8 @@ spring:
   config:
     activate:
       on-profile: dev
+    import:
+      - optional:file:${user.dir}/conf/utic-traf-server-dev.yml
   datasource:
     hikari:
       utic:
@@ -115,6 +117,8 @@ spring:
   config:
     activate:
       on-profile: prod
+    import:
+      - optional:file:${user.dir}/conf/utic-traf-server-prod.yml
   datasource:
     hikari:
       utic: