mirror of
https://github.com/dbeaver/cloudbeaver.git
synced 2026-09-24 16:04:36 +08:00
CB-5561 execute data migration if runtime config contains env variables (#2873)
This commit is contained in:
+3
-2
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
+10
@@ -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();
|
||||
}
|
||||
|
||||
+6
@@ -625,4 +625,10 @@ public abstract class CBServerConfigurationController<T extends CBServerConfig>
|
||||
}
|
||||
return uri;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@Override
|
||||
public Map<String, Object> getOriginalConfigurationProperties() {
|
||||
return originalConfigurationProperties;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user