From 54544b63347ccee2e4d14ef94faaf8a1cbb7a986 Mon Sep 17 00:00:00 2001
From: Alexander Skoblikov <aleksandr.skoblikov@dbeaver.com>
Date: Mon, 26 Aug 2024 15:19:32 +0300
Subject: [PATCH] CB-5561 execute data migration if runtime config contains env
 variables (#2873)

---
 .../model/app/BaseServerConfigurationController.java   |  5 +++--
 .../model/app/WebServerConfigurationController.java    | 10 ++++++++++
 .../server/CBServerConfigurationController.java        |  6 ++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseServerConfigurationController.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseServerConfigurationController.java
index 8204ffda61..6ea3bcea9d 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseServerConfigurationController.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseServerConfigurationController.java
@@ -22,9 +22,10 @@ import com.google.gson.GsonBuilder;
 /**
  * Abstract class that contains methods for loading configuration with gson.
  */
-public abstract class BaseServerConfigurationController<T extends WebServerConfiguration> implements WebServerConfigurationController<T> {
+public abstract class BaseServerConfigurationController<T extends WebServerConfiguration>
+    implements WebServerConfigurationController<T> {
 
-    protected Gson getGson() {
+    public Gson getGson() {
         return getGsonBuilder().create();
     }
 
diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/WebServerConfigurationController.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/WebServerConfigurationController.java
index febbce7a4d..c06f137b70 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/WebServerConfigurationController.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/WebServerConfigurationController.java
@@ -16,9 +16,12 @@
  */
 package io.cloudbeaver.model.app;
 
+import com.google.gson.Gson;
+import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.DBException;
 
 import java.nio.file.Path;
+import java.util.Map;
 
 /**
  * Server configuration controller.
@@ -31,4 +34,11 @@ public interface WebServerConfigurationController<T extends WebServerConfigurati
      */
     void loadServerConfiguration(Path configPath) throws DBException;
 
+    @NotNull
+    default Map<String, Object> getOriginalConfigurationProperties() {
+        return Map.of();
+    }
+
+    @NotNull
+    Gson getGson();
 }
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfigurationController.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfigurationController.java
index b4233baf3f..25c0d26390 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfigurationController.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBServerConfigurationController.java
@@ -625,4 +625,10 @@ public abstract class CBServerConfigurationController<T extends CBServerConfig>
         }
         return uri;
     }
+
+    @NotNull
+    @Override
+    public Map<String, Object> getOriginalConfigurationProperties() {
+        return originalConfigurationProperties;
+    }
 }
\ No newline at end of file