From 65f17f424e2e5abfd00e240c13c888a93fddd1ee Mon Sep 17 00:00:00 2001
From: Adrien Kantcheff <5028967+akantcheff@users.noreply.github.com>
Date: Thu, 19 Sep 2024 15:31:59 +0200
Subject: [PATCH] tr(platform-setup): add constructor to set dbVendor (#3157)

Needed by distrib bundle tests to set the db vendor.

Related to BPM-253
---
 .../impl/ConfigurationServiceImpl.java              | 13 ++-----------
 .../bonitasoft/platform/setup/PlatformSetup.java    |  4 ++--
 .../platform/setup/PlatformSetupAccessor.java       | 11 +++++++----
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/platform/platform-resources/src/main/java/org/bonitasoft/platform/configuration/impl/ConfigurationServiceImpl.java b/platform/platform-resources/src/main/java/org/bonitasoft/platform/configuration/impl/ConfigurationServiceImpl.java
index eb0abdc9b4..ea2c1b6557 100644
--- a/platform/platform-resources/src/main/java/org/bonitasoft/platform/configuration/impl/ConfigurationServiceImpl.java
+++ b/platform/platform-resources/src/main/java/org/bonitasoft/platform/configuration/impl/ConfigurationServiceImpl.java
@@ -47,7 +47,6 @@
 import org.bonitasoft.platform.exception.PlatformException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
@@ -67,18 +66,10 @@ public class ConfigurationServiceImpl implements ConfigurationService {
 
     private final TransactionTemplate transactionTemplate;
 
-    @Value("${db.vendor}")
-    private String dbVendor;
+    private final String dbVendor;
 
-    @Autowired
     public ConfigurationServiceImpl(JdbcTemplate jdbcTemplate,
-            TransactionTemplate transactionTemplate) {
-        this.jdbcTemplate = jdbcTemplate;
-        this.transactionTemplate = transactionTemplate;
-    }
-
-    public ConfigurationServiceImpl(JdbcTemplate jdbcTemplate,
-            TransactionTemplate transactionTemplate, String dbVendor) {
+            TransactionTemplate transactionTemplate, @Value("${db.vendor}") String dbVendor) {
         this.jdbcTemplate = jdbcTemplate;
         this.transactionTemplate = transactionTemplate;
         this.dbVendor = dbVendor;
diff --git a/platform/platform-resources/src/main/java/org/bonitasoft/platform/setup/PlatformSetup.java b/platform/platform-resources/src/main/java/org/bonitasoft/platform/setup/PlatformSetup.java
index 243309ff9a..568dcfc9e5 100644
--- a/platform/platform-resources/src/main/java/org/bonitasoft/platform/setup/PlatformSetup.java
+++ b/platform/platform-resources/src/main/java/org/bonitasoft/platform/setup/PlatformSetup.java
@@ -85,7 +85,6 @@ public class PlatformSetup {
 
     private final DataSource dataSource;
 
-    @Value("${db.vendor}")
     protected String dbVendor;
 
     private Path initialConfigurationFolder;
@@ -97,11 +96,12 @@ public class PlatformSetup {
             PlatformSetup.class.getClassLoader());
 
     public PlatformSetup(ScriptExecutor scriptExecutor, ConfigurationService configurationService,
-            VersionService versionService, DataSource dataSource) {
+            VersionService versionService, DataSource dataSource, @Value("${db.vendor}") String dbVendor) {
         this.scriptExecutor = scriptExecutor;
         this.configurationService = configurationService;
         this.versionService = versionService;
         this.dataSource = dataSource;
+        this.dbVendor = dbVendor;
     }
 
     /**
diff --git a/platform/platform-resources/src/main/java/org/bonitasoft/platform/setup/PlatformSetupAccessor.java b/platform/platform-resources/src/main/java/org/bonitasoft/platform/setup/PlatformSetupAccessor.java
index 22e21b58d0..7a07241016 100644
--- a/platform/platform-resources/src/main/java/org/bonitasoft/platform/setup/PlatformSetupAccessor.java
+++ b/platform/platform-resources/src/main/java/org/bonitasoft/platform/setup/PlatformSetupAccessor.java
@@ -70,13 +70,16 @@ public PlatformSetup createNewPlatformSetup(DataSource dataSource, String dbVend
         final DataSourceTransactionManager dataSourceTransactionManager = new DataSourceTransactionManager(dataSource);
         TransactionTemplate transactionTemplate = new TransactionTemplate(dataSourceTransactionManager);
         VersionService versionService = new VersionServiceImpl(jdbcTemplate);
-        return createPlatformSetup(createScriptExecutor(dataSource, dbVendor, versionService),
-                new ConfigurationServiceImpl(jdbcTemplate, transactionTemplate, dbVendor), versionService, dataSource);
+        return createPlatformSetup(
+                createScriptExecutor(dataSource, dbVendor, versionService),
+                new ConfigurationServiceImpl(jdbcTemplate, transactionTemplate, dbVendor),
+                versionService, dataSource, dbVendor);
     }
 
     protected PlatformSetup createPlatformSetup(ScriptExecutor scriptExecutor,
-            ConfigurationService configurationService, VersionService versionService, DataSource dataSource) {
-        return new PlatformSetup(scriptExecutor, configurationService, versionService, dataSource);
+            ConfigurationService configurationService, VersionService versionService, DataSource dataSource,
+            String dbVendor) {
+        return new PlatformSetup(scriptExecutor, configurationService, versionService, dataSource, dbVendor);
     }
 
     protected ScriptExecutor createScriptExecutor(DataSource dataSource, String dbVendor,