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 implements WebServerConfigurationController { +public abstract class BaseServerConfigurationController + implements WebServerConfigurationController { - 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 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 } return uri; } + + @NotNull + @Override + public Map getOriginalConfigurationProperties() { + return originalConfigurationProperties; + } } \ No newline at end of file