From 26aa3dec467bfa6b25d479260ce52030ea973745 Mon Sep 17 00:00:00 2001
From: "ivanov.denis" <ivanov.denis@cg.ru>
Date: Mon, 30 Sep 2024 12:37:46 +0300
Subject: [PATCH] fixes

---
 backend/pom.xml                               | 12 -----
 .../java/ru/micord/db/DbConfiguration.java    | 54 +++++--------------
 test/pom.xml                                  |  5 --
 3 files changed, 14 insertions(+), 57 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index fe1d6c90..2a903b5a 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -11,10 +11,6 @@
   <artifactId>backend</artifactId>
   <packaging>war</packaging>
   <dependencies>
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-jwt</artifactId>
-    </dependency>
     <dependency>
       <groupId>io.jsonwebtoken</groupId>
       <artifactId>jjwt-api</artifactId>
@@ -42,10 +38,6 @@
       <groupId>org.jooq</groupId>
       <artifactId>jooq</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.santuario</groupId>
-      <artifactId>xmlsec</artifactId>
-    </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
@@ -152,10 +144,6 @@
       <groupId>ru.cg.webbpm.modules</groupId>
       <artifactId>standard-annotations</artifactId>
     </dependency>
-    <dependency>
-      <groupId>ru.cg.webbpm.modules.core</groupId>
-      <artifactId>metrics</artifactId>
-    </dependency>
     <dependency>
       <groupId>ru.cg.webbpm.modules.reporting</groupId>
       <artifactId>reporting-api</artifactId>
diff --git a/backend/src/main/java/ru/micord/db/DbConfiguration.java b/backend/src/main/java/ru/micord/db/DbConfiguration.java
index c53865e1..d51e2df9 100644
--- a/backend/src/main/java/ru/micord/db/DbConfiguration.java
+++ b/backend/src/main/java/ru/micord/db/DbConfiguration.java
@@ -1,5 +1,9 @@
 package ru.micord.db;
 
+import java.util.HashMap;
+import java.util.Map;
+import javax.sql.DataSource;
+
 import org.jooq.ConnectionProvider;
 import org.jooq.DSLContext;
 import org.jooq.ExecuteListener;
@@ -11,19 +15,14 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Primary;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy;
 import org.springframework.transaction.PlatformTransactionManager;
 
-import ru.cg.webbpm.modules.core.metrics.MetricsConfig;
-import ru.cg.webbpm.modules.core.runtime.api.context.ExecutionContextHelper;
 import ru.cg.webbpm.modules.database.api.ConfigurationProvider;
-import ru.cg.webbpm.modules.database.api.metrics.DataSourceWithMetrics;
 import ru.cg.webbpm.modules.database.api.provider.DslProvider;
-
-import ru.cg.webbpm.modules.database.impl.DbConfInitializer;
+import ru.cg.webbpm.modules.database.bean.config.Datasource;
 import ru.cg.webbpm.modules.database.impl.data_source.DataSourceConfigReader;
 import ru.cg.webbpm.modules.database.impl.data_source.DataSourceFactory;
 import ru.cg.webbpm.modules.database.impl.data_source.HikariDataSourceFactory;
@@ -31,21 +30,9 @@ import ru.cg.webbpm.modules.database.impl.data_source.JndiDataSourceFactory;
 import ru.cg.webbpm.modules.database.impl.provider.DefaultConnectionProvider;
 import ru.cg.webbpm.modules.database.impl.provider.DslProviderImpl;
 import ru.cg.webbpm.modules.database.impl.service.ProcessSqlService;
-
-import ru.cg.webbpm.modules.database.bean.config.Datasource;
-
-
 import ru.cg.webbpm.modules.resources.api.ResourceProvider;
 
-import ru.fix.aggregating.profiler.PrefixedProfiler;
-import ru.fix.aggregating.profiler.Profiler;
-
-import javax.sql.DataSource;
-import java.util.HashMap;
-import java.util.Map;
-
 @Configuration
-@Import(MetricsConfig.class)
 public class DbConfiguration {
   @Value("${webbpm.db.query_timeout:120}")
   private Integer queryTimeout;
@@ -53,11 +40,6 @@ public class DbConfiguration {
   private ResourceProvider resourceProvider;
   @Autowired
   private ProcessSqlService processSqlService;
-  @Autowired
-  private Profiler profiler;
-  @Autowired
-  private ExecutionContextHelper executionContextHelper;
-
   @Autowired
   private ExecuteListener[] executeListeners;
 
@@ -77,15 +59,9 @@ public class DbConfiguration {
   @Bean
   @Primary
   public DataSource datasource(DataSourceFactory dataSourceFactory) {
-    DataSource dataSource = dataSourceFactory.createDataSource(datasourceConfig(),
+    return dataSourceFactory.createDataSource(datasourceConfig(),
         JndiDataSourceFactory::createDataSource
     );
-    return new DataSourceWithMetrics(
-        dataSource,
-        "project",
-        new PrefixedProfiler(profiler, "webbpm.db"),
-        executionContextHelper
-    );
   }
 
   @Bean
@@ -120,7 +96,7 @@ public class DbConfiguration {
   @Bean
   @Primary
   public org.jooq.Configuration jooqConfiguration(ConnectionProvider connectionProvider,
-      Settings jooqSettings) {
+                                                  Settings jooqSettings) {
     DefaultConfiguration configuration = new DefaultConfiguration();
     configuration.setSQLDialect(datasourceConfig().getSqlDialect());
     jooqSettings = jooqSettings.withExecuteLogging(false);
@@ -143,14 +119,12 @@ public class DbConfiguration {
   }
 
   @Bean
-  public DslProvider dslProvider(@Qualifier("dsl") DSLContext dsl) {
-    return new DslProviderImpl(dsl, this.dslContextMap);
-  }
-
-  @Bean
-  public DbConfInitializer dbConfInitializer(DataSourceFactory dataSourceFactory,
-                                             org.jooq.Configuration masterConfiguration, Datasource datasource) {
-    return new DbConfInitializer(dataSourceFactory, masterConfiguration, datasource,
-        processSqlService, connectionProviderMap, dslContextMap);
+  public DslProvider dslProvider(@Qualifier("dsl") DSLContext dsl,
+                                 DataSourceFactory dataSourceFactory,
+                                             org.jooq.Configuration masterConfiguration,
+                                             Datasource datasource) {
+    return new DslProviderImpl(dsl, dataSourceFactory, masterConfiguration, datasource,
+        processSqlService, connectionProviderMap, this.dslContextMap
+    );
   }
 }
diff --git a/test/pom.xml b/test/pom.xml
index 157ab256..cebfcdd6 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -49,11 +49,6 @@
       <artifactId>client</artifactId>
     </dependency>
 
-    <!--JWT-->
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-jwt</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-core</artifactId>