dbeaver/dbeaver-vscode#22 review fixes

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseServletApplication.java

@@ -45,7 +45,7 @@
 import java.util.Map;
 
 /**
- * Web application
+ * Servlet application
  */
 public abstract class BaseServletApplication extends BaseApplicationImpl implements ServletApplication {
 

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/ServletAuthApplication.java

@@ -21,7 +21,7 @@
 import org.jkiss.dbeaver.DBException;
 
 public interface ServletAuthApplication extends ServletApplication {
-    WebAuthConfiguration getAuthConfiguration();
+    ServletAuthConfiguration getAuthConfiguration();
 
     String getAuthServiceURL();
 

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/WebAuthConfiguration.java → server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/ServletAuthConfiguration.java

@@ -25,7 +25,7 @@
 /**
  * Application authentication configuration
  */
-public interface WebAuthConfiguration {
+public interface ServletAuthConfiguration {
 
     String getDefaultAuthProvider();
 

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/config/CBAppConfig.java

@@ -20,7 +20,7 @@
 import io.cloudbeaver.auth.provider.local.LocalAuthProviderConstants;
 import io.cloudbeaver.model.app.BaseWebAppConfiguration;
 import io.cloudbeaver.model.app.WebAppConfiguration;
-import io.cloudbeaver.model.app.WebAuthConfiguration;
+import io.cloudbeaver.model.app.ServletAuthConfiguration;
 import io.cloudbeaver.registry.WebAuthProviderDescriptor;
 import io.cloudbeaver.registry.WebAuthProviderRegistry;
 import org.jkiss.code.NotNull;
@@ -37,7 +37,7 @@
 /**
  * Application configuration
  */
-public class CBAppConfig extends BaseWebAppConfiguration implements WebAuthConfiguration, WebAppConfiguration {
+public class CBAppConfig extends BaseWebAppConfiguration implements ServletAuthConfiguration, WebAppConfiguration {
     private static final Log log = Log.getLog(CBAppConfig.class);
 
     public static final DataSourceNavigatorSettings DEFAULT_VIEW_SETTINGS = PRESET_WEB.getSettings();
@@ -162,6 +162,7 @@ public boolean isRedirectOnFederatedAuth() {
         return redirectOnFederatedAuth;
     }
 
+    @NotNull
     public String[] getEnabledDrivers() {
         return enabledDrivers;
     }
@@ -170,6 +171,7 @@ public void setEnabledDrivers(String[] enabledDrivers) {
         this.enabledDrivers = enabledDrivers;
     }
 
+    @NotNull
     public String[] getDisabledDrivers() {
         return disabledDrivers;
     }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSessionAuthProcessor.java

@@ -20,7 +20,7 @@
 import io.cloudbeaver.DBWUserIdentity;
 import io.cloudbeaver.DBWebException;
 import io.cloudbeaver.auth.SMAuthProviderExternal;
-import io.cloudbeaver.model.app.WebAuthConfiguration;
+import io.cloudbeaver.model.app.ServletAuthConfiguration;
 import io.cloudbeaver.model.user.WebUser;
 import io.cloudbeaver.registry.WebAuthProviderDescriptor;
 import io.cloudbeaver.registry.WebAuthProviderRegistry;
@@ -127,7 +127,7 @@ private List<WebAuthInfo> finishWebSessionAuthorization(SMAuthInfo authInfo) thr
 
                 DBWUserIdentity userIdentity = null;
                 var providerConfigId = authConfiguration.getAuthProviderConfigurationId();
-                var providerConfig = ServletAppUtils.getWebAuthApplication()
+                var providerConfig = ServletAppUtils.getAuthApplication()
                     .getAuthConfiguration()
                     .getAuthProviderConfiguration(providerConfigId);
                 if (authProviderExternal != null) {
@@ -194,7 +194,7 @@ private WebAuthProviderDescriptor getAuthProvider(String providerId) throws DBWe
     }
 
     private boolean isProviderEnabled(@NotNull String providerId) {
-        WebAuthConfiguration appConfiguration = (WebAuthConfiguration) ServletAppUtils.getServletApplication()
+        ServletAuthConfiguration appConfiguration = (ServletAuthConfiguration) ServletAppUtils.getServletApplication()
             .getAppConfiguration();
         return appConfiguration.isAuthProviderEnabled(providerId);
     }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/ServletAppUtils.java

@@ -59,7 +59,7 @@ public static ServletApplication getServletApplication() {
         return (ServletApplication) DBWorkbench.getPlatform().getApplication();
     }
 
-    public static ServletAuthApplication getWebAuthApplication() throws DBException {
+    public static ServletAuthApplication getAuthApplication() throws DBException {
         ServletApplication application = getServletApplication();
         if (!ServletAuthApplication.class.isAssignableFrom(application.getClass())) {
             throw new DBException("The current application doesn't contain authorization configuration");
@@ -169,7 +169,7 @@ public static String removeSideSlashes(String action) {
 
     @NotNull
     public static StringBuilder getAuthApiPrefix(String serviceId) throws DBException {
-        return getAuthApiPrefix(getWebAuthApplication(), serviceId);
+        return getAuthApiPrefix(getAuthApplication(), serviceId);
     }
 
     @NotNull

server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/CBApplication.java

@@ -22,7 +22,7 @@
 import io.cloudbeaver.model.WebServerConfig;
 import io.cloudbeaver.model.app.BaseServletApplication;
 import io.cloudbeaver.model.app.ServletAuthApplication;
-import io.cloudbeaver.model.app.WebAuthConfiguration;
+import io.cloudbeaver.model.app.ServletAuthConfiguration;
 import io.cloudbeaver.model.config.CBAppConfig;
 import io.cloudbeaver.model.config.CBServerConfig;
 import io.cloudbeaver.model.config.SMControllerConfiguration;
@@ -177,7 +177,7 @@ public T getServerConfiguration() {
     }
 
     @Override
-    public WebAuthConfiguration getAuthConfiguration() {
+    public ServletAuthConfiguration getAuthConfiguration() {
         return getAppConfiguration();
     }
 

server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/CBPlatform.java

@@ -84,13 +84,13 @@ protected synchronized void initialize() {
     }
 
     protected void scheduleServerJobs() {
-        new WebSessionMonitorJob(this, getSessionManager())
+        new WebSessionMonitorJob(this, application.getSessionManager())
             .scheduleMonitor();
 
-        new SessionStateJob(this, getSessionManager())
+        new SessionStateJob(this, application.getSessionManager())
             .scheduleMonitor();
 
-        new WebDataSourceMonitorJob(this, getSessionManager())
+        new WebDataSourceMonitorJob(this, application.getSessionManager())
             .scheduleMonitor();
 
         new AbstractJob("Delete temp folder") {
@@ -120,7 +120,7 @@ public synchronized void dispose() {
 
     @NotNull
     @Override
-    public WebApplication getApplication() {
+    public CBApplication<?> getApplication() {
         return application;
     }
 
@@ -140,10 +140,6 @@ public boolean isShuttingDown() {
         return false;
     }
 
-    public CBSessionManager getSessionManager() {
-        return application.getSessionManager();
-    }
-
     public void refreshApplicableDrivers() {
         this.applicableDrivers.clear();
 

server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/events/WSObjectPermissionUpdatedEventHandler.java

@@ -66,7 +66,7 @@ public void handleEvent(@NotNull WSObjectPermissionEvent event) {
             return;
         }
         log.debug(event.getTopicId() + " event handled");
-        Collection<BaseWebSession> allSessions = CBPlatform.getInstance().getSessionManager().getAllActiveSessions();
+        Collection<BaseWebSession> allSessions = CBApplication.getInstance().getSessionManager().getAllActiveSessions();
         for (var activeUserSession : allSessions) {
             if (!isAcceptableInSession(activeUserSession, event)) {
                 log.debug("Cannot handle %s event '%s' in session %s".formatted(

server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/events/WSUserEventHandler.java

@@ -16,6 +16,7 @@
  */
 package io.cloudbeaver.server.events;
 
+import io.cloudbeaver.server.CBApplication;
 import io.cloudbeaver.server.CBPlatform;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.model.websocket.WSEventHandler;
@@ -31,7 +32,7 @@ public void handleEvent(@NotNull EVENT event) {
         if (eventType == null) {
             return;
         }
-        var sessionManager = CBPlatform.getInstance().getSessionManager();
+        var sessionManager = CBApplication.getInstance().getSessionManager();
         switch (eventType) {
             case CLOSE_USER_SESSIONS:
                 if (event instanceof WSUserCloseSessionsEvent closeSessionsEvent) {

server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/servlets/CBStaticServlet.java

@@ -83,7 +83,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
         }
         String uri = request.getPathInfo();
         try {
-            WebSession webSession = CBPlatform.getInstance().getSessionManager().getWebSession(
+            WebSession webSession = CBApplication.getInstance().getSessionManager().getWebSession(
                 request, response, false);
             performAutoLoginIfNeeded(request, webSession);
             WebActionParameters webActionParameters = WebActionParameters.fromSession(webSession, false);

server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/service/core/CECoreModelExtender.java

@@ -20,6 +20,9 @@
 import io.cloudbeaver.service.DBWBindingContext;
 import io.cloudbeaver.service.WebServiceBindingBase;
 
+/**
+ * extends the base gql model, to avoid unnecessary fields in other applications
+ */
 public class CECoreModelExtender extends WebServiceBindingBase<DBWVoidService> {
     public CECoreModelExtender() {
         super(DBWVoidService.class, new DBWVoidService(), "schema/service.core.graphqls");

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/WebServiceUtils.java

@@ -346,7 +346,7 @@ public static List<WebAuthProviderDescriptor> getEnabledAuthProviders() {
         List<WebAuthProviderDescriptor> result = new ArrayList<>();
         String[] authProviders = null;
         try {
-            authProviders = ServletAppUtils.getWebAuthApplication().getAuthConfiguration().getEnabledAuthProviders();
+            authProviders = ServletAppUtils.getAuthApplication().getAuthConfiguration().getEnabledAuthProviders();
         } catch (DBException e) {
             log.error(e.getMessage(), e);
             return List.of();

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/BaseWebPlatform.java

@@ -132,8 +132,6 @@ private void initTempFolder(@NotNull DBRProgressMonitor monitor) {
     @NotNull
     public abstract WebApplication getApplication();
 
-    public abstract WebAppSessionManager getSessionManager();
-
     protected abstract void scheduleServerJobs();
 
     @Override

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/WebServiceBindingBase.java

@@ -104,12 +104,12 @@ protected static DBWBindingContext getBindingContext(DataFetchingEnvironment env
     }
 
     protected static WebSession getWebSession(DataFetchingEnvironment env) throws DBWebException {
-        return WebAppUtils.getWebPlatform().getSessionManager().getWebSession(
+        return WebAppUtils.getWebApplication().getSessionManager().getWebSession(
             getServletRequest(env), getServletResponse(env));
     }
 
     protected static WebSession getWebSession(DataFetchingEnvironment env, boolean errorOnNotFound) throws DBWebException {
-        return WebAppUtils.getWebPlatform().getSessionManager().getWebSession(
+        return WebAppUtils.getWebApplication().getSessionManager().getWebSession(
             getServletRequest(env), getServletResponse(env), errorOnNotFound);
     }
 
@@ -127,12 +127,12 @@ protected static WebConnectionInfo getWebConnection(DataFetchingEnvironment env)
      */
     @Nullable
     public static WebSession findWebSession(DataFetchingEnvironment env) {
-        return WebAppUtils.getWebPlatform().getSessionManager().findWebSession(
+        return WebAppUtils.getWebApplication().getSessionManager().findWebSession(
             getServletRequest(env));
     }
 
     public static WebSession findWebSession(DataFetchingEnvironment env, boolean errorOnNotFound) throws DBWebException {
-        return WebAppUtils.getWebPlatform().getSessionManager().findWebSession(
+        return WebAppUtils.getWebApplication().getSessionManager().findWebSession(
             getServletRequest(env), errorOnNotFound);
     }
 

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/WebServiceBindingCore.java

@@ -25,6 +25,7 @@
 import io.cloudbeaver.model.WebNetworkHandlerConfigInput;
 import io.cloudbeaver.model.session.WebSession;
 import io.cloudbeaver.server.BaseWebPlatform;
+import io.cloudbeaver.server.WebAppSessionManager;
 import io.cloudbeaver.server.WebAppUtils;
 import io.cloudbeaver.server.graphql.GraphQLEndpoint;
 import io.cloudbeaver.service.DBWBindingContext;
@@ -49,8 +50,7 @@ public WebServiceBindingCore() {
 
     @Override
     public void bindWiring(DBWBindingContext model) throws DBWebException {
-        BaseWebPlatform platform = WebAppUtils.getWebPlatform();
-        var sessionManager = platform.getSessionManager();
+        WebAppSessionManager sessionManager = WebAppUtils.getWebApplication().getSessionManager();
         model.getQueryType()
             .dataFetcher("serverConfig", env -> getService(env).getServerConfig())
             .dataFetcher("productSettings", env -> getService(env).getProductSettings(getWebSession(env)))

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java

@@ -267,7 +267,7 @@ public List<WebServerMessage> readSessionLog(
     @Override
     public boolean closeSession(HttpServletRequest request) throws DBWebException {
         try {
-            var baseWebSession = WebAppUtils.getWebPlatform().getSessionManager().closeSession(request);
+            var baseWebSession = WebAppUtils.getWebApplication().getSessionManager().closeSession(request);
             if (baseWebSession instanceof WebSession webSession) {
                 for (WebSessionHandlerDescriptor hd : WebHandlerRegistry.getInstance().getSessionHandlers()) {
                     try {
@@ -288,22 +288,22 @@ public boolean closeSession(HttpServletRequest request) throws DBWebException {
     @Override
     @Deprecated
     public boolean touchSession(@NotNull HttpServletRequest request, @NotNull HttpServletResponse response) throws DBWebException {
-        return WebAppUtils.getWebPlatform().getSessionManager().touchSession(request, response);
+        return WebAppUtils.getWebApplication().getSessionManager().touchSession(request, response);
     }
 
     @Override
     @Deprecated
     public WebSession updateSession(@NotNull HttpServletRequest request, @NotNull HttpServletResponse response)
         throws DBWebException {
-        var sessionManager = WebAppUtils.getWebPlatform().getSessionManager();
+        var sessionManager = WebAppUtils.getWebApplication().getSessionManager();
         sessionManager.touchSession(request, response);
         return sessionManager.getWebSession(request, response, true);
     }
 
     @Override
     public boolean refreshSessionConnections(@NotNull HttpServletRequest request, @NotNull HttpServletResponse response)
         throws DBWebException {
-        WebSession session = WebAppUtils.getWebPlatform().getSessionManager().getWebSession(request, response);
+        WebSession session = WebAppUtils.getWebApplication().getSessionManager().getWebSession(request, response);
         if (session == null) {
             return false;
         } else {

server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/RPSessionHandler.java

@@ -19,7 +19,7 @@
 import io.cloudbeaver.DBWebException;
 import io.cloudbeaver.auth.SMAuthProviderExternal;
 import io.cloudbeaver.auth.provider.rp.RPAuthProvider;
-import io.cloudbeaver.model.app.WebAuthConfiguration;
+import io.cloudbeaver.model.app.ServletAuthConfiguration;
 import io.cloudbeaver.model.session.WebSession;
 import io.cloudbeaver.model.session.WebSessionAuthProcessor;
 import io.cloudbeaver.registry.WebAuthProviderDescriptor;
@@ -46,7 +46,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 public class RPSessionHandler implements DBWSessionHandler {
 
@@ -57,7 +56,7 @@ public class RPSessionHandler implements DBWSessionHandler {
     public boolean handleSessionOpen(WebSession webSession, HttpServletRequest request, HttpServletResponse response) throws DBException, IOException {
         boolean configMode = CBApplication.getInstance().isConfigurationMode();
         //checks if the app is not in configuration mode and reverse proxy auth is enabled in the config file
-        WebAuthConfiguration appConfiguration = (WebAuthConfiguration) ServletAppUtils.getServletApplication()
+        ServletAuthConfiguration appConfiguration = (ServletAuthConfiguration) ServletAppUtils.getServletApplication()
             .getAppConfiguration();
         boolean isReverseProxyAuthEnabled = appConfiguration.isAuthProviderEnabled(RPAuthProvider.AUTH_PROVIDER);
         if (!configMode && isReverseProxyAuthEnabled) {
@@ -73,7 +72,7 @@ public void reverseProxyAuthentication(@NotNull HttpServletRequest request, @Not
             throw new DBWebException("Auth provider " + RPAuthProvider.AUTH_PROVIDER + " not found");
         }
         SMAuthProviderExternal<?> authProviderExternal = (SMAuthProviderExternal<?>) authProvider.getInstance();
-        SMAuthProviderCustomConfiguration configuration = ServletAppUtils.getWebAuthApplication()
+        SMAuthProviderCustomConfiguration configuration = ServletAppUtils.getAuthApplication()
             .getAuthConfiguration()
             .getAuthCustomConfigurations()
             .stream()