dbeaver-vscode#3 fix conflict

dbeaver · Sep 17, 2024 · 15c9fdc · 15c9fdc
1 parent b8348ff
commit 15c9fdc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jetty/CBJettyServer.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jetty/CBJettyServer.java
@@ -16,6 +16,7 @@
  */
 package io.cloudbeaver.server.jetty;
 
+import io.cloudbeaver.model.app.GQLApplicationAdapter;
 import io.cloudbeaver.registry.WebServiceRegistry;
 import io.cloudbeaver.server.CBApplication;
 import io.cloudbeaver.server.CBServerConfig;
@@ -120,7 +121,7 @@ public void runServer() {
                     }
                 }
 
-                initSessionManager(this.application.getMaxSessionIdleTime(), servletContextHandler);
+                initSessionManager(this.application.getMaxSessionIdleTime(), application, servletContextHandler);
 
                 server.setHandler(servletContextHandler);
 
@@ -180,11 +181,11 @@ private Path getSslConfigurationPath() {
 
     public static void initSessionManager(
         long maxIdleTime,
+        @NotNull GQLApplicationAdapter application,
         @NotNull ServletContextHandler servletContextHandler
     ) {
         // Init sessions persistence
         CBSessionHandler sessionHandler = new CBSessionHandler(application);
-        var maxIdleTime = application.getMaxSessionIdleTime();
         int intMaxIdleSeconds;
         if (maxIdleTime > Integer.MAX_VALUE) {
             log.warn("Max session idle time value is greater than Integer.MAX_VALUE. Integer.MAX_VALUE will be used instead");

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jetty/CBSessionHandler.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jetty/CBSessionHandler.java
@@ -16,16 +16,16 @@
  */
 package io.cloudbeaver.server.jetty;
 
-import io.cloudbeaver.server.CBApplication;
+import io.cloudbeaver.model.app.GQLApplicationAdapter;
 import jakarta.servlet.SessionCookieConfig;
 import org.eclipse.jetty.http.Syntax;
 import org.eclipse.jetty.server.session.SessionHandler;
 
 public class CBSessionHandler extends SessionHandler {
     private final CBCookieConfig cbCookieConfig;
-    private final CBApplication<?> application;
+    private final GQLApplicationAdapter application;
 
-    public CBSessionHandler(CBApplication<?> application) {
+    public CBSessionHandler(GQLApplicationAdapter application) {
         this.cbCookieConfig = new CBCookieConfig();
         this.application = application;
     }