Merge branch 'devel' into chore/vscode-dev-environment

dbeaver · Sep 19, 2024 · 5f95f45 · 5f95f45
2 parents 664f9e0 + b869bdd
commit 5f95f45
Show file tree

Hide file tree

Showing 64 changed files with 644 additions and 420 deletions.
diff --git a/server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF
@@ -29,7 +29,9 @@ Export-Package: io.cloudbeaver,
  io.cloudbeaver.websocket,
  io.cloudbeaver.model,
  io.cloudbeaver.model.app,
+ io.cloudbeaver.model.config,
  io.cloudbeaver.model.fs,
+ io.cloudbeaver.model.log,
  io.cloudbeaver.model.rm,
  io.cloudbeaver.model.rm.local,
  io.cloudbeaver.model.rm.lock,

diff --git a/...undles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseAuthWebAppConfiguration.java b/...undles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseAuthWebAppConfiguration.java
diff --git a/.../io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseServerConfigurationController.java b/.../io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseServerConfigurationController.java
@@ -18,13 +18,15 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import org.jkiss.code.NotNull;
 
 /**
  * Abstract class that contains methods for loading configuration with gson.
  */
 public abstract class BaseServerConfigurationController<T extends WebServerConfiguration>
     implements WebServerConfigurationController<T> {
 
+    @NotNull
     public Gson getGson() {
         return getGsonBuilder().create();
     }

diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseWebApplication.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseWebApplication.java
@@ -59,7 +59,6 @@ public abstract class BaseWebApplication extends BaseApplicationImpl implements
     public static final String CLI_PARAM_WEB_CONFIG = "-web-config";
     public static final String LOGBACK_FILE_NAME = "logback.xml";
 
-
     private static final Log log = Log.getLog(BaseWebApplication.class);
 
     private String instanceId;